Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor frontend: Merge duplicated layouts #80

Merged
merged 3 commits into from
Mar 7, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
let { children }: LayoutProps = $props();
</script>

<div class="flex h-screen w-screen flex-col overflow-hidden">
<div class="flex min-h-screen w-full flex-col">
<Navbar />
{@render children()}
</div>
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<script lang="ts">
import "$src/app.css";
import Navbar from "$components/Navbar.svelte";
import type { LayoutProps } from "./$types";
import { MetaTags } from "svelte-meta-tags";
import Clock from "$components/timetable/Clock.svelte";
Expand Down Expand Up @@ -75,37 +74,33 @@
}}
/>

<div class="flex min-h-screen flex-col">
<Navbar />

<div class="bg-background sticky top-20 z-10 container mx-auto w-full flex-col px-6 pt-4">
<div class="flex justify-between">
{#snippet favoriteStation()}
<div class="flex flex-row items-baseline gap-x-2 break-all">
{#if $session.data}
<Star
class="shrink-0 cursor-pointer transition-all duration-300 {favor
? 'fill-accent stroke-yellow-400'
: 'hover:stroke-accent fill-transparent'}"
onclick={toggleFavour}
/>
{/if}
<span class="text-xl font-semibold break-words whitespace-normal md:text-4xl">{station.name}</span>
</div>
{/snippet}

{@render favoriteStation()}
<Clock />
</div>

<button class="group relative flex cursor-pointer gap-x-2 text-base md:text-xl" onclick={navigate}>
<CornerDownRight />
Show {isDeparture ? "Arrivals" : "Departures"}
<span
class="bg-accent absolute bottom-0 left-0 h-0.5 w-full scale-x-0 transform transition-transform duration-300 group-hover:scale-x-100"
></span>
</button>
<div class="bg-background sticky top-20 z-10 container mx-auto w-full flex-col px-6 pt-4">
<div class="flex justify-between">
{#snippet favoriteStation()}
<div class="flex flex-row items-baseline gap-x-2 break-all">
{#if $session.data}
<Star
class="shrink-0 cursor-pointer transition-all duration-300 {favor
? 'fill-accent stroke-yellow-400'
: 'hover:stroke-accent fill-transparent'}"
onclick={toggleFavour}
/>
{/if}
<span class="text-xl font-semibold break-words whitespace-normal md:text-4xl">{station.name}</span>
</div>
{/snippet}

{@render favoriteStation()}
<Clock />
</div>

{@render children()}
<button class="group relative flex cursor-pointer gap-x-2 text-base md:text-xl" onclick={navigate}>
<CornerDownRight />
Show {isDeparture ? "Arrivals" : "Departures"}
<span
class="bg-accent absolute bottom-0 left-0 h-0.5 w-full scale-x-0 transform transition-transform duration-300 group-hover:scale-x-100"
></span>
</button>
</div>

{@render children()}
12 changes: 0 additions & 12 deletions frontend/src/routes/journey/coach-sequence/+layout.svelte

This file was deleted.