cleanup / nav

GenerateNU · Apr 17, 2024 · c1685ff · c1685ff
1 parent f7533d2
commit c1685ff
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 21 deletions.
diff --git a/website/src/App.tsx b/website/src/App.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import AboutPage from './pages/MainPage';
 import './App.css';
 import { BrowserRouter as Router, Route, Routes } from "react-router-dom";
-import ProjectsPage from './components/ProjectsPage';
+import ProjectsPage from './pages/ProjectsPage';
 import ProductPurchasePage from './pages/ProductPurchasePage';
 
 const App: React.FC = () => {

diff --git a/website/src/components/Navbar.tsx b/website/src/components/Navbar.tsx
@@ -12,11 +12,15 @@ export default function Navbar() {
                 </Link>
             </div>
             <div className=' hidden lg:flex flex-row gap-3'>
-                <a href="" className=' text-brand-blue-light text-lg font-semibold px-5'>About Us</a>
+            <Link to="/" className='text-brand-blue-light text-lg font-semibold px-5'>
+                    <h1>About Us</h1>
+                </Link>
                 <Link to="/product-purchase" className='text-brand-blue-light text-lg font-semibold px-5'>
                     <h1>Products</h1>
                 </Link>
-                <a href="" className=' text-brand-blue-light text-lg font-semibold px-5'>Projects</a>
+                <Link to="/projects" className='text-brand-blue-light text-lg font-semibold px-5'>
+                    <h1>Projects</h1>
+                </Link>
             </div>
         </div>
         <CustomButton label='Get in touch' link='' />

diff --git a/website/src/components/Timeline.tsx b/website/src/components/Timeline.tsx
@@ -19,8 +19,8 @@ export default function Timeline() {
         <div className=" w-full h-5/6 lg:h-auto flex flex-col lg:flex-row justify-evenly items-center gap-4">
             <div className=" relative h-36 lg:h-48 flex justify-center" >
                 <div className=" flex justify-center items-baseline lg:items-center">
-                    <div className=" w-24 h-24 bg-white drop-shadow-2xl rounded-full flex justify-center items-center" >
-                        <img src={ComputerIcon} alt="" className=' w-12 h-12 top-[72px]' />
+                    <div className="  rounded-full flex justify-center items-center" >
+                        <img src={ComputerIcon} alt="" className='h-24 w-24' />
                     </div>
                 </div>
                 <h3 className=" absolute bottom-0 text-nowrap text-lg text-brand-white font-bold">Starting in CAD</h3>

diff --git a/website/src/components/WhyTubender.tsx b/website/src/components/WhyTubender.tsx
@@ -27,7 +27,7 @@ export default function WhyTubender() {
                 <div className=' w-full xl:w-1/3 flex flex-col gap-11'>
                     <h2 className=' text-5xl font-semibold text-brand-blue-dark'>What we do</h2>
                     <p className=' text-2xl text-brand-blue'>Our mission at Tubender is to democratize manufacturing by making automatic metal tube bending machines smaller, more affordable, and easier to use. We empower makers of all experience levels to create incredible products with precision and accessibility, ensuring that technical expertise is never a barrier.</p>
-                    <CustomButton label='Our projects' link='' />
+                    <CustomButton label='Our projects' link='/projects' />
                 </div>
                 <div className=' grid grid-cols-2 w-full xl:w-1/2 gap-28 pr-8'>
                     <InfoCell symbol={Complex} title="Complex" body="Tubender allows complex shapes via software-controlled freeform bending with CAD." />

diff --git a/website/src/images/.background.png.icloud → website/src/images/background.png b/website/src/images/.background.png.icloud → website/src/images/background.png
diff --git a/website/src/images/computer.svg b/website/src/images/computer.svg
diff --git a/website/src/images/.splash_bg.svg.icloud → website/src/images/splash_bg.svg b/website/src/images/.splash_bg.svg.icloud → website/src/images/splash_bg.svg
diff --git a/website/src/pages/ProductPurchasePage.tsx b/website/src/pages/ProductPurchasePage.tsx
@@ -26,14 +26,15 @@ function ProductPurchasePage() {
       </div>
       <div className='bg-off-white py-10 flex flex-col items-center'>
   <h1 className='mb-8 text-4xl font-bold'>Our Main Features</h1>
-  <div className='flex flex-col items-center'>
-    <img src={Complex} alt="" className='my-4'/>
-    <img src={Automatic} alt="" className='my-4'/>
-    <img src={Portable} alt="" className='my-4'/>
-    <img src={Affordable} alt="" className='my-4'/>
+    <div className='flex flex-col items-center'>
+      <img src={Complex} alt="" className='my-4'/>
+      <img src={Automatic} alt="" className='my-4'/>
+      <img src={Portable} alt="" className='my-4'/>
+      <img src={Affordable} alt="" className='my-4'/>
+    </div>
+    </div>
+        <Footer/>
   </div>
-</div>
-      </div>
   );
 }
 

diff --git a/website/src/components/ProjectsPage.tsx → website/src/pages/ProjectsPage.tsx b/website/src/components/ProjectsPage.tsx → website/src/pages/ProjectsPage.tsx
@@ -1,9 +1,9 @@
 import CaseStudy from '../images/case_study.svg'
 import GradientBackground from '../images/gradient_background.png'
 import OurProjects from '../images/our_projects.svg'
-import Navbar from './Navbar'
-import Footer from './Footer'
-import MailingList from './MailingList'
+import Navbar from '../components/Navbar'
+import Footer from '../components/Footer'
+import MailingList from '../components/MailingList'
 
 function Header() {
     return (