From b89ea07c17ee54eaadacdbe19639664bd7187ef7 Mon Sep 17 00:00:00 2001
From: Antoine Richardi <antoine.richardi@etu.univ-amu.fr>
Date: Wed, 22 Mar 2023 20:16:20 +0100
Subject: [PATCH] fix navlinks / fixblackgradient / changed 3dmodel

---
 package-lock.json                   |  8 ++++----
 package.json                        |  2 +-
 src/App.jsx                         |  2 +-
 src/components/Contact.jsx          |  2 +-
 src/components/canvas/Computers.jsx | 10 +++++-----
 src/hoc/SectionWrapper.jsx          |  4 ++++
 src/index.css                       | 17 +++++++++++++++++
 7 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 84a516e..c0d3a54 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28,7 +28,7 @@
         "autoprefixer": "^10.4.14",
         "postcss": "^8.4.21",
         "tailwindcss": "^3.2.7",
-        "vite": "^4.2.0"
+        "vite": "^4.2.1"
       }
     },
     "node_modules/@ampproject/remapping": {
@@ -3096,9 +3096,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-4.2.0.tgz",
-      "integrity": "sha512-AbDTyzzwuKoRtMIRLGNxhLRuv1FpRgdIw+1y6AQG73Q5+vtecmvzKo/yk8X/vrHDpETRTx01ABijqUHIzBXi0g==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-4.2.1.tgz",
+      "integrity": "sha512-7MKhqdy0ISo4wnvwtqZkjke6XN4taqQ2TBaTccLIpOKv7Vp2h4Y+NpmWCnGDeSvvn45KxvWgGyb0MkHvY1vgbg==",
       "dev": true,
       "dependencies": {
         "esbuild": "^0.17.5",
diff --git a/package.json b/package.json
index 7c9c994..78fe10b 100644
--- a/package.json
+++ b/package.json
@@ -32,6 +32,6 @@
     "autoprefixer": "^10.4.14",
     "postcss": "^8.4.21",
     "tailwindcss": "^3.2.7",
-    "vite": "^4.2.0"
+    "vite": "^4.2.1"
   }
 }
diff --git a/src/App.jsx b/src/App.jsx
index 80ebb5d..9254b30 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -6,7 +6,7 @@ const App = () => {
   return (
     <BrowserRouter>
     
-      <div className='relative z-0 bg-primary'>
+      <div className='relative z-0 bg-primary pb-1'>
         <div className='bg-hero-pattern bg-cover bg-no-repeat bg-center'>
           <Navbar/>
           <Hero/>
diff --git a/src/components/Contact.jsx b/src/components/Contact.jsx
index 760ce86..cc7364f 100644
--- a/src/components/Contact.jsx
+++ b/src/components/Contact.jsx
@@ -46,7 +46,7 @@ const Contact = () => {
     }
   }
   return (
-    <div className='xl:mt-12 xl:flex-row flex-col-reverse flex gap-10 overflow-hidden'>
+    <div className='xl:mt-12 xl:flex-row flex-col-reverse flex gap-10 overflow-hidden pb-18'>
       <motion.div
         variants={slideIn('left', 'tween', 0.2, 1)}
         className='flex-[0.75] bg-black-100 p-8 rounded-2xl'
diff --git a/src/components/canvas/Computers.jsx b/src/components/canvas/Computers.jsx
index 4ab70ba..c4a703b 100644
--- a/src/components/canvas/Computers.jsx
+++ b/src/components/canvas/Computers.jsx
@@ -4,7 +4,7 @@ import { OrbitControls, Preload, useGLTF } from '@react-three/drei'
 import CanvasLoader from '../Loader'
 
 const Computers = ({ isMobile }) => {
-  const computer = useGLTF('./mangrove/scene.gltf')
+  const computer = useGLTF('./desktop_pc/scene.gltf')
   return (
     <mesh>
       <hemisphereLight intensity={1} groundColor='white' />
@@ -18,9 +18,9 @@ const Computers = ({ isMobile }) => {
       />
       <primitive 
       object={computer.scene}
-      scale={isMobile ? 0.2 : 1.1}
-      position={[0, -5, 0]}
-      rotation={[-0.01, 1, 0]}
+      scale={isMobile ? 0.7 : 0.75}
+      position={[0, -2.5, -1.5]}
+      rotation={[0, -0.2, -0.1]}
       />
     </mesh>
   )
@@ -39,7 +39,7 @@ const ComputersCanvas = () => {
     <Canvas
       frameloop='demand'
       shadows
-      camera={{position: [20,3,0], fov:60}}
+      camera={{position: [20,3,5], fov:25}}
       gl={{preserveDrawingBuffer:true}}
     > 
       <Suspense fallback={<CanvasLoader/>}>
diff --git a/src/hoc/SectionWrapper.jsx b/src/hoc/SectionWrapper.jsx
index 231ee03..9609704 100644
--- a/src/hoc/SectionWrapper.jsx
+++ b/src/hoc/SectionWrapper.jsx
@@ -11,7 +11,11 @@ function HOC() {
         whileInView="show"
         viewport={{once:true, amount:0.25}}
         className={`${styles.paddingX} max-w-7xl mx-auto my-10`}
+        id={idName}
         >
+            <span className='hash-span' id={idName}>
+          &nbsp;
+        </span>
             <Component/>
         </motion.section>
     )
diff --git a/src/index.css b/src/index.css
index ed74ae0..44b5dfe 100644
--- a/src/index.css
+++ b/src/index.css
@@ -114,6 +114,22 @@
   -webkit-text-fill-color: transparent;
 }
 
+.black-text-gradient {
+  background: #464646; /* fallback for old browsers */
+  background: -webkit-linear-gradient(
+    to top,
+    #464646,
+    #555555
+  ); /* Chrome 10-25, Safari 5.1-6 */
+  background: linear-gradient(
+    to top,
+    #464646,
+    #949494
+  ); /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */
+  -webkit-background-clip: text;
+  -webkit-text-fill-color: transparent;
+}
+
 /* canvas- styles */
 .canvas-loader {
   font-size: 10px;
@@ -201,4 +217,5 @@
       -1.8em 1.8em 0 0em rgba(255, 255, 255, 0.5),
       -2.6em 0em 0 0em rgba(255, 255, 255, 0.7), -1.8em -1.8em 0 0em #ffffff;
   }
+  
 }
\ No newline at end of file