Skip to content

Commit

Permalink
merged dev
Browse files Browse the repository at this point in the history
  • Loading branch information
daancs committed Dec 12, 2023
2 parents 740b09b + 42d1f9f commit dd485a2
Show file tree
Hide file tree
Showing 5 changed files with 264 additions and 214 deletions.
14 changes: 14 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
},
"dependencies": {
"@fullcalendar/moment": "^5.11.0",
"@fullcalendar/moment-timezone": "^5.11.0",
"@fullcalendar/react": "^5.11.1",
"@fullcalendar/timegrid": "^5.11.0",
"@prisma/client": "^4.16.0",
Expand Down
15 changes: 5 additions & 10 deletions pages/mottagningen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ const TimelineItem = ({ data }: { data: TimelineEventWithCategory }) => (
href={data.link}
target="_blank"
>
{ data.link.split('//').at(-1)?.split('/')[0].split('.').splice(-2).join('.') }
{data.link.split('//').at(-1)?.split('/')[0].split('.').splice(-2).join('.')}
</a>
)}
<span className="circle" />
Expand Down Expand Up @@ -108,15 +108,10 @@ const Mottagningen: NextPage<MottagningenProps> = ({ mottagningenText, timelineD

<Divider />

<div className="timeline-box mt-8 flex flex-col items-center">
<div className="text-6xl font-theme text-center mb-12">Tidslinje</div>

<div className="mb-12">
<PageText>Nedan finns en timeline över allting man kan behöva göra innan mottagningen samt deadlines till dessa. Timelinen kan även innehålla lite roliga grejer som även sker efter mottagningen såsom aspning!</PageText>
</div>

<Timeline data={filteredTimelineData} />
</div>
<PageInfo heading="Tidslinje">
Nedan finns en timeline över allting man kan behöva göra innan mottagningen samt deadlines till dessa. Timelinen kan även innehålla lite roliga grejer som även sker efter mottagningen såsom aspning!
</PageInfo>
<Timeline data={filteredTimelineData} />

<Divider />

Expand Down
Loading

0 comments on commit dd485a2

Please sign in to comment.