chore: move actions to src

vevcom · Nov 8, 2023 · 95f19e1 · 95f19e1
1 parent 89bf944
commit 95f19e1
Show file tree

Hide file tree

Showing 21 changed files with 35 additions and 37 deletions.
diff --git a/src/app/actions/images/create.ts → src/actions/images/create.ts b/src/app/actions/images/create.ts → src/actions/images/create.ts
diff --git a/src/images/Omegamai.jpeg → ...app/(home)/backgroundimages/Omegamai.jpeg b/src/images/Omegamai.jpeg → ...app/(home)/backgroundimages/Omegamai.jpeg
diff --git a/src/images/frontImg.jpeg → ...app/(home)/backgroundimages/frontImg.jpeg b/src/images/frontImg.jpeg → ...app/(home)/backgroundimages/frontImg.jpeg
diff --git a/src/images/taktlause.jpeg → ...pp/(home)/backgroundimages/taktlause.jpeg b/src/images/taktlause.jpeg → ...pp/(home)/backgroundimages/taktlause.jpeg
diff --git a/src/app/(home)/page.module.scss b/src/app/(home)/page.module.scss
@@ -1,7 +1,7 @@
 @use "@/styles/ohma";
-$omegamai: url("../../images/Omegamai.jpeg");
-$frontImg: url("../../images/frontImg.jpeg");
-$taktlause: url("../../images/taktlause.jpeg");
+$omegamai: url("backgroundimages/Omegamai.jpeg");
+$frontImg: url("backgroundimages/frontImg.jpeg");
+$taktlause: url("backgroundimages/taktlause.jpeg");
 
 .wrapper {
     font-size: 40px;

diff --git a/src/app/components/Image/Image.tsx b/src/app/components/Image/Image.tsx
@@ -13,16 +13,16 @@ export default async function Image({ alt, name, ...props } : PropTypes) {
     })
     try {
         if (!image) throw `no image found with name: ${name}`
-        const imagesrc = require(`./../../../../store/images/${image?.fsLocation}`)
+        const imagesrc = await import(`./../../../../store/images/${image?.fsLocation}`)
         return (
             <NextImage alt={alt ?? image.alt} src={imagesrc} {...props} />
         )
     } catch (err) {
-        const imagesrc = require('./../../../../public/default_image.jpeg')
+        const imagesrc = await import('./../../../../public/default_image.jpeg')
         return (
             <div>
                 <div>Could not find image {name}</div>
-                <NextImage alt={'default image'} src={imagesrc} {...props} />
+                <NextImage alt="default image" src={imagesrc} {...props} />
             </div>
         )
     }

