From bf91398b02c2914eededdf69ae9a7044c66d506e Mon Sep 17 00:00:00 2001 From: Navid Chowdhury Date: Sun, 10 Mar 2024 18:28:52 -0400 Subject: [PATCH 1/2] fixed typo on home page --- front-end/package.json | 1 + front-end/src/App.js | 30 +++++++--------- front-end/src/screens/Home.js | 2 +- front-end/src/styles/Home.css | 28 +++++++++++++++ front-end/src/styles/Login.css | 63 ++++++++++++++++++++++++++++++++++ 5 files changed, 105 insertions(+), 19 deletions(-) create mode 100644 front-end/src/styles/Home.css create mode 100644 front-end/src/styles/Login.css diff --git a/front-end/package.json b/front-end/package.json index 467cf33..4eb321f 100644 --- a/front-end/package.json +++ b/front-end/package.json @@ -8,6 +8,7 @@ "@testing-library/user-event": "^13.5.0", "react": "^18.2.0", "react-dom": "^18.2.0", + "react-router-dom": "^6.22.2", "react-scripts": "5.0.1", "web-vitals": "^2.1.4" }, diff --git a/front-end/src/App.js b/front-end/src/App.js index 3784575..44f099b 100644 --- a/front-end/src/App.js +++ b/front-end/src/App.js @@ -1,25 +1,19 @@ -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'; function App() { return ( -
-
- logo -

- Edit src/App.js and save to reload. -

- - Learn React - -
-
+ + + }> + } /> + } /> + + ); } export default App; +//https://www.w3schools.com/react/react_router.asp \ No newline at end of file diff --git a/front-end/src/screens/Home.js b/front-end/src/screens/Home.js index 425cc97..0f91f07 100644 --- a/front-end/src/screens/Home.js +++ b/front-end/src/screens/Home.js @@ -7,9 +7,9 @@ function Home(){

Home Page

-

View Closet

View Closet

Add Item

+

Outfit Archive

Generator Outfit

