Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: 🔀 squash merge release candidate for sprint-2
* Added Team Information to `team.md` * chore: 📝 Created a PR Template * Setup Team Information * chore: 📝 Created a PR Template * Add product.md Add the product.md file * feat: 🎉 Initial Project Setup * Setup Team Information * Initial setup done, configuring frontend * modified changes * modified changes * more changes * modified changes, error in package install * done setup * cleanup code * docs: 📝 Added Setup Instructions * changed .js files to .ts in server/ * minor changes * added scss support * updated README.md * changed server to mongodb * fixed issues * chore: 🙈 Added Git Ignore for Server * chore: 🧑💻 Removed Tracking Server `node_modules` * chore: 🧑💻 Removed Tracking Server `.env` * refactor: 🚚 Moved all JS files to `src` * chore: ➕ Installed `rimraf` * chore: 🔨 Added script to reset packages * chore: 🧑💻 Created VSCode Tasks to automate Install and Start Dev * refactor: ⚡ Updated Components with `'use client';` * refactor: ⚰️ Removed unused code --------- Co-authored-by: Shawn Santhoshgeorge <[email protected]> Co-authored-by: Shashwat Doshi <[email protected]> * chore: 🧑💻 Added Recommended VSCode Configuration * Setup Team Information * chore: 🧑💻 Recommended VSCode Extensions * chore: 🧑💻 Common VSCode Settings * chore: 🧑💻 added extension * chore: 🧑💻 Disabled AutoCommit & Prompt CI * chore: 🧑💻 Removed VS Code Postgresql Extension --------- Co-authored-by: Shashwat Doshi <[email protected]> * chore: Added Signed Team Contract * docs: 📝 Added README * docs: 📝 Added Contribution Section to README * docs: 📝 Added Motivation Section to README * refactor: 📝 Updated Contribution Section * docs: 📝 Setup Installation Section * docs: 📝 Added Technologies Used * docs: 📝 Added Contributors List * docs: 📝 Added Table of Contents * Correct grammatical errors and add product summary * Add product summary to Table of Contents * docs: 📝 Added Installation Section * docs: 📝 Added TS to Technologies Used * docs: 📝 Added Figma Design to TOC --------- Co-authored-by: Aditya Kulkarni <[email protected]> * Add user_interface Add the user interface pdf * Add product_backlog Add product_backlog pdf * Implement PR feedback Implemented changes recommended in the PR * Remove unnecessary files Remove .DS_Store file from branch * Add logo and banner * refactor: 🏷️ Added TS Support for Server * build: ➖ Uninstalled `dotenv` from Server FIN-64 * build: ➕ Installed 6 packages to Server `ts-dotenv` `@types/cors` `@types/express` `@types/node` `ts-node-dev` `typescript` FIN-64 * chore: 🔧 Updated version, description in Server `package.json` FIN-65 * chore: 🔧 Added `tsconfig.json` FIN-66 * chore: 🙈 Added `.build` to `.gitignore` FIN-68 * refactor: ♻️ Updated Code to Support Typescript Implemented Types of Schema, CORS Support and other FIN-67, FIN-69, FIN-63 * build: 🔨 Updated Scripts to work with Typescript FIN-70 * fix: 🐛 Removed CORS Config for Server * build: 🔨 Added `.build` to `rimraf` parameters * chore: 🎨 Implemented Prettier * build: ➕ Installed Prettier for Client & Server FIN-72 * chore: 🧑💻 Created `.prettierrc` FIN-73 * chore: 🧑💻 Created `.prettierignore` FIN-74 * build: 🔨 Updated NPM Scripts to run Prettier FIN-75 * ci: 👷 Setup GitHub Action to Automate Formatting FIN-76 * chore: 🧑💻 Created VS Code Task for Prettier * style: 🎨 Formatted Client & Server Code FIN-71 * refactor: ♻️ Removed Todo App Code * build: 🔨 Updated build directory name for Server TS * chore: 🙈 Updated `.build` to `build` in `.gitignore` * docs: 📝 Added `README.md` for Server Information about Folder Structure, NPM Scripts, Endpoints FIN-81 * refactor: 🔥 Removed Todo Code from Server FIN-83, FIN-79 * feat: ✨ Added Status Endpoint FIN-84 * refactor: 🔥 Removed Todo Components from Client FIN-85, FIN-79 * refactor: ♻️ Changed Chakra-UI to work with `app` dir FIN-86 * build: 📦️ Moved various packages to `devDependencies` `@types/node` `@types/react` `@types/react-dom` `eslint` `eslint-config-next` `typescript` FIN-87 * build: 📦️ Removed `@chakra-ui/icons` and `react-icons` for `@react-icons/all-files` FIN-87 * build: 📦️ Updated Chakra-UI packages FIN-87 * build: 📦️ Updated SASS FIN-87 * docs: 📝 Added README.md for Client Information about NPM Scripts, FIN-88 * feat: 🔍️ Added Site Metadata * chore: 🔍️ Added a `favicon.ico` * style: 🎨 Implemented 7-1 Pattern for SCSS FIN-89 * style: 💄 Implemented Basic Styles FIN-89 * feat: 🔍️ Added Icons to Metadata * chore: 🔥 Removed unused `.svg` from `public` * chore: 🚚 Renamed Banner and Logo * docs: 📝 Updated `client` and `server` README.md Client and Server has changes to Folder Structure FIN-81, FIN-88 * docs: 📝 Added `.env` config to Setup * ci: 👷 Added Write Access to Actions * style: 🎨 Formatted Client & Server Code --------- Co-authored-by: ShawnGeorge03 <[email protected]> * feat: 🗃️ Implemented DB Schema for Learning * feat: ✨ implemented signup and login using Clerk, need UI fixes * fix: 🐛 Fixed Server Folder Structure * fix: 🐛 Moved `models` and `types` folder inside `src` FIN-95 * fix: 🐛 Added export for `ArticleSchema` * chore: 🎨 Added Spacing for Consistency * feat: ✨ Squash Merged Nav-bar PR * feat: 🚧 Initial work for Navbar * feat: 🚧 Initial work for Navbar * feat: 💄 Added Navbar for FIN-77 * fix: 🐛 Change Import Path for Themes * feat: ♻️ Cleaned up code for Navbar * feat: 🚧 Initial work for Navbar * feat: 💄 Added Navbar for FIN-77 * feat: ♻️ Cleaned up code for Navbar * style: 🎨 Formatted Client & Server Code * fix: ♻️ Refactor file structure based on PR feedback * fix: 🐛 Fix PR comments --------- Co-authored-by: Shawn Santhoshgeorge <[email protected]> Co-authored-by: D3nam <[email protected]> * feat: ✨ UI changes and added logic for authentication * feat: 🎨 minor changes * feat: 🎨 minor changes * feat: 💄 minor changes * feat/fin-48/all-courses (#28) * Set up * Base set up frontend * feat: allcourses display page complete * feat: display all courses page complete * chore: add comments * style: 🎨 Formatted Client & Server Code * fix: fixed some semantics * fix: port changed to 4000 * style: 🎨 Formatted Client & Server Code --------- Co-authored-by: aryan-thakur <[email protected]> * feat: ✨ connected user information to the database * docs: 📝 Updated README.md * feat: 🎨 integrated sign-up/sign-in with existing navbar * style: 🎨 Formatted Client & Server Code * refactor: 🎨 minor changes in structure of code * refactor: 🎨 minor changes * fix: 🐛 Fixed Import Statments & Cleaned Files * chore: Updated Server `package-lock.json` * refactor: 🎨 Removed Try-Catch in Course Controller * fix: 🔧 Removed Server Types * chore: 🚚 Renamed Filenames for Transparent Logo * refactor: 🏷️ Updated Learning and Nav Link Types * fix: 🏷️ Updates Type Folder Path * refactor: 🚚 Updated Navbar SCSS Filename * refactor: 🎨 Formatted Client Code * fix: 🚚 Updated File path for `AllCourses` Component * feat: ✨ Create a Basic Dashboard Page * refactor: 🚚 Update Image Loading * fix: 🚚 Added `/learning` route * fix: 🏷️ Added `Props` type * refactor: 🚑️ merged hotfix from develop * feat: ✨ Added GET all users endpoint for future use * style: 🎨 Formatted Client & Server Code * fix: 🐛 fixed navbar tabs bug (#32) Fixed Navbar tabs bug --------- Co-authored-by: shashwat-doshi <[email protected]> * feat: ✨ Created All Units Page * feat: 🚧 Created files for an endpoint to connect all units * chore: 🔥 Removed unnecessary file * chore: 🗃️ Added contentType field for Article and Video Added slug field for Course * chore: 🔥 Removed unnecessary file * chore: 🗃️ Updated VideoSchema and ArticleSchema with contentType * fix: 🐛 Fixed bug relating to UnitSchema Updated the content property from a 2-D array to a 1-D array * chore: 🗃️ Updated CourseSchema by adding a 'slug' property * feat: ✨ Created API Route for getting all units * feat: ✨ Completed Controller for the API Route to Get All Units * fix: 🐛 fixed navbar tabs bug (#32) Fixed Navbar tabs bug --------- Co-authored-by: shashwat-doshi <[email protected]> * chore: 🧐 Created Fake Data for Units * feat: ✨ Created Basic Card for Unit FIN-91 * feat: ✨ Created Basic Unit Summary Component FIN-92 * feat: ✨ Created the Course Page FIN-93 * chore: 🧐 Created Fake Data for Units * refactor: 🎨 Removed `_id` & `__v` and other changes * refactor: 🏷️ Changed from `String` Wrapper to `string` * feat: ✨ Added Routing to Course Page * feat: ✨ Added Support for Invalid Course ID * chore: 📱 Resized Logo Image FIN-97 * chore: 🗃️ Updates `Unit`, `Article`, `Video` schemas with `slug` field * feat: 🎨 Minor Changes to `/units` route FIN-90 * refactor: 🗃️ Renamed `title` to `name` in Video & Article * refactor: 🎨 Removed Single Use Types * refactor: 🚚 Removed `CourseID` Route * feat: 🥅 Added Error Handling for Course Page * feat: 👽️ Added Changes for `/units` Endpoint FIN-93 * refactor: 🎨 Removed period from title * style: 🎨 Formatted Client & Server Code * chore: 🧐 Removed Fake Data for All Units Page * style: 📱 Centered the Sign-In and Sign-Up Pages * style: 💄 Minor Adjustment to Unit List * refactor: 🎨 Make use of top-level await --------- Co-authored-by: Adam Badar <[email protected]> Co-authored-by: Shashwat Doshi <[email protected]> Co-authored-by: shashwat-doshi <[email protected]> Co-authored-by: ShawnGeorge03 <[email protected]> * feat: ✨ Squash merged PR for FIN-17(Dashboard-Learning) * feat: 🚧 Started working on dashboard-learning page * feat: ✨ Added Sidebar for dashboard page functionality * feat: 🚧 Started working on dashboard-learning page * feat: ✨ Added Sidebar for dashboard page functionality * feat: 💄 Improved UI for Dashboard-Learning Page * feat: 🚧 Started working on dashboard-learning page * feat: ✨ Added Sidebar for dashboard page functionality * feat: 💄 Improved UI for Dashboard-Learning Page * feat: ✨ Cleaned up dashboard-learning page * feat: ♻️ Cleaned up code * fix: 🩹 Fixed PR comments * docs: Add iteration plan for sprint 01 * docs: Add sprint review for Sprint 0 (#39) * Merge Article and Video Page (#41) * Video Commits commit 8ae72ce Author: Aditya-k-23 <[email protected]> Date: Fri Jun 16 02:23:50 2023 +0000 style: 🎨 Formatted Client & Server Code commit eeffb7c Merge: 6e48db3 cf93f4c Author: Aditya Kulkarni <[email protected]> Date: Thu Jun 15 22:23:22 2023 -0400 Merge branch 'develop' into feature/FIN-52/content-video commit 6e48db3 Author: Aditya Kulkarni <[email protected]> Date: Thu Jun 15 22:14:56 2023 -0400 feat: Add side pane to video page commit 4488407 Author: Aditya Kulkarni <[email protected]> Date: Thu Jun 15 20:12:17 2023 -0400 feat: Fixed routing for video content commit c846c8c Author: Aditya Kulkarni <[email protected]> Date: Thu Jun 15 18:19:49 2023 -0400 fix: delete unnecessary comments commit b7ce55a Merge: 478a060 6e9fcb7 Author: Aditya Kulkarni <[email protected]> Date: Thu Jun 15 15:03:13 2023 -0400 Merge branch 'develop' into feature/FIN-52/content-video commit 478a060 Author: Aditya Kulkarni <[email protected]> Date: Thu Jun 15 15:01:18 2023 -0400 feat: added youtube embed for video content * Article Commits commit ef832d5 Author: Balraj Kharol <[email protected]> Date: Fri Jun 16 00:25:59 2023 -0400 feat: ✨ Split the article page into multiple components, Still need to add side bar that aditya has created for this Video page (will be done by morning). commit 51e52e5 Merge: 7e63e7f 53ec29e Author: Balraj Kharol <[email protected]> Date: Thu Jun 15 23:01:36 2023 -0400 Merge branch 'Feature/FIN-51/ArticlePage' of https://github.com/CSCC012023/final-project-s23-agile-avengers into Feature/FIN-51/ArticlePage commit 7e63e7f Author: Balraj Kharol <[email protected]> Date: Thu Jun 15 11:40:46 2023 -0400 feat: 💄 Added article Defination Added the text field to the defination of article in order to fetch the text from database rather than hard coding it. commit 51e02c0 Author: Balraj Kharol <[email protected]> Date: Tue Jun 13 16:01:55 2023 -0400 feat: ✨ created article page and connected backend commit a5fabbe Author: Balraj Kharol <[email protected]> Date: Thu Jun 15 11:40:46 2023 -0400 feat: 💄 Added article Defination Added the text field to the defination of article in order to fetch the text from database rather than hard coding it. commit 1a1662a Author: Balraj Kharol <[email protected]> Date: Tue Jun 13 16:01:55 2023 -0400 feat: ✨ created article page and connected backend commit 53ec29e Merge: 4ef09da 4a65301 Author: Balraj Kharol <[email protected]> Date: Thu Jun 15 21:27:26 2023 -0400 Merge branch 'Feature/FIN-51/ArticlePage' of https://github.com/CSCC012023/final-project-s23-agile-avengers into Feature/FIN-51/ArticlePage commit 4ef09da Author: Balraj Kharol <[email protected]> Date: Thu Jun 15 11:40:46 2023 -0400 feat: 💄 Added article Defination Added the text field to the defination of article in order to fetch the text from database rather than hard coding it. commit 6020d52 Author: Balraj Kharol <[email protected]> Date: Tue Jun 13 16:01:55 2023 -0400 feat: ✨ created article page and connected backend commit 4a65301 Merge: bed2157 d0fb37e Author: Shashwat Doshi <[email protected]> Date: Thu Jun 15 11:49:15 2023 -0400 Merge branch 'develop' into Feature/FIN-51/ArticlePage commit bed2157 Author: Balraj Kharol <[email protected]> Date: Thu Jun 15 11:40:46 2023 -0400 feat: 💄 Added article Defination Added the text field to the defination of article in order to fetch the text from database rather than hard coding it. commit 6b34b10 Author: Balraj Kharol <[email protected]> Date: Tue Jun 13 16:01:55 2023 -0400 feat: ✨ created article page and connected backend * Router Merge Issue * Removed console.log from Server * Removed String Wrapper class and Added Article Type * Removed console.log in Client * Updated Routing for Video and Article * Formatting * fix: Fixed content video bugs Add fixes as per feature/FIN-52/content-video PR. Also resized the nav bar logo to now fit inside the grey bar * feat: ✨ Implemented the side bar using Aditya's implementation of the side bar. * style: 🎨 Formatted Client & Server Code * fix: delete unused component --------- Co-authored-by: Shawn Santhoshgeorge <[email protected]> Co-authored-by: Aditya Kulkarni <[email protected]> Co-authored-by: balraj03 <[email protected]> * chore/non-ref/release-planning-document-1 (#40) * docs: Add RPM document for sprint 1 * fix: Add participants to sprint 1 RPM document * fix: 🎨 minor fixes (#42) * docs: added sprint 1 docs (#43) * Bugfix/non-ref/RPM (#44) * fix: Add RPM for sprint 1 * fix: Delete old RPM document * feat: add learning progress model (#46) * ci: 👷 Implemented CI Changes * revert: 🔥 Removed `package-lock.json` from Project FIN-103, FIN-78 * revert: 🔥 Removed `package.json` from Project FIN-103, FIN-78 * chore: 🙈 Unified `.gitignore` for Project FIN-103, FIN-78 * chore: 🧑💻 Initialized NPM Workspaces FIN-103, FIN-78 * chore: 📦️ Added Current Packages FIN-108, FIN-78 * chore: 🔨 Added `dev` & `build` NPM Scripts FIN-109, FIN-78 * chore: 🔨 Added `format` & `purge` NPM Scripts FIN-109, FIN-78 * chore: 🧑💻 Improved Prettier Configuration FIN-110, FIN-78 * chore: 🧑💻 Updated VSCode Task for NPM Workspace FIN-78 * chore: 🧑💻 Recommended Various Extensions FIN-78 * chore: 🧑💻 Added Auto Import Sort & Lint Fixes FIN-78 * chore: 🧑💻 Implemented ESLint for Project FIN-111, FIN-78 * refactor: 🚨 Fixed ESLint Errors FIN-111, FIN-78 * ci: 👷 Implemented CI Jobs for `lint` & `format` FIN-112, FIN-78 * chore: 📝 Updated PR Template for PR Closure FIN-78 * fix: 🐛 Minor Bugs from Linting FIN-111, FIN-78 * docs: 📝 Updated README.md FIN-113, FIN-78 * ci: 👷 Added Conventional Commits to GitHub Actions FIN-112, FIN-78 * docs: 📝 Added URL to Postman Testing FIN-113, FIN-78 * docs: 📝 Updated README for Client & Server FIN-113, FIN-78 * style: 🎨 Formatted Client & Server Code * ci: 👷 Fixed Issue with Conventional Commits GA FIN-112, FIN-78 * ci: 👷 Added Commitlint Configuration FIN-112, FIN-78 * ci: 👷 Updated Commitlint Configuration& GA FIN-112, FIN-78 * ci: 👷 Updated `actions/checkout` to v3.5.3 FIN-112, FIN-78 --------- Co-authored-by: ShawnGeorge03 <[email protected]> * ci: 🔧 updates ESLint Rules (FIN-114) * ci: 👷 updated TS `ban-types` in Server FIN-114 * ci: 👷 removed `operator-linebreak` from Project FIN-114 * ci: 👷 changed `require-jsdoc` to warn FIN-114 * ci: 👷 changed TS `no-explicit-any` off FIN-114 * style: 🎨 Formatted Client & Server Code --------- Co-authored-by: ShawnGeorge03 <[email protected]> * feat: ✨ squash merge FIN-18 into develop * feat: ✨ added barebones implimentation for getLearningProgress * feat: ✨ added barebones implimentation for getLearningProgress * feat: ✨ Created an endpoint for Learning progress * feat: ✨ Add continue learning feature to dashboard * feat: 💄 Improved Ui * feat: 🚧 Added minor Ui fix * fix: 🔥 Remove temporary insert endpoint * fix: 🐛 Fix bug when user sign's up for first time * fix: 🐛 Fix another minor bug when user sign_in first time * fix: ♻️ Refactor code to fix linter warnings * docs: 📝 Added Jsdoc for learningProgress Endpoint * docs: 📝 Update documentation for getLearningProgress * style: ♻️ Removed unused comment * fix: 🔥 fix Pr comments for FIN-18 * feat: 🔥 fix eslint issues for PR for FIN-18 * style: 🎨 Formatted Client & Server Code * feat: 🐛 fix Pr comments * fix: 🐛 fix docs to reflect changes * style: 🎨 Formatted Client & Server Code --------- Co-authored-by: Balraj Kharol <[email protected]> Co-authored-by: balraj03 <[email protected]> Co-authored-by: D3nam <[email protected]> * Feat/fin 57/search bar learning (#49) feat: ✨ implemented search bar on Courses page (FIN-57) --------- Co-authored-by: Aryan Thakur <[email protected]> * feat: ✨ added Unit Page (FIN-50) * feat: ✨ made link to `UnitPage` from `CoursePage` FIN-50 * feat: ✨ created `UnitPage` FIN-50 * revert: 🎨 removed text capitalize FIN-50 * fix: 🐛 fixed bug in `GET /units` FIN-50 * style: 💄 padding for card body FIN-50 * feat: ✨ added Unit Progress Info FIN-50 * fix: 🐛 fixed when user has no unit progress FIN-50 * fix: Make sidepane automatic to avoid overflow (#53) * fix: Make sidepane automatic to avoid overflow * style: 🎨 Formatted Client & Server Code --------- Co-authored-by: Aditya-k-23 <[email protected]> * feat: ✨ created Progress Pane for All Units Page (FIN-55) * feat: ✨ Created endpoint for retrieving units progress of a user * Updated router.ts * chore: ♻️ Added import statemtents * feat: ✨ Completed UI for FIN-55 Updated error checking Fixed endpoint issues by using clerk userID instead of Mongodb id * chore: 📦️ updated package.json * chore: 🐛 removed duplicate * chore: 🚨 linter warnings * style: 🎨 Formatted Client & Server Code * refactor: 🎨 pr changes * style: 🎨 Formatted Client & Server Code * style: 🎨 Formatted Client & Server Code --------- Co-authored-by: adam-badar <[email protected]> Co-authored-by: Shawn Santhoshgeorge <[email protected]> Co-authored-by: ShawnGeorge03 <[email protected]> * docs: 🔀 squash merge PR for FIN-115 * Add sprint review and iteration plan * Update sprint-01-review.md * Complete sprint-01-review.md * doc: Add sprint 2 - burndown and Product Backlog * docs: Add sprint 2 - Activity diagram and system design document * docs: 📝 added schedule.pdf for FIN-115 * fix: 📝 add minor typo fix --------- Co-authored-by: Aditya Kulkarni <[email protected]> * style: 🎨 Formatted Client & Server Code --------- Co-authored-by: Shawn Santhoshgeorge <[email protected]> Co-authored-by: Aditya Kulkarni <[email protected]> Co-authored-by: Shashwat Doshi <[email protected]> Co-authored-by: Shashwat Doshi <[email protected]> Co-authored-by: Shashwat Doshi <[email protected]> Co-authored-by: Aditya Kulkarni <[email protected]> Co-authored-by: ShawnGeorge03 <[email protected]> Co-authored-by: D3nam <[email protected]> Co-authored-by: aryan-thakur <[email protected]> Co-authored-by: aryan-thakur <[email protected]> Co-authored-by: shashwat-doshi <[email protected]> Co-authored-by: Adam Badar <[email protected]> Co-authored-by: balraj03 <[email protected]> Co-authored-by: balraj03 <[email protected]> Co-authored-by: Balraj Kharol <[email protected]> Co-authored-by: Aryan Thakur <[email protected]> Co-authored-by: Aditya-k-23 <[email protected]> Co-authored-by: Adam Badar <[email protected]> Co-authored-by: adam-badar <[email protected]>
- Loading branch information
20 people
authored
Jul 7, 2023
1 parent
6d8e8e8
commit c78a8a2