changes

dreamz12345 · Jul 15, 2024 · bdfe899 · bdfe899
1 parent 01357e9
commit bdfe899
Show file tree

Hide file tree

Showing 14 changed files with 59 additions and 11 deletions.
diff --git a/portfolio/public/index.html b/portfolio/public/index.html
@@ -14,6 +14,8 @@
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
-    <div id="root"></div>
+    <div id="root">
+
+    </div>
   </body>
 </html>
diff --git a/portfolio/src/Assets/0001-1200.mp4 b/portfolio/src/Assets/0001-1200.mp4
diff --git a/portfolio/src/Assets/HOD_3000.png b/portfolio/src/Assets/HOD_3000.png
diff --git a/portfolio/src/Assets/IDME_2000.png b/portfolio/src/Assets/IDME_2000.png
diff --git a/portfolio/src/Assets/TT-SU2_700_samples_transparen_background.png b/portfolio/src/Assets/TT-SU2_700_samples_transparen_background.png
diff --git a/portfolio/src/Assets/about_square_size.jpg b/portfolio/src/Assets/about_square_size.jpg
diff --git a/portfolio/src/Assets/asdasd.jpg b/portfolio/src/Assets/asdasd.jpg
diff --git a/portfolio/src/Assets/pong_full_size.jpg b/portfolio/src/Assets/pong_full_size.jpg
diff --git a/portfolio/src/Assets/trkME+.png b/portfolio/src/Assets/trkME+.png
diff --git a/portfolio/src/Components/Navbar/Navbar.js b/portfolio/src/Components/Navbar/Navbar.js
@@ -11,7 +11,7 @@ const Navbar = () => {
             <div className="navbarContents">
                 <NavLink to="/" className="logoAndPortfolioText">
                     <img src={logo} alt="Logo" className="logoImg"></img>
-                    <text className="portfolioText">Portfolio</text>
+                    <p className="portfolioText">Portfolio</p>
 
                 </NavLink>
                     <div className="desktopMenu">

diff --git a/portfolio/src/Pages/Hobbies.js b/portfolio/src/Pages/Hobbies.js
@@ -1,11 +1,59 @@
 import Navbar from "../Components/Navbar/Navbar";
+import Footer from "../Components/Footer/Footer";
+import ScrollToTop from "../Components/scrollToTop";
+import renderPhoto from "../Assets/TT-SU2_700_samples_transparen_background.png";
+import HOD from "../Assets/HOD_3000.png";
+import IDME from "../Assets/IDME_2000.png";
+import trkMEplus from "../Assets/trkME+.png";
+import "./About.css";
 
 const Hobbies = () => {
     return (
-        <div>
-            <Navbar />
+        <div className="page">
+                <ScrollToTop/>
+            <div className="pageAboveFooter">
+                <Navbar />
+                <div className="pageContent">
+
+                    <div className="aboutMidDiv">
+                        <span className="aboutTitleText">3D Models</span>
+                        <span className="boldTxt">Renders</span>
+                    </div>
+
+                    <div className="homeDivOuter">
+
+                        <div className="homeDivMid">
+                            <div className="homeDivInner">
+                                <img src={renderPhoto} alt="projectsPhoto" className="homePhoto" />
+                            </div>
+                        </div>
+
+                        <div className="homeDivMid">
+                            <div className="homeDivInner">
+                                <img src={HOD} alt="projectsPhoto" className="homePhoto" />
+                            </div>
+                        </div>
+
+                        <div className="homeDivMid">
+                            <div className="homeDivInner">
+                                <img src={IDME} alt="projectsPhoto" className="homePhoto" />
+                            </div>
+                        </div>
+
+                        <div className="homeDivMid">
+                            <div className="homeDivInner">
+                                <img src={trkMEplus} alt="projectsPhoto" className="homePhoto" />
+                            </div>
+                        </div>
+
+                    </div>
+
+                </div>
+                <Footer />
+            </div>
         </div>
     )
 }
 
+
 export default Hobbies;
diff --git a/portfolio/src/Pages/Home.js b/portfolio/src/Pages/Home.js
@@ -50,13 +50,13 @@ const Home = () => {
                                 <NavLink to="/projects">
                                     <div className="homeDivInner">
                                         <span className="boldTxt">Projects</span>
-                                        <video src={pongVideo} alt="projectsPhoto" className="homePhoto" video loop autoPlay muted />
+                                        <video src={pongVideo} alt="projectsPhoto" className="homePhoto" loop autoPlay muted />
                                     </div>
                                 </NavLink>
                             </div>
 
                             <div className="homeDivMid">
-                                <NavLink to="/projects">
+                                <NavLink to="/hobbies">
                                     <div className="homeDivInner">
                                         <span className="boldTxt">Hobbies</span>
                                         <img src={renderPhoto} alt="projectsPhoto" className="homePhoto"></img>

diff --git a/portfolio/src/index.js b/portfolio/src/index.js
@@ -1,7 +1,8 @@
 import React from 'react';
 import ReactDOM from 'react-dom/client';
 import App from './App';
-import './style.css'
+import './style.css';
+
 
 const root = ReactDOM.createRoot(document.getElementById('root'));
 root.render(

diff --git a/portfolio/src/style.css b/portfolio/src/style.css
@@ -36,16 +36,13 @@ li {
 }
 
 
-p{
-    color: rgb(129, 137, 146);
-}
 
 .pageContent{
     margin: 1rem auto;
     max-width: 80vw;
     background: rgb(27, 27, 31);
     padding: 1vmax 1vmax;
-    
+
     border-radius: 1vmax;
 }