From b1f3db6a42ece7d7c91042709657e01f636850c4 Mon Sep 17 00:00:00 2001 From: elisejakob Date: Mon, 24 Jun 2024 02:15:22 +0200 Subject: [PATCH] add new page links and remove unused templates, add icon for external link --- web/src/app/medlem/page.tsx | 33 ---- web/src/app/om/page.tsx | 19 --- web/src/app/praktisk-test/page.tsx | 165 ------------------- web/src/components/general/Icon.tsx | 7 +- web/src/components/general/icon.module.scss | 1 + web/src/components/layout/Header.tsx | 30 ++-- web/src/components/layout/header.module.scss | 2 +- 7 files changed, 26 insertions(+), 231 deletions(-) delete mode 100644 web/src/app/medlem/page.tsx delete mode 100644 web/src/app/om/page.tsx delete mode 100644 web/src/app/praktisk-test/page.tsx diff --git a/web/src/app/medlem/page.tsx b/web/src/app/medlem/page.tsx deleted file mode 100644 index b1d604f..0000000 --- a/web/src/app/medlem/page.tsx +++ /dev/null @@ -1,33 +0,0 @@ -import { graphql } from "@/gql"; -//import { NewsFragment } from "@/gql/graphql"; -import { getClient } from "@/app/client"; -import Link from "next/link"; -import { PageHeader } from "@/components/general/PageHeader"; -import { IconListBlock } from "@/components/blocks/IconListBlock"; - -export default async function Page() { - return ( -
- -

- - Bli medlem → - -

-

- - Mitt medlemskap → - -

-

(+ Inngang til foreningene et sted under her)

- -
- ); -} diff --git a/web/src/app/om/page.tsx b/web/src/app/om/page.tsx deleted file mode 100644 index 26d4958..0000000 --- a/web/src/app/om/page.tsx +++ /dev/null @@ -1,19 +0,0 @@ -import { graphql } from "@/gql"; -//import { NewsFragment } from "@/gql/graphql"; -import { getClient } from "@/app/client"; -import Link from "next/link"; -import { PageHeader } from "@/components/general/PageHeader"; -import { IconListBlock } from "@/components/blocks/IconListBlock"; - -export default async function Page() { - return ( -
- -

Generelt om oss, CN og DNS

-

Inngang til kontakt, åpningstider og kart(?)

-

Historie og tradisjoner

-

Inngang til HMgrisen.no

-

Inngang til foreningene (kanskje under info om DNS over?)

-
- ); -} diff --git a/web/src/app/praktisk-test/page.tsx b/web/src/app/praktisk-test/page.tsx deleted file mode 100644 index d91d220..0000000 --- a/web/src/app/praktisk-test/page.tsx +++ /dev/null @@ -1,165 +0,0 @@ -import { graphql } from "@/gql"; -//import { NewsFragment } from "@/gql/graphql"; -import { getClient } from "@/app/client"; -import Link from "next/link"; -import { PageHeader } from "@/components/general/PageHeader"; -import { IconListBlock } from "@/components/blocks/IconListBlock"; -import { PageSectionBlock } from "@/components/blocks/PageSection"; - -export default async function Page() { - return ( -
- -
- Hopp til - -
- - -
-

Adkomst

-
-

Adresse

-

- Chateau Neuf -
- Slemdalsveien -
- 15 0369 Oslo -

- Åpne i Google Maps → -
- -
-
-
-

Adkomst

-

Skal vi si noe kort om hvordan du enklest kommer deg til Neuf?

-

Kollektivt

-

Parkering

-
-
-
-

Åpningstider

-
-

Serveringssteder

-
-

Glassbaren (1. etasje)

- - - - - - - - - - - - - - - -
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
-
-
-
-

Ekspedisjonen

-
-

Slottsmester og telefon

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

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

- Se kontaktinfo til ekspedisjonen → -
-
-
-
-

Billetter

-
- -
- ); -} diff --git a/web/src/components/general/Icon.tsx b/web/src/components/general/Icon.tsx index 2073f18..807bb84 100644 --- a/web/src/components/general/Icon.tsx +++ b/web/src/components/general/Icon.tsx @@ -1,6 +1,10 @@ import styles from "./icon.module.scss"; -export default function Icon({ type }: { type?: "doc" | "arrow" }) { +export default function Icon({ + type, +}: { + type?: "doc" | "arrow" | "externalLink"; +}) { return (
{type === "doc" && ( @@ -12,6 +16,7 @@ export default function Icon({ type }: { type?: "doc" | "arrow" }) { )} {type === "arrow" &&
} + {type === "externalLink" &&
} {!type && (
{ const [showMenu, setShowMenu] = useState(false); @@ -129,21 +130,10 @@ export const Header = () => {
  • - + Bli frivillig
  • -
  • - -
  • -
  • - - Mitt medlemskap → - -
  • {/* TODO: skal trolig ikke være så synlig ved lansering */} Lokaler* @@ -152,6 +142,22 @@ export const Header = () => { {/* TODO: skal trolig ikke være så synlig ved lansering */} Foreninger*
  • +
  • + +
  • +
  • + + Mitt medlemskap + + +
  • diff --git a/web/src/components/layout/header.module.scss b/web/src/components/layout/header.module.scss index 632045c..dfd9015 100644 --- a/web/src/components/layout/header.module.scss +++ b/web/src/components/layout/header.module.scss @@ -100,7 +100,7 @@ .search, .galtinn { - margin-top: var(--spacing-l); + margin-top: var(--spacing-m); } .siteMenu[data-show=true] {