generated from nyu-software-engineering/generic-mern-stack-project
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #24 from agiledev-students-spring2024/navid
Fixed text on homepage, added more endpoints to router, and changed some css that was written by shiwen
- Loading branch information
Showing
20 changed files
with
175 additions
and
51 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,34 @@ | ||
| import logo from './logo.svg'; | ||
| import './App.css'; | ||
| import { BrowserRouter, Routes, Route } from "react-router-dom"; | ||
| import Login from './screens/Login'; | ||
| import Home from './screens/Home'; | ||
| import Registration from './screens/Registration'; | ||
| import Accessories from './screens/Accessories'; | ||
| import All_Items from './screens/All_Items'; | ||
| import Coats_Jackets from './screens/Coats_Jackets'; | ||
| import Pants from './screens/Pants'; | ||
| import Shirt from './screens/Shirts'; | ||
| import Shoes from './screens/Shoes'; | ||
| import Skirts_Dresses from './screens/Skirts_Dresses'; | ||
|
|
||
| function App() { | ||
| return ( | ||
| <div className="App"> | ||
| <header className="App-header"> | ||
| <img src={logo} className="App-logo" alt="logo" /> | ||
| <p> | ||
| Edit <code>src/App.js</code> and save to reload. | ||
| </p> | ||
| <a | ||
| className="App-link" | ||
| href="https://reactjs.org" | ||
| target="_blank" | ||
| rel="noopener noreferrer" | ||
| > | ||
| Learn React | ||
| </a> | ||
| </header> | ||
| </div> | ||
| <BrowserRouter> | ||
| <Routes> | ||
| <Route path="/" element={<Login/>}> </Route> | ||
| <Route path="/home" element={<Home/>} /> | ||
| <Route path="/register" element={<Registration/>} /> | ||
| <Route path="/accessories" element={<Accessories/>} /> | ||
| <Route path="/all-items" element={<All_Items/>} /> | ||
| <Route path="/coats-jackets" element={<Coats_Jackets/>} /> | ||
| <Route path="/pants" element={<Pants/>} /> | ||
| <Route path="/shirt" element={<Shirt/>} /> | ||
| <Route path="/shoes" element={<Shoes/>} /> | ||
| <Route path="/skirts-dresses" element={<Skirts_Dresses/>} /> | ||
| </Routes> | ||
| </BrowserRouter> | ||
| ); | ||
| } | ||
|
|
||
| export default App; | ||
| //https://www.w3schools.com/react/react_router.asp |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| @import url('https://fonts.googleapis.com/css2?family=Cormorant+Infant:ital,wght@0,300;0,400;0,500;0,600;0,700;1,300;1,400;1,500;1,600;1,700&family=IM+Fell+French+Canon+SC&family=Inria+Serif:ital,wght@0,300;0,400;0,700;1,300;1,400;1,700&family=Inter:[email protected]&display=swap'); | ||
|
|
||
| .banner { | ||
| background-color: #f1f1f1; | ||
| padding: 1.5rem; | ||
| text-align: center; | ||
| } | ||
|
|
||
| .banner h1{ | ||
| font-family: "IM Fell French Canon SC", serif; | ||
| margin: 0; | ||
| margin-left: 2em; | ||
| text-align: left; | ||
| font-size: 27px; | ||
| } | ||
|
|
||
| .banner h3 { | ||
| font-family: 'Cormorant Infant', serif; | ||
| font-weight: 300; | ||
| } | ||
|
|
||
| .homeList { | ||
| display: flex; | ||
| flex-direction: column; | ||
| text-align: center; | ||
| font-family: "Inria Serif", serif; | ||
| font-weight: 700; | ||
| font-style: normal; | ||
| } | ||
|
|
||
| .homeList a{ | ||
| text-decoration: none; | ||
| text-decoration: none; | ||
| color: black; | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| @import url('https://fonts.googleapis.com/css2?family=Cormorant+Infant:ital,wght@0,300;0,400;0,500;0,600;0,700;1,300;1,400;1,500;1,600;1,700&family=IM+Fell+French+Canon+SC&family=Inria+Serif:ital,wght@0,300;0,400;0,700;1,300;1,400;1,700&family=Inter:[email protected]&display=swap'); | ||
|
|
||
| .banner{ | ||
| background-color: #f1f1f1; | ||
| padding: 1.5rem; | ||
| } | ||
|
|
||
| .banner h1 { | ||
| font-family: "IM Fell French Canon SC", serif; | ||
| font-weight: 400; | ||
| margin: 0; | ||
| text-align: center; | ||
| } | ||
|
|
||
| .banner h3{ | ||
| font-family: 'Cormorant Infant', serif; | ||
| font-weight: 300; | ||
| text-align: center; | ||
| } | ||
|
|
||
| .login{ | ||
| display: flex; | ||
| flex-direction: column; | ||
| align-items: center; | ||
| } | ||
|
|
||
| .login h2 { | ||
| font-family: "Inria Serif", serif; | ||
| font-weight: 700; | ||
| font-style: normal; | ||
| } | ||
|
|
||
| .loginForm{ | ||
| display: flex; | ||
| flex-direction: column; | ||
| width: max-content; | ||
| } | ||
|
|
||
| .loginForm input{ | ||
| background-color: #f1f1f1; | ||
| border: none; | ||
| text-align: center; | ||
| border-radius: 5px; | ||
| } | ||
|
|
||
| .loginForm button{ | ||
| background-color: #000000; | ||
| border: none; | ||
| color: #f1f1f1; | ||
| padding: .5rem; | ||
| } | ||
|
|
||
| .register{ | ||
| text-align: center; | ||
| } | ||
|
|
||
| .register a { | ||
| text-decoration: none; | ||
| text-decoration: none; | ||
| font-size: xx-small; | ||
| font-family: "Inter", sans-serif; | ||
| color: #919191; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.