misc messy design progress, fix table error, add more placeholder content to pages, etc

This commit is contained in:
elisejakob
2024-05-23 12:50:47 +02:00
parent 87f144ed0d
commit 2d9fd68060
13 changed files with 202 additions and 102 deletions

View File

@ -69,7 +69,7 @@ export default async function Page({ params }: { params: { slug: string } }) {
)} )}
<p>{formatDate(news.firstPublishedAt, commonDateFormat)}</p> <p>{formatDate(news.firstPublishedAt, commonDateFormat)}</p>
</section> </section>
<section className="page-content"> <section className="pageContent">
<Blocks blocks={news.body} /> <Blocks blocks={news.body} />
</section> </section>
</main> </main>

View File

@ -52,7 +52,7 @@ export default async function Page({ params }: { params: { slug: string } }) {
<> <>
<main className="site-main" id="main"> <main className="site-main" id="main">
<EventHeader event={event} /> <EventHeader event={event} />
<section className="page-content"> <section className="pageContent">
<DateList /> <DateList />
<Blocks blocks={event.body} /> <Blocks blocks={event.body} />
</section> </section>

View File

@ -63,9 +63,10 @@ export default async function Page({ params }: { params: { slug: string } }) {
/> />
)} )}
</section> </section>
<section className="page-content"> <section className="pageContent">
<Blocks blocks={association.body} /> <Blocks blocks={association.body} />
<table> <table>
<tbody>
<tr> <tr>
<th>Type</th> <th>Type</th>
<td>{association.associationType}</td> <td>{association.associationType}</td>
@ -76,6 +77,7 @@ export default async function Page({ params }: { params: { slug: string } }) {
<td>{association.websiteUrl}</td> <td>{association.websiteUrl}</td>
</tr> </tr>
)} )}
</tbody>
</table> </table>
</section> </section>
</main> </main>

View File

@ -61,9 +61,10 @@ export default async function Page({ params }: { params: { slug: string } }) {
/> />
)} )}
</section> </section>
<section className="page-content"> <section className="pageContent">
<Blocks blocks={venue.body} /> <Blocks blocks={venue.body} />
<table> <table>
<tbody>
<tr> <tr>
<th>Etasje</th> <th>Etasje</th>
<td>{venue.floor}</td> <td>{venue.floor}</td>
@ -100,6 +101,7 @@ export default async function Page({ params }: { params: { slug: string } }) {
<th>A/V</th> <th>A/V</th>
<td>{venue.capabilityAudioVideo}</td> <td>{venue.capabilityAudioVideo}</td>
</tr> </tr>
</tbody>
</table> </table>
</section> </section>
</main> </main>

View File

@ -9,7 +9,7 @@ export default async function Page() {
return ( return (
<main className="site-main" id="main"> <main className="site-main" id="main">
<PageHeader heading="Bli medlem" /> <PageHeader heading="Bli medlem" />
<p>Som medlem kan du... får du... glede og samvær</p> <p className="lead">Som medlem kan du... får du... glede og samvær</p>
<p> <p>
<a <a
href="https://galtinn.neuf.no/register" href="https://galtinn.neuf.no/register"
@ -24,7 +24,7 @@ export default async function Page() {
Mitt medlemskap &rarr; Mitt medlemskap &rarr;
</a> </a>
</p> </p>
<p>Inngang til foreningene</p> <p>(+ Inngang til foreningene et sted under her)</p>
<IconListBlock /> <IconListBlock />
</main> </main>
); );

View File

@ -97,6 +97,7 @@ export default async function Page() {
<div className="openingHoursItem"> <div className="openingHoursItem">
<h3>Glassbaren (1. etasje)</h3> <h3>Glassbaren (1. etasje)</h3>
<table className="openingHours"> <table className="openingHours">
<tbody>
<tr> <tr>
<td>ManTor</td> <td>ManTor</td>
<td>15:0000:30</td> <td>15:0000:30</td>
@ -109,11 +110,13 @@ export default async function Page() {
<td>LørSøn</td> <td>LørSøn</td>
<td>Åpent ved arrangement</td> <td>Åpent ved arrangement</td>
</tr> </tr>
</tbody>
</table> </table>
</div> </div>
<div className="openingHoursItem"> <div className="openingHoursItem">
<h3>Bokcaféen (2. etasje)</h3> <h3>Bokcaféen (2. etasje)</h3>
<table className="openingHours"> <table className="openingHours">
<tbody>
<tr> <tr>
<td>TirTor</td> <td>TirTor</td>
<td>19:0023:30</td> <td>19:0023:30</td>
@ -122,6 +125,7 @@ export default async function Page() {
<td>Fre</td> <td>Fre</td>
<td>19:0001:30</td> <td>19:0001:30</td>
</tr> </tr>
</tbody>
</table> </table>
</div> </div>
</div> </div>
@ -130,6 +134,7 @@ export default async function Page() {
<div className="openingHoursItem"> <div className="openingHoursItem">
<h3>Slottsmester og telefon</h3> <h3>Slottsmester og telefon</h3>
<table className="openingHours"> <table className="openingHours">
<tbody>
<tr> <tr>
<td>ManFre</td> <td>ManFre</td>
<td>15:0000:00</td> <td>15:0000:00</td>
@ -138,6 +143,7 @@ export default async function Page() {
<td>Lør</td> <td>Lør</td>
<td>14:0000:00</td> <td>14:0000:00</td>
</tr> </tr>
</tbody>
</table> </table>
<p>Ekspedisjonen er også åpen under arrangementer huset.</p> <p>Ekspedisjonen er også åpen under arrangementer huset.</p>
<Link href="/kontakt">Se kontaktinfo til ekspedisjonen &rarr;</Link> <Link href="/kontakt">Se kontaktinfo til ekspedisjonen &rarr;</Link>

View File

@ -23,7 +23,16 @@ export default async function Page() {
<> <>
<main className="site-main" id="main"> <main className="site-main" id="main">
<PageHeader heading="Utleie" /> <PageHeader heading="Utleie" />
<VenueList venues={venues} /> <p className="lead">
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!
</p>
<p>Her kommer mer om utleiereglement etc.</p>
<br />
<br />
<VenueList heading="Våre lokaler" venues={venues} />
</main> </main>
<BgPig type="key" /> <BgPig type="key" />
</> </>

File diff suppressed because one or more lines are too long

View File

@ -16,7 +16,7 @@
bottom: 0; bottom: 0;
right: 0; right: 0;
transform: translate(1vw, 20%); transform: translate(1vw, 20%);
z-index: 1; z-index: 600;
transition: opacity .6s ease; transition: opacity .6s ease;
&[data-inview=true] { &[data-inview=true] {

View File

@ -2,10 +2,14 @@ import Link from "next/link";
import styles from "./footer.module.scss"; import styles from "./footer.module.scss";
import { NeonChillPig } from "../general/pigs/fun/NeonChillPig"; import { NeonChillPig } from "../general/pigs/fun/NeonChillPig";
import { ToTop } from "./ToTop"; import { ToTop } from "./ToTop";
import { LogoNeuf } from "../general/Logo";
export const Footer = () => { export const Footer = () => {
return ( return (
<footer className={styles.footer}> <footer className={styles.footer}>
<div className={styles.logo}>
<LogoNeuf />
</div>
<div className={styles.contact}> <div className={styles.contact}>
<ul className={styles.contactList}> <ul className={styles.contactList}>
<li className={styles.contactItem}> <li className={styles.contactItem}>
@ -64,6 +68,7 @@ export const Footer = () => {
<li className={styles.contactItem}> <li className={styles.contactItem}>
<h2 className="suphead">Åpningstider i dag</h2> <h2 className="suphead">Åpningstider i dag</h2>
<table className="openingHours"> <table className="openingHours">
<tbody>
<tr> <tr>
<td>Glassbaren</td> <td>Glassbaren</td>
<td>15:0000:30</td> <td>15:0000:30</td>
@ -76,6 +81,7 @@ export const Footer = () => {
<td>Ekspedisjonen</td> <td>Ekspedisjonen</td>
<td>15:0000:00</td> <td>15:0000:00</td>
</tr> </tr>
</tbody>
</table> </table>
<Link href="/praktisk#apningstider">Se alle åpningstider</Link> <Link href="/praktisk#apningstider">Se alle åpningstider</Link>
</li> </li>

View File

@ -1,7 +1,4 @@
.footer { .footer {
display: flex;
justify-content: space-between;
align-items: flex-end;
min-height: 60vh; min-height: 60vh;
padding: var(--spacing-sitepadding); padding: var(--spacing-sitepadding);
background: var(--color-chateauBlue); background: var(--color-chateauBlue);
@ -42,3 +39,12 @@
font-size: var(--font-size-caption); font-size: var(--font-size-caption);
} }
} }
.logo {
width: 12rem;
margin-bottom: var(--spacing-section-bottom);
>div {
width: 100%;
}
}

View File

@ -2,12 +2,28 @@ import { VenueFragment } from "@/gql/graphql";
import { VenueItem } from "./VenueItem"; import { VenueItem } from "./VenueItem";
import styles from "./venueList.module.scss"; import styles from "./venueList.module.scss";
export const VenueList = ({ venues }: { venues: VenueFragment[] }) => { export const VenueList = ({
venues,
heading,
}: {
venues: VenueFragment[];
heading: string;
}) => {
return ( return (
<div>
{heading && (
<h2 className="circlehead">
<span className="circle"></span>
<span className="circle"></span>
<span className="circle"></span>
{heading}
</h2>
)}
<ul className={styles.venueList}> <ul className={styles.venueList}>
{venues.map((venue) => ( {venues.map((venue) => (
<VenueItem key={venue.id} venue={venue} /> <VenueItem key={venue.id} venue={venue} />
))} ))}
</ul> </ul>
</div>
); );
}; };

View File

@ -37,7 +37,6 @@ body {
.site-main { .site-main {
padding: var(--spacing-sitepadding) var(--spacing-sitepadding) 0; padding: var(--spacing-sitepadding) var(--spacing-sitepadding) 0;
min-height: 100vh; min-height: 100vh;
position: relative;
animation: fadeUp .8s ease-out forwards; animation: fadeUp .8s ease-out forwards;
&.index { &.index {
@ -95,6 +94,7 @@ h6 {
font-weight: 700; font-weight: 700;
text-transform: uppercase; text-transform: uppercase;
letter-spacing: .05em; letter-spacing: .05em;
margin-bottom: 1rem;
.circle { .circle {
display: inline-block; display: inline-block;