diff --git a/HOW_TO_MARK.md b/HOW_TO_MARK.md index 99bf0f0f7..bc72d1949 100644 --- a/HOW_TO_MARK.md +++ b/HOW_TO_MARK.md @@ -24,7 +24,7 @@ https://github.com/CodeYourFuture/JavaScript-Core-1-Coursework-Week1-Solution ### 1.2) Using the Solutions Repo -In these repositories you will find solutions to each weeks coursework. These solutions are example answers and will not be the exact solution that students give. You should use it to inform your feedback of the coursework. +In these repositories you will find solutions to each week's coursework. These solutions are example answers and will not be the exact solution that students give. You should use it to inform your feedback of the coursework. Additionally, you will find marking guides in these places @@ -48,7 +48,7 @@ https://syllabus.codeyourfuture.io/guides/marking-guide This guide should be used when you see a student making a common mistake so instead of writing out a reply you can send them to the a good resource. -For example, if the student is leaving in lots of comments out code you could write +For example, if the student is leaving in lots of commented out code you could write ```txt Great work so far! diff --git a/Karma - mobile design.png b/Karma - mobile design.png deleted file mode 100644 index c03c21ccc..000000000 Binary files a/Karma - mobile design.png and /dev/null differ diff --git a/README.md b/README.md index 11db502fa..31db35cef 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,9 @@ The aim of this exercise is to create a page that looks just like this one: +![Karma desktop design](./homepage-desktop.png) -![alt text](./Karma%20-%20desktop%20design.png "Karma desktop design") - - -### Tasks +### Set up - **Fork and clone** this repo. - To fork, hit the 'fork' button in the top right corner of this page on Github. @@ -14,12 +12,14 @@ The aim of this exercise is to create a page that looks just like this one: - To clone, click the green button that says 'Code' on that page. Now the code is on your own machine (this happened when you cloned), AND it's linked to your own Karma repository on Github (which was created when you forked). - - Before you start coding, **create a new branch** following this format `your-class-name/your-name`, for example: `london-class-7/adam-smith`. Your branch name should be all lowercase, with no spaces. +# Instructions - **Edit `index.html` and `style.css`** to re-create the design above. - Remember, use semantic HTML to re-create the structure, and style each element using CSS to make a perfect copy of the above image. - All the images and icons you need can be found in the `img` folder, and the font 'Roboto' is already loaded into the project. + - **Only create the desktop design** for now. - - **Commit and push your code often** so you get into the habit and you avoid losing any code that you write if your machine crashes for example. +### Submitting your work + - **Commit and push your code often** (for example every half an hour)so you get into the habit and you avoid losing any code that you write if your machine crashes for example. - Once you're ready to submit your homework for review, do a final push and **create a Pull Request**. If you're unsure how to do this, [have a look here](https://syllabus.codeyourfuture.io/git/cheatsheet/#i-want-to-send-my-code-to-volunteers-pushing). diff --git a/additional/Karma - desktop - extended.png b/additional/Karma - desktop - extended.png deleted file mode 100644 index fc12cd2ca..000000000 Binary files a/additional/Karma - desktop - extended.png and /dev/null differ diff --git a/Karma - desktop design.png b/homepage-desktop.png similarity index 100% rename from Karma - desktop design.png rename to homepage-desktop.png diff --git a/level-2/README.md b/level-2/README.md new file mode 100644 index 000000000..1d1e538e8 --- /dev/null +++ b/level-2/README.md @@ -0,0 +1,35 @@ +# karma-clone +## Level 2 +The aim of this exercise is to: +- add a new section to the homepage +- create a new 'store' page with an order form +- connect the 2 pages together by adding navigation + +# Instructions + +- You'll find the designs inside the 'level-2' folder. +- Add the new section in your `index.html` +- Create a new page called `store.html` and re-create the design for the store page (the design is `level-2/store-desktop.png`) +- For the store page styles, you can keep using the same `style.css` file and add your store page styles in there. +You could also create a specific `store.css` file, but make sure you don't repeat the CSS already in `style.css`! +- Connect the 2 pages by: + - making the homepage's "Get Karma today" button navigate to the store page. + - making the header navigation "Store" link navigate to the store page, and the "Meet Karma" link navigate to the homepage. + +### Stretch goal + +**Custom radio buttons and checkbox** + +The 2 radio buttons and the checkbox in the store page design are tricky to style and will require you to do a little research. Focus on the rest of the form and layout first, and leave these until the end as a stretch goal. + +## Submitting your work + - Remember to **commit and push your code often** + - Once you're ready to submit your homework for review, do a final push and **create a Pull Request**. If you're unsure how to do this, [have a look here](https://syllabus.codeyourfuture.io/git/cheatsheet/#i-want-to-send-my-code-to-volunteers-pushing). + **Note:** If you've added your level 2 code to the same branch, then it will just update your previous Pull Request and you won't need a new PR. + +## Designs + +![Homepage extended design](./homepage-desktop-extended.png) + +![Store design](./store-desktop.png) + diff --git a/level-2/checkmark.svg b/level-2/checkmark.svg new file mode 100644 index 000000000..17a3c14f3 --- /dev/null +++ b/level-2/checkmark.svg @@ -0,0 +1,3 @@ + + + diff --git a/level-2/homepage-desktop-extended.png b/level-2/homepage-desktop-extended.png new file mode 100644 index 000000000..6ebe959ca Binary files /dev/null and b/level-2/homepage-desktop-extended.png differ diff --git a/additional/feature-img.png b/level-2/homepage-feature.png similarity index 100% rename from additional/feature-img.png rename to level-2/homepage-feature.png diff --git a/level-2/store-desktop.png b/level-2/store-desktop.png new file mode 100644 index 000000000..441382b1b Binary files /dev/null and b/level-2/store-desktop.png differ diff --git a/level-2/store-image_by-andrew-neel-unsplash.jpg b/level-2/store-image_by-andrew-neel-unsplash.jpg new file mode 100644 index 000000000..a8ad89099 Binary files /dev/null and b/level-2/store-image_by-andrew-neel-unsplash.jpg differ diff --git a/level-3/README.md b/level-3/README.md new file mode 100644 index 000000000..5dc5831af --- /dev/null +++ b/level-3/README.md @@ -0,0 +1,22 @@ +# karma-clone +## Level 3 + +Now let's make this website responsive! + +# Instructions + +- Use media queries to make both the homepage and the order page look good on mobile. +- You'll find the mobile designs inside the 'level-3' folder. +- You can use 1 or 2 breakpoints, it's up to you (if you're not sure, start with 768px - it's a classic one as it's the width of an iPad and a good point to switch from a mobile layout to a desktop layout). +- You might have to change some of your existing HTML and CSS code so that your webpage can match the mobile and desktop designs + +### Submitting your work + - Remember to **commit and push your code often** + - Once you're ready to submit your homework for review, do a final push and **create a Pull Request**. If you're unsure how to do this, [have a look here](https://syllabus.codeyourfuture.io/git/cheatsheet/#i-want-to-send-my-code-to-volunteers-pushing). + **Note:** If you've added your level 3 code to the same branch you used for the previous levels, then it will just update your existing Pull Request and you won't need a new PR. + +## Designs + +![Homepage mobile design](./homepage-mobile.png) + +![Store mobile design](./store-mobile.png) diff --git a/level-3/homepage-mobile.png b/level-3/homepage-mobile.png new file mode 100644 index 000000000..bbf49ff15 Binary files /dev/null and b/level-3/homepage-mobile.png differ diff --git a/img/menu-hamburger.svg b/level-3/menu-hamburger.svg similarity index 100% rename from img/menu-hamburger.svg rename to level-3/menu-hamburger.svg diff --git a/level-3/store-mobile.png b/level-3/store-mobile.png new file mode 100644 index 000000000..db48cab47 Binary files /dev/null and b/level-3/store-mobile.png differ