Skip to content

Commit 982b404

Browse files
committed
fix GUI, new skeleton version
1 parent 0b3ac6e commit 982b404

File tree

3 files changed

+21
-31
lines changed

3 files changed

+21
-31
lines changed

src/routes/+layout.svelte

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040
href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@48,400,0,0"
4141
/>
4242
<div class="h-dvh flex flex-col">
43-
<div class="md:container md:mx-auto justify-center items-center">
44-
<AppBar class="rounded-b-3xl">
45-
<AppBar.Toolbar class="flex flex-auto items-end">
43+
<div class="md:container md:mx-auto">
44+
<AppBar class="rounded-b-3xl p-2">
45+
<AppBar.Toolbar class="grid-cols-[auto_1fr_auto]">
4646
<AppBar.Lead class="flex items-end">
4747
<a href="/" class="material-symbols-outlined" style="font-size: {navHeight}rem">map</a>
4848
<a href="/" class="text-2xl">sailBlog</a>

src/routes/trips/[trip]/+page.svelte

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,10 @@
104104
<div class="flex items-center">
105105
<h3 class="h5 align-middle mr-2">Skipper:</h3>
106106
<a href="/user/{requestedTripData.skipper?.username}" class="btn btn-sm preset-tonal-secondary border border-secondary-500 mr-1 pl-1 flex items-center text-sm">
107-
<Avatar name={requestedTripData.skipper?.firstName + " " + requestedTripData.skipper?.lastName}
108-
src={getProfilePicture(requestedTripData.skipper)}
109-
background="bg-primary-500"
110-
classes="!ml-0 !size-6"
111-
rounded="rounded-full"
112-
/>
107+
<Avatar class="!ml-0 !size-6">
108+
<Avatar.Image src={getProfilePicture(requestedTripData.skipper)} class="!size-6"/>
109+
<Avatar.Fallback>{requestedTripData.skipper?.firstName.charAt(0)+requestedTripData.skipper?.lastName.charAt(0)}</Avatar.Fallback>
110+
</Avatar>
113111
{requestedTripData.skipper?.username}
114112
</a>
115113
</div>
@@ -119,12 +117,10 @@
119117
{#each requestedTripData?.crew as member, i}
120118
{#if member.username != requestedTripData?.skipper?.username}
121119
<a href="/user/{member.username}" class="btn btn-sm preset-tonal-secondary border border-secondary-500 mr-1 pl-2 flex items-center">
122-
<Avatar name={member.firstName + " " + member.lastName}
123-
src={getProfilePicture(member)}
124-
background="bg-primary-500"
125-
classes="!ml-0 !size-6"
126-
rounded="rounded-full"
127-
/>
120+
<Avatar class="!ml-0 !size-6">
121+
<Avatar.Image src={getProfilePicture(member)} class="!size-6"/>
122+
<Avatar.Fallback>{member.firstName?.toUpperCase().charAt(0)}{member.firstName?.toUpperCase().charAt(1)}</Avatar.Fallback>
123+
</Avatar>
128124
{member.username}
129125
</a>
130126
{/if}

src/routes/trips/edit/[trip]/+page.svelte

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -209,12 +209,10 @@
209209
<div class="flex flex-wrap items-center">
210210
<h3 class="h5 align-middle mr-2">Skipper:</h3>
211211
<button onclick={()=>{showSkipperSearch = true}} class="btn btn-sm preset-tonal-secondary border border-secondary-500 mr-1 pl-1 group hover:preset-filled-warning-500">
212-
<Avatar name={requestedTripData.skipper?.firstName + " " + requestedTripData.skipper?.lastName}
213-
src={getProfilePicture(requestedTripData?.skipper)}
214-
background="bg-primary-500"
215-
classes="!size-6 group-hover:hidden"
216-
rounded="rounded-full"
217-
/>
212+
<Avatar class="!ml-0 !size-6 group-hover:hidden">
213+
<Avatar.Image src={getProfilePicture(requestedTripData.skipper)} class="!size-6"/>
214+
<Avatar.Fallback>{requestedTripData.skipper?.firstName.charAt(0)+requestedTripData.skipper?.lastName.charAt(0)}</Avatar.Fallback>
215+
</Avatar>
218216
<span class="h-6 !w-6 !text-md material-symbols-outlined hidden! group-hover:block!">autorenew</span>
219217
{requestedTripData.skipper?.username}
220218
</button>
@@ -225,20 +223,16 @@
225223
<h3 class="h5 align-middle mr-2">Crew:</h3>
226224
{#each requestedTripData?.crew as member, i}
227225
<button onclick={()=>{deleteUser(member.username)}} class="btn btn-sm preset-tonal-secondary border border-secondary-500 mr-1 pl-1 group hover:preset-filled-error-500 text-sm">
228-
<Avatar name={member.firstName + " " + member.lastName}
229-
src={getProfilePicture(member)}
230-
background="bg-primary-500"
231-
classes="!ml-0 !size-6 group-hover:hidden"
232-
rounded="rounded-full"
233-
/>
226+
<Avatar class="!ml-0 !size-6 group-hover:hidden">
227+
<Avatar.Image src={getProfilePicture(member)} class="!size-6"/>
228+
<Avatar.Fallback>{member.firstName?.charAt(0).toString()!+member.lastName?.charAt(0).toString()}</Avatar.Fallback>
229+
</Avatar>
234230
<span class="h-6 !w-6 !text-md material-symbols-outlined hidden! group-hover:block!">close</span>
235231
{member.username}
236232
</button>
237233
{/each}
238-
<button onclick={()=>{showCrewSearch = true}} class="btn btn-sm !p-1 preset-tonal-secondary border border-secondary-500 mr-1 group hover:preset-filled-primary-500 content-center">
239-
<Avatar name="+" classes="!size-6" rounded="rounded-full" background="color-secondary-500">
240-
<span class="material-symbols-outlined">add</span>
241-
</Avatar>
234+
<button onclick={()=>{showCrewSearch = true}} class="btn btn-sm !p-1 !size-8 preset-tonal-secondary border border-secondary-500 mr-1 group hover:preset-filled-primary-500 content-center">
235+
+
242236
</button>
243237
<SearchBar bind:displayed={showCrewSearch} onSelected={addCrew} getList={search} inputClass="w-32"/>
244238
</div>

0 commit comments

Comments
 (0)