Merge pull request #9 from include-davis/feat/products-page

Feat/products page
include-davis · May 12, 2024 · 67fcd7a · 67fcd7a
2 parents 4bc9957 + a1175b3
commit 67fcd7a
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 63 deletions.
diff --git a/app/(pages)/_components/Footer/Footer.module.scss b/app/(pages)/_components/Footer/Footer.module.scss
@@ -10,7 +10,7 @@
     background-color: var(--secondary);
     .credit {
         width: 100%;
-        padding: var(--tiny-spacer);
+        padding: var(--spacer);
         text-align: center;
         background-color: var(--primary);
         color: var(--text-light);
@@ -62,7 +62,7 @@
         flex-direction: column;
     }
 
-    .learn_more, .projects {
+    .learn_more {
         display: flex;
         flex-direction: column;
 
@@ -71,20 +71,5 @@
             flex-direction: column;
             gap: var(--tiny-spacer);
         }
-
-        .project_link_columns {
-            display: flex;
-            flex-direction: row;
-            gap: var(--tiny-spacer);
-            @include mixins.phone {
-                flex-direction: column;
-            }
-
-            >div {
-                display: flex;
-                flex-direction: column;
-                gap: var(--tiny-spacer);
-            }
-        }
     }
 }
diff --git a/app/(pages)/_components/Footer/Footer.tsx b/app/(pages)/_components/Footer/Footer.tsx
@@ -11,15 +11,12 @@ export default function Footer({ navLinks }: { navLinks: NavLink[] }) {
     <div className={styles.container}>
       <div className={styles.content_container}>
         <div className={styles.description}>
-          <h2>Platform Team Demo</h2>
-          <p>
-            This footer was designed so that you can practice writing efficient
-            HTML/CSS while getting familiar with our codebase.
-          </p>
+          <h2>include estore</h2>
+          <p>this estore demo was built for future clients to look at</p>
         </div>
         <div className={styles.navigation}>
           <div className={styles.learn_more}>
-            <h2>Learn more</h2>
+            <h2>look around</h2>
             <div className={styles.learn_more_links}>
               {navLinks.map((link) => {
                 return (
@@ -30,26 +27,10 @@ export default function Footer({ navLinks }: { navLinks: NavLink[] }) {
               })}
             </div>
           </div>
-          <div className={styles.projects}>
-            <h2>Projects</h2>
-            <div className={styles.project_link_columns}>
-              <div>
-                {/* Should be done with a loop */}
-                <Link href="/project/1">Project 1</Link>
-                <Link href="/project/2">Project 2</Link>
-                <Link href="/project/3">Project 3</Link>
-              </div>
-              <div>
-                <Link href="/project/4">Project 4</Link>
-                <Link href="/project/5">Project 5</Link>
-                <Link href="/project/6">Project 6</Link>
-              </div>
-            </div>
-          </div>
         </div>
       </div>
       <p className={styles.credit}>
-        Designed & develped with 🤍 by #include at Davis @2023
+        Designed & develped with 🤍 by #include at Davis @2024
       </p>
     </div>
   );

diff --git a/app/(pages)/_components/Navbar/Navbar.module.scss b/app/(pages)/_components/Navbar/Navbar.module.scss
@@ -1,6 +1,6 @@
 @use 'app/(pages)/_globals/mixins';
 
-$scale: 1.04;
+$scale: 1.02;
 
 .relative_wrapper {
     position: relative;
@@ -20,10 +20,10 @@ $scale: 1.04;
     justify-content: space-between;
     align-items: center;
 
-    background-color: var(--primary);
+    background-color: var(--light-foreground);
 
     >h2 {
-        color: var(--text-light);
+        color: var(--text-mid-grey);
     }
 }
 
@@ -38,7 +38,8 @@ $scale: 1.04;
         display: flex;
         flex-direction: row;
         gap: var(--spacer);
-        color: var(--text-light);
+        color: var(--text-mid-grey);
+        font-size: 1.25rem;
 
         >* {
             padding: var(--tiny-spacer);

diff --git a/app/(pages)/_components/Navbar/Navbar.tsx b/app/(pages)/_components/Navbar/Navbar.tsx
@@ -15,7 +15,7 @@ export default function Navbar({ navLinks }: { navLinks: NavLink[] }) {
   return (
     <div className={styles.relative_wrapper}>
       <div className={styles.container}>
-        <h2>LOGO IMG</h2>
+        <h2>estore</h2>
         <div className={styles.nav_container}>
           <div className={`${styles.links} ${active ? styles.active : null}`}>
             {navLinks.map((link) => {

diff --git a/app/(pages)/_data/navLinks.json b/app/(pages)/_data/navLinks.json
@@ -1,18 +1,14 @@
 [
     {
-      "name": "Home",
-      "slug": "/"
+        "name": "shop",
+        "slug": "/shop"
     },
     {
-      "name": "About Us",
-      "slug": "/about"
+        "name": "about",
+        "slug": "/about"
     },
     {
-      "name": "Examples",
-      "slug": "/examples"
-    },
-    {
-      "name": "Contact Us",
-      "slug": "/contact"
+        "name": "contact",
+        "slug": "/contact"
     }
-  ]
+]
diff --git a/app/(pages)/_globals/globals.scss b/app/(pages)/_globals/globals.scss
@@ -4,16 +4,20 @@
     /* variables */
     --include-purple: #3c257e;
 
-    --primary: var(--include-purple);
-    --secondary: #e7c6f9;
+    --primary: #373737;
+    --secondary: #fee8de;
 	--tertiary: #bf9a90;
 	--tertiary-light: #f8f6f5;
+    --light-foreground: white;
     --light-background: rgb(241, 240, 240);
-    --dark-background: #0d303b;
+    --mid-background: #5b5b71;
+    --mid-dark-background: #373737;
+    --dark-background: black;
 
-    --text-dark: #0d303b;
-    --text-light: #def6ff;
+    --text-dark: #373737;
+    --text-light: white;
 	--text-grey: #808080;
+    --text-mid-grey: #5C5B71;
 
     /* spacers */
     --tiny-spacer: 8px;
@@ -30,7 +34,7 @@
 	--b-input-focus: 2px solid var(--tertiary);
 
     /* navbar */
-    --navbar-height: 80px;
+    --navbar-height: 100px;
 
 	/* icon size */
 	--icon-input-size: 1.5rem;
@@ -56,6 +60,7 @@ h1 {
 }
 h2 {
     font-size: 2.5rem;
+    font-weight: 400;
 }
 h3 {
     font-size: 2rem;

diff --git a/app/(pages)/_globals/metadata.json b/app/(pages)/_globals/metadata.json
@@ -1,5 +1,5 @@
 {
-    "title": "Next.js Starter Template",
+    "title": "all products - include",
     "icons": {
       "icon": "/icons/icon.ico"
     }