diff --git a/front-end/src/styles/Home.css b/front-end/src/styles/Home.css new file mode 100644 index 0000000..23e602c --- /dev/null +++ b/front-end/src/styles/Home.css @@ -0,0 +1,28 @@ +@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:wght@100..900&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; +} + +.homeList { + display: flex; + flex-direction: column; + text-align: center; + font-family: "Inria Serif", serif; + font-weight: 700; + font-style: normal; +} \ No newline at end of file diff --git a/front-end/src/styles/Login.css b/front-end/src/styles/Login.css new file mode 100644 index 0000000..2f03f2b --- /dev/null +++ b/front-end/src/styles/Login.css @@ -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:wght@100..900&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; +} From 0e065dbe4e32b4f9814bd0ffa8847fd555943626 Mon Sep 17 00:00:00 2001 From: N-A-V-I-D Date: Mon, 11 Mar 2024 20:43:42 -0400 Subject: [PATCH 2/2] added overlay to home, edited css that was done by shiwen --- front-end/src/App.js | 15 +++++++++++++++ front-end/src/components/OverlayMenu.js | 12 +++++++++--- front-end/src/screens/Accessories.js | 2 +- front-end/src/screens/All_Items.js | 2 +- front-end/src/screens/Coats_Jackets.js | 2 +- front-end/src/screens/Home.js | 12 ++++++++---- front-end/src/screens/Pants.js | 2 +- front-end/src/screens/Shirts.js | 2 +- front-end/src/screens/Shoes.js | 2 +- front-end/src/screens/Skirts_Dresses.js | 2 +- front-end/src/styles/Accessories.css | 4 ++-- front-end/src/styles/All_Items.css | 4 ++-- front-end/src/styles/Coats_Jackets.css | 4 ++-- front-end/src/styles/Home.css | 22 +++++++++++++++------- front-end/src/styles/Pants.css | 4 ++-- front-end/src/styles/Shirts.css | 7 +++++-- front-end/src/styles/Shoes.css | 10 +++++----- front-end/src/styles/Skirts_Dresses.css | 12 +++++++----- 18 files changed, 79 insertions(+), 41 deletions(-) diff --git a/front-end/src/App.js b/front-end/src/App.js index 44f099b..1cccf5a 100644 --- a/front-end/src/App.js +++ b/front-end/src/App.js @@ -3,6 +3,14 @@ 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 ( @@ -10,6 +18,13 @@ function App() { }> } /> } /> + } /> + } /> + } /> + } /> + } /> + } /> + } /> ); diff --git a/front-end/src/components/OverlayMenu.js b/front-end/src/components/OverlayMenu.js index 270212a..37ad446 100644 --- a/front-end/src/components/OverlayMenu.js +++ b/front-end/src/components/OverlayMenu.js @@ -1,6 +1,6 @@ import React, { useState } from 'react'; import './OverlayMenu.css'; - +import { Link } from 'react-router-dom'; const OverlayMenu = () => { const [isOpen, setIsOpen] = useState(false); // State to manage the menu visibility @@ -17,12 +17,18 @@ const OverlayMenu = () => {

Wardrobe Wizard

diff --git a/front-end/src/screens/Accessories.js b/front-end/src/screens/Accessories.js index c78402f..5d3973d 100644 --- a/front-end/src/screens/Accessories.js +++ b/front-end/src/screens/Accessories.js @@ -17,7 +17,7 @@ const Accessories = () => {

WARDROBE WIZARD

-

Accessories

+

Accessories

{Accessories.map((Accessorie, index) => ( diff --git a/front-end/src/screens/All_Items.js b/front-end/src/screens/All_Items.js index 384fb83..f2d9d5a 100644 --- a/front-end/src/screens/All_Items.js +++ b/front-end/src/screens/All_Items.js @@ -17,7 +17,7 @@ const All_Items = () => {

WARDROBE WIZARD

-

All_Items

+

All Items

{All_Items.map((All_Item, index) => ( diff --git a/front-end/src/screens/Coats_Jackets.js b/front-end/src/screens/Coats_Jackets.js index 013a1c0..7abc9f9 100644 --- a/front-end/src/screens/Coats_Jackets.js +++ b/front-end/src/screens/Coats_Jackets.js @@ -17,7 +17,7 @@ const Coats_Jackets = () => {

WARDROBE WIZARD

-

Coats/Jackets

+

Coats/Jackets

{Coats_Jackets.map((Coat_Jacket, index) => ( diff --git a/front-end/src/screens/Home.js b/front-end/src/screens/Home.js index 0f91f07..ffbb4a3 100644 --- a/front-end/src/screens/Home.js +++ b/front-end/src/screens/Home.js @@ -1,16 +1,20 @@ import '../styles/Home.css' +import OverlayMenu from '../components/OverlayMenu'; +import { Link } from 'react-router-dom'; + function Home(){ return(
+

WARDROBE WIZARD

Home Page

-

View Closet

-

Add Item

-

Outfit Archive

-

Generator Outfit

+

View Closet

+

Add Item

+

Outfit Archive

+

Generator Outfit

) diff --git a/front-end/src/screens/Pants.js b/front-end/src/screens/Pants.js index a1a9bb6..5afc48c 100644 --- a/front-end/src/screens/Pants.js +++ b/front-end/src/screens/Pants.js @@ -17,7 +17,7 @@ const Pants = () => {

WARDROBE WIZARD

-

Pants

+

Pants

{Pants.map((Pant, index) => ( diff --git a/front-end/src/screens/Shirts.js b/front-end/src/screens/Shirts.js index af1016d..047211e 100644 --- a/front-end/src/screens/Shirts.js +++ b/front-end/src/screens/Shirts.js @@ -17,7 +17,7 @@ const Shirt = () => {

WARDROBE WIZARD

-

Shirts

+

Shirts

{shirts.map((shirt, index) => ( diff --git a/front-end/src/screens/Shoes.js b/front-end/src/screens/Shoes.js index fd2fb33..a2ba3fa 100644 --- a/front-end/src/screens/Shoes.js +++ b/front-end/src/screens/Shoes.js @@ -17,7 +17,7 @@ const Shoes = () => {

WARDROBE WIZARD

-

Shoes

+

Shoes

{Shoes.map((Shoe, index) => ( diff --git a/front-end/src/screens/Skirts_Dresses.js b/front-end/src/screens/Skirts_Dresses.js index 64e208e..75eaad6 100644 --- a/front-end/src/screens/Skirts_Dresses.js +++ b/front-end/src/screens/Skirts_Dresses.js @@ -17,7 +17,7 @@ const Skirts_Dresses = () => {

WARDROBE WIZARD

-

Skirts/Dresses

+

Skirts/Dresses

{Skirts_Dresses.map((Skirt_Dresse, index) => ( diff --git a/front-end/src/styles/Accessories.css b/front-end/src/styles/Accessories.css index e068537..d75a851 100644 --- a/front-end/src/styles/Accessories.css +++ b/front-end/src/styles/Accessories.css @@ -7,7 +7,7 @@ text-align: center; } -.Accessories-banner h1, .Accessories-banner h2 { +.Accessories-banner h1 { font-family: "IM Fell French Canon SC", serif; margin: 0; margin-left: 2em; @@ -15,7 +15,7 @@ font-size: 27px; } -.Accessories-banner h2 { +.Accessories-banner h3, .Accessories-banner h1 { font-family: 'Cormorant Infant', serif; font-weight: 300; } diff --git a/front-end/src/styles/All_Items.css b/front-end/src/styles/All_Items.css index ce19a73..aaa2514 100644 --- a/front-end/src/styles/All_Items.css +++ b/front-end/src/styles/All_Items.css @@ -7,7 +7,7 @@ text-align: center; } -.All_Items-banner h1, .All_Items-banner h2 { +.All_Items-banner h1 { font-family: "IM Fell French Canon SC", serif; margin: 0; margin-left: 2em; @@ -15,7 +15,7 @@ font-size: 27px; } -.All_Items-banner h2 { +.All_Items-banner h3, .All_Items-banner h1 { font-family: 'Cormorant Infant', serif; font-weight: 300; } diff --git a/front-end/src/styles/Coats_Jackets.css b/front-end/src/styles/Coats_Jackets.css index 55417f6..97fb0a0 100644 --- a/front-end/src/styles/Coats_Jackets.css +++ b/front-end/src/styles/Coats_Jackets.css @@ -7,7 +7,7 @@ text-align: center; } -.Coats_Jackets-banner h1, .Coats_Jackets-banner h2 { +.Coats_Jackets-banner h1 { font-family: "IM Fell French Canon SC", serif; margin: 0; margin-left: 2em; @@ -15,7 +15,7 @@ font-size: 27px; } -.Coats_Jackets-banner h2 { +.Coats_Jackets-banner h3, .Coats_Jackets-banner h1 { font-family: 'Cormorant Infant', serif; font-weight: 300; } diff --git a/front-end/src/styles/Home.css b/front-end/src/styles/Home.css index 23e602c..1d939e1 100644 --- a/front-end/src/styles/Home.css +++ b/front-end/src/styles/Home.css @@ -1,21 +1,22 @@ @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:wght@100..900&display=swap'); -.banner{ +.banner { background-color: #f1f1f1; padding: 1.5rem; + text-align: center; } -.banner h1 { +.banner h1{ font-family: "IM Fell French Canon SC", serif; - font-weight: 400; margin: 0; - text-align: center; + margin-left: 2em; + text-align: left; + font-size: 27px; } -.banner h3{ +.banner h3 { font-family: 'Cormorant Infant', serif; font-weight: 300; - text-align: center; } .homeList { @@ -25,4 +26,11 @@ font-family: "Inria Serif", serif; font-weight: 700; font-style: normal; -} \ No newline at end of file +} + +.homeList a{ + text-decoration: none; + text-decoration: none; + color: black; +} + diff --git a/front-end/src/styles/Pants.css b/front-end/src/styles/Pants.css index 2162b01..8f54c5e 100644 --- a/front-end/src/styles/Pants.css +++ b/front-end/src/styles/Pants.css @@ -7,7 +7,7 @@ text-align: center; } -.Pants-banner h1, .Pants-banner h2 { +.Pants-banner h1 { font-family: "IM Fell French Canon SC", serif; margin: 0; margin-left: 2em; @@ -15,7 +15,7 @@ font-size: 27px; } -.Pants-banner h2 { +.Pants-banner h3 { font-family: 'Cormorant Infant', serif; font-weight: 300; } diff --git a/front-end/src/styles/Shirts.css b/front-end/src/styles/Shirts.css index 6682750..71d0f40 100644 --- a/front-end/src/styles/Shirts.css +++ b/front-end/src/styles/Shirts.css @@ -7,12 +7,15 @@ text-align: center; } -.Shirt-banner h1, .Shirt-banner h2 { +.Shirt-banner h1{ font-family: "IM Fell French Canon SC", serif; margin: 0; + margin-left: 2em; + text-align: left; + font-size: 27px; } -.Shirt-banner h2 { +.Shirt-banner h3, .Shirt-banner h1 { font-family: 'Cormorant Infant', serif; font-weight: 300; } diff --git a/front-end/src/styles/Shoes.css b/front-end/src/styles/Shoes.css index 7ffae97..ffff9d8 100644 --- a/front-end/src/styles/Shoes.css +++ b/front-end/src/styles/Shoes.css @@ -7,17 +7,17 @@ text-align: center; } -.Shoes-banner h1, .Shoes-banner h2 { +.Shoes-banner h1 { font-family: "IM Fell French Canon SC", serif; margin: 0; + margin-left: 2em; + text-align: left; + font-size: 27px; } -.Shoes-banner h2 { +.Shoes-banner h3, .Shoes-banner h1 { font-family: 'Cormorant Infant', serif; font-weight: 300; - margin-left: 2em; - text-align: left; - font-size: 27px; } /* Grid layout for the shirt list */ diff --git a/front-end/src/styles/Skirts_Dresses.css b/front-end/src/styles/Skirts_Dresses.css index 09f0e7a..8f9ffa6 100644 --- a/front-end/src/styles/Skirts_Dresses.css +++ b/front-end/src/styles/Skirts_Dresses.css @@ -7,17 +7,19 @@ text-align: center; } -.Skirts_Dresses-banner h1, .Skirts_Dresses-banner h2 { +.Skirts_Dresses-banner h1 { font-family: "IM Fell French Canon SC", serif; margin: 0; + margin-left: 2em; + text-align: left; + font-size: 27px; + } -.Skirts_Dresses-banner h2 { +.Skirts_Dresses-banner h3, .Skirts_Dresses-banner h1 { font-family: 'Cormorant Infant', serif; font-weight: 300; - margin-left: 2em; - text-align: left; - font-size: 27px; + } /* Grid layout for the shirt list */