From 2d9fd68060e1edeedaff8cfabea83cefe74328f5 Mon Sep 17 00:00:00 2001 From: elisejakob Date: Thu, 23 May 2024 12:50:47 +0200 Subject: [PATCH] misc messy design progress, fix table error, add more placeholder content to pages, etc --- web/src/app/aktuelt/[slug]/page.tsx | 2 +- web/src/app/arrangementer/[slug]/page.tsx | 2 +- web/src/app/foreninger/[slug]/page.tsx | 20 +++--- web/src/app/lokaler/[slug]/page.tsx | 76 ++++++++++---------- web/src/app/medlem/page.tsx | 4 +- web/src/app/praktisk/page.tsx | 62 ++++++++-------- web/src/app/utleie/page.tsx | 11 ++- web/src/components/general/Logo.tsx | 53 ++++++++++++++ web/src/components/general/pig.module.scss | 2 +- web/src/components/layout/Footer.tsx | 30 ++++---- web/src/components/layout/footer.module.scss | 12 +++- web/src/components/venues/VenueList.tsx | 28 ++++++-- web/src/css/base.scss | 2 +- 13 files changed, 202 insertions(+), 102 deletions(-) diff --git a/web/src/app/aktuelt/[slug]/page.tsx b/web/src/app/aktuelt/[slug]/page.tsx index 0eeb1aa..c57521c 100644 --- a/web/src/app/aktuelt/[slug]/page.tsx +++ b/web/src/app/aktuelt/[slug]/page.tsx @@ -69,7 +69,7 @@ export default async function Page({ params }: { params: { slug: string } }) { )}

{formatDate(news.firstPublishedAt, commonDateFormat)}

-
+
diff --git a/web/src/app/arrangementer/[slug]/page.tsx b/web/src/app/arrangementer/[slug]/page.tsx index 4f9c9f7..c73e096 100644 --- a/web/src/app/arrangementer/[slug]/page.tsx +++ b/web/src/app/arrangementer/[slug]/page.tsx @@ -52,7 +52,7 @@ export default async function Page({ params }: { params: { slug: string } }) { <>
-
+
diff --git a/web/src/app/foreninger/[slug]/page.tsx b/web/src/app/foreninger/[slug]/page.tsx index d2c9f99..58e7587 100644 --- a/web/src/app/foreninger/[slug]/page.tsx +++ b/web/src/app/foreninger/[slug]/page.tsx @@ -63,19 +63,21 @@ export default async function Page({ params }: { params: { slug: string } }) { /> )}
-
+
- - - - - {association.websiteUrl && ( + - - + + - )} + {association.websiteUrl && ( + + + + + )} +
Type{association.associationType}
Nettside{association.websiteUrl}Type{association.associationType}
Nettside{association.websiteUrl}
diff --git a/web/src/app/lokaler/[slug]/page.tsx b/web/src/app/lokaler/[slug]/page.tsx index b6be962..a973843 100644 --- a/web/src/app/lokaler/[slug]/page.tsx +++ b/web/src/app/lokaler/[slug]/page.tsx @@ -61,45 +61,47 @@ export default async function Page({ params }: { params: { slug: string } }) { /> )}
-
+
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Etasje{venue.floor}
Branntillatelse for{venue.capacityLegal}
Stående{venue.capacityStanding}
Sittende{venue.capacitySitting}
BrukTODO
Bar{venue.capabilityBar}
Lyd{venue.capabilityLighting}
Lys{venue.capabilityLighting}
A/V{venue.capabilityAudioVideo}
Etasje{venue.floor}
Branntillatelse for{venue.capacityLegal}
Stående{venue.capacityStanding}
Sittende{venue.capacitySitting}
BrukTODO
Bar{venue.capabilityBar}
Lyd{venue.capabilityLighting}
Lys{venue.capabilityLighting}
A/V{venue.capabilityAudioVideo}
diff --git a/web/src/app/medlem/page.tsx b/web/src/app/medlem/page.tsx index d2ac034..1f9a9ec 100644 --- a/web/src/app/medlem/page.tsx +++ b/web/src/app/medlem/page.tsx @@ -9,7 +9,7 @@ export default async function Page() { return (
-

Som medlem kan du... får du... glede og samvær

+

Som medlem kan du... får du... glede og samvær

-

Inngang til foreningene

+

(+ Inngang til foreningene et sted under her)

); diff --git a/web/src/app/praktisk/page.tsx b/web/src/app/praktisk/page.tsx index bafe578..f4bc40f 100644 --- a/web/src/app/praktisk/page.tsx +++ b/web/src/app/praktisk/page.tsx @@ -97,31 +97,35 @@ export default async function Page() {

Glassbaren (1. etasje)

- - - - - - - - - - - - + + + + + + + + + + + + + +
Man—Tor15:00—00:30
Fre15:00—02:30
Lør—SønÅpent ved arrangement
Man—Tor15:00—00:30
Fre15:00—02:30
Lør—SønÅpent ved arrangement

Bokcaféen (2. etasje)

- - - - - - - - + + + + + + + + + +
Tir—Tor19:00—23:30
Fre19:00—01:30
Tir—Tor19:00—23:30
Fre19:00—01:30
@@ -130,14 +134,16 @@ export default async function Page() {

Slottsmester og telefon

- - - - - - - - + + + + + + + + + +
Man—Fre15:00—00:00
Lør14:00—00:00
Man—Fre15:00—00:00
Lør14:00—00:00

Ekspedisjonen er også åpen under arrangementer på huset.

Se kontaktinfo til ekspedisjonen → diff --git a/web/src/app/utleie/page.tsx b/web/src/app/utleie/page.tsx index 9611e45..1a0e143 100644 --- a/web/src/app/utleie/page.tsx +++ b/web/src/app/utleie/page.tsx @@ -23,7 +23,16 @@ export default async function Page() { <>
- +

+ Chateau Neuf har lokaler til diverse arrangementer, og alle våre + lokaler er tilgjengelige for utleie, både for studenter, + utdanningsinstitusjoner og andre. Vi har blant annet huset + Spellemannsprisen og Dalai Lama! +

+

Her kommer mer om utleiereglement etc.

+
+
+
diff --git a/web/src/components/general/Logo.tsx b/web/src/components/general/Logo.tsx index 47f9798..f6c4c62 100644 --- a/web/src/components/general/Logo.tsx +++ b/web/src/components/general/Logo.tsx @@ -173,3 +173,56 @@ export const LogoIcon = ({ face }: { face?: "left" | "right" }) => {
); }; + +export const LogoNeuf = () => { + return ( +
+ + + + + + + + + + + + + + + + + +
+ ); +}; diff --git a/web/src/components/general/pig.module.scss b/web/src/components/general/pig.module.scss index 6137f22..fb5c45a 100644 --- a/web/src/components/general/pig.module.scss +++ b/web/src/components/general/pig.module.scss @@ -16,7 +16,7 @@ bottom: 0; right: 0; transform: translate(1vw, 20%); - z-index: 1; + z-index: 600; transition: opacity .6s ease; &[data-inview=true] { diff --git a/web/src/components/layout/Footer.tsx b/web/src/components/layout/Footer.tsx index b4f7e2c..08c4343 100644 --- a/web/src/components/layout/Footer.tsx +++ b/web/src/components/layout/Footer.tsx @@ -2,10 +2,14 @@ import Link from "next/link"; import styles from "./footer.module.scss"; import { NeonChillPig } from "../general/pigs/fun/NeonChillPig"; import { ToTop } from "./ToTop"; +import { LogoNeuf } from "../general/Logo"; export const Footer = () => { return (