Skip to content

Commit

Permalink
style(*): remove prettier-plugin-sort-imports
Browse files Browse the repository at this point in the history
  • Loading branch information
garrappachc committed Mar 3, 2024
1 parent 48cb98c commit 39f6652
Show file tree
Hide file tree
Showing 30 changed files with 61 additions and 217 deletions.
6 changes: 1 addition & 5 deletions .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,5 @@
"trailingComma": "all",
"arrowParens": "avoid",
"printWidth": 100,
"plugins": [
"prettier-plugin-svelte",
"@trivago/prettier-plugin-sort-imports",
"prettier-plugin-tailwindcss"
]
"plugins": ["prettier-plugin-svelte", "prettier-plugin-tailwindcss"]
}
7 changes: 3 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,15 @@
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
"test:unit": "vitest",
"lint": "prettier --check --plugin prettier-plugin-svelte . && eslint .",
"format": "prettier --write --plugin prettier-plugin-svelte ."
"lint": "prettier --check . && eslint .",
"format": "prettier --write ."
},
"devDependencies": {
"@playwright/test": "^1.28.1",
"@sveltejs/adapter-node": "4.0.1",
"@sveltejs/kit": "^2.0.0",
"@sveltejs/vite-plugin-svelte": "^3.0.0",
"@tailwindcss/typography": "0.5.10",
"@trivago/prettier-plugin-sort-imports": "4.3.0",
"@types/howler": "2.2.11",
"@types/lodash": "4.14.202",
"@typescript-eslint/eslint-plugin": "^7.0.0",
Expand Down Expand Up @@ -59,4 +58,4 @@
"rxjs": "7.8.1",
"socket.io-client": "4.7.4"
}
}
}
157 changes: 3 additions & 154 deletions pnpm-lock.yaml

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

2 changes: 1 addition & 1 deletion src/lib/core/components/footer.svelte
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<footer class="w-full">
<div class="container mx-auto my-4">
<div
class="text-abru-light-75 flex flex-col items-center gap-2 text-sm font-normal md:flex-row md:gap-0"
class="flex flex-col items-center gap-2 text-sm font-normal text-abru-light-75 md:flex-row md:gap-0"
>
<span>© 2023 tf2pickup.org | version 4.0.0-alpha.7</span>
<div class="grow" />
Expand Down
6 changes: 3 additions & 3 deletions src/lib/core/components/menu.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -29,22 +29,22 @@

<a
href={PUBLIC_DISCORD_INVITATION}
class="text-abru-light-75 hidden hover:text-slate-200 xl:inline-block"
class="hidden text-abru-light-75 hover:text-slate-200 xl:inline-block"
target="_blank"
>
<IconBrandDiscord size={32} stroke={1.5} />
</a>

<a
href="https://ko-fi.com/tf2pickuporg"
class="text-abru-light-75 hidden hover:text-slate-200 xl:inline-block"
class="hidden text-abru-light-75 hover:text-slate-200 xl:inline-block"
target="_blank"
>
<IconHeart size={32} stroke={1.5} />
</a>

<div class="hidden w-2 lg:block" />
<div class="bg-abru-light-15 my-2 h-[2px] grow lg:hidden" />
<div class="my-2 h-[2px] grow bg-abru-light-15 lg:hidden" />

{#if $profile}
<Profile {...$profile.player} />
Expand Down
4 changes: 2 additions & 2 deletions src/lib/core/components/navigation-bar.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
>
{#if menuOpen}
<div
class="bg-abru-light-3 fixed left-0 right-0 bottom-0 top-[95px] z-50"
class="fixed bottom-0 left-0 right-0 top-[95px] z-50 bg-abru-light-3"
transition:fly={{ y: -15 }}
>
<Menu />
Expand All @@ -25,7 +25,7 @@
<img alt="tf2pickup.pl logo" src={logo} height="120" class="h-[44px] object-contain" />
</a>

<button class="text-abru-light-75 mx-4 lg:hidden" on:click={() => (menuOpen = !menuOpen)}>
<button class="mx-4 text-abru-light-75 lg:hidden" on:click={() => (menuOpen = !menuOpen)}>
{#if menuOpen}
<IconX size={48} />
{:else}
Expand Down
4 changes: 2 additions & 2 deletions src/lib/core/components/profile.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@

{#if menuOpen}
<div
class="bg-abru-dark-29 absolute z-50 mt-2 w-[300px] origin-top rounded-[10px] p-2 drop-shadow-xl"
class="absolute z-50 mt-2 w-[300px] origin-top rounded-[10px] bg-abru-dark-29 p-2 drop-shadow-xl"
in:growDown={{ duration: 150 }}
out:fade={{ duration: 100 }}
>
<div class="text-abru-light-75 flex flex-col gap-1">
<div class="flex flex-col gap-1 text-abru-light-75">
<a href="/players/{steamId}" class="menu-item">
<IconUserCircle /><span>My profile</span>
</a>
Expand Down
4 changes: 2 additions & 2 deletions src/lib/games/components/connect-string.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
</script>

<div
class="border-abru-light-25 bg-abru-light-5 text-abru-light-75 flex flex-row gap-4 rounded border px-3 py-[10px] text-base font-medium"
class="flex flex-row gap-4 rounded border border-abru-light-25 bg-abru-light-5 px-3 py-[10px] text-base font-medium text-abru-light-75"
>
<div
class="bg-abru-light-5 text-abru-light-75 fade block flex-1 cursor-text select-all overflow-hidden whitespace-nowrap text-base"
class="fade block flex-1 cursor-text select-all overflow-hidden whitespace-nowrap bg-abru-light-5 text-base text-abru-light-75"
class:italic={!connectString}
>
{connectString ?? stateDescription}
Expand Down
6 changes: 3 additions & 3 deletions src/lib/players/components/online-player-list.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@
import { slide } from 'svelte/transition';
</script>

<div class="bg-abru-dark-6 flex h-full flex-col rounded-lg p-2">
<div class="text-abru-light-75 my-3.5 flex flex-row justify-center gap-1">
<div class="flex h-full flex-col rounded-lg bg-abru-dark-6 p-2">
<div class="my-3.5 flex flex-row justify-center gap-1 text-abru-light-75">
<IconUserCircle />
<span class="text-sm font-bold">Players online: {$onlinePlayers.size}</span>
</div>

{#each $onlinePlayersSorted as player}
<a
href="/players/{player.steamId}"
class="text-abru-light-75 even:bg-abru-dark-6 odd:bg-abru-light-5 rounded-sm px-2 py-1 text-center text-base font-light hover:underline lg:text-start"
class="rounded-sm px-2 py-1 text-center text-base font-light text-abru-light-75 odd:bg-abru-light-5 even:bg-abru-dark-6 hover:underline lg:text-start"
transition:slide|local
>
{player.name}
Expand Down
Loading

0 comments on commit 39f6652

Please sign in to comment.