diff --git a/src/app/actions/images/create.ts b/src/actions/images/create.ts similarity index 100% rename from src/app/actions/images/create.ts rename to src/actions/images/create.ts diff --git a/src/images/Omegamai.jpeg b/src/app/(home)/backgroundimages/Omegamai.jpeg similarity index 100% rename from src/images/Omegamai.jpeg rename to src/app/(home)/backgroundimages/Omegamai.jpeg diff --git a/src/images/frontImg.jpeg b/src/app/(home)/backgroundimages/frontImg.jpeg similarity index 100% rename from src/images/frontImg.jpeg rename to src/app/(home)/backgroundimages/frontImg.jpeg diff --git a/src/images/taktlause.jpeg b/src/app/(home)/backgroundimages/taktlause.jpeg similarity index 100% rename from src/images/taktlause.jpeg rename to src/app/(home)/backgroundimages/taktlause.jpeg diff --git a/src/app/(home)/page.module.scss b/src/app/(home)/page.module.scss index edff8d66f..11a0e183e 100644 --- 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 index d0fb99c78..555e6e498 100644 --- 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 ( ) } catch (err) { - const imagesrc = require('./../../../../public/default_image.jpeg') + const imagesrc = await import('./../../../../public/default_image.jpeg') return (
Could not find image {name}
- +
) } diff --git a/src/app/components/ImageUploader/ImageUploader.tsx b/src/app/components/ImageUploader/ImageUploader.tsx index 7dadf1606..cce8e28dc 100644 --- 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 index d8e631053..9566648d0 100644 --- 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%; } \ No newline at end of file diff --git a/src/app/components/NavBar/BurgerMenu.tsx b/src/app/components/NavBar/BurgerMenu.tsx index 332869811..d51b97aa1 100644 --- 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 ( - <> -
- -
-
- {burgerOpen && ( + <> +
+ +
+ {burgerOpen ? (
- - - - - {!isLoggedIn && + + + + + {!isLoggedIn && - } - {isLoggedIn && + } + {isLoggedIn && <> @@ -59,11 +60,10 @@ function BurgerMenu({ isLoggedIn, applicationPeriod }:PropTypes) { } - } + }
- )} -
- + ) : (
)} + ) } diff --git a/src/app/components/NavBar/MobileNavBar.module.scss b/src/app/components/NavBar/MobileNavBar.module.scss index bb877fe71..801d8c0c5 100644 --- 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 index 5523ddd16..0d3ba6154 100644 --- a/src/app/components/NavBar/MobileNavBar.tsx +++ b/src/app/components/NavBar/MobileNavBar.tsx @@ -20,7 +20,7 @@ function MobileNavBar({ session } : PropTypes) { return (