From 6a958cbcc349420c4eecf42748b0403cfe180c5a Mon Sep 17 00:00:00 2001 From: Brewhouse Digital <66521220+brewhousedigital@users.noreply.github.com> Date: Sat, 22 Oct 2022 00:33:12 -0500 Subject: [PATCH] UI Cleanup & Sveltestrap Removal (#13) * UI Cleanup * Removed unused import Co-authored-by: Brewhouse Digital --- packages/pockethost.io/.prettierignore | 3 +- packages/pockethost.io/package.json | 9 +- packages/pockethost.io/src/app.d.ts | 4 - .../src/components/AuthCheck.svelte | 4 +- .../src/components/Button/Button.svelte | 31 - .../src/components/Button/types.ts | 21 - .../src/components/Caption/Caption.svelte | 26 - .../src/components/Caption/types.ts | 6 - .../src/components/Clipboard.svelte | 1 + .../src/components/CodeSample.svelte | 1 + .../src/components/CopyButton.svelte | 5 +- .../src/components/Error/Error.svelte | 8 - .../src/components/Error/types.ts | 1 - .../src/components/Feature.svelte | 32 - .../src/components/Icons/Check.svelte | 5 - .../src/components/Icons/Github.svelte | 5 - .../src/components/Navbar.svelte | 13 +- .../src/components/Protected.svelte | 4 +- .../components/ProvisioningStatus/types.ts | 6 - .../src/components/Title/Title.svelte | 32 - .../src/components/Title/types.ts | 4 - .../pockethost.io/src/routes/+error.svelte | 26 + .../pockethost.io/src/routes/shh/+page.svelte | 31 - packages/pockethost.io/src/types.ts | 4 - packages/pockethost.io/src/util/database.ts | 6 +- packages/pockethost.io/src/util/redirect.ts | 5 - packages/pockethost.io/yarn-error.log | 1422 ----------------- yarn.lock | 255 ++- 28 files changed, 148 insertions(+), 1822 deletions(-) delete mode 100644 packages/pockethost.io/src/components/Button/Button.svelte delete mode 100644 packages/pockethost.io/src/components/Button/types.ts delete mode 100644 packages/pockethost.io/src/components/Caption/Caption.svelte delete mode 100644 packages/pockethost.io/src/components/Caption/types.ts delete mode 100644 packages/pockethost.io/src/components/Error/Error.svelte delete mode 100644 packages/pockethost.io/src/components/Error/types.ts delete mode 100644 packages/pockethost.io/src/components/Feature.svelte delete mode 100644 packages/pockethost.io/src/components/Icons/Check.svelte delete mode 100644 packages/pockethost.io/src/components/Icons/Github.svelte delete mode 100644 packages/pockethost.io/src/components/ProvisioningStatus/types.ts delete mode 100644 packages/pockethost.io/src/components/Title/Title.svelte delete mode 100644 packages/pockethost.io/src/components/Title/types.ts create mode 100644 packages/pockethost.io/src/routes/+error.svelte delete mode 100644 packages/pockethost.io/src/routes/shh/+page.svelte delete mode 100644 packages/pockethost.io/src/util/redirect.ts delete mode 100644 packages/pockethost.io/yarn-error.log diff --git a/packages/pockethost.io/.prettierignore b/packages/pockethost.io/.prettierignore index cb3c1f57..86f10af4 100644 --- a/packages/pockethost.io/.prettierignore +++ b/packages/pockethost.io/.prettierignore @@ -13,4 +13,5 @@ package-lock.json yarn.lock # Source files -/src/assets/_bootstrap.css \ No newline at end of file +/src/assets/_bootstrap.css +dist-server \ No newline at end of file diff --git a/packages/pockethost.io/package.json b/packages/pockethost.io/package.json index 2470c297..49f3f02a 100644 --- a/packages/pockethost.io/package.json +++ b/packages/pockethost.io/package.json @@ -14,7 +14,7 @@ "watch": "chokidar 'src/**' -c 'yarn build' --initial" }, "devDependencies": { - "@sveltejs/adapter-auto": "next", + "@sveltejs/adapter-node": "^1.0.0-next.99", "@sveltejs/kit": "next", "chokidar-cli": "^3.0.0", "svelte": "^3.44.0", @@ -26,16 +26,11 @@ }, "type": "module", "dependencies": { - "@fortawesome/free-brands-svg-icons": "^6.2.0", - "@fortawesome/free-solid-svg-icons": "^6.2.0", "@pockethost/common": "0.0.1", "@s-libs/micro-dash": "12", - "@sveltejs/adapter-node": "^1.0.0-next.92", "pocketbase": "^0.7.0", "random-word-slugs": "^0.1.6", "sass": "^1.54.9", - "svelte-fa": "^3.0.3", - "svelte-highlight": "^6.2.1", - "sveltestrap": "^5.9.0" + "svelte-highlight": "^6.2.1" } } diff --git a/packages/pockethost.io/src/app.d.ts b/packages/pockethost.io/src/app.d.ts index 42184e37..3e4ed205 100644 --- a/packages/pockethost.io/src/app.d.ts +++ b/packages/pockethost.io/src/app.d.ts @@ -7,7 +7,3 @@ declare namespace App { // interface Error {} // interface Platform {} } - -declare module '@fortawesome/pro-solid-svg-icons/index.es' { - export * from '@fortawesome/pro-solid-svg-icons' -} diff --git a/packages/pockethost.io/src/components/AuthCheck.svelte b/packages/pockethost.io/src/components/AuthCheck.svelte index cadb6256..fa3a6e68 100644 --- a/packages/pockethost.io/src/components/AuthCheck.svelte +++ b/packages/pockethost.io/src/components/AuthCheck.svelte @@ -1,10 +1,10 @@ diff --git a/packages/pockethost.io/src/components/Button/Button.svelte b/packages/pockethost.io/src/components/Button/Button.svelte deleted file mode 100644 index 8bfab0dd..00000000 --- a/packages/pockethost.io/src/components/Button/Button.svelte +++ /dev/null @@ -1,31 +0,0 @@ - - -
- -
- - diff --git a/packages/pockethost.io/src/components/Button/types.ts b/packages/pockethost.io/src/components/Button/types.ts deleted file mode 100644 index 534c6a69..00000000 --- a/packages/pockethost.io/src/components/Button/types.ts +++ /dev/null @@ -1,21 +0,0 @@ -export enum ButtonSizes { - Micro = 'micro', - Normal = 'normal', - Wide = 'wide' -} - -/** - * | 'primary' - | 'secondary' - | 'success' - | 'danger' - | 'warning' - | 'info' - | 'light' - | 'dark' - | 'link'; - */ -export enum ButtonColors { - Primary = 'primary', - Light = 'light' -} diff --git a/packages/pockethost.io/src/components/Caption/Caption.svelte b/packages/pockethost.io/src/components/Caption/Caption.svelte deleted file mode 100644 index ffcd10bd..00000000 --- a/packages/pockethost.io/src/components/Caption/Caption.svelte +++ /dev/null @@ -1,26 +0,0 @@ - - -
- - diff --git a/packages/pockethost.io/src/components/Caption/types.ts b/packages/pockethost.io/src/components/Caption/types.ts deleted file mode 100644 index 368b6545..00000000 --- a/packages/pockethost.io/src/components/Caption/types.ts +++ /dev/null @@ -1,6 +0,0 @@ -export enum CaptionSize { - Small = 'small', - Normal = 'normal', - Large = 'large', - Hero = 'hero' -} diff --git a/packages/pockethost.io/src/components/Clipboard.svelte b/packages/pockethost.io/src/components/Clipboard.svelte index 369bd052..ee4ab1f4 100644 --- a/packages/pockethost.io/src/components/Clipboard.svelte +++ b/packages/pockethost.io/src/components/Clipboard.svelte @@ -17,6 +17,7 @@ +