edb/neuf-www
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add new page links and remove unused templates, add icon for external link

Browse Source
This commit is contained in:
elisejakob
2024-06-24 02:15:22 +02:00
parent 62ecffd274
commit b1f3db6a42
7 changed files with 26 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
web/src/app/medlem/page.tsx
View File

@ -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 (
<main className="site-main" id="main">
<PageHeader
heading="Bli medlem"
lead="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut molestie tortor a interdum blandit. Sed ac purus sit amet libero posuere molestie."
/>
<p>
<a
href="https://galtinn.neuf.no/register"
target="_blank"
className="button"
>
Bli medlem &rarr;
</a>
</p>
<p>
<a href="https://galtinn.neuf.no/" target="_blank" className="button">
Mitt medlemskap &rarr;
</a>
</p>
<p>(+ Inngang til foreningene et sted under her)</p>
<IconListBlock />
</main>
);
}

19
web/src/app/om/page.tsx
View File

@ -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 (
<main className="site-main" id="main">
<PageHeader heading="Om oss" />
<p>Generelt om oss, CN og DNS</p>
<p>Inngang til kontakt, åpningstider og kart(?)</p>
<p>Historie og tradisjoner</p>
<p>Inngang til HMgrisen.no</p>
<p>Inngang til foreningene (kanskje under info om DNS over?)</p>
</main>
);
}

165
web/src/app/praktisk-test/page.tsx
View File

@ -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 (
<main className="site-main" id="main">
<PageHeader
heading="Praktisk info"
lead="Velkommen til oss! Enten du skal på teater, konsert, foredrag, eller er
student eller pensjonist, gleder vi oss til å se deg på Chateau Neuf.
Her finner du informasjon om hvordan du kommer deg til oss, og hva vi
kan by på av tjenester."
/>
<div className="anchorLinks">
<span className="suphead">Hopp til</span>
<ul>
<li>
<a href="#adkomst" className="button">
Adkomst
</a>
</li>
<li>
<a href="#apningstider" className="button">
Åpningstider
</a>
</li>
<li>
<a href="#billetter" className="button">
Billetter
</a>
</li>
<li>
<a href="#" className="button">
Booking og utleie
</a>
</li>
<li>
<a href="#" className="button">
Hittegods
</a>
</li>
<li>
<a href="#" className="button">
Tilgjengelighet
</a>
</li>
<li>
<a href="#" className="button">
Vergeordning
</a>
</li>
<li>
<a href="#" className="button">
Servering
</a>
</li>
</ul>
</div>
<PageSectionBlock
block={{ title: "Adkomst", body: [] } as any}
// subheading="Hvordan kommer man seg til Neuf?"
/>
<PageSectionBlock block={{ title: "Åpningstider", body: [] } as any} />
<section className="pageSection" id="adkomst">
<h1>Adkomst</h1>
<div className="pageSectionGroup">
<h2>Adresse</h2>
<p>
Chateau Neuf
<br />
Slemdalsveien
<br />
15 0369 Oslo
</p>
<a href="#">Åpne i Google Maps &rarr;</a>
<div className="iframe-wrap">
<iframe
loading="lazy"
src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d3997.986159638909!2d10.708115532212085!3d59.932257000000334!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x46416ddb5278789f%3A0xadda2b97f9d1cad6!2sChateau+Neuf+-+The+Norwegian+Students'+Society!5e0!3m2!1sen!2sno!4v1554374857442!5m2!1sen!2sno"
allowFullScreen
width="600"
height="450"
frameBorder="0"
></iframe>
</div>
</div>
<div className="pageSectionGroup">
<h2>Adkomst</h2>
<p>Skal vi si noe kort om hvordan du enklest kommer deg til Neuf?</p>
<h3>Kollektivt</h3>
<h3>Parkering</h3>
</div>
</section>
<section className="pageSection" id="apningstider">
<h1>Åpningstider</h1>
<div className="openingHoursGroup">
<h2>Serveringssteder</h2>
<div className="openingHoursItem">
<h3>Glassbaren (1. etasje)</h3>
<table className="openingHours">
<tbody>
<tr>
<td>Man—Tor</td>
<td>15:00—00:30</td>
</tr>
<tr>
<td>Fre</td>
<td>15:00—02:30</td>
</tr>
<tr>
<td>Lør—Søn</td>
<td>Åpent ved arrangement</td>
</tr>
</tbody>
</table>
</div>
<div className="openingHoursItem">
<h3>Bokcaféen (2. etasje)</h3>
<table className="openingHours">
<tbody>
<tr>
<td>Tir—Tor</td>
<td>19:00—23:30</td>
</tr>
<tr>
<td>Fre</td>
<td>19:00—01:30</td>
</tr>
</tbody>
</table>
</div>
</div>
<div className="openingHoursGroup">
<h2>Ekspedisjonen</h2>
<div className="openingHoursItem">
<h3>Slottsmester og telefon</h3>
<table className="openingHours">
<tbody>
<tr>
<td>Man—Fre</td>
<td>15:00—00:00</td>
</tr>
<tr>
<td>Lør</td>
<td>14:00—00:00</td>
</tr>
</tbody>
</table>
<p>Ekspedisjonen er også åpen under arrangementer på huset.</p>
<Link href="/kontakt">Se kontaktinfo til ekspedisjonen &rarr;</Link>
</div>
</div>
</section>
<section className="pageSectionAlt" id="billetter">
<h1>Billetter</h1>
</section>
<IconListBlock />
</main>
);
}

