Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
12b5100
Merge pull request #168 from AustinCodingAcademy/test
CLofton Jan 9, 2017
60c6eb6
Update PULL_REQUEST_TEMPLATE.md
CLofton Jan 9, 2017
f207512
Update PULL_REQUEST_TEMPLATE.md
CLofton Jan 9, 2017
029419e
updated file structure for new layout of curriculum
CLofton Jan 11, 2017
9937ac9
built file structure for revamped curriculum
CLofton Jan 11, 2017
94f4f29
fixed file structure
CLofton Jan 11, 2017
0a86e68
Update index.html
kevincolten Jan 17, 2017
18ad747
first commit
Jan 25, 2017
02669c4
removed index link
Jan 25, 2017
a121b1c
adding eslint
kevincolten Apr 10, 2017
de89a53
removed extra files
kevincolten Apr 10, 2017
a2a8701
added branding, htmllint fork
kevincolten Apr 10, 2017
532fa33
added branding, htmllint fork
kevincolten Apr 10, 2017
146b11a
removed lint.sh
kevincolten Apr 10, 2017
88f6f2d
fixed start command
kevincolten Apr 10, 2017
46c5816
updated workbook for Q2 2017
CLofton Apr 10, 2017
135e135
Merge branch 'gh-pages' of https://github.com/AustinCodingAcademy/web…
CLofton Apr 10, 2017
3604078
added jquery apps and test
kevincolten Apr 10, 2017
2b898db
added eslint config file
kevincolten Apr 10, 2017
afb8f03
updated readme
kevincolten Apr 11, 2017
9e87ede
updated readme
kevincolten Apr 11, 2017
953c5fc
added hello world to index.html
CLofton Apr 11, 2017
817e116
fixed
CLofton Apr 11, 2017
bbe2442
added hello world to index.html
CLofton Apr 11, 2017
21e8a27
Update README.md
CLofton Apr 11, 2017
d293846
added jquery challanges
kevincolten Apr 11, 2017
8837229
linking to jquery
kevincolten Apr 11, 2017
b13c880
changed names
kevincolten Apr 11, 2017
e545844
Merge branch 'gh-pages' of github.com:AustinCodingAcademy/web-workboo…
kevincolten Apr 11, 2017
0b2a2eb
commented out challenge instructions
kevincolten Apr 11, 2017
b454461
added jquery cdn
kevincolten Apr 11, 2017
1792489
added more jquery challenges
kevincolten Apr 11, 2017
37a45b8
added jquery cdn
kevincolten Apr 11, 2017
437e223
fixed flex value
kevincolten Apr 11, 2017
613d6b0
Merge branch 'gh-pages' of github.com:AustinCodingAcademy/web-workboo…
kevincolten Apr 11, 2017
2289204
fixed eslintrc name
kevincolten Apr 11, 2017
e5d2b36
Merge pull request #228 from CLofton/gh-pages
kevincolten Apr 11, 2017
c99b469
Revert "Chris Lofton"
kevincolten Apr 11, 2017
94507ea
Merge pull request #230 from AustinCodingAcademy/revert-228-gh-pages
kevincolten Apr 11, 2017
531c762
Merge branch 'gh-pages' into jquery-challenges
kevincolten Apr 11, 2017
cb46862
Update PULL_REQUEST_TEMPLATE.md
CLofton Apr 17, 2017
d7849dd
Update PULL_REQUEST_TEMPLATE.md
CLofton Apr 17, 2017
61949d2
Update
CLofton Apr 17, 2017
4bcc2f8
Merge pull request #229 from AustinCodingAcademy/jquery-challenges
kevincolten Jul 11, 2017
b32a3a0
Update package.json
kevincolten Aug 15, 2017
d76eaa6
Update script.js
kevincolten Sep 1, 2017
ba5e5f4
Update script.js
kevincolten Sep 1, 2017
38211d1
updated
Sep 29, 2017
b6efd95
Update index.html
kevincolten Feb 13, 2018
7eeb3c2
Rename 05week/news-website/index.html to 05week/travel-gram/index.html
kevincolten Feb 13, 2018
08a437a
Rename 05week/news-website/css/style.css to 05week/travel-gram/css/st…
kevincolten Feb 13, 2018
0dc6bce
updated workbook
kevincolten Feb 21, 2018
b0a0af8
Create introduction.js
kevincolten Feb 21, 2018
93f5b5d
using aca javascripting
kevincolten Feb 21, 2018
ee9a331
Update PULL_REQUEST_TEMPLATE.md
kevincolten Mar 4, 2018
a7bd490
Update PULL_REQUEST_TEMPLATE.md
kevincolten Mar 4, 2018
d2049f3
Adding auto-generated CircleCI 2.0 config file
kevincolten Jul 30, 2018
94a5b1a
update package.lock
kevincolten Aug 20, 2018
1441d20
updated node
kevincolten Aug 20, 2018
bdf3983
put html lint last
kevincolten Aug 20, 2018
ce004ac
Create index.html
kevincolten Sep 7, 2018
66345cc
Create style.css
kevincolten Sep 7, 2018
e8978f9
Create index.html
kevincolten Sep 7, 2018
f4da91f
Create style.css
kevincolten Sep 7, 2018
034e81b
Create index.html
kevincolten Sep 7, 2018
57b92b1
Create style.css
kevincolten Sep 7, 2018
6a452b5
Update config.yml
kevincolten Sep 7, 2018
6ed3148
Update config.yml
kevincolten Sep 7, 2018
c960a8d
Update config.yml
kevincolten Sep 7, 2018
8fd32a3
Update package.json
kevincolten Sep 7, 2018
85e3638
Update config.yml
kevincolten Sep 7, 2018
6d1ee6f
first commit
edgarespadron Oct 15, 2018
f993ef6
blog
edgarespadron Oct 15, 2018
74d8ec2
box
edgarespadron Oct 29, 2018
57c0c54
checkpoint
edgarespadron Oct 29, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
version: 2
jobs:
build:
working_directory: ~/web-workbook
docker:
- image: circleci/node:8.9.4
steps:
- checkout
- restore_cache:
keys:
- v2-dep-{{ .Branch }}-
- v2-dep-gh-pages-
- v2-dep-
- run: npm install
- save_cache:
key: v2-dep-{{ .Branch }}-{{ epoch }}
paths:
- ./node_modules
- run: npm run lint
9 changes: 9 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"extends": "",
"rules": {
"indent": ["error", 2]
},
"env": {
"es6": true
}
}
100 changes: 29 additions & 71 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,71 +1,29 @@
# Checkpoint Rubric

