Skip to content

Updated workshops 1 & 2 pages #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tiramisuuuuuuu merged 1 commit into from
Feb 24, 2025
Merged

Updated workshops 1 & 2 pages #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion app/_components/(workshop)/materials-lessons/materialsLessons.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ import styles from './materialsLessons.module.scss'

import Lesson from './lessonCard'
import Demo1 from '@/_demos/demo1'
import Inspect from '@/_demos/inspect'

const componentMap = {
Demo1: <Demo1 />
Demo1: <Demo1 />,
Inspect: <Inspect />
}

export default function Materials({ slideDeckLink, recordingLink, lessons }) {
Expand Down
2 changes: 1 addition & 1 deletion app/_data/homepage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"current_week": 1,
"links": {
"training_repo": "https://github.com/include-davis/tech-fw-2024",
"training_repo": "https://github.com/include-davis/tech-ws-2025",
"slack_invite": "https://join.slack.com/t/2nclude-at-davis/shared_invite/zt-2xs9er08y-3McmYoNfdmagZ8dWY5T3Yw"
},
"contacts": [
Expand Down
167 changes: 94 additions & 73 deletions app/_data/workshops.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
"Intro to Git"
],
"assignment": {
"brief": "For your assignment you will need to practice HTML and CSS.\n\nAccess your personal page and create a profile. Introduce yourself by briefly telling us about you. Practice correct HTML semantics. Then create a “Skills” section. Create a list of your skills.\n\nOnce you complete the HTML, starting designing your CSS. Make sure to use the techniques taught in the workshop.",
"tags": ["flexbox", "html", "media queries"],
"deadline": "2.3.2025"
"brief": "For your assignment you will need to practice HTML and CSS.\n\nAccess your personal page and create a profile. Introduce yourself by briefly telling us about you. Practice correct HTML semantics. Then, add additional elements, such as an image or a “Skills” section with a list of your skills.\n\nOnce you complete the HTML, starting designing your CSS. Make sure to use the techniques taught in the workshop.",
"tags": ["flexbox", "html"],
"deadline": "2.24.2025"
},
"timeline": [
{
Expand All @@ -29,7 +29,7 @@
"endBeforeHalf": 2
},
{
"item": "Figma",
"item": "Figma for Assigment 1",
"startDay": 4,
"startInHalf": 1,
"endDay": 7,
Expand All @@ -43,39 +43,15 @@
"endBeforeHalf": 3
}
],
"slideDeckLink": "https://docs.google.com/presentation/d/1ewQZ1HhVQ1b20G3XeMrt6rBJtL67yPqk7xNFqaYBb-I/edit?usp=sharing",
"recordingLink": "",
"slideDeckLink": "https://docs.google.com/presentation/d/1Xbkw9om4aPU-0zZlmqbti8Ek57wd3XMNWiX-ti0GldI/edit?usp=sharing",
"recordingLink": "https://ucdavis.zoom.us/rec/share/eI6kS0X1nnN-Ck2MsbGnHwCqqkdvRRjCxVTqSSCu23gXy_G97-cIu-Z8hYICYeu-.BVv7C1gRnEgt554W",
"lessons": [
{
"title": "Flexbox",
"description": "Learn how to use flexbox!",
"resources": [
{
"name": "cheat sheet",
"link": "https://www.google.com"
},
{
"name": "interactive guide",
"link": "https://www.google.com"
}
],
"demoComponentName": "Demo1"
},
{
"title": "Position",
"description": "Learn how to use positioning!",
"resources": [
{
"name": "cheat sheet",
"link": "https://www.google.com"
},
{
"name": "interactive guide",
"link": "https://www.google.com"
}
],
"demoComponentName": "Demo1"
}
"title": "Chrome Developer Tools",
"description": "Try using the inspect tool to check out the component to the right- How are elements nested? What tags are used? Check out the css styles!",
"resources": [],
"demoComponentName": "Inspect"
}
],
"defaultCode": {
"/App.js": {
Expand Down Expand Up @@ -129,18 +105,11 @@
"Positioning"
],
"assignment": {
"brief": "For your assignment you will need to practice HTML and CSS.\n\nAccess your personal page and create a profile. Introduce yourself by briefly telling us about you. Practice correct HTML semantics. Then create a “Skills” section. Create a list of your skills.\n\nOnce you complete the HTML, starting designing your CSS. Make sure to use the techniques taught in the workshop.",
"tags": ["flexbox", "html", "media queries"],
"deadline": "10.18.2024"
"brief": "For your assignment you will need to practice HTML and CSS.\n\nAccess your personal page and create a profile. Introduce yourself by briefly telling us about you. Practice correct HTML semantics. Then, add additional elements, such as an image or a “Skills” section with a list of your skills.\n\nOnce you complete the HTML, starting designing your CSS. Make sure to use the techniques taught in the workshop.",
"tags": ["flexbox", "html"],
"deadline": "2.24.2025"
},
"timeline": [
{
"item": "Front-End Video",
"startDay": 1,
"startInHalf": 1,
"endDay": 3,
"endBeforeHalf": 1
},
{
"item": "Workshop Slide Deck",
"startDay": 2,
Expand All @@ -149,34 +118,38 @@
"endBeforeHalf": 2
},
{
"item": "Figma",
"item": "Additional Resources",
"startDay": 4,
"startInHalf": 1,
"endDay": 7,
"endBeforeHalf": 1
},
{
"item": "Something Else",
"item": "Assignment 1",
"startDay": 5,
"startInHalf": 1,
"endDay": 7,
"endBeforeHalf": 3
}
],
"slideDeckLink": "https://docs.google.com/presentation/d/19xRDWqRobKuQZbGXVShH4oshbxYSzu-H/edit?usp=drive_link&ouid=111649398785307597923&rtpof=true&sd=true",
"recordingLink": "",
"slideDeckLink": "https://docs.google.com/presentation/d/1PJDpJ_-nHqBZitoPJOKbV1Ercueo6kMY/edit?usp=sharing&ouid=104829516095066094781&rtpof=true&sd=true",
"recordingLink": "https://ucdavis.zoom.us/rec/share/OjUMW-UXHIS_8N-tvga9hMhlYLTMzpeuka2WAyVM8EUmceotXOSLVNHw9FT-Fgp4.KIjWZXvksKg3Ndro?startTime=1740092702000",
"lessons": [
{
"title": "Flexbox",
"description": "Learn how to use flexbox!",
"resources": [
{
"name": "cheat sheet",
"link": "https://www.google.com"
"link": "https://flexboxsheet.com/"
},
{
"name": "interactive guide",
"link": "https://www.google.com"
"name": "basic guide",
"link": "https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_flexible_box_layout/Basic_concepts_of_flexbox"
},
{
"name": "interactive environment",
"link": "https://flexboxlabs.netlify.app/"
}
],
"demoComponentName": "Demo1"
Expand All @@ -187,11 +160,11 @@
"resources": [
{
"name": "cheat sheet",
"link": "https://www.google.com"
"link": "https://www.w3schools.com/css/css_positioning.asp"
},
{
"name": "interactive guide",
"link": "https://www.google.com"
"name": "full guide",
"link": "https://developer.mozilla.org/en-US/docs/Web/CSS/position"
}
],
"demoComponentName": "Demo1"
Expand All @@ -207,40 +180,88 @@
},
"additionalResources": [
{
"title": "Figma",
"title": "HTML Tags",
"type": "Website",
"image": "/images/filler.jpeg",
"link": "https://flukeout.github.io/"
"link": "https://www.semrush.com/blog/html-tags-list/"
},
{
"title": "CSS Selector Game",
"title": "HTML Attributes",
"type": "Website",
"image": "/images/filler.jpeg",
"link": "https://flukeout.github.io/"
"link": "https://www.w3schools.com/tags/ref_attributes.asp"
},
{
"title": "Installing Git",
"title": "CSS Units",
"type": "Website",
"image": "/images/filler.jpeg",
"link": "https://flukeout.github.io/"
"link": "https://www.freecodecamp.org/news/css-unit-guide/"
},
{
"title": "CSS Cheat Sheet",
"title": "More CSS Units",
"type": "Website",
"image": "/images/filler.jpeg",
"link": "https://flukeout.github.io/"
"link": "https://www.digitalocean.com/community/tutorials/css-css-units-explained"
},
{
"title": "HTML Semantics",
"title": "Box Model Cheat Sheet",
"type": "Website",
"image": "",
"link": "https://flukeout.github.io/"
"link": "https://www.codecademy.com/learn/learn-css/modules/learn-css-box-model/cheatsheet"
},
{
"title": "HTML File Setup",
"title": "Display Property",
"type": "Website",
"image": "/images/filler.jpeg",
"link": "https://flukeout.github.io/"
"link": "https://css-tricks.com/almanac/properties/d/display/"
},
{
"title": "Overflow Property",
"type": "Website",
"image": "",
"link": "https://blog.hubspot.com/website/css-overflow"
},
{
"title": "PsuedoClasses",
"type": "Website",
"image": "",
"link": "https://css-tricks.com/pseudo-class-selectors/"
},
{
"title": "Flexbox Cheat Sheet",
"type": "Website",
"image": "",
"link": "https://css-tricks.com/snippets/css/a-guide-to-flexbox/"
},
{
"title": "Practical Guide to CSS Positioning",
"type": "Website",
"image": "",
"link": "https://www.digitalocean.com/community/tutorials/css-practical-guide-position-relative-absolute"
},
{
"title": "Positioning Real World Example",
"type": "Video",
"image": "",
"link": "https://www.youtube.com/watch?v=MxEtxo_AaZ4"
},
{
"title": "Media Query Tutorial",
"type": "Website",
"image": "",
"link": "https://developer.mozilla.org/en-US/docs/Learn_web_development/Core/CSS_layout/Media_queries"
},
{
"title": "Media Query Explained + Cheat Sheet",
"type": "Website",
"image": "",
"link": "https://medium.com/@sawanrathod/css3-media-query-cheat-sheet-1fab77ea3cb8"
},
{
"title": "Mastering Responsive Design",
"type": "Video",
"image": "",
"link": "https://youtu.be/K24lUqcT0Ms?si=WZDUyaX_YNQyY-zr"
}
]
},
Expand All @@ -254,9 +275,9 @@
"JSON"
],
"assignment": {
"brief": "For your assignment you will need to practice HTML and CSS.\n\nAccess your personal page and create a profile. Introduce yourself by briefly telling us about you. Practice correct HTML semantics. Then create a “Skills” section. Create a list of your skills.\n\nOnce you complete the HTML, starting designing your CSS. Make sure to use the techniques taught in the workshop.",
"tags": ["flexbox", "html", "media queries"],
"deadline": "10.18.2024"
"brief": "For your assignment you will need to practice HTML and CSS.\n\nAccess your personal page and create a profile. Introduce yourself by briefly telling us about you. Practice correct HTML semantics. Then, add additional elements, such as an image or a “Skills” section with a list of your skills.\n\nOnce you complete the HTML, starting designing your CSS. Make sure to use the techniques taught in the workshop.",
"tags": ["flexbox", "html"],
"deadline": "2.24.2025"
},
"timeline": [
{
Expand Down Expand Up @@ -379,9 +400,9 @@
"Props"
],
"assignment": {
"brief": "For your assignment you will need to practice HTML and CSS.\n\nAccess your personal page and create a profile. Introduce yourself by briefly telling us about you. Practice correct HTML semantics. Then create a “Skills” section. Create a list of your skills.\n\nOnce you complete the HTML, starting designing your CSS. Make sure to use the techniques taught in the workshop.",
"tags": ["flexbox", "html", "media queries"],
"deadline": "10.18.2024"
"brief": "For your assignment you will need to practice HTML and CSS.\n\nAccess your personal page and create a profile. Introduce yourself by briefly telling us about you. Practice correct HTML semantics. Then, add additional elements, such as an image or a “Skills” section with a list of your skills.\n\nOnce you complete the HTML, starting designing your CSS. Make sure to use the techniques taught in the workshop.",
"tags": ["flexbox", "html"],
"deadline": "2.24.2025"
},
"timeline": [
{
Expand Down
24 changes: 24 additions & 0 deletions app/_demos/inspect.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import styles from './inspect.module.scss'
import { IoMdStar } from "react-icons/io";
import { IoMdStarHalf } from "react-icons/io";


export default function Inspect(){
return (
<div className={styles.big_box}>
<img src="/images/salad.jpg" alt="Caesar salad" className={styles.salad} width="300" height="200" />
<text className={styles.subheader}>DELICIOUS AND REFRESHING</text>
<text className={styles.header}>Simple Caesar Salad</text>
<div className={styles.rating}>
<div className={styles.stars}>
<IoMdStar className={styles.star} />
<IoMdStar className={styles.star} />
<IoMdStar className={styles.star} />
<IoMdStar className={styles.star} />
<IoMdStarHalf className={styles.star} />
</div>
<text className={styles.ratingText}>1 Rating</text>
</div>
</div>
)
}
51 changes: 51 additions & 0 deletions app/_demos/inspect.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
.big_box {
width: 100%;
aspect-ratio: 1.5;

display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
gap: 10px;
padding: 20px;

background-color: lightgoldenrodyellow;
}

.salad {
width: 50%;
height: 50%;
}

.subheader {
font-weight: bold;
font-size: 12px;
}

.header {
height: 20px;
font-size: large;
text-decoration: underline;
text-decoration-color: orchid;
}

.rating {
display: flex;
justify-content: flex-start;
align-items: center;
}

.stars {
display: flex;
justify-content: center;
align-items: center;
row-gap: 5px;
color: orchid;
}

.ratingText {
color: gray;
font-size: small;
margin-left: 5px;
}

Binary file added public/images/salad.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.