add apply link

public/content/course-info.md

@@ -28,13 +28,15 @@ If participating in the iOS track, you’ll need a MacBook with macOS 12.5 (Mont
 
 The weekly lectures are intended to give an introduction to the contents covered by the homework due the following week. The general structure will be a conceptual overview of the highlighted topics, use cases, and real-life examples. Attendance will be recorded.
 
-## Labs (Optional but Recommended)
+## Labs
 
-Labs are a fun way to learn and practice the content in a more hands-on way! They are recommended for those starting out in programming and web development, who want to put what they've learned in lecture into practice. We have all sorts of exciting exercises for you to make your own demos and small apps.
+Labs are a fun way to learn and practice the content in a more hands-on way! We have all sorts of exciting exercises for you to make your own demos and small apps.
 
 They also serve as a means of introducing the homework assignment (that was assigned the previous week) for those who are struggling to grasp certain concepts or haven't gotten around to doing the assigned homework. Those who do not wish to complete an assignment in its entirety for a certain week, can come to the lab section and attempt the homework for the entire duration. You can receive full credit for the homework assignment regardless of completion (based on effort, TAs will check you off). 
 
-You do not need to attend these labs if you feel comfortable that you can complete the homework assignment, or have already completed it.
+Web: Labs consist of a mini-lecture reviewing past topics, introducton of new concepts, and potentially a short lab assignment depending on the week. The first hour is required. The second half of lab serves as office hours / homework party and is optional, but highly recommended for those new to programming.
+
+iOS: Lab is optional.
 
 ## Learning Goals
 - Tackling detailed project specs

public/content/staff.json

@@ -1,25 +1,22 @@
 {
   "lecturers": [
     {
-      "image": "assets/steffi.jpg",
-      "name": "Steffi Tan",
-      "title": "Course Lead, Web Lecturer",
-      "description": "Hi! I'm a second year studying Computer Science and Cognitive Science. I like crocheting, lockpicking, Valorant, soup, and Kung Fu Panda 3.",
-      "social": "@staph.e"
+      "image": "assets/andy.jpg",
+      "name": "Andy Huang",
+      "title": "Course Lead & iOS Lecturer",
+      "description": "Hi! I’m Andy and I’m a fourth year studying CS. I spend way too much time on Netflix and watching anime! Feel free to talk to me if you have show recommendations or have questions regarding iOS development!",
+      "social": "@andyy_huang"
     },
     {
-      "image": "assets/oliver.jpg",
-      "name": "Oliver Carmont",
-      "title": "Web Lecturer",
-      "description": "Hi! I’m Oliver. I’m a sophomore studying CS. I’m an international student from Spain and Australia. At Berkeley, I’m involved in Cal Hacks, Codeology and IM Soccer.",
-      "social": "@oliver.cz"
+      "name": "Madhav Varshney",
+      "title": "Web Lead & Lecturer"
     },
     {
-      "image": "assets/juliet.jpg",
-      "name": "Juliet Kim",
-      "title": "iOS Lecturer",
-      "description": "Hey! I'm Juliet and I'm a senior studying CS from LA. I love journaling, baking, hitting that 12-3-30, and matcha lemonade <3. Super excited to meet everyone this semester!",
-      "social": "@julietkim_"
+      "image": "assets/jessica.jpg",
+      "name": "Jessica Ng",
+      "title": "Web Lead & Lecturer",
+      "description": "Hi! I’m Jessica, a second-year intended computer science major! You can usually find me reading, crocheting, playing Tetris, or binge-watching Love Island. I'm so excited to meet everyone this semester!",
+      "social": "@jessican_1212"
     }
   ],
   "tas": [
@@ -30,14 +27,6 @@
       "description": "Hi! I'm Abinaya - a first year double majoring in Data Science and CRS. I'm really interested in climate tech and food systems, and I love croissants, embroidery, journalling, and coding on the weekends. Super excited to meet you all and see where we go this semester <3 ",
       "social": "513-293-4206"
     },
-
-    {
-      "image": "assets/andy.jpg",
-      "name": "Andy Huang",
-      "title": "iOS TA",
-      "description": "Hi! I’m Andy and I’m a third year studying computer science. I spend way too much time on Netflix and watching anime! Feel free to talk to me if you have show recommendations or have questions regarding iOS development!",
-      "social": "@andyy_huang"
-    },
     {
     "image": "assets/enya.jpg",
     "name": "Enya Do",
@@ -52,13 +41,6 @@
       "description": "I'm a second year CS + Legal Studies major. Ask me about fencing, hiking, cooking, or the circadian rhythms of malaria parasites.",
       "social": "@alex.gberg"
     },
-    {
-      "image": "assets/jessica.jpg",
-      "name": "Jessica Ng",
-      "title": "Web TA",
-      "description": "Hi! I’m Jessica, a first-year intended CS major! You can usually find me reading, playing Tetris or Catan, or binge-watching reality dating shows. I’m excited to be a part of the Cubstart Web team this semester!",
-      "social": "@jessican_1212"
-    },
     {
       "image": "assets/bryan.jpeg",
       "name": "Bryan Chu",
@@ -81,19 +63,23 @@
       "social": ""
     }
   ],
-  "logistics": [
+  "archives": [
+    {
+      "image": "assets/steffi.jpg",
+      "name": "Steffi Tan",
+      "title": "Web Lecturer",
+      "social": "@staph.e"
+    },
     {
       "image": "assets/tyler.jpg",
       "name": "Tyler Sameshima",
-      "title": "Course Lead, Logistics",
-      "description": "Hey all! I'm Tyler, a third year majoring in CS. In my free time, I like playing video games, listening to music, and learning new languages. Feel free to reach out if you want to talk!",
+      "title": "Logistics",
       "social": "@tysameshima"
     },
     {
       "image": "assets/tony.jpg",
       "name": "Tony Hong",
-      "title": "iOS Lead, Logistics",
-      "description": "Hello! I'm Tony and I'm currently a junior studying EECS. Some of my academic/industry interests are backend engineering and systems engineering. I also enjoy playing badminton, watching kdramas/anime, and listening to music during my free time.",
+      "title": "iOS Lecturer, Logistics",
       "social": "@tshong"
     }
   ]

public/content/web/schedule-page.md

@@ -7,16 +7,16 @@ Welcome to the full-stack web development track.
 
 | Week | Lecture                                                                                                                                                                                                                                                                          | Lab Section                           | Homework/Project                                                                |
 |------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------|---------------------------------------------------------------------------------|
-| 1    | Introduction to HTML and the Web [Slides](https://docs.google.com/presentation/d/19vGc47fYunPBSALIEE1Omj7y3T8KDrNYOlz1imfURq0/edit?usp=sharing) [Demo](assets/lecture1demo.html) [Recording](https://drive.google.com/file/d/1LaoVcslRvGMQnjzI0hQxN-pcSilnZuL0/view?usp=sharing) | No lab                                | [HW 1: HTML Basics](#/hw/web/hw1)                                               |
-| 2    | CSS Basics and Browser Developer Tools [Slides](https://docs.google.com/presentation/d/1umjzYl1vDQuG5YU7E5FoYZhiOt8x79NFlbNYNU-U0Ls/edit?usp=sharing) [Recording](https://drive.google.com/file/d/13gND4HH3dtF06P8rgP0aBZ7J2YGFFGzg/view?usp=sharing)                            | [Lab 1: Happy Hour](#/lab/web/lab1)   | [HW 2: Personal Portfolio](#/hw/web/hw2) **[Solution](assets/hw2/answers.zip)** |
-| 3    | Javascript Basics [Slides](https://docs.google.com/presentation/d/1JiCptlXFFypDnqhv2449ubpmhcDAPk0ae0U-w1cVwaw/edit?usp=sharing) [Recording](https://drive.google.com/file/d/1TLnKkzBTK6c_5Z9EsOrFUKc2DE4jDs4U/view?usp=sharing)                                                 | [Lab 2: Random Jokes](#/lab/web/lab2) | [HW 3: JavaScript Playground](#/hw/web/hw3) **[Solution](assets/hw3/hw3-solution.zip)**                                     |
-| 4    | Using Git and Deployment (with Github Pages) & Introduction to APIs [Slides](https://docs.google.com/presentation/d/1jvVkDlQxOv7bO1FipbD_xVAi-Ypcp2Y6zN3Et935BZk/edit?usp=sharing) [Recording](https://drive.google.com/file/d/1KAaAH07FKOGO1UGqcnxrT273gamn1Ohc/view?usp=sharing)                                                                                              | Fun Lab Exercise + HW Help            | [HW 4: Deployment](#/hw/web/hw4)                                                |
-| 5    | APIs, JSONs, Postman [Slides](https://docs.google.com/presentation/d/10piwcYBk6V6UMJLp144o__lCzNjc9JHSY7cXM4atNuM/edit?usp=sharing) [Recording](https://drive.google.com/file/d/1abeq0ltflVvzEB-GHdErDRxCv5o3Frg7/view?usp=sharing)                                                                                                                                                                                                                                                            | Fun Lab Exercise + HW Help            | [HW 5: OpenWeatherMap API ](#/hw/web/hw5) **[Solution](assets/hw5/solution.js)**                                                       |
-| 6    | Express/NodeJS [Slides](https://docs.google.com/presentation/d/1dD16g-xuquVMlcOq58o5b0x6EMTTKPtylxa7bEIPOT4/edit?usp=sharing) [Recording](https://drive.google.com/file/d/1-iaGbX_pqePu6IpmWu2bH-z5QfYzBlK7/view?usp=sharing)                                                                                                                                                                                                                                                                 | Fun Lab Exercise + HW Help            | [HW 6: Quizlet-ish Part 1](#/hw/web/hw6) **[Solution](assets/hw6/solution.js)**                                                         |
-| 7    | MongoDB, Mongoose [Slides](https://docs.google.com/presentation/d/13squncYrCUeThZa4eHwbdSb4DpaCFBUlJpl8lUr55k0/edit?usp=sharing) [Recording](https://drive.google.com/file/d/1M-_mL-8zmxZGQDhVmQjxY9EbzdQx0YH2/view?usp=sharing)     [Team Formation Form, Due 3/26](https://forms.gle/abwppheGnA8hifzw8) [Final Project](#/spec)                                                                                                                                                                                                                                                              | Fun Lab Exercise + HW Help            | [HW 7: Quizlet-ish Part 2](#/hw/web/hw7) **[Solution](assets/hw7/solution.js)**                                                       |
-| 8    | No Class (Spring Recess)                                                                                                                                                                                                                                                         |
-| 9    | React [Slides](https://docs.google.com/presentation/d/1ODMe7ikZOxUZrmJfpNVgL0-CfY4FjrrbwE_pFaGtPRM/edit?usp=sharing) [Recording](https://drive.google.com/file/d/1VDFOp8wW7fdLVIp7AVf95RCe97aLnIvj/view?usp=share_link) [Lab Mini-Lecture Slides](https://docs.google.com/presentation/d/1t9q1l46RC1xCD310znLQ-MVqoZhGew2ZKZEw6GxcD-g/view)     | Fun Lab Exercise + HW Help            | [HW 8: Social Media Website](#/hw/web/hw8)                                                      |
-| 10   | Putting it all together [Demo](assets/demo-app.zip)                                                                                                                                                                                                                                                         | Fun Lab Exercise + HW Help            | [Final Project](#/spec)                                                            |
-| 11   | Auth0 [Slides](https://docs.google.com/presentation/d/1kNhsvf2MRFW7VzDEiG2LOrvfEcYIR3zPgXlCqvhGgdU/edit?usp=sharing) [Recording](https://drive.google.com/file/d/13Ja1L3B600YEXIcVUaRn5jGWMZjdraH5/view?usp=sharing)                                                                                                                                                                                                                                                    | Fun Lab Exercise + HW Help            | [Final Project](#/spec)                                                         |                                       |                                                                                 |
-| 12   | Final Project OH                          s                                                                                                                                                                                                                                       | Final Project OH                      | Prep for Demo Day                                                               |
-| 13   | Demo Day                                                                                                                                                                                                                                                                         |
+| 1    | Introduction to HTML and the Web   | No lab                                | [HW 1: HTML Basics](#/hw/web/hw1)                                               |
+| 2    | CSS Basics and Browser Developer Tools                             | Lab 1: Happy Hour   | HW 2: Personal Portfolio |
+| 3    | Javascript Basics  | Lab 2: Random Jokes | HW 3: JavaScript Playground                                    |
+| 4    | Using Git and Deployment (with Github Pages) & Introduction to APIs     | Fun Lab Exercise + HW Help            | HW 4: Deployment   |
+| 5    | APIs, JSONs, Postman | Fun Lab Exercise + HW Help   | HW 5: OpenWeatherMap API   |
+| 6    | Express/NodeJS    | Fun Lab Exercise + HW Help            | HW 6: Quizlet-ish Part 1 |
+| 7    | MongoDB, Mongoose    | Fun Lab Exercise + HW Help            | HW 7: Quizlet-ish Part 2 |
+| 8    | No Class (Spring Recess)   |
+| 9    | React  | Fun Lab Exercise + HW Help            | HW 8: Social Media Website    |
+| 10   | Putting it all together   | Fun Lab Exercise + HW Help            | Final Project |
+| 11   | Auth0   | Fun Lab Exercise + HW Help            | Final Project   |     |
+| 12   | Final Project OH        | Final Project OH                      | Prep for Demo Day  |
+| 13   | Demo Day  |

src/components/HomePage/FAQ/FAQ.js

@@ -32,7 +32,7 @@ function FAQPage(props) {
     <label className="accordion__item">
       <input type="checkbox" name="accordion"/>
       <div className="accordion__title">How do I apply?</div>
-      <div className="accordion__content"><b>Applications have closed for Spring 2023. We'll see you in Fall! </b></div>
+      <div className="accordion__content"><b>Fill out the application <a href="https://docs.google.com/forms/d/e/1FAIpQLSco-puPnC9Se1k35ZDxzbOLbCqXUt2It2X23kLkFGkQ3F2snw/viewform">here</a> by September 1st 2023.</b></div>
     </label>
     <label className="accordion__item">
       <input type="checkbox" name="accordion"/>

src/components/HomePage/HomePage.css

@@ -1,3 +1,38 @@
+.banner {
+  width: 100vw;
+  height: 100px;
+  background-color: var(--main-color);
+  color: white;
+  font-weight: 700;
+  font-size: 23px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  animation: grow 1s ease-in-out;
+  border-top: 2px solid var(--accent-color);
+  border-bottom: 2px solid var(--accent-color);
+}
+
+.banner p{
+  animation: fadeIn 2s ease;
+  margin: 0;
+}
+
+@keyframes grow {
+  0% { height: 0px;
+  }
+  100% {
+    height: 100px;
+  }
+}
+
+@keyframes fadeIn {
+  0% { opacity: 0;
+  }
+  100% {
+    opacity: 1;
+  }
+}
 
 .header-text {
     background-color: var(--main-bg-color);
@@ -10,18 +45,22 @@
 .applybutton {
 	color: white;
 	background-color: var(--main-color);
-	border: 5px solid transparent;
-	transition: .7s ease;
+	border: 4px solid transparent;
+	transition: .4s ease;
 	border-radius: 50px;
   text-decoration: none;
   padding: 5px 20px;
+  font-size: 20px;
+  font-weight: 700;
+  box-shadow: 2px 5px 10px rgba(0, 0, 0, 0.311);
 }
 
 .applybutton:hover {
 	color: var(--main-color);
 	background-color: var(--main-bg-color);
 	transform: scale(1.1);
-	border: 5px solid var(--main-color);
+	border: 4px solid var(--main-color);
+  box-shadow: none;
 }
 
 .herelink {
@@ -34,7 +73,7 @@
 }
 
 .hero-wrapper {
-  margin: 40px auto;
+  margin: auto;
 }
 
 .header h1, h2 {

src/components/HomePage/HomePage.js

@@ -11,6 +11,7 @@ function HomePage(props) {
 
     return (
     <div>
+    <div className="banner"><p>Cubstart Fall 2023 applications are open! Click the apply button below!</p></div>
     <div className="hero-wrapper">
         <div className="header">
             <div className='header-text'>
@@ -37,10 +38,10 @@ function HomePage(props) {
                         className="typing-text"
                         /></h1>
                     <p>Cubstart is a web/mobile development course for beginner to intermediate developers. Whether you need project experiences to kickstart your resume, or if you have a desire to build but don’t know where to start, Cubstart is the course for you.</p>
-                    {/* <div className='button-container'>
-                    <a href="https://docs.google.com/forms/d/e/1FAIpQLSe1GzSg45wwQhyDKDZBpd9Oh6V7BH8QqIWIaFRe9ZgzxUaMnA/viewform" className="applybutton">Apply by 2/5!</a>
-                    </div> */}
-                    <b>Applications have closed for Spring 2023. We'll see you in Fall! </b>
+                    <div className='button-container'>
+                    <a href="https://docs.google.com/forms/d/e/1FAIpQLSco-puPnC9Se1k35ZDxzbOLbCqXUt2It2X23kLkFGkQ3F2snw/viewform" className="applybutton">APPLY NOW!</a>
+                    </div>
+                    {/*<b>Applications have closed for Spring 2023. We'll see you in Fall! </b> */}
                     <br/>
                     <div className="stats-wrapper">
                         <div className="stats-item">

src/components/SchedulePage/SchedulePage.css

@@ -96,7 +96,7 @@ h1, h2, h3, h4, h5, h6, p {
 .tab-content a {
   text-decoration: none;
   color: var(--main-color);
-  transition: ease-in 0.2s;
+  transition: ease-in 0.1s;
   border-radius: 6px;
   padding: 5px;
   border:z 2px solid #49c5f79c;

src/components/SchedulePage/SchedulePage.js

@@ -23,7 +23,7 @@ function SchedulePage(props) {
     <div className="text-wrapper">
         <div className="header">
             <h1>CS 198-075/750: Introduction to Building Apps</h1>
-            <h2>UC Berkeley, Fall 2023</h2>
+            <h2>UC Berkeley | Fall 2023</h2>
         </div>
         <div class="wrapper">
         <div class="tabs">

src/components/SolutionsPage/SolutionsPage.js

@@ -21,7 +21,7 @@ function SolutionsPage(props) {
     <div className="text-wrapper">
         <div className="header">
             <h1>CS 198-075/750: Introduction to Building Apps</h1>
-            <h2>UC Berkeley, Fall 2023</h2>
+            <h2>UC Berkeley | Fall 2023</h2>
         </div>
         <div class="wrapper">
         <div class="tabs">

src/components/StaffPage/StaffCard.js

@@ -3,7 +3,7 @@ import './staff.css'
 function StaffCard(props) {
     return (
     <div className="card">
-        <img src={props.content.image}></img>
+        <div><img src={props.content.image}></img></div>
         <h2>{props.content.name}</h2>
         <h3>{props.content.title}</h3>
         <p>{props.content.description}</p>