Skip to content

Commit 2122718

Browse files
Darren52BTpv-nguyendavidgit3000jdang9191ryagatep
authored
#40: Merge Dev into Main
* start frontend repo * basic server and api * packeges * global header (search functionality pending) * implementing fetch implementing fetch after search bar button is clicked, response is wacky because of "no-cors", looking into enabling cors * added cors middleware for server, implement query string for title * Update header * commit again * m * merge with new server update and fetch function * fixing commit * random notes * reformat * fix conflict * search bar design complete (rendering article searh page pending) * fetch works with searchbar * finished user api as well as part of articles api * PR: Implemented Search Bar on Global Header (#3) * global header (search functionality pending) * search bar + useState Hook implemented * #8: Implemented basic article summary, article results, and routing * global header (search functionality pending) * implementing fetch implementing fetch after search bar button is clicked, response is wacky because of "no-cors", looking into enabling cors * added cors middleware for server, implement query string for title * Update header * commit again * m * merge with new server update and fetch function * fixing commit * random notes * reformat * fix conflict * search bar design complete (rendering article searh page pending) * fetch works with searchbar * search bar + useState Hook implemented * add DescriptionBox.js * working on routing and creating two pages (article search results and artive view pages) * search bar and article list working * search result * linked description box now brings to url based on id * fixed error displaying article list page * fixed issue with displaying article list page * change title query to title that contains string * fetching single article data from article list * moved code to articleview.js * removed mdbreact * adapted to not use mdbreact col --------- Co-authored-by: davidgit3000 <[email protected]> Co-authored-by: CerealAaa <[email protected]> Co-authored-by: Patrick Nguyen <[email protected]> Co-authored-by: jdang9191 <[email protected]> * #9: Implemented Article Section Header Component * #10: implemented Article BodySection component * implemented BodySection component, fixed header-marker from disappearing at smaller screen widths * refactored body content into a separate component and used body content component with header component to create section body component * #11: Implemented Topic List component * create topic list component * fixed conflicts * #12: Implemented Article Header * implemented BodySection component, fixed header-marker from disappearing at smaller screen widths * refactored body content into a separate component and used body content component with header component to create section body component * completed basic structure and font sizes * adapted article components to not use container * added key to topic list * #13: Implemented Article Page Image Banner * finished image banner * merged dev * finished image banner * fix merge * #14: Implements Table of Contents Component * implemented BodySection component, fixed header-marker from disappearing at smaller screen widths * refactored body content into a separate component and used body content component with header component to create section body component * completed basic structure and font sizes * adapted article components to not use container * added key to topic list * implemented styling for table of contents * * finished image banner * merged dev * finished image banner * fix merge * refactored body content into a separate component and used body content component with header component to create section body component * completed basic structure and font sizes * adapted article components to not use container * implemented styling for table of contents * completed merge, removed redundant scss * #15: Implemented Article Related Topics Component * implemented BodySection component, fixed header-marker from disappearing at smaller screen widths * refactored body content into a separate component and used body content component with header component to create section body component * completed basic structure and font sizes * adapted article components to not use container * added key to topic list * finished related topics component * #16: Implemented Article Page component and in Article View * created article page * removed temp article example route * made related topics list stick to top as scrolling down * added bcrpyt to hash passwords * added login post request to see if password matched with hashed password * added firebase commands * Create a Signin Card component with custom stylings (#18) * Create a Signin Card component with custom stylings * update error validation and add Signup Card component, add breakpoints for each card * modify the error validation functions, handleSubmit(), and add a state hook for all error messages * add auth.js containing authentication objects for future addition and modification (used for Signin and Signup components): * add client authenticaton to all fields in Signup * add custom.css and custom.css.map * started refactoring to use form feedback * modify client authentiation (not using Alerts component) - provide feedback instead - add show/hide password - add email validation using Regex * merge changes back to dl-signin --------- Co-authored-by: Darren52BT <[email protected]> * #!9: Constructed Signin/Signup Pages * created logo component and signin/signup pages * refactored logo to use more bootstrap classes * #16: Refactored Routes to use Outlet * #22: Migrated Frontend to Vite * finished vite migration and restructured scss * removed redundant css * path corrections * fixed paths * create jwt token * added Footer, changed the route for Signin and Signup in App.jsx, and change the view height of Signed Pages * position the Footer to the bottom of the page * added Footer, changed the route for Signin and Signup in App.jsx, and… (#24) * added Footer, changed the route for Signin and Signup in App.jsx, and change the view height of Signed Pages * position the Footer to the bottom of the page * login returns token * Add files via upload * Update index.js * Update queries.js * created Profile Setting component * add scss file for ProfileEdit, validation, and some small functionalities * add rounded corner to the InputGroup * add logo links for the Footer * modified the styling of ProfileEdit, added a SCSS file for resuable Settings styling pages, and created a Modal for Password Change * fixed the bug of password toggle icon and added validation for Password Change Modal * add navbar link, construct the profile setting page, and correct the typo in the DescriptionBox in the Home page * quick fix to not returning right page * cleaning up merge * pt 2 * wrap auth context around frontend application * create hook to handle signup fetch * #29: Implemented User Settings Customizations Form * created customizations form inputs and layout * added typehead implementation, started scss override * styled dropdown menu, fixed save/cancel changes * added color for no matches found text * removed redundant test code * fix the navbar underline color, enable navigation between each nav link * add CustomizationsEdit to the 'Customiztions' nav link * finish auth, local storage of user, and example of how to access user * #30: Implemented Saved Articles form section for the settings * created saved articles form with modal * added cancel button functionality * Create requireAuth.js * a * added middleware file which makes sure user is authenticated before users can edit/add files * created authorize article middlware that is supposed to check if if user has authorized permissions for certain api routes * railway implemented * gitignore * gitignore * gitignore update * #31: Added new palette colors as scss variables * added new theme colors * fixed colors, added comments * redesigned the header based on Figma * changed the spacing between left and right sections in larger viewport (1440px+) -> make them closer on larger screen * new middleware that makes sure only author can delete article they made * add theme toggler * #33: Implemented footer and added fonts * completed footer and added fonts * edited font name * created the web title and added the main article for the Home page * fixed the main article stylings, added parameters for MainArticle, modified the layout of AppTitle * changed the link of 'My Profile' on the user menu * #35: finished sign pages redesign * finished sign pages * added theme toggle listener that responds to changing prefers-color-mode, fixed colors changing across themes * fixed create one link * fixed scss import links * added color modes for AppTitle, MainArticle, and Header * #36: implemented settings redesign * completed basic background/input bg redesign * completed settings redesign * fixed arrow marker class names * #37: implemented article page redesign * reused settings arrow marker for all arrow markers * finished article redesign * made some adjustments to settings * Revert "made some adjustments to settings" This reverts commit 0ee758a. * new articles format * #38: Added fixes to Settings Page --------- Co-authored-by: CerealAaa <[email protected]> Co-authored-by: davidgit3000 <[email protected]> Co-authored-by: Patrick Nguyen <[email protected]> Co-authored-by: jdang9191 <[email protected]> Co-authored-by: David <[email protected]> Co-authored-by: ryagatep <[email protected]>
1 parent 19b9db0 commit 2122718

File tree

127 files changed

+19486
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+19486
-0
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
node_modules
2+
server/.env

‎frontend/.gitignore‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
2+
3+
# dependencies
4+
/node_modules
5+
/.pnp
6+
.pnp.js
7+
8+
# testing
9+
/coverage
10+
11+
# production
12+
/build
13+
14+
# misc
15+
.DS_Store
16+
.env.local
17+
.env.development.local
18+
.env.test.local
19+
.env.production.local
20+
21+
npm-debug.log*
22+
yarn-debug.log*
23+
yarn-error.log*

‎frontend/README.md‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
# Getting Started with Create React App
2+
3+
This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
4+
5+
## Available Scripts
6+
7+
In the project directory, you can run:
8+
9+
### `npm start`
10+
11+
Runs the app in the development mode.\
12+
Open [http://localhost:3000](http://localhost:3000) to view it in your browser.
13+
14+
The page will reload when you make changes.\
15+
You may also see any lint errors in the console.
16+
17+
### `npm test`
18+
19+
Launches the test runner in the interactive watch mode.\
20+
See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
21+
22+
### `npm run build`
23+
24+
Builds the app for production to the `build` folder.\
25+
It correctly bundles React in production mode and optimizes the build for the best performance.
26+
27+
The build is minified and the filenames include the hashes.\
28+
Your app is ready to be deployed!
29+
30+
See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
31+
32+
### `npm run eject`
33+
34+
**Note: this is a one-way operation. Once you `eject`, you can't go back!**
35+
36+
If you aren't satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
37+
38+
Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you're on your own.
39+
40+
You don't have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn't feel obligated to use this feature. However we understand that this tool wouldn't be useful if you couldn't customize it when you are ready for it.
41+
42+
## Learn More
43+
44+
You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
45+
46+
To learn React, check out the [React documentation](https://reactjs.org/).
47+
48+
### Code Splitting
49+
50+
This section has moved here: [https://facebook.github.io/create-react-app/docs/code-splitting](https://facebook.github.io/create-react-app/docs/code-splitting)
51+
52+
### Analyzing the Bundle Size
53+
54+
This section has moved here: [https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size](https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size)
55+
56+
### Making a Progressive Web App
57+
58+
This section has moved here: [https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app](https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app)
59+
60+
### Advanced Configuration
61+
62+
This section has moved here: [https://facebook.github.io/create-react-app/docs/advanced-configuration](https://facebook.github.io/create-react-app/docs/advanced-configuration)
63+
64+
### Deployment
65+
66+
This section has moved here: [https://facebook.github.io/create-react-app/docs/deployment](https://facebook.github.io/create-react-app/docs/deployment)
67+
68+
### `npm run build` fails to minify
69+
70+
This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify)

‎frontend/index.html‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8" />
5+
<link rel="icon" href="./favicon.ico" />
6+
<meta name="viewport" content="width=device-width, initial-scale=1" />
7+
<meta name="theme-color" content="#000000" />
8+
<meta
9+
name="description"
10+
content="Web site created using create-react-app"
11+
/>
12+
<link rel="apple-touch-icon" href="/logo192.png" />
13+
<!--
14+
manifest.json provides metadata used when your web app is installed on a
15+
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
16+
-->
17+
<link rel="manifest" href="/manifest.json" />
18+
19+
<link rel="preconnect" href="https://fonts.googleapis.com" />
20+
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
21+
<link
22+
href="https://fonts.googleapis.com/css2?family=Roboto&display=swap"
23+
rel="stylesheet"
24+
/>
25+
<title>CS Catalog</title>
26+
</head>
27+
<body>
28+
<noscript>You need to enable JavaScript to run this app.</noscript>
29+
<div id="root"></div>
30+
<script type="module" src="/src/index.jsx"></script>
31+
<!--
32+
This HTML file is a template.
33+
If you open it directly in the browser, you will see an empty page.
34+
35+
You can add webfonts, meta tags, or analytics to this file.
36+
The build step will place the bundled scripts into the <body> tag.
37+
38+
To begin the development, run `npm start` or `yarn start`.
39+
To create a production bundle, use `npm run build` or `yarn build`.
40+
-->
41+
</body>
42+
</html>

0 commit comments

Comments
 (0)