diff --git a/src/app/components/ImageUploader/ImageUploader.tsx b/src/app/components/ImageUploader/ImageUploader.tsx
@@ -1,4 +1,4 @@
-import create from '@/app/actions/images/create'
+import create from '@/actions/images/create'
 
 export default function ImageUploader() {
     return (

diff --git a/src/app/components/NavBar/BurgerMenu.module.scss b/src/app/components/NavBar/BurgerMenu.module.scss
@@ -5,4 +5,6 @@
     grid-template-columns: repeat(5, 1fr);
     gap: 2*ohma.$gap;
     padding: 3*ohma.$gap ohma.$gap  ohma.$gap ohma.$gap;
+    grid-area: b;
+    width: 100%;
 }
diff --git a/src/app/components/NavBar/BurgerMenu.tsx b/src/app/components/NavBar/BurgerMenu.tsx
@@ -1,3 +1,5 @@
+'use client'
+
 import BurgerItem from './BurgerItem'
 import {
     faBars,
@@ -29,23 +31,22 @@ function BurgerMenu({ isLoggedIn, applicationPeriod }:PropTypes) {
     const [burgerOpen, setBurgerOpen] = useState(false)
 
     return (
-    <>
-        <div className={styles.item}>
-            <button onClick={() => setBurgerOpen(!burgerOpen)}>
-                <FontAwesomeIcon icon={faBars} />
-            </button>
-        </div>
-        <div className={styles.burgerMenu}>
-            {burgerOpen && (
+        <>
+            <div className={styles.item}>
+                <button onClick={() => setBurgerOpen(!burgerOpen)}>
+                    <FontAwesomeIcon icon={faBars} />
+                </button>
+            </div>
+            {burgerOpen ? (
                 <div className={styles.BurgerMenu}>
-                <BurgerItem href="/ombul" name="OmBul" icon={faNewspaper}/>
-                <BurgerItem href="/infopages/about" name="Om Omega" icon={faCircleInfo}/>
-                <BurgerItem href="/infopages/committees" name="Komitéer" icon={faBeer}/>
-                <BurgerItem href="/infopages/guides" name="Guider" icon={faQuestionCircle}/>
-                {!isLoggedIn &&
+                    <BurgerItem href="/ombul" name="OmBul" icon={faNewspaper}/>
+                    <BurgerItem href="/infopages/about" name="Om Omega" icon={faCircleInfo}/>
+                    <BurgerItem href="/infopages/committees" name="Komitéer" icon={faBeer}/>
+                    <BurgerItem href="/infopages/guides" name="Guider" icon={faQuestionCircle}/>
+                    {!isLoggedIn &&
                     <BurgerItem href="/infopages/nystudent" name="Ny Student?" icon={faGraduationCap}/>
-                }
-                {isLoggedIn &&
+                    }
+                    {isLoggedIn &&
                 <>
                     <BurgerItem href="/money/shop" name="Omegashop" icon={faShoppingCart}/>
                     <BurgerItem href="/omegaquotes" name="Omegaquotes" icon={faComment}/>
@@ -59,11 +60,10 @@ function BurgerMenu({ isLoggedIn, applicationPeriod }:PropTypes) {
                         <BurgerItem href="/applications" name="Søknad" icon={faAddressCard}/>
                     }
                 </>
-                }
+                    }
                 </div>
-            )}
-        </div>
-    </>
+            ) : (<div></div>)}
+        </>
     )
 }
 

diff --git a/src/app/components/NavBar/MobileNavBar.module.scss b/src/app/components/NavBar/MobileNavBar.module.scss
@@ -12,7 +12,7 @@
     grid-template-areas: 
         ". . . . ."
         "b b b b b";
-    > .item {
+    > *:not(:last-child) {
 
         border-left: solid .5px ohma.$white;
         display: grid;
@@ -38,10 +38,6 @@
             outline: inherit;
         }
     }
-    > .burgerMenu {
-        grid-area: b;
-        width: 100%;
-    }
     overflow: hidden;
 }
 

diff --git a/src/app/components/NavBar/MobileNavBar.tsx b/src/app/components/NavBar/MobileNavBar.tsx
@@ -20,7 +20,7 @@ function MobileNavBar({ session } : PropTypes) {
 
     return (
         <nav className={styles.MobileNavBar}>
-            <div className={styles.item}>
+            <div>
                 {
                     isLoggedIn ?
                         <Link href="/events">
@@ -31,17 +31,17 @@ function MobileNavBar({ session } : PropTypes) {
                         </Link>
                 }
             </div>
-            <div className={styles.item}>
+            <div>
                 <Link href="/news">
                     <FontAwesomeIcon icon={faNewspaper} />
                 </Link>
             </div>
-            <div className={styles.item}>
+            <div>
                 <Link href="/">
                     <Image name="simple_logo" width={30}/>
                 </Link>
             </div>
-            <div className={styles.item}>
+            <div>
                 {
                     isLoggedIn ?
                         <Link href={'/user/profile/me'}>

diff --git a/src/images/OV.jpeg b/src/images/OV.jpeg
diff --git a/src/images/add_to_home_screen.png b/src/images/add_to_home_screen.png
diff --git a/src/images/kappemann.jpeg b/src/images/kappemann.jpeg
diff --git a/src/images/logo_simple.png b/src/images/logo_simple.png
diff --git a/src/images/logo_white.png b/src/images/logo_white.png
diff --git a/src/images/magisk_hatt.png b/src/images/magisk_hatt.png
diff --git a/src/images/nordic.png b/src/images/nordic.png
diff --git a/src/images/ohma.jpeg b/src/images/ohma.jpeg
diff --git a/src/images/omega_logo_white.png b/src/images/omega_logo_white.png
diff --git a/tsconfig.json b/tsconfig.json
@@ -23,8 +23,8 @@
       "@/*": ["./src/*"],
       "@/components/*": ["src/app/components/*"],
       "@/styles/*": ["src/styles/*"],
-      "@/images/*": ["src/images/*"],
-      "@/actions/*": ["src/app/actions/*"],
+      "@/images/*": ["src/actions/images/*"],
+      "@/actions/*": ["src/actions/*"],
       "@/prisma/*": ["src/prisma/*"]
 
     }