7
web/src/components/general/Icon.tsx
View File

@ -1,6 +1,10 @@
import styles from "./icon.module.scss"; import styles from "./icon.module.scss";
export default function Icon({ type }: { type?: "doc" | "arrow" }) { export default function Icon({
type,
}: {
type?: "doc" | "arrow" | "externalLink";
}) {
return ( return (
<div className={styles.icon}> <div className={styles.icon}>
{type === "doc" && ( {type === "doc" && (
@ -12,6 +16,7 @@ export default function Icon({ type }: { type?: "doc" | "arrow" }) {
</svg> </svg>
)} )}
{type === "arrow" && <div>&rarr;</div>} {type === "arrow" && <div>&rarr;</div>}
{type === "externalLink" && <div>&#8599;</div>}
{!type && ( {!type && (
<div> <div>
<svg <svg

1
web/src/components/general/icon.module.scss
View File

@ -3,6 +3,7 @@
height: var(--size-icon); height: var(--size-icon);
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
line-height: 1;
svg { svg {
display: block; display: block;

30
web/src/components/layout/Header.tsx
View File

@ -4,6 +4,7 @@ import { usePathname } from "next/navigation";
import Link from "next/link"; import Link from "next/link";
import styles from "./header.module.scss"; import styles from "./header.module.scss";
import { Logo, LogoIcon } from "@/components/general/Logo"; import { Logo, LogoIcon } from "@/components/general/Logo";
import Icon from "../general/Icon";
export const Header = () => { export const Header = () => {
const [showMenu, setShowMenu] = useState(false); const [showMenu, setShowMenu] = useState(false);
@ -129,21 +130,10 @@ export const Header = () => {
</Link> </Link>
</li> </li>
<li> <li>
<Link href="/" data-active={pathname === "/frivillig"}> <Link href="/frivillig" data-active={pathname === "/frivillig"}>
Bli frivillig Bli frivillig
</Link> </Link>
</li> </li>
<li className={styles.search}>
<label>
<p>Søk</p>
<input type="text" />
</label>
</li>
<li className={styles.galtinn}>
<a href="https://galtinn.neuf.no/" target="_blank">
Mitt medlemskap &rarr;
</a>
</li>
<li> <li>
{/* TODO: skal trolig ikke være så synlig ved lansering */} {/* TODO: skal trolig ikke være så synlig ved lansering */}
<Link href="/lokaler">Lokaler*</Link> <Link href="/lokaler">Lokaler*</Link>
@ -152,6 +142,22 @@ export const Header = () => {
{/* TODO: skal trolig ikke være så synlig ved lansering */} {/* TODO: skal trolig ikke være så synlig ved lansering */}
<Link href="/foreninger">Foreninger*</Link> <Link href="/foreninger">Foreninger*</Link>
</li> </li>
<li className={styles.search}>
<label>
<p>Søk</p>
<input type="text" />
</label>
</li>
<li className={styles.galtinn}>
<a
href="https://galtinn.neuf.no/"
target="_blank"
className="button tertiary"
>
<span>Mitt medlemskap</span>
<Icon type="externalLink" />
</a>
</li>
</ul> </ul>
</div> </div>
</nav> </nav>

2
web/src/components/layout/header.module.scss
View File

@ -100,7 +100,7 @@
.search, .search,
.galtinn { .galtinn {
margin-top: var(--spacing-l); margin-top: var(--spacing-m);
} }
.siteMenu[data-show=true] { .siteMenu[data-show=true] {