Merge pull request #5 from Naetffy/Murcia

Murcia
Naetffy · Apr 25, 2024 · 9e60bb5 · 9e60bb5
2 parents fea2b75 + 06ab957
commit 9e60bb5
Show file tree

Hide file tree

Showing 47 changed files with 373 additions and 349 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -12,6 +12,7 @@
     "react": "^18.2.0",
     "react-bootstrap": "^2.10.2",
     "react-dom": "^18.2.0",
+    "react-icons": "^5.1.0",
     "react-router-dom": "^6.22.3",
     "react-scripts": "5.0.1",
     "sweetalert2": "^11.10.8",

diff --git a/public/images/1.jpg b/public/images/1.jpg
diff --git a/public/images/1.png b/public/images/1.png
diff --git a/public/images/2.jpg b/public/images/2.jpg
diff --git a/public/images/2.png b/public/images/2.png
diff --git a/public/images/3.jpg b/public/images/3.jpg
diff --git a/public/images/3.png b/public/images/3.png
diff --git a/public/images/4.png b/public/images/4.png
diff --git a/public/images/5.png b/public/images/5.png
diff --git a/public/images/6.jpg b/public/images/6.jpg
diff --git a/public/images/6.png b/public/images/6.png
diff --git a/src/logo.png → public/images/logo.png b/src/logo.png → public/images/logo.png
diff --git a/public/index.html b/public/index.html
@@ -2,14 +2,14 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
+    <link rel="icon" href="./images/logo.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
     <meta
       name="description"
       content="Web site created using create-react-app"
     />
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
+    <link rel="apple-touch-icon" href="./images/logo.png" />
     <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
@@ -24,7 +24,7 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>React App</title>
+    <title>ClothCraft</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

diff --git a/public/logo192.png b/public/logo192.png
diff --git a/public/logo512.png b/public/logo512.png
diff --git a/public/robots.txt b/public/robots.txt
diff --git a/src/App.css b/src/App.css
diff --git a/src/App.jsx b/src/App.jsx
@@ -1,23 +1,22 @@
+import { BrowserRouter, Route, Routes } from 'react-router-dom';
+import Home from './components/Home';
+import Wardrobe from './components/Wardrobe';
+import Calendar from './components/Calendar';
+import Community from './components/Community';
+import Profile from './components/Profile';
 
-import HeaderComponent from './components/HeaderComponent'
-import {BrowserRouter} from 'react-router-dom'
-import './App.css';
-import LeftComponent from './components/LeftComponent';
-import RightComponentCalendar from './components/RightComponentCalendar';
-import RightComponentCommunity from './components/RightComponentCommunity';
-import CenterdCloset from './components/CenteredCloset';
 function App() {
-  return (
-    <div>  
+  return ( 
     <BrowserRouter>
-      <HeaderComponent/>                
-      <LeftComponent/> 
-      <CenterdCloset/>
-      <RightComponentCalendar />   
-      <RightComponentCommunity /> 
+      <Routes>
+        <Route path='/' element={<Home></Home>}/>
+        <Route path='/Wardrobe' element={<Wardrobe></Wardrobe>}/>
+        <Route path='/Calendar' element={<Calendar></Calendar>}/>
+        <Route path='/Community' element={<Community></Community>}/>
+        <Route path='/Profile' element={<Profile></Profile>}/>
+      </Routes>
     </BrowserRouter>
-  </div>
-)
+  )
 }
 
 export default App;
diff --git a/src/components/Calendar.js b/src/components/Calendar.js
@@ -0,0 +1,12 @@
+import React from 'react';
+import NavBar from './secondary/NavBar';
+
+const Calendar = () => {
+    return (
+        <div className='col-12'>
+            <NavBar/>
+        </div>
+    );
+}
+
+export default Calendar;
diff --git a/src/components/Carousels/CarouselPants.js b/src/components/Carousels/CarouselPants.js
diff --git a/src/components/Carousels/CarouselShirt.js b/src/components/Carousels/CarouselShirt.js
diff --git a/src/components/CenteredCloset.css b/src/components/CenteredCloset.css
diff --git a/src/components/CenteredCloset.jsx b/src/components/CenteredCloset.jsx
diff --git a/src/components/Community.js b/src/components/Community.js
@@ -0,0 +1,11 @@
+import React from 'react';
+import NavBar from './secondary/NavBar';
+const Community = () => {
+    return (
+        <div className='col-12'>
+            <NavBar/>
+        </div>
+    );
+}
+
+export default Community;
diff --git a/src/components/HeaderComponent.css b/src/components/HeaderComponent.css
diff --git a/src/components/HeaderComponent.jsx b/src/components/HeaderComponent.jsx
diff --git a/src/components/Home.js b/src/components/Home.js
@@ -0,0 +1,43 @@
+import React from 'react';
+import NavBar from './secondary/NavBar';
+import Outfit from './secondary/Outfit';
+import './styles/Home.css';
+import { IoRestaurantSharp } from "react-icons/io5";
+import { MdFamilyRestroom } from "react-icons/md";
+import { GiBalloons, GiBigDiamondRing } from "react-icons/gi";
+import { PiPants } from "react-icons/pi";
+import { FaClock } from "react-icons/fa";
+
+const Home = () => {
+    return (
+        <div className='col-12'>
+            <div className='col-12'>
+                <NavBar/>
+            </div>
+            <div className='row container-fluid'>
+                <div className='col-sm-6 offset-sm-3 col-md-4 offset-md-4 col-lg-2 offset-lg-3 mt-5'>
+                    <Outfit/>
+                </div>
+                <div className='row col-4 offset-2 mt-5'>
+                    <div className='col-6 offset-3 mb-2 p-3 recommendations'> 
+                        <p><b>Collections</b></p>
+                        <a href="/Community" className="custom-link"><b><IoRestaurantSharp size={24}/> BBQ</b></a>
+                        <a href="/Community" className="custom-link"><b><MdFamilyRestroom size={24}/> Familiy</b></a>
+                        <a href="/Community" className="custom-link"><b><GiBalloons size={24}/> Festival</b></a>
+                    </div>
+                    <div className='col-6 offset-3 mt-2 p-3 recommendations'> 
+                        <p><b>Community Ideas</b></p>
+                        <a href="/Community" className="custom-link"><b><PiPants size={24}/> Bottoms</b></a>
+                        <a href="/Community" className="custom-link"><b><GiBigDiamondRing size={24}/> Wedding Time</b></a>
+                        <a href="/Community" className="custom-link"><b><FaClock size={24}/> Upcoming Events</b></a>
+                    </div>
+                </div>
+            </div>
+
+
+        </div>
+
+    );
+}
+
+export default Home;
diff --git a/src/components/LeftComponent.css b/src/components/LeftComponent.css