Skip to content

Commit

Permalink
remove mock data, fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Tschonti committed Jan 28, 2024
1 parent 7a85617 commit baf9cdc
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 40 deletions.
50 changes: 15 additions & 35 deletions src/app/contact/page.tsx
Original file line number Diff line number Diff line change
@@ -1,55 +1,35 @@
import Link from 'next/link';

import { IndexPageData } from '@/models/models';

async function getIndexData(): Promise<IndexPageData> {
const res = await fetch(`${process.env.BACKEND_URL}/conference/index`);
if (!res.ok) {
throw new Error(res.status.toString());
}
return res.json();
}
import { getIndexData } from '@/models/get-index-data';

export default async function asyncontact() {
const { organisers } = await getIndexData();
// TODO sort by priority
const a = organisers.sort((o) => o.priority);
const org = [
...organisers,
...organisers,
...organisers,
...organisers,
...organisers,
...organisers,
...organisers,
...organisers,
...organisers,
...organisers,
...organisers,
];
const sortedOrganizers = organisers.sort((o) => o.priority);

return (
<div className='flex flex-col'>
<h1 className='mb-[74px]'>Kapcsolat</h1>
<div className='flex flex-col px-6 xl:px-0'>
<h1 className='mb-16 mt-8'>Kapcsolat</h1>

<Link
href='mailto:[email protected]'
className='my-8 text-xl sm:text-2xl md:text-3xl font-semibold text-center hover:text-brand'
target='blank'
>
[email protected]
</Link>

<div className='grid grid-cols-1 md:grid-cols-2 2xl:grid-cols-3 gap-16'>
{org.map((organiser) => (
{sortedOrganizers.map((organiser) => (
<div className='w-[384px]'>
<img src={organiser.pictureUrl} className='rounded-t-[30px] w-full h-[384px]' />
<div className='rounded-b-[30px] pt-[18px] px-[49px] pb-[38px] grid grid-cols-1 gap-2 bg-[#101010]'>
<div className='rounded-b-[30px] pt-4 px-3 pb-9 grid grid-cols-1 gap-2 bg-[#101010]'>
<h2 className='text-center text-3xl font-bold'>{organiser.name}</h2>
<p className='text-center text-2xl'>{organiser.rank}</p>
<p className='text-center text-base text-[#FFE500]'>{organiser.emailAddress}</p>
</div>
</div>
))}
</div>
<Link
href='mailto:[email protected]'
className='mt-8 text-xl sm:text-2xl md:text-3xl font-semibold text-center hover:text-brand'
target='blank'
>
[email protected]
</Link>
</div>
);
}
2 changes: 1 addition & 1 deletion src/app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export default async function Landing() {
</div>

<div className='grid grid-cols-1 sm:grid-cols-6 max-w-6xl w-full my-40 gap-6 px-6 xl:px-0'>
{data.registration.url && <RegisterTile data={data.registration} />}
{data.registration.cooltixEventId && <RegisterTile data={data.registration} />}

<StatTile desc='konferenciát rendeztünk már' number='20' />
<StatTile desc='percnyi előadás egy nap alatt' number='700+' />
Expand Down
4 changes: 1 addition & 3 deletions src/components/navbar/desktop-navbar.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
import { NavbarItems } from '@/components/navbar/navbar-items';
import { UniLogos } from '@/components/uni-logos';

export function DesktopNavbar() {
return (
<nav className='max-w-screen-2xl w-full mx-auto hidden md:flex p-10 md:p-15 pb-0 justify-between items-center flex-wrap gap-10 flex-col md:flex-row'>
<UniLogos />
<nav className='max-w-screen-2xl w-full mx-auto hidden md:flex p-10 md:p-15 pb-0 justify-end items-center flex-wrap gap-10 flex-col md:flex-row'>
<div className='flex items-center gap-10'>
<NavbarItems />
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/models/models.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export interface Presentation {

export interface RegistraionData {
buttonText: string;
url: string;
cooltixEventId: string;
}

export interface MobilAppData {
Expand Down

0 comments on commit baf9cdc

Please sign in to comment.