diff --git a/.gitattributes b/.gitattributes index 706c6436..dfc22e2a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,2 @@ -/courses/Foundation/web-architecture-101/presentation/web-architecture-101.pdf linguist-generated=true -/courses/Foundation/web-architecture-101/presentation/web-architecture-101.zip linguist-generated=true +/courses/Foundation/intro-to-web-architecture/presentation/intro-to-web-architecture.pdf linguist-generated=true +/courses/Foundation/intro-to-web-architecture/presentation/intro-to-web-architecture.zip linguist-generated=true diff --git a/.gitignore b/.gitignore index 6856a41f..6c2a629a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ # Ignore hidden Mac OS directory files **/.DS_Store -courses/foundation/web-architecture-101/presentation/web-architecture-101/ +courses/foundation/intro-to-web-architecture/presentation/intro-to-web-architecture/ node_modules/ support/dist/ diff --git a/.prettierignore b/.prettierignore index 35f938c3..06347932 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,4 +1,4 @@ /contributing/meetings/ -/courses/foundation/web-architecture-101/HYF Web Architecture 101/ +/courses/foundation/intro-to-web-architecture/HYF Intro to Web Architecture/ /courses/frontend/advanced-javascript/week1/session-materials/movies.js /support/dist/ diff --git a/SUMMARY.md b/SUMMARY.md index aebb7742..9ac4ef03 100644 --- a/SUMMARY.md +++ b/SUMMARY.md @@ -43,10 +43,10 @@ - [Preparation](courses/foundation/intro-to-javascript/week4/preparation.md) - [Session Plan](courses/foundation/intro-to-javascript/week4/session-plan.md) - [Assignment](courses/foundation/intro-to-javascript/week4/assignment.md) - - [Web Architecture 101](courses/foundation/web-architecture-101/README.md) - - [Preparation](courses/foundation/web-architecture-101/preparation.md) - - [Session Plan](courses/foundation/web-architecture-101/session-plan.md) - - [Assignment](courses/foundation/web-architecture-101/assignment.md) + - [Intro to Web Architecture](courses/foundation/intro-to-web-architecture/README.md) + - [Preparation](courses/foundation/intro-to-web-architecture/preparation.md) + - [Session Plan](courses/foundation/intro-to-web-architecture/session-plan.md) + - [Assignment](courses/foundation/intro-to-web-architecture/assignment.md) - [Databases](courses/foundation/databases/README.md) - [Week 1](courses/foundation/databases/week1/README.md) - [Preparation](courses/foundation/databases/week1/preparation.md) diff --git a/contributing/proposals/js-node-restructure.md b/contributing/proposals/js-node-restructure.md index d9506a25..8dc18fd2 100644 --- a/contributing/proposals/js-node-restructure.md +++ b/contributing/proposals/js-node-restructure.md @@ -51,13 +51,13 @@ This is schemas for current module structures. I will use the same **color-codin Introduce small reusable logic/function tasks already in the final week (e.g., calculating prices, transforming arrays) and encourage saving the code — these will be reused in API or frontend in later modules. -### 2. Module: Web Architecture 101 +### 2. Module: Intro to Web Architecture **Duration**: 1 week\ **Purpose**: Introduce shared concepts between frontend and backend. Creates a unified mental model before Introductions for specialisations and removes duplicates from modules (like API explanations).\ **Note**: It, probably, will require some new material there (we didn’t have architecture before), but we can always just stick to the topics that was introduced before in old modules. -#### Topics for Web Architecture 101 [not limited to] +#### Topics for Intro to Web Architecture [not limited to] - Client vs Server - What is Backend? @@ -74,7 +74,7 @@ Introduce small reusable logic/function tasks already in the final week (e.g., c **Duration**: 1 week\ **Purpose**: Provide a hands-on primer to backend development. Enables learners to build a basic working backend (simple CRUD server or even less).\ -**Reasoning**: Placing backend first in hands-on development allows learners to apply their JavaScript fundamentals while reinforcing their understanding of APIs introduced in Web Architecture 101. This progression is both natural and confidence-building: learners already know how to write logic, and now they can wrap it in endpoints (basically, another level of functions). Starting here also clarifies the API before they consume it from the frontend side. +**Reasoning**: Placing backend first in hands-on development allows learners to apply their JavaScript fundamentals while reinforcing their understanding of APIs introduced in Intro to Web Architecture. This progression is both natural and confidence-building: learners already know how to write logic, and now they can wrap it in endpoints (basically, another level of functions). Starting here also clarifies the API before they consume it from the frontend side. #### Topics for Introduction to Backend @@ -173,6 +173,6 @@ Introduce small reusable logic/function tasks already in the final week (e.g., c _Option 1_: It might be natural to introduce separate files in «Introduction to Backend», and then mention in «Introduction to Frontend» how it is solved there. -_Option 2_: Introduce idea of structuring files (and import/export) on «Web Architecture 101» session. +_Option 2_: Introduce idea of structuring files (and import/export) on «Introduction to Web Architecture» session. _Option 3_: Not to give this concept in Foundation, because it seems like it can be done in one file, and later they will have to have separate files in React / Node anyway. diff --git a/courses/foundation/README.md b/courses/foundation/README.md index 39b8e048..58b92942 100644 --- a/courses/foundation/README.md +++ b/courses/foundation/README.md @@ -4,19 +4,19 @@ Here you'll learn the fundamentals for how the web works, the basics of programm ## Modules -| Name | Weeks | -| -------------------------------------------------------- | --------------- | -| [HTML & CSS](./html-and-css/README.md) | 1 | -| [Git](./git) | 1 | -| [Intro to Using AI](./intro-to-using-ai/README.md) | 1 | -| [Intro to JavaScript](./intro-to-javascript/README.md) | 4 | -| [Web Architecture 101](./web-architecture-101/README.md) | 1 | -| [Databases](./databases/README.md) | 1 | -| [Intro to Backend](./intro-to-backend/README.md) | 1 | -| [Intro to Frontend](./intro-to-frontend/README.md) | 1 | -| [Intro to Agile](./intro-to-agile/README.md) | 1 | -| [Career Training](./career-training/README.md) | 3 (1 in person) | -| [Final project](./final-project/README.md) | 3 | +| Name | Weeks | +| ------------------------------------------------------------------ | --------------- | +| [HTML & CSS](./html-and-css/README.md) | 1 | +| [Git](./git) | 1 | +| [Intro to Using AI](./intro-to-using-ai/README.md) | 1 | +| [Intro to JavaScript](./intro-to-javascript/README.md) | 4 | +| [Intro to Web Architecture](./intro-to-web-architecture/README.md) | 1 | +| [Databases](./databases/README.md) | 1 | +| [Intro to Backend](./intro-to-backend/README.md) | 1 | +| [Intro to Frontend](./intro-to-frontend/README.md) | 1 | +| [Intro to Agile](./intro-to-agile/README.md) | 1 | +| [Career Training](./career-training/README.md) | 3 (1 in person) | +| [Final project](./final-project/README.md) | 3 | Total: 16 weeks @@ -69,7 +69,7 @@ Total: 16 weeks - [ ] Understand global vs local scope - [ ] Using objects and arrays to store, access and manipulate more complex data -### [Web Architecture 101](/courses/foundation/web-architecture-101) +### [Intro to Web Architecture](/courses/foundation/intro-to-web-architecture) - [ ] Understand the key components of a web application - [ ] Know what happens when you enter a URL in a web browser diff --git a/courses/foundation/web-architecture-101/README.md b/courses/foundation/intro-to-web-architecture/README.md similarity index 97% rename from courses/foundation/web-architecture-101/README.md rename to courses/foundation/intro-to-web-architecture/README.md index 89f568ca..4fcdb98d 100644 --- a/courses/foundation/web-architecture-101/README.md +++ b/courses/foundation/intro-to-web-architecture/README.md @@ -1,4 +1,4 @@ -# Web Architecture 101 +# Intro to Web Architecture The purpose of this module is to provide a mental model of how web sites work, some of the key terminology and how these concepts relating to the coming modules on the course. diff --git a/courses/foundation/web-architecture-101/assignment.md b/courses/foundation/intro-to-web-architecture/assignment.md similarity index 100% rename from courses/foundation/web-architecture-101/assignment.md rename to courses/foundation/intro-to-web-architecture/assignment.md diff --git a/courses/foundation/web-architecture-101/preparation.md b/courses/foundation/intro-to-web-architecture/preparation.md similarity index 85% rename from courses/foundation/web-architecture-101/preparation.md rename to courses/foundation/intro-to-web-architecture/preparation.md index 13b029a6..0a8a208f 100644 --- a/courses/foundation/web-architecture-101/preparation.md +++ b/courses/foundation/intro-to-web-architecture/preparation.md @@ -4,7 +4,7 @@ Before the session, please read/watch these materials to get familiar with the basic concepts: -- [Web Architecture 101](https://medium.com/storyblocks-engineering/web-architecture-101-a3224e126947) - Comprehensive introduction to web architecture fundamentals +- [Intro to Web Architecture](https://medium.com/storyblocks-engineering/intro-to-web-architecture-a3224e126947) - Comprehensive introduction to web architecture fundamentals - [Everything You Need to Know to Become a Junior Web Developer](https://medium.com/geeks-for-tech/everything-you-need-to-know-to-become-a-junior-web-developer-7ff429df477) - Explains client-server model and roles - [Client server model](https://www.youtube.com/watch?v=L5BlpPU_muY) (6 min) - [The structure of a web application](https://www.freecodecamp.org/news/how-the-web-works-part-ii-client-server-model-the-structure-of-a-web-application-735b4b6d76e3/) - Read up until the "That's all folks! (Well, sorta…)" part diff --git a/courses/foundation/web-architecture-101/session-materials/web-architecture-101.key b/courses/foundation/intro-to-web-architecture/session-materials/web-architecture-101.key similarity index 100% rename from courses/foundation/web-architecture-101/session-materials/web-architecture-101.key rename to courses/foundation/intro-to-web-architecture/session-materials/web-architecture-101.key diff --git a/courses/foundation/web-architecture-101/session-materials/web-architecture-101.pdf b/courses/foundation/intro-to-web-architecture/session-materials/web-architecture-101.pdf similarity index 100% rename from courses/foundation/web-architecture-101/session-materials/web-architecture-101.pdf rename to courses/foundation/intro-to-web-architecture/session-materials/web-architecture-101.pdf diff --git a/courses/foundation/web-architecture-101/session-materials/web-architecture-101.zip b/courses/foundation/intro-to-web-architecture/session-materials/web-architecture-101.zip similarity index 100% rename from courses/foundation/web-architecture-101/session-materials/web-architecture-101.zip rename to courses/foundation/intro-to-web-architecture/session-materials/web-architecture-101.zip diff --git a/courses/foundation/web-architecture-101/session-plan.md b/courses/foundation/intro-to-web-architecture/session-plan.md similarity index 96% rename from courses/foundation/web-architecture-101/session-plan.md rename to courses/foundation/intro-to-web-architecture/session-plan.md index c0adde6b..04d72637 100644 --- a/courses/foundation/web-architecture-101/session-plan.md +++ b/courses/foundation/intro-to-web-architecture/session-plan.md @@ -4,7 +4,7 @@ These are some examples of previously created materials by mentors that you can use yourself, or for inspiration. -- Web Architecture 101 ([key](session-materials/web-architecture-101.key), [pdf](session-materials/web-architecture-101.pdf), [zip](session-materials/web-architecture-101.zip) by [@rvedotrc](https://github.com/rvedotrc)) +- Intro to Web Architecture ([key](session-materials/web-architecture-101.key), [pdf](session-materials/web-architecture-101.pdf), [zip](session-materials/web-architecture-101.zip) by [@rvedotrc](https://github.com/rvedotrc)) ## Session outline diff --git a/support/src/documentationHelpers/programStructure.json b/support/src/documentationHelpers/programStructure.json index 32b209e3..19d9af6e 100644 --- a/support/src/documentationHelpers/programStructure.json +++ b/support/src/documentationHelpers/programStructure.json @@ -21,8 +21,8 @@ "location": "courses/foundation/intro-to-javascript" }, { - "name": "Web Architecture 101", - "location": "courses/foundation/web-architecture-101" + "name": "Intro to Web Architecture", + "location": "courses/foundation/intro-to-web-architecture" }, { "name": "Databases",