Merge branch 'main' of https://github.com/Taseen18/Serenity

Taseen18 · Mar 28, 2024 · 85cab5c · 85cab5c
2 parents 770e29b + b3a3b28
commit 85cab5c
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 3 deletions.
diff --git a/web/src/App.js b/web/src/App.js
@@ -7,7 +7,8 @@ import Chat from './pages/Chat'
 import Tracking from './pages/Tracking'
 import About from './pages/About'
 import Exercise from './pages/Exercise'
-
+import Diet from './pages/Diet'
+import MentalHealth from './pages/MentalHealth'
 
 const App = () => {
 
@@ -37,6 +38,8 @@ const App = () => {
                 <Route exact path='/Chat' element={<Chat />} />
                 <Route exact path='/About' element={<About />} />
                 <Route exact path='/Exercise' element={<Exercise />} />
+                <Route exact path='/Diet' element={<Diet />} />
+                <Route exact path='/MentalHealth' element={<MentalHealth />} />
             </Routes>
 
     </div>

diff --git a/web/src/pages/Diet.js b/web/src/pages/Diet.js
@@ -0,0 +1,34 @@
+import React from 'react'
+import '../css/resourceMore.css';
+//import {resourceList} from "../helper/resourceList" //use open and close curly braces to grab file individually from export
+//import resourceItem from "../components/resource"
+import Navbar from "../components/Navbar";
+import Line from "../assets/images/Line.png"
+function Diet() {
+  return (
+    <div className="Holder">
+          {/*Going to make the holder section a component, so doesnt refresh to new page when u use the h3 links to cycle inbetween..
+          <div className="menuList">
+            {resourceList.map((resourceItem, key) => {
+           return <resourceItem key={key} titleCenter={resourceItem.titleCenter} leftScroll={resourceItem.leftScroll} rightScroll={resourceItem.rightScroll} infomation={resourceItem.infomation}/>
+        })}
+      </div>*/}
+      <Navbar />
+      <div className="topSection">
+        <h3> {"<"}Mental Health</h3>
+        <div className="titleSection">
+          <h1 className="title">Diet</h1>
+          <img className="underline" src={Line} />
+        </div>
+        <h3> Exercise {">"}</h3>
+      </div>
+
+      <div className="resourceWrapper">
+        <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer nec odio. Praesent libero. Sed cursus ante dapibus diam. Sed nisi. Nulla quis sem at nibh elementum imperdiet.Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer nec odio. Praesent libero. Sed cursus ante dapibus diam. Sed nisi. Nulla quis sem at nibh elementum imperdiet.Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer nec odio. Praesent libero. Sed cursus ante dapibus diam. Sed nisi. Nulla quis sem at nibh elementum imperdiet.Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer nec odio. Praesent libero. Sed cursus ante dapibus diam. Sed nisi. Nulla quis sem at nibh elementum imperdiet.Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer nec odio. Praesent libero. Sed cursus ante dapibus diam. Sed nisi. Nulla quis sem at nibh elementum imperdiet.</p>
+      </div>
+
+    </div>
+  )
+}
+
+export default Diet
diff --git a/web/src/pages/MentalHealth.js b/web/src/pages/MentalHealth.js
@@ -0,0 +1,34 @@
+import React from 'react'
+import '../css/resourceMore.css';
+//import {resourceList} from "../helper/resourceList" //use open and close curly braces to grab file individually from export
+//import resourceItem from "../components/resource"
+import Navbar from "../components/Navbar";
+import Line from "../assets/images/Line.png"
+function MentalHealth() {
+  return (
+    <div className="Holder">
+          {/*Going to make the holder section a component, so doesnt refresh to new page when u use the h3 links to cycle inbetween..
+          <div className="menuList">
+            {resourceList.map((resourceItem, key) => {
+           return <resourceItem key={key} titleCenter={resourceItem.titleCenter} leftScroll={resourceItem.leftScroll} rightScroll={resourceItem.rightScroll} infomation={resourceItem.infomation}/>
+        })}
+      </div>*/}
+      <Navbar />
+      <div className="topSection">
+        <h3> {"<"}Exercise</h3>
+        <div className="titleSection">
+          <h1 className="title">Mental Health</h1>
+          <img className="underline" src={Line} />
+        </div>
+        <h3> Diet {">"}</h3>
+      </div>
+
+      <div className="resourceWrapper">
+        <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer nec odio. Praesent libero. Sed cursus ante dapibus diam. Sed nisi. Nulla quis sem at nibh elementum imperdiet.Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer nec odio. Praesent libero. Sed cursus ante dapibus diam. Sed nisi. Nulla quis sem at nibh elementum imperdiet.Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer nec odio. Praesent libero. Sed cursus ante dapibus diam. Sed nisi. Nulla quis sem at nibh elementum imperdiet.Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer nec odio. Praesent libero. Sed cursus ante dapibus diam. Sed nisi. Nulla quis sem at nibh elementum imperdiet.Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer nec odio. Praesent libero. Sed cursus ante dapibus diam. Sed nisi. Nulla quis sem at nibh elementum imperdiet.</p>
+      </div>
+
+    </div>
+  )
+}
+
+export default MentalHealth
diff --git a/web/src/pages/Resources.js b/web/src/pages/Resources.js
@@ -19,9 +19,9 @@ function Resources() {
       <div className="selection">
 
 
-        <Link to="/exercise" className="linker"> <img className="pad" src={diet} /> </Link>
+        <Link to="/diet" className="linker"> <img className="pad" src={diet} /> </Link>
         <Link to="/exercise" className="linker"> <img id="middlepad"className="pad"src={exercise} /> </Link>
-        <Link to="/exercise" className="linker">  <img className="pad"src={mh} /> </Link>
+        <Link to="/mentalhealth" className="linker">  <img className="pad"src={mh} /> </Link>
 
 
       </div>