## Checkpoint 1: Company/Organization Website following Wireframe
- [ ] A CSS file is effectively linked to the HTML file in the Head section: 10 points
- [ ] A link to a CSS reset file is included in the Head section of the HTML file: 10 points
- [ ] The webpage links to another page (multi-page website): 10 points
- [ ] The company/orgnanization name is lined up with the navigation menu at the top of the page: 10 points
- [ ] The title is centered in front of a background image: 10 points
- [ ] The body images are sized and formatted according to the wire frame: 10 points
- [ ] The body text is sized, positioned, and formatted to match the fire frame: 10 points
- [ ] Flexbox or floats are used to accurately replicate the layout of the wireframe: 10 points
- [ ] The footer consists of a background image, centered text, and 2 buttons that function as links: 10 points
- [ ] The student demonstrated mastery of HTML/CSS by building a website of professional caliber: 10 points

Specific Comments:

*Comments may also be made on the file itself using github's commenting tools.*






## Checkpoint 2: Foundry Winery Website
- [ ] Responsive navbar: 20 points
- [ ] Responsive site (resizes to fit desktop, tablet, and mobile views): 30 points
- [ ] Matched layout of original site: 20 points
- [ ] Matched font of original site: 10 points
- [ ] Properly commented code: 10 points
- [ ] Properly indented code: 10 points

Specific Comments:

*Comments may also be made on the file itself using github's commenting tools.*






## Checkpoint 3: Learning Team Project
- [ ] Mockup meets customer requirements: 25 points
- [ ] Website meets customer requirements: 25 points
- [ ] Learning team worked together effectively and contributed equally: 25 points
- [ ] Class presentation was engaging and effective: 25 points

Specific Comments:

*Comments may also be made on the file itself using github's commenting tools.*







## Checkpoint 4: Personal Portfolio Website
- [ ] Responive: 20 points
- [ ] Evidence of Effective Use of Design Principles: 20 points
- [ ] Links to Resume: 20 points
- [ ] Links to at least 3 Projects: 20 points
- [ ] Effective Communicates Desired Message ("Hire me"): 20 points

Specific Comments:

*Comments may also be made on the file itself using github's commenting tools.*





## Checkpoint Rubric
This is the rubric that your instructor will use to grade your checkpoints. Please do not edit.

**Checkpoint 1**
- [ ] A CSS file is effectively linked to the HTML file in the Head section: 15 points
- [ ] A link to a CSS reset file is included in the Head section of the HTML file: 15 points
- [ ] Appropriate use of Semantic Elements: 15 points
- [ ] Effective use of box model: 15 points
- [ ] Proper use of documentation (commenting on code): 15 points
- [ ] Linter passing: 10 points
- [ ] The student demonstrated mastery of HTML/CSS by building a website of professional caliber: 15 points

**Checkpoint 2**
- [ ] Effective use of Flexbox layout: 15 points
- [ ] Responsive site (resizes to fit desktop, tablet, and mobile views): 15 points
- [ ] Effective use of CSS Grid: 15 points
- [ ] Proper use of documentation (commenting on code): 15 points
- [ ] Site is hosted on github: 15 points
- [ ] Linter passing: 10 points
- [ ] The student demonstrated mastery of HTML/CSS and Responsive Web Design by building a website of professional caliber: 15 points

**Checkpoint 3**
- [ ] Use of HTML: 15 points
- [ ] Use of CSS: 15 points
- [ ] Use of JQuery: 15 points
- [ ] Proper use of documentation (commenting on code): 15 points
- [ ] Linter passing: 10 points
- [ ] The application has a professional look: 15 points
- [ ] The application functions as it should: 15 points
1 change: 1 addition & 0 deletions .stylelintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
2 changes: 0 additions & 2 deletions 01Lesson/index.html

This file was deleted.

File renamed without changes.
Empty file added 01week/helloworld/index.html
Empty file.
Empty file added 01week/resume/css/style.css
Empty file.
Empty file added 01week/resume/index.html
Empty file.
8 changes: 0 additions & 8 deletions 02Lesson/01Homework/index.html

This file was deleted.

9 changes: 0 additions & 9 deletions 02Lesson/01Project/index.html

This file was deleted.

47 changes: 0 additions & 47 deletions 02Lesson/02Homework/css/style.css

This file was deleted.

60 changes: 0 additions & 60 deletions 02Lesson/02Homework/index.html

This file was deleted.

24 changes: 0 additions & 24 deletions 02Lesson/02Project/css/style.css

This file was deleted.

10 changes: 0 additions & 10 deletions 02Lesson/02Project/index.html

This file was deleted.

Binary file added 02week/bio/Picture32.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
38 changes: 38 additions & 0 deletions 02week/bio/css/style.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
*
{
box-sizing: border-box;
}
body {
font-family: Arial;
padding: 20px;
background:pink;
}

/* Header/Blog Title */
.header {
padding: 30px;
font-size: 40px;
text-align: center;
background: white;
}

/* Footer */
.footer {
padding: 20px;
text-align: center;
background: #ddd;
margin-top: 20px;
}

.column {
float: left;
width: 33%;
padding: 10px;
height: 300px;
}

.row:after {
content: "";
display: table;
clear: both;
}
38 changes: 38 additions & 0 deletions 02week/bio/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<!Doctype html>
<html>
<head>
<link href="css\style.css" rel= "stylesheet" type= "text/css">
</head>

<Body>

<h1 class="header">Edgar</h1>


<div class="row">
<div class = "column">
<h3>About Me</h3>
<p>
Hello, My name is Edgar Micheal Espadron. I was born in Naha, Japan on January 17, 1997. I am currently studying computer coding
with austin coding academy. I played Basketball, Football, and did track and field in High School. We won Europeans for basketbal and I am
a European champion for High Jump and Long Jump. I also hold the school record for longest standing long jump which was 11 feet and longest long jump
in a meet which was 8.40 meters
</p>
</div>

<div class = "column">
<h3>Education</h3>
<p>
Kaiserslautern High School
Temple College
Dallas Coding Academy

</p>
</div>

<div class = "column">
<img src="Picture32.jpeg" class="headshot"/>
</div>
</div>
</body>
</html>
Binary file added 02week/blog/Picture32.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading