Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions frontend/.npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
legacy-peer-deps=true
6 changes: 3 additions & 3 deletions frontend/generateUmbracoApiClient.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import fs from 'node:fs';
import path from 'path';
import { loadEnvConfig } from '@next/env';
import openapiTS from 'openapi-typescript';
import openapiTS, { astToString } from 'openapi-typescript';
loadEnvConfig(process.cwd());

async function main() {
Expand All @@ -27,11 +27,11 @@ async function main() {

await Promise.all(
schemaConfigs.map(async ({ url, outputFile }) => {
const output = await openapiTS(url.toString());
const outputAst = await openapiTS(url.toString());

await fs.promises.writeFile(
path.join(__dirname, 'src', 'data', 'umbraco', outputFile),
output,
astToString(outputAst),
);
}),
);
Expand Down
4,596 changes: 2,342 additions & 2,254 deletions frontend/package-lock.json

Large diffs are not rendered by default.

41 changes: 21 additions & 20 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,39 +11,40 @@
"generate:umbraco-api-client": "tsx generateUmbracoApiClient.ts"
},
"dependencies": {
"@date-fns/tz": "^1.1.2",
"@fortawesome/fontawesome-svg-core": "^6.6.0",
"@fortawesome/free-brands-svg-icons": "^6.6.0",
"@fortawesome/free-regular-svg-icons": "^6.6.0",
"@fortawesome/free-solid-svg-icons": "^6.6.0",
"@fortawesome/react-fontawesome": "^0.2.2",
"@date-fns/tz": "^1.4.1",
"@fortawesome/fontawesome-svg-core": "^7.2.0",
"@fortawesome/free-brands-svg-icons": "^7.2.0",
"@fortawesome/free-regular-svg-icons": "^7.2.0",
"@fortawesome/free-solid-svg-icons": "^7.2.0",
"@fortawesome/react-fontawesome": "^3.3.0",
"@szhsin/react-accordion": "^1.4.1",
"date-fns": "^4.1.0",
"next": "16.2.2",
"next-plausible": "^4.0.0",
"openapi-fetch": "^0.12.2",
"openapi-fetch": "^0.17.0",
"react": "^19.2.0",
"react-dom": "^19.2.0",
"react-swipeable": "^7.0.2",
"sharp": "^0.33.5",
"sweetalert2": "^11.14.1",
"sharp": "^0.34.5",
"sweetalert2": "^11.26.24",
"throttle-debounce": "^5.0.2"
},
"devDependencies": {
"@tailwindcss/typography": "^0.5.15",
"@types/node": "^24.7.2",
"@tailwindcss/postcss": "^4.2.2",
"@tailwindcss/typography": "^0.5.19",
"@types/node": "^25.5.2",
"@types/react": "^19.2.2",
"@types/react-dom": "^19.2.2",
"@types/throttle-debounce": "^5.0.2",
"eslint": "^9.38.0",
"eslint": "^9.39.4",
"eslint-config-next": "16.2.2",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.2.1",
"openapi-typescript": "^6.7.6",
"postcss": "^8",
"prettier": "^3.3.3",
"tailwindcss": "^3.4.13",
"tsx": "^4.19.1",
"typescript": "^5"
"eslint-config-prettier": "^10.1.8",
"eslint-plugin-prettier": "^5.5.5",
"openapi-typescript": "^7.13.0",
"postcss": "^8.5.9",
"prettier": "^3.8.1",
"tailwindcss": "^4.2.2",
"tsx": "^4.21.0",
"typescript": "^6.0.2"
}
}
2 changes: 1 addition & 1 deletion frontend/postcss.config.mjs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/** @type {import('postcss-load-config').Config} */
const config = {
plugins: {
tailwindcss: {},
'@tailwindcss/postcss': {},
},
};

Expand Down
5 changes: 4 additions & 1 deletion frontend/src/app/[conference]/[...slug]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ export async function generateMetadata({

switch (item.contentType) {
case 'speaker':
return await generateSpeakerMetadata({ conference, speaker: item });
return await generateSpeakerMetadata({
conference,
speaker: item,
});
case 'page':
return await generateGenericMetadata({
params: resolvedParams,
Expand Down
60 changes: 33 additions & 27 deletions frontend/src/app/globals.css
Original file line number Diff line number Diff line change
@@ -1,38 +1,44 @@
@tailwind base;
@tailwind components;
@tailwind utilities;
@import "tailwindcss";
@plugin "@tailwindcss/typography";

.button {
@apply text-white bg-black p-4 uppercase font-bold tracking-wider text-sm hover:-translate-y-1 transition-transform
@theme {
--color-primary: #D72F32;
--color-secondary: #1E1E1E;
}

.button.secondary {
@apply bg-primary
}
@layer components {
.button {
@apply text-white bg-black p-4 uppercase font-bold tracking-wider text-sm hover:-translate-y-1 transition-transform
}

.content-container {
@apply container;
}
.button.secondary {
@apply bg-primary
}

.large-content-container {
max-width: 1900px;
}
.content-container {
@apply container;
}

.small-content-container {
max-width: 800px;
}
.large-content-container {
max-width: 1900px;
}

.small-content-container {
max-width: 800px;
}

.content-container,
.large-content-container,
.small-content-container {
@apply mx-auto;
width: calc(100% - theme('spacing.8'));
.content-container,
.large-content-container,
.small-content-container {
@apply mx-auto;
width: calc(100% - calc(var(--spacing) * 8));

@media screen(md) {
width: calc(100% - theme('spacing.20'));
@media (width >= theme(--breakpoint-md)) {
width: calc(100% - calc(var(--spacing) * 20));
}
}
}

.links a {
@apply text-primary underline
.links a {
@apply text-primary underline
}
}
6 changes: 3 additions & 3 deletions frontend/src/components/ScheduleGrid/ScheduleGrid.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
grid-template-columns: repeat(var(--grid-template-columns), minmax(100%, 1fr));
gap: 1rem;

@media screen(lg) {
@media (width >= 64rem) {
grid-template-columns: repeat(var(--grid-template-columns), minmax(50%, 1fr));
}

@media screen(xl) {
@media (width >= 80rem) {
grid-template-columns: repeat(var(--grid-template-columns), minmax(33.3333333%, 1fr));
}

@media screen('2xl') {
@media (width >= 96rem) {
gap: 2rem;
grid-template-columns: repeat(var(--grid-template-columns), minmax(calc(33.3333333% - 1rem), 1fr));
}
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/TextInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export function TextInput({
id={id}
value={value}
onChange={(evt) => onChange(evt.target.value)}
className="block px-2.5 pb-2.5 pt-5 w-full text-sm text-gray-900 bg-gray-100 appearance-none focus:outline-none focus:ring-0 peer"
className="block px-2.5 pb-2.5 pt-5 w-full text-sm text-gray-900 bg-gray-100 appearance-none focus:outline-hidden focus:ring-0 peer"
placeholder=" "
name={name}
required={required}
Expand Down
20 changes: 10 additions & 10 deletions frontend/src/data/types.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import type { components } from '@/data/umbraco/deliveryApiSchema';
import type { UmbracoContent } from '@/data/umbraco/types';
import type { Overwrite } from '@/util';

export type Conference =
components['schemas']['ConferenceContentResponseModel'];
type Content = UmbracoContent;

export type Conference = Extract<Content, { contentType: 'conference' }>;

export type ParsedConference = Overwrite<
Conference,
Expand All @@ -16,15 +18,15 @@ export type ParsedConference = Overwrite<
}
>;

export type Sponsors = components['schemas']['SponsorsContentResponseModel'];
export type Sponsors = Extract<Content, { contentType: 'sponsors' }>;

export type SponsorTier = components['schemas']['SponsorTierElementModel'];

export type Sponsor = components['schemas']['SponsorElementModel'];

export type Sessions = components['schemas']['SessionsContentResponseModel'];
export type Sessions = Extract<Content, { contentType: 'sessions' }>;

export type Session = components['schemas']['SessionContentResponseModel'];
export type Session = Extract<Content, { contentType: 'session' }>;

export type ParsedSession = Overwrite<
Session,
Expand All @@ -39,19 +41,17 @@ export type ParsedSession = Overwrite<
}
>;

export type Track = components['schemas']['TrackContentResponseModel'];
export type Track = Extract<Content, { contentType: 'track' }>;

export type TrackWithSessions = Track & { children: ParsedSession[] };

export type ScheduleItem = ParsedSession | TrackWithSessions;

export type Schedule = { items: ScheduleItem[]; grid: string[][] };

export type Speaker = components['schemas']['SpeakerContentResponseModel'];
export type Speaker = Extract<Content, { contentType: 'speaker' }>;

export type Page =
| components['schemas']['PageContentResponseModel']
| components['schemas']['HomeContentResponseModel'];
export type Page = Extract<Content, { contentType: 'home' | 'page' }>;

export type ContentBlock = components['schemas']['IApiElementModel'];

Expand Down
Loading
Loading