diff --git a/web/src/app/arrangementer/page.tsx b/web/src/app/arrangementer/page.tsx index 29d1175..105c678 100644 --- a/web/src/app/arrangementer/page.tsx +++ b/web/src/app/arrangementer/page.tsx @@ -1,8 +1,8 @@ - import { EventFragment, EventOccurrence } from "@/gql/graphql"; import { getClient } from "@/app/client"; import { EventContainer } from "@/components/events/EventContainer"; import { allEventsQuery } from "@/lib/event"; +import { PageHeader } from "@/components/general/PageHeader"; export default async function Page() { const { data, error } = await getClient().query(allEventsQuery, {}); @@ -10,9 +10,7 @@ export default async function Page() { return (
-
-

Arrangementer

-
+
); diff --git a/web/src/app/lokaler/page.tsx b/web/src/app/lokaler/page.tsx index 3fa7014..2b9c1f5 100644 --- a/web/src/app/lokaler/page.tsx +++ b/web/src/app/lokaler/page.tsx @@ -3,6 +3,7 @@ import { VenueFragment } from "@/gql/graphql"; import { getClient } from "@/app/client"; import { VenueList } from "@/components/venues/VenueList"; import Link from "next/link"; +import { PageHeader } from "@/components/general/PageHeader"; const VenueFragmentDefinition = graphql(` fragment Venue on VenuePage { @@ -54,13 +55,11 @@ export default async function Page() { return (
-
-

Lokaler

-

- Her kan vi presentere lokalene på Chateau Neuf, og eventuelt henvise - videre til undersiden om utleie. -

-
+ +

+ Her kan vi presentere lokalene på Chateau Neuf, og eventuelt henvise + videre til undersiden om utleie. +

); diff --git a/web/src/app/page.tsx b/web/src/app/page.tsx index b97acbd..803238b 100644 --- a/web/src/app/page.tsx +++ b/web/src/app/page.tsx @@ -6,6 +6,7 @@ import { Body } from "@/components/general/Body"; import Image from "next/image"; import { PersonList } from "@/components/people/PersonList"; import { NewsList } from "@/components/news/NewsList"; +import { PersonSection } from "@/components/people/PersonSection"; export default async function Home() { const homeQuery = graphql(` @@ -24,20 +25,8 @@ export default async function Home() {
«Hvor Glæden hersker, er alltid Fest»
-
-

Styret

- -
-
-

Administrasjonen

- -
-

- Sed sodales nunc quis sapien malesuada, a faucibus turpis blandit. - Suspendisse potenti. Sed auctor enim et augue dapibus, vitae laoreet - lacus vulputate. Nulla sed finibus diam. -

- + + ); diff --git a/web/src/app/utleie/page.tsx b/web/src/app/utleie/page.tsx new file mode 100644 index 0000000..6064aa4 --- /dev/null +++ b/web/src/app/utleie/page.tsx @@ -0,0 +1,60 @@ +import { graphql } from "@/gql"; +import { VenueFragment } from "@/gql/graphql"; +import { getClient } from "@/app/client"; +import { VenueList } from "@/components/venues/VenueList"; +import Link from "next/link"; +import { PageHeader } from "@/components/general/PageHeader"; + +const VenueFragmentDefinition = graphql(` + fragment Venue on VenuePage { + __typename + id + slug + title + body { + id + blockType + field + ... on RichTextBlock { + rawValue + value + } + } + featuredImage { + url + width + height + } + showAsBookable + floor + preposition + capabilityAudio + capabilityAudioVideo + capabilityBar + capabilityLighting + capacityLegal + capacityStanding + capacitySitting + } +`); + +export default async function Page() { + const allVenuesQuery = graphql(` + query allVenues { + venues: pages(contentType: "venues.VenuePage") { + ... on VenuePage { + ...Venue + } + } + } + `); + const { data, error } = await getClient().query(allVenuesQuery, {}); + const venues = (data?.venues ?? []) as VenueFragment[]; + + return ( +
+ + +
+ ); +} diff --git a/web/src/components/general/PageHeader.tsx b/web/src/components/general/PageHeader.tsx new file mode 100644 index 0000000..4708772 --- /dev/null +++ b/web/src/components/general/PageHeader.tsx @@ -0,0 +1,10 @@ +import styles from "./pageHeader.module.scss"; + +export const PageHeader = ({ heading }: { heading: string }) => { + return ( +
+

{heading}

+

Lead

+
+ ); +}; diff --git a/web/src/components/general/pageHeader.module.scss b/web/src/components/general/pageHeader.module.scss new file mode 100644 index 0000000..592b9dc --- /dev/null +++ b/web/src/components/general/pageHeader.module.scss @@ -0,0 +1,3 @@ +.pageHeader { + position: relative; +} \ No newline at end of file diff --git a/web/src/components/layout/Header.tsx b/web/src/components/layout/Header.tsx index ad1073f..cac35ef 100644 --- a/web/src/components/layout/Header.tsx +++ b/web/src/components/layout/Header.tsx @@ -24,7 +24,7 @@ export const Header = () => { Praktisk info
  • - Utleie + Utleie
  • Bli medlem @@ -45,7 +45,7 @@ export const Header = () => { Praktisk info
  • - Utleie + Utleie
  • Bli medlem diff --git a/web/src/components/people/PersonSection.tsx b/web/src/components/people/PersonSection.tsx new file mode 100644 index 0000000..2dbb70c --- /dev/null +++ b/web/src/components/people/PersonSection.tsx @@ -0,0 +1,11 @@ +import { PersonList } from "./PersonList"; +import styles from "./personSection.module.scss"; + +export const PersonSection = ({ heading }: { heading: string }) => { + return ( +
    +

    {heading}

    + +
    + ); +}; diff --git a/web/src/components/people/personSection.module.scss b/web/src/components/people/personSection.module.scss new file mode 100644 index 0000000..bf87a01 --- /dev/null +++ b/web/src/components/people/personSection.module.scss @@ -0,0 +1,17 @@ +.personSection { + background: var(--color-background-secondary); + margin: calc(var(--spacing-sitepadding)*2) calc(var(--spacing-sitepadding)*-1); + padding: var(--spacing-sitepadding); + + +.personSection { + margin-top: calc(var(--spacing-sitepadding)*-2); + } + + &:nth-of-type(even) { + background: var(--color-background); + } +} + +.heading { + margin: 2rem 0; +} \ No newline at end of file