From 102ecd9b3e3baea115d11990b27fe76fa6fc85a6 Mon Sep 17 00:00:00 2001 From: Brian Ginsburg <7957636+bgins@users.noreply.github.com> Date: Thu, 15 Sep 2022 12:52:24 -0700 Subject: [PATCH] Cleanup and refactoring (#60) * Use production infra * Move theme out of subdirectory * Remove unused example test * Separate webnative module into init and account * Move state off of module global state * Move utils out of common directory * Organize imports consistently * Replace last remaining Toast with a Notification * Rename theme to themeStore Renaming keeps the theme store naming consistent with the other stores. * Replace uuid helper with WebCrypto randomUUID * Enfore minimum node version at >=16.9 * Refactor delegate-account and link-device routes Use component views for consistency with the other routes * Use FilesystemActivity component in Register * Remove console logs * Add extractSearchParam Generalizes extracting a search param from a URL. * Hide app name in header on mobile * Remove deviceStore We weren't using it in the app. Mobile styles are handled with tailwind utility classes. * Add social preview image * Remove navigate event from AreYouSure component The event was unused. * Replace convertUint8ToString with uint8arrays * Add initializeFilesystem Separates out app-specific resource creation from the required registration code * Allow minor webnative version upgrades * Update package-lock.json --- .npmrc | 1 + package-lock.json | 187 ++++++++++++++++- package.json | 6 +- src/components/Header.svelte | 16 +- src/components/auth/backup/AreYouSure.svelte | 10 +- .../ConnectBackupDevice.svelte | 41 ++++ .../delegate-account/DelegateAccount.svelte | 64 ++++++ .../auth/link-device/LinkDevice.svelte | 48 +++++ .../auth/link/DelegateAccount.svelte | 196 ------------------ src/components/auth/link/LinkDevice.svelte | 106 ---------- src/components/auth/register/Register.svelte | 26 +-- src/components/auth/register/Welcome.svelte | 2 +- .../common/FilesystemActivity.svelte | 17 ++ .../gallery/imageGallery/ImageGallery.svelte | 1 + .../gallery/imageGallery/ImageModal.svelte | 3 +- src/components/gallery/upload/Dropzone.svelte | 6 +- .../notifications/Notification.svelte | 4 +- .../notifications/Notifications.svelte | 3 +- src/components/notifications/Toast.svelte | 37 ---- src/lib/app-info.ts | 1 + .../{common/webnative.ts => auth/account.ts} | 86 ++------ src/lib/common/example.test.ts | 5 - src/lib/common/utils.ts | 52 ----- src/lib/device.ts | 3 - src/lib/gallery.ts | 14 +- src/lib/init.ts | 61 ++++++ src/lib/notifications.ts | 3 +- src/lib/{theme/index.ts => theme.ts} | 0 src/lib/utils.ts | 35 ++++ src/lib/views.ts | 6 +- src/routes/__layout.svelte | 61 ++---- src/routes/backup.svelte | 13 +- src/routes/connect.svelte | 3 +- src/routes/delegate-account.svelte | 122 ++++++++++- src/routes/gallery.svelte | 7 +- src/routes/index.svelte | 2 +- src/routes/link-device.svelte | 59 +++++- src/stores.ts | 5 +- static/preview.png | Bin 0 -> 19476 bytes tailwind.config.cjs | 5 + 40 files changed, 720 insertions(+), 597 deletions(-) create mode 100644 .npmrc create mode 100644 src/components/auth/delegate-account/ConnectBackupDevice.svelte create mode 100644 src/components/auth/delegate-account/DelegateAccount.svelte create mode 100644 src/components/auth/link-device/LinkDevice.svelte delete mode 100644 src/components/auth/link/DelegateAccount.svelte delete mode 100644 src/components/auth/link/LinkDevice.svelte create mode 100644 src/components/common/FilesystemActivity.svelte delete mode 100644 src/components/notifications/Toast.svelte rename src/lib/{common/webnative.ts => auth/account.ts} (53%) delete mode 100644 src/lib/common/example.test.ts delete mode 100644 src/lib/common/utils.ts delete mode 100644 src/lib/device.ts create mode 100644 src/lib/init.ts rename src/lib/{theme/index.ts => theme.ts} (100%) create mode 100644 src/lib/utils.ts create mode 100644 static/preview.png diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000..4fd0219 --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +engine-strict=true \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 60c194a..fb6773a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,8 @@ "dependencies": { "clipboard-copy": "^4.0.1", "qrcode-svg": "^1.1.0", - "webnative": "0.34.1" + "uint8arrays": "^3.1.0", + "webnative": "^0.34.1" }, "devDependencies": { "@sveltejs/adapter-static": "1.0.0-next.36", @@ -37,6 +38,9 @@ "tslib": "^2.0.0", "typescript": "^4.4.4", "vite": "^3.0.0" + }, + "engines": { + "node": ">=16.9" } }, "node_modules/@babel/code-frame": { @@ -47,6 +51,100 @@ "@babel/highlight": "^7.10.4" } }, + "node_modules/@babel/helper-validator-identifier": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz", + "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/highlight": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz", + "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==", + "dev": true, + "dependencies": { + "@babel/helper-validator-identifier": "^7.18.6", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/highlight/node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/@babel/highlight/node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "dev": true + }, + "node_modules/@babel/highlight/node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "dev": true, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/@babel/highlight/node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/@cspotcode/source-map-support": { "version": "0.8.1", "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", @@ -3235,6 +3333,12 @@ "node": ">= 0.8" } }, + "node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true + }, "node_modules/js-yaml": { "version": "3.14.1", "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", @@ -5712,6 +5816,81 @@ "@babel/highlight": "^7.10.4" } }, + "@babel/helper-validator-identifier": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz", + "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==", + "dev": true + }, + "@babel/highlight": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz", + "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.18.6", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "^1.9.0" + } + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } + }, + "color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "dev": true + }, + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "dev": true + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "dev": true + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "@cspotcode/source-map-support": { "version": "0.8.1", "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", @@ -7996,6 +8175,12 @@ "integrity": "sha512-Smw4xcfIQ5LVjAOuJCvN/zIodzA/BBSsluuoSykP+lUvScIi4U6RJLfwHet5cxFnCswUjISV8oAXaqaJDY3chg==", "dev": true }, + "js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true + }, "js-yaml": { "version": "3.14.1", "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", diff --git a/package.json b/package.json index 082dc73..a60c38c 100644 --- a/package.json +++ b/package.json @@ -53,6 +53,10 @@ "dependencies": { "clipboard-copy": "^4.0.1", "qrcode-svg": "^1.1.0", - "webnative": "0.34.1" + "uint8arrays": "^3.1.0", + "webnative": "^0.34.1" + }, + "engines": { + "node": ">=16.9" } } diff --git a/src/components/Header.svelte b/src/components/Header.svelte index 67c6365..5744bc6 100644 --- a/src/components/Header.svelte +++ b/src/components/Header.svelte @@ -1,16 +1,16 @@ @@ -18,7 +18,7 @@
goto('/')}> - {appName} +
{#if !$sessionStore.loading && !$sessionStore.authed} @@ -40,7 +40,7 @@ {/if} - {#if $theme === 'light'} + {#if $themeStore === 'light'} setTheme('dark')}> diff --git a/src/components/auth/backup/AreYouSure.svelte b/src/components/auth/backup/AreYouSure.svelte index ff5fb79..15dac28 100644 --- a/src/components/auth/backup/AreYouSure.svelte +++ b/src/components/auth/backup/AreYouSure.svelte @@ -1,16 +1,8 @@ + + +
+
+
+

Connect a backup device

+ {@html qrcode} +

+ Scan this code on the new device, or share the connection link. +

+ + {#if !backupCreated} + + {/if} +
+
+
diff --git a/src/components/auth/delegate-account/DelegateAccount.svelte b/src/components/auth/delegate-account/DelegateAccount.svelte new file mode 100644 index 0000000..2edad97 --- /dev/null +++ b/src/components/auth/delegate-account/DelegateAccount.svelte @@ -0,0 +1,64 @@ + + + +
+
+
+

+ A new device would like to connect to your account +

+
+ + +
+
+ + +
+
+
+
diff --git a/src/components/auth/link-device/LinkDevice.svelte b/src/components/auth/link-device/LinkDevice.svelte new file mode 100644 index 0000000..2c94a11 --- /dev/null +++ b/src/components/auth/link-device/LinkDevice.svelte @@ -0,0 +1,48 @@ + + + +
+
+
+

Connection Requested

+
+ {#if pin} + + {pin} + + {/if} + Enter this code on your connected device. +
+ + Waiting for a response... +
+
+
+ +
+
+
+
diff --git a/src/components/auth/link/DelegateAccount.svelte b/src/components/auth/link/DelegateAccount.svelte deleted file mode 100644 index 6b45686..0000000 --- a/src/components/auth/link/DelegateAccount.svelte +++ /dev/null @@ -1,196 +0,0 @@ - - -{#if view === 'backup-device'} - -
-
-
-

Connect a backup device

- {@html qrcode} -

- Scan this code on the new device, or share the connection link. -

- - {#if !backupCreated} - - {/if} -
-
-
-{:else if view === 'delegate-account'} - -
-
-
-

- A new device would like to connect to your account -

-
- - -
-
- - -
-
-
-
-{/if} diff --git a/src/components/auth/link/LinkDevice.svelte b/src/components/auth/link/LinkDevice.svelte deleted file mode 100644 index 1b436dc..0000000 --- a/src/components/auth/link/LinkDevice.svelte +++ /dev/null @@ -1,106 +0,0 @@ - - - -{#if loadingFilesystem} -
-
-

- - Loading file system... -

-
-
-{:else} -
-
-
-

Connection Requested

-
- {#if displayPin} - - {displayPin} - - {/if} - Enter this code on your connected device. -
- - Waiting for a response... -
-
-
- -
-
-
-
-{/if} diff --git a/src/components/auth/register/Register.svelte b/src/components/auth/register/Register.svelte index fb19368..fce149f 100644 --- a/src/components/auth/register/Register.svelte +++ b/src/components/auth/register/Register.svelte @@ -4,9 +4,10 @@ isUsernameValid, isUsernameAvailable, register - } from '$lib/common/webnative' + } from '$lib/auth/account' import CheckIcon from '$components/icons/CheckIcon.svelte' import XIcon from '$components/icons/XIcon.svelte' + import FilesystemActivity from '$components/common/FilesystemActivity.svelte' let username: string = '' let usernameValid = true @@ -14,6 +15,8 @@ let registrationSuccess = true let checkingUsername = false + let initializingFilesystem = false + const checkUsername = async (event: Event) => { const { value } = event.target as HTMLInputElement @@ -28,30 +31,17 @@ checkingUsername = false } - let authInProcess = false const registerUser = async () => { - authInProcess = true + initializingFilesystem = true registrationSuccess = await register(username) - if (!registrationSuccess) authInProcess = false + if (!registrationSuccess) initializingFilesystem = false } -{#if authInProcess} - -
-
-

- - Initializing file system... -

-
-
+{#if initializingFilesystem} + {:else}
diff --git a/src/components/auth/register/Welcome.svelte b/src/components/auth/register/Welcome.svelte index 1ff1e3f..141c944 100644 --- a/src/components/auth/register/Welcome.svelte +++ b/src/components/auth/register/Welcome.svelte @@ -1,7 +1,7 @@ diff --git a/src/components/common/FilesystemActivity.svelte b/src/components/common/FilesystemActivity.svelte new file mode 100644 index 0000000..ca125b0 --- /dev/null +++ b/src/components/common/FilesystemActivity.svelte @@ -0,0 +1,17 @@ + + + +
+
+

+ + {activity} file system... +

+
+
diff --git a/src/components/gallery/imageGallery/ImageGallery.svelte b/src/components/gallery/imageGallery/ImageGallery.svelte index 33b258e..980903c 100644 --- a/src/components/gallery/imageGallery/ImageGallery.svelte +++ b/src/components/gallery/imageGallery/ImageGallery.svelte @@ -1,5 +1,6 @@ diff --git a/src/components/notifications/Notifications.svelte b/src/components/notifications/Notifications.svelte index c559505..501509e 100644 --- a/src/components/notifications/Notifications.svelte +++ b/src/components/notifications/Notifications.svelte @@ -1,7 +1,8 @@ {#if $notificationStore.length} diff --git a/src/components/notifications/Toast.svelte b/src/components/notifications/Toast.svelte deleted file mode 100644 index 8711ed3..0000000 --- a/src/components/notifications/Toast.svelte +++ /dev/null @@ -1,37 +0,0 @@ - - -
-
-
- {#if kind === 'success'} - - {:else if kind === 'error'} - - {/if} - {message} -
-
-
diff --git a/src/lib/app-info.ts b/src/lib/app-info.ts index bbc6726..126facd 100644 --- a/src/lib/app-info.ts +++ b/src/lib/app-info.ts @@ -1,3 +1,4 @@ export const appName = 'Awesome Webnative App' export const appDescription = 'This is another awesome Webnative app.' export const appURL = 'https://webnative.netlify.app' +export const appImageURL = `${appURL}/preview.png` diff --git a/src/lib/common/webnative.ts b/src/lib/auth/account.ts similarity index 53% rename from src/lib/common/webnative.ts rename to src/lib/auth/account.ts index 3c403c7..7e82ad3 100644 --- a/src/lib/common/webnative.ts +++ b/src/lib/auth/account.ts @@ -1,75 +1,10 @@ import * as webnative from 'webnative' -import { setup } from 'webnative' +import type FileSystem from 'webnative/fs/index' -import { asyncDebounce } from '$lib/common/utils' +import { asyncDebounce } from '$lib/utils' import { filesystemStore, sessionStore } from '../../stores' +import { getBackupStatus } from '$lib/auth/backup' import { AREAS, GALLERY_DIRS } from '$lib/gallery' -import { getBackupStatus, type BackupStatus } from '$lib/auth/backup' - -// runfission.net = staging -setup.endpoints({ - api: 'https://runfission.net', - lobby: 'https://auth.runfission.net', - user: 'fissionuser.net' -}) - -let state: webnative.AppState - -// TODO: Add a flag or script to turn debugging on/off -setup.debug({ enabled: false }) - -export const initialize = async (): Promise => { - try { - let backupStatus: BackupStatus = null - - state = await webnative.app({ useWnfs: true }) - - switch (state.scenario) { - case webnative.AppScenario.NotAuthed: - sessionStore.set({ - username: '', - authed: false, - loading: false, - backupCreated: null - }) - break - - case webnative.AppScenario.Authed: - backupStatus = await getBackupStatus(state.fs) - - sessionStore.set({ - username: state.username, - authed: state.authenticated, - loading: false, - backupCreated: backupStatus.created - }) - - filesystemStore.set(state.fs) - break - - default: - break - } - } catch (error) { - switch (error) { - case webnative.InitialisationError.InsecureContext: - sessionStore.update(session => ({ - ...session, - loading: false, - error: 'Insecure Context' - })) - break - - case webnative.InitialisationError.UnsupportedBrowser: - sessionStore.update(session => ({ - ...session, - loading: false, - error: 'Unsupported Browser' - })) - break - } - } -} export const isUsernameValid = async (username: string): Promise => { return webnative.account.isUsernameValid(username) @@ -94,9 +29,8 @@ export const register = async (username: string): Promise => { const fs = await webnative.bootstrapRootFileSystem() filesystemStore.set(fs) - // Create public and private directories for the gallery - await fs.mkdir(webnative.path.directory(...GALLERY_DIRS[AREAS.PUBLIC])) - await fs.mkdir(webnative.path.directory(...GALLERY_DIRS[AREAS.PRIVATE])) + // TODO Remove if only public and private directories are needed + await initializeFilesystem(fs) sessionStore.update(session => ({ ...session, @@ -107,6 +41,16 @@ export const register = async (username: string): Promise => { return success } +/** + * Create additional directories and files needed by the app + * + * @param fs FileSystem + */ +const initializeFilesystem = async (fs: FileSystem): Promise => { + await fs.mkdir(webnative.path.directory(...GALLERY_DIRS[AREAS.PUBLIC])) + await fs.mkdir(webnative.path.directory(...GALLERY_DIRS[AREAS.PRIVATE])) +} + export const loadAccount = async (username: string): Promise => { await checkDataRoot(username) diff --git a/src/lib/common/example.test.ts b/src/lib/common/example.test.ts deleted file mode 100644 index 7ae0a69..0000000 --- a/src/lib/common/example.test.ts +++ /dev/null @@ -1,5 +0,0 @@ -import test from 'ava' - -test('my passing test', t => { - t.pass() -}) diff --git a/src/lib/common/utils.ts b/src/lib/common/utils.ts deleted file mode 100644 index 6034b1d..0000000 --- a/src/lib/common/utils.ts +++ /dev/null @@ -1,52 +0,0 @@ -export function asyncDebounce( - fn: (...args: A) => Promise, - wait: number -): (...args: A) => Promise { - let lastTimeoutId: ReturnType | undefined = undefined - - return (...args: A): Promise => { - clearTimeout(lastTimeoutId) - - return new Promise((resolve, reject) => { - const currentTimeoutId = setTimeout(async () => { - try { - if (currentTimeoutId === lastTimeoutId) { - const result = await fn(...args) - resolve(result) - } - } catch (err) { - reject(err) - } - }, wait) - - lastTimeoutId = currentTimeoutId - }) - } -} - -/** - * Util to convert a Uint8Array to a string - * @param u8array - * @returns string - */ -export const convertUint8ToString: (u8array: Uint8Array) => string = u8array => { - const CHUNK_SZ = 0x8000 - const c = [] - for (let i = 0; i < u8array.length; i += CHUNK_SZ) { - c.push(String.fromCharCode.apply(null, u8array.subarray(i, i + CHUNK_SZ))) - } - return c.join('') -} - -/** - * Generate a new uuid - * @returns uuid - */ -export const uuid: () => string = () => - // @ts-expect-error disable number[] + number warning - ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, (c: number) => - ( - c ^ - (crypto.getRandomValues(new Uint8Array(1))[0] & (15 >> (c / 4))) - ).toString(16) - ) diff --git a/src/lib/device.ts b/src/lib/device.ts deleted file mode 100644 index 9eb8590..0000000 --- a/src/lib/device.ts +++ /dev/null @@ -1,3 +0,0 @@ -export type Device = { - isMobile: boolean -} \ No newline at end of file diff --git a/src/lib/gallery.ts b/src/lib/gallery.ts index 68e0cec..3b043b3 100644 --- a/src/lib/gallery.ts +++ b/src/lib/gallery.ts @@ -1,8 +1,9 @@ +import * as uint8arrays from 'uint8arrays' import { get as getStore } from 'svelte/store' + import * as wn from 'webnative' -import { filesystemStore, galleryStore } from '../stores' -import { convertUint8ToString } from '$lib/common/utils' import { addNotification } from '$lib/notifications' +import { filesystemStore, galleryStore } from '../stores' export enum AREAS { PUBLIC = 'Public', @@ -60,9 +61,7 @@ export const getImagesFromWNFS: () => Promise = async () => { const cid = isPrivate ? file.header.content.toString() : file.cid.toString() // Create a base64 string to use as the image `src` - const src = `data:image/jpeg;base64, ${btoa( - convertUint8ToString(file.content as Uint8Array) - )}` + const src = `data:image/jpeg;base64, ${uint8arrays.toString(file.content, 'base64')}` return { cid, @@ -90,7 +89,6 @@ export const getImagesFromWNFS: () => Promise = async () => { loading: false, })) } catch (error) { - console.error(error) galleryStore.update(store => ({ ...store, loading: false, @@ -132,12 +130,10 @@ export const uploadImageToWNFS: ( // Announce the changes to the server await fs.publish() - console.log(`${image.name} image has been published`) addNotification(`${image.name} image has been published`, 'success') } catch (error) { addNotification(error.message, 'error') - console.log(error) } } @@ -161,7 +157,6 @@ export const deleteImageFromWNFS: (name: string) => Promise = async (name) // Announce the changes to the server await fs.publish() - console.log(`${name} image has been deleted`) addNotification(`${name} image has been deleted`, 'success') // Refetch images and update galleryStore @@ -171,7 +166,6 @@ export const deleteImageFromWNFS: (name: string) => Promise = async (name) } } catch (error) { addNotification(error.message, 'error') - console.error(error) } } diff --git a/src/lib/init.ts b/src/lib/init.ts new file mode 100644 index 0000000..f0c02e0 --- /dev/null +++ b/src/lib/init.ts @@ -0,0 +1,61 @@ +import * as webnative from 'webnative' +import { setup } from 'webnative' + +import { filesystemStore, sessionStore } from '../stores' +import { getBackupStatus, type BackupStatus } from '$lib/auth/backup' + +// TODO: Add a flag or script to turn debugging on/off +setup.debug({ enabled: false }) + +export const initialize = async (): Promise => { + try { + let backupStatus: BackupStatus = null + + const state: webnative.AppState = await webnative.app({ useWnfs: true }) + + switch (state.scenario) { + case webnative.AppScenario.NotAuthed: + sessionStore.set({ + username: '', + authed: false, + loading: false, + backupCreated: null + }) + break + + case webnative.AppScenario.Authed: + backupStatus = await getBackupStatus(state.fs) + + sessionStore.set({ + username: state.username, + authed: state.authenticated, + loading: false, + backupCreated: backupStatus.created + }) + + filesystemStore.set(state.fs) + break + + default: + break + } + } catch (error) { + switch (error) { + case webnative.InitialisationError.InsecureContext: + sessionStore.update(session => ({ + ...session, + loading: false, + error: 'Insecure Context' + })) + break + + case webnative.InitialisationError.UnsupportedBrowser: + sessionStore.update(session => ({ + ...session, + loading: false, + error: 'Unsupported Browser' + })) + break + } + } +} \ No newline at end of file diff --git a/src/lib/notifications.ts b/src/lib/notifications.ts index 6a5c0ee..c8c3653 100644 --- a/src/lib/notifications.ts +++ b/src/lib/notifications.ts @@ -1,5 +1,4 @@ import { notificationStore } from '../stores' -import { uuid } from '$lib/common/utils' export type Notification = { id?: string @@ -22,7 +21,7 @@ export const addNotification: ( timeout?: number ) => void = (msg, type = 'info', timeout = 5000) => { // uuid for each notification - const id = uuid() + const id = crypto.randomUUID() // adding new notifications to the bottom of the list so they stack from bottom to top notificationStore.update(rest => [ diff --git a/src/lib/theme/index.ts b/src/lib/theme.ts similarity index 100% rename from src/lib/theme/index.ts rename to src/lib/theme.ts diff --git a/src/lib/utils.ts b/src/lib/utils.ts new file mode 100644 index 0000000..3cd7c17 --- /dev/null +++ b/src/lib/utils.ts @@ -0,0 +1,35 @@ +export function asyncDebounce( + fn: (...args: A) => Promise, + wait: number +): (...args: A) => Promise { + let lastTimeoutId: ReturnType | undefined = undefined + + return (...args: A): Promise => { + clearTimeout(lastTimeoutId) + + return new Promise((resolve, reject) => { + const currentTimeoutId = setTimeout(async () => { + try { + if (currentTimeoutId === lastTimeoutId) { + const result = await fn(...args) + resolve(result) + } + } catch (err) { + reject(err) + } + }, wait) + + lastTimeoutId = currentTimeoutId + }) + } +} + +export const extractSearchParam = (url: URL, param: string): string | null => { + const val = url.searchParams.get(param) + + // clear the param from the URL + url.searchParams.delete(param) + history.replaceState(null, document.title, url.toString()) + + return val +} \ No newline at end of file diff --git a/src/lib/views.ts b/src/lib/views.ts index 12353af..d176623 100644 --- a/src/lib/views.ts +++ b/src/lib/views.ts @@ -1,3 +1,7 @@ export type BackupView = 'backup' | 'are-you-sure' -export type ConnectView = 'connect' | 'open-connected-device' \ No newline at end of file +export type ConnectView = 'connect' | 'open-connected-device' + +export type DelegateAccountView = 'connect-backup-device' | 'delegate-account' + +export type LinkDeviceView = 'link-device' | 'load-filesystem' \ No newline at end of file diff --git a/src/routes/__layout.svelte b/src/routes/__layout.svelte index 7fa9e3b..baae8d9 100644 --- a/src/routes/__layout.svelte +++ b/src/routes/__layout.svelte @@ -1,42 +1,24 @@ @@ -51,14 +33,14 @@ - + - - + + - + @@ -68,19 +50,8 @@ - - -
+
- - {#if session.error} - - {/if} -
diff --git a/src/routes/backup.svelte b/src/routes/backup.svelte index 9eadad1..f2a3056 100644 --- a/src/routes/backup.svelte +++ b/src/routes/backup.svelte @@ -1,15 +1,12 @@ diff --git a/src/routes/delegate-account.svelte b/src/routes/delegate-account.svelte index a5001cb..c77fa02 100644 --- a/src/routes/delegate-account.svelte +++ b/src/routes/delegate-account.svelte @@ -1,5 +1,123 @@ - +{#if view === 'connect-backup-device'} + +{:else if view === 'delegate-account'} + +{/if} diff --git a/src/routes/gallery.svelte b/src/routes/gallery.svelte index 65001c0..dae469e 100644 --- a/src/routes/gallery.svelte +++ b/src/routes/gallery.svelte @@ -1,10 +1,11 @@ - + + +{#if view === 'link-device'} + +{:else if view === 'load-filesystem'} + +{/if} diff --git a/src/stores.ts b/src/stores.ts index a00b378..67f293b 100644 --- a/src/stores.ts +++ b/src/stores.ts @@ -3,14 +3,13 @@ import type { Writable } from 'svelte/store' import type FileSystem from 'webnative/fs/index' import { loadTheme } from '$lib/theme' -import type { Device } from '$lib/device' import { AREAS } from '$lib/gallery' import type { Gallery } from '$lib/gallery' import type { Notification } from '$lib/notifications' import type { Session } from '$lib/session' import type { Theme } from '$lib/theme' -export const theme: Writable = writable(loadTheme()) +export const themeStore: Writable = writable(loadTheme()) export const sessionStore: Writable = writable({ username: null, @@ -21,8 +20,6 @@ export const sessionStore: Writable = writable({ export const filesystemStore: Writable = writable(null) -export const deviceStore: Writable = writable({ isMobile: true }) - export const galleryStore: Writable = writable({ loading: true, publicImages: [], diff --git a/static/preview.png b/static/preview.png new file mode 100644 index 0000000000000000000000000000000000000000..bb29b5f7e8d3fe44d05441f5bb28973110d80051 GIT binary patch literal 19476 zcmbt+4P4Xp+P=LUJC*1uE1!6gI;5V6mui5DI!{?L9Juq0k*|Pe;u(sh2qbUIJjv;h zAes;$?I}0bW=cs&f-ud{MA0L28WM~bMK{HPFu>8)bKT$HP&D=Q{QsYQp3l=k_Ivq$ z@B6;4`?{|$AN_4^kkez%kBt~H!YNqrhIqt?hucPscp&eUX#3czO%_G{^{uC=I+!VmnV5A9@+hQ(O=)F`ctIW3m#82 zJn8#d#>0R5;f<}Y{MRVSr)@S zx9(*8wJR0B@=oP_*KxzpGq_WBqj1}=W?Q$(x3DUq&R~7hEJ`oEUJ@`(8S*H&&9LVX2TX(uqZ%W%Y&>7j= z=arUHsGS*Qn|FNu;9KqsemU|?)sgGXcBR?(E%()Z_O+IQ!lWe)=9Vv#E_Wtfu5*!H zvHUVHx@5IA%PSdA+VZMlMP~Eq4s%J$Xup)Pb%qOz;w(`CDPft-mol5bDUUprZO;5m z`}e-A$+Ahgw(6@5zjhQYw$80O*XG}Rpd>jxRaL0v#c98ZHedaszr?WUdhw#Fw76z- zZgqT};YNo!u6eLWo;EJGTBiHO*4W<{kix4o)VygnRF$vDH`jmBZ#FbGU9Ag{<>eiS z$TY|XEZK3Z8_cy|^t;PuRGdgkI9=J-=d!-1IuB^V?G{3KM|7F{ysIo0FV?%O!H^VgYS?Y{c$r_NLeEj`h~vJ${V8H z{w$7|9`@@u?-n1KuQ^_*p7~UrB-gX#NJ!dBwNHHU*~OaUJJiRcG>y1>4KF;Ie&{1p zU%PezSIUUl`S)ADBClDbk(bZc%$Org=nhHCQ&xPH?<`X%_RcC>rQWx!_}c1#u#H~& zlFVF_m5hSqoFu8l~19|8qI};zPXc{kr@)R+n}`_=~pKZzN^)h8d668y-?<1C4Q+ zw_Qu<6GT^a!9PDE+}@ipvS6 zq)}+U$)XFd^f8*v5qya@bc;P*{%2d0&nI^KU#-V8d12G4=sSzp^J{YLYZac`?CBj_ z?fcTypRJoJo?zRYsK9$w&9z=hr~kkUE;Pn9h@C#Q@0IkNl+2SykL7PZnGnuCExOBI`sZcx=^vN%f;Ec-A^ zl2ke1r_c`gS@KK^Ql0TB811F6^x@Y{57Gn%X-cMuFJ9cC9`Ngo(Aa$VPR5dd=a|0B z6!AV19nSIOhdz>P@=tZHH<*O}ORS6bN#w1%E%xiR(VCUk%ADSFO{#{AZMv&RRi~$l zo$~FuUV0wgPM@a$|HDNAZBe;hT$Io)tv;eU zgpct@apz&xQuV80m25dfuj&4-L?k3+AJ6e*@AK$5T$Q_afAxIpqP-IN#4c%MyRPen zXiaa9>Bz(Ux)JmcHYI}Qsvz9k=Dk33DI&E%IN*mxLVWC1#%!~<>Hc^FZ+F0%SJo*k z!$m#9Qw!>qn(g?P?_AYc4TFB{S7}dkr%~XU2L}8$j_22HdpHPN>nq%zpZw}7YvbGM z^9pUF0&C%%BJbFO<<2>%nrd9Dn1fZ@h!4+qyPbt#|I>X#15Jieq`+J(zbx~13JbS?ONE#aLyQ{b){@Eh=xra2?@SJBeb?Ig5k_!#DT>4OIR z4$*bin*&hR!oB6uyKuQrzgOKDg`F$DE}oHvu!*rK125t72UVvRXvQo~EfvUu@mW8SSEdstRAq{0 zSzlVG2>chlr%c_~f*?E_smbe>uFH}TLU;d3?{|4nOU#9wT-4ZV5&bLlqU=a_;J z=yNIPO>F%szH2F+`U8z6gE^*I<0z5Rj9Za!PAg*8{?2?$b>8lwzeL&MTM|pvxv6EX zqQXf&`;s7`oSrq4p7Jw<=(n`R?AO<4NfNRoQEL>nC=7V+w1V_JkMR1a&pq^OC_M2$ z=r`-5vOQ4WPz2I8;X=nlCfFiwpi(>?C~iWgZK0gl6e1Jmnx5s-Qa{mFqsqB19eFja z;19S^er-sN%Gkjbmx{?qnm^&{<&O&!nBcBA6HQ$$aaVRptzFXjn)AGbPE*)RQ7m5mMNiw*zE+WZ5aC#WKyDoh z$l4jKuneP=qEBWXf!WVg#ce0Bjp}`p@(L7?7gGyPQQmv{>f7l)Z$)Y1 zaUZ8t=OU#Qi+*~J?0Bx}gG|xk2S3RtG)EO`eu}oG=z5oQQ$(tBVQ>EkqpvYe;h~Rr zyoxuAIz$FR*@2`2b*zZ4l1x9IcUh3|lzie(Ii{RZ{LnE}t2>p+&r*QgeOQ3* zIH+20q?jx?C8;;G1Zmv&5BN<()trH<$=^&dHp{we?JbD2{+m5(RD}Y&lb`P#uO8Ve z4ZxQk!VS#j#HYX3i}h}i@PIqt5@i$61+1ycDE z{sf{f`>~Rl^gUj1D?x1j5Y`P(!3TN%=~&?QRsy@7*pR~$h(8349q^k3?8kD@J}b02 zpaAb7DX=YnNOg|w@doj3sc1UIkE+s3SL>W*y%DA_uDXT zgJ@?w5RUFVgm7G`n_#p>sHeKw*(h217jfV|z`xmRLt81UQmOIpFW0lxzR zUicK7ZQH{}^IHT?gl_ToO+J?uF{a+h`$f8J>;#9g%hotJmqM%1TC$1DU7$#BCg!+Q zy&9`NlEd4;uO->-x_1=|)6^&TyQ-Uq0bBq24|@B@oH+9%&m#9lEuBA|n0Mb~xSKWwVld%ngcEwzBYk1JfD z-UNLDSac7{`-D6X{jQ;3V>o1P*{gy(Sz(%AWRL^U_kPABVXRQu_2D0|@V{j0&w zkk->|ZWC>K6yc-D`Bp*MLyjJUpzw-2Vfe8$RM-qW%dRWBRmex8iUfpR(&<@}ODJ=3 ztO0t&hp=LB`fJv~N1|iSt%#|k7Oyij$3DJPBwOUAUy8d;w9WV{YLAOiU~y%jtV}*m zC3=Fb^LwzR&}m`qgML>KgM}PkhN-Du#J{jnq$8%ZC`BDf{RV2V8JU{RsAsTjS>2g^ zUivaLkqeFHXV99gQeOkD215nMz#Bxpz&-QpZj5o9Vc5J^X?2!wLW>G6TBf{r4kC}H z^EYo5@sKa2k_;?-mPF3_IStQ}rlyS3dk~z2WB|&5EJQ3Ah2-&j)P( zM1|tG*l7mH=c|K$jlc;x(P(gqZP>bC7J>*uv_eS;x)oGoo+K7Mz}nB5uMsh6Ft>5N zmH#``MV$hrXZ;58$ENw3htTO{K8$9sY>+x6po4<}+{r^73>oXgfz&?W%fxv6c6$yH zHYY~Qi{1^EX8A9+rYW=?yzuj?1=(B>C-`j;jeQv@8T>8)?WK4|anRV?`AOCkktYGM2+OMspQ=n;xM^o7`8tRQQG6xtIKTFL+~ zeL8C(f;6C%L@E=P5YsuH3nF5Svr#vW@SkP9@^VoRYB7Z|bA-hcO4B2efeI;zstxDw5 z+~lkGcs8|QJU!%jq2*Oa${HwT(Uw3v@ega+xe((G7TK@r{(zm4~0OmfBs2K2fO z)Y6-=|5dbO*qD-T>8EPE?i%%KAn`~fJnPv5quX`81A~5He10g(^wez8&I`Ja!JMGT z7{zYi)7z#2u>egc&-5z^h0fmx1q}^At&w-)pnoq2=&`H1RU8PSs-&ssGC1e98!v3e z1A*)dWD}xMi@Vs{$UdOGD8;*j=}$_lH*8fVA8{-Mv?5gB#sR-ML3hc&!e%Vjc92l2 zzM!Bv90k4Hrd!PT?=S$w-8!f$H>;%FcK$$5hom}lzt<@Q_;E#Nt*&~+9K+CnPo9zLZMy1f(W=1fAboKdt*%k3*c)f zDLXB?FTM0B0bKZ>IOF3(SVuS)XH!N?YH65!VRCRYj;D`9ym-~mAr%6l(1(p!E-dp! z+jEtga3MaGA1Euv5EVR`V?xu{;X)~8y(8&JjdU;!%D-vfNPOElROx5Ai#Dg;FrQcE zJ;XT)4OsKXiFBw#C~H(%Mtk8m-wV=AgCM~P8Jk6iso-V`6Sjd7ywAAbZ?g^ZP8(}x zl)?mxGN?%tY~e*}Gi%VHwvD78GLDe)6FLTg-osYavekZaqCmzQ@JmWfEqIL)z}>xh zO6TO_Hr+dY(tX%;{vp+)iHhXEU`>W8Y}*d0Zuo2v^-#Ar?`>?+$eC;bCkbTR2K@%n zA)+4$miLywqyB6SEeW(#G*!!mmH__d`W(~yz>`03z?*g2Lt+Q%tHu5Jt>sygehQf_ z*m40W3zo;2g8L)mUZ~Lq^f`4q@UIX?Ih=!D$w=b#dc!WNu;|#_sl2}&R#_ntwd(${ zP_qbVjRO0nkU)6qEoO-)MKz@bM*yl2EDr*F{jcUA!UsQx(78{dqM+BHj{`dlFY8S@ z;bALU6D+$VkTnsvA}w}%@43|CIp98|uk21&1VX}j^iz9uzcl$((n*d4imTA-??>@N zM~4zM2~gncsG{A}16EFWjb+WwwTi$Etk5i~ki^zUWl26vEy%b>Dzwrm>&bW^J?1Oy2C4OwP%73Pe)b8QVOJ7#PR{QSVZ=Q6mbruQ6VQ$ zbv@vrck6S|6-eSsi`Od7*ML=`>lwi$$rDFZ#zU$n0>!a_vrFC5PqHLI)0rx}j#@i# z$4FGbTa=O$##$(TUDe47?KlOY9rW+$F6p%a=uu3IAvyado>4_pr{7GnHy z(>5kkx^@T>s8(ZrjpCxYExN^E+g7W#KbpOCzf zCMrX-reImVdJX&bm90c___x>{y>TbT2>jF&PrlqT$N`8Px-kuL|pV8U0J z2BG*gh&wr+atu9dVlWiRvVQJ<(D&n9KlGOWT|FNAv11M4KIpWAMS|2tJ|>So2=RcR&8bpy zu0{73nt36tnf?x;DMCYvc%~y(V(yM?7-z5s0-U>OBK2_827}XMf<*DW$44JF;P-j1 z>FmSQy3?3KJ43&_9BE5welG9pXQo2C_4s5|Ua)BczW-JJ;Rp zz_3-9z=ra$T_w0uIsThTd&DtsglzAVo<)Qfvc^4#?t;g;Imq<|QP_j>j1udupX5W^ zobQ~Z-V^#R^>$5LpQAP=i7Mk8n2FHn;(1yL?)r{767G*$U8D4zdS94(be|*xGG_Qh zeqB7&VuaebJk!V_*?kDAR=@3=zx|DAV$Q$Y1i2<6i59;wF0bXYLAxm(zVqEyNqtha~@a3hN7RkT{5dfwqT zSRe5TYt5K4--j{k_#r)#I#H_gp;;_+q5lu>-JlyW5OFJ|7!K#qO`#PBX*|Yr!v|@3&g}IrXNhFYnRvlrp720sXYzkH5mA?Ap z$mA>JwwTGh5-8~R%`?eNPM#IW!Wr{Ehu6!NxFfMqLYYTm_96`lN5$uJOcPU`-ALlY zLLfcoV2>apaKqPvCBlRs4XOpp+jP^RA0N;~UCOss1F`l=CL=tVepQJ)Dx?wY^YV^W zP_9|4VHH`UH>Sn@{T48MZ5&Aklr9oB}v0IDk^8fFa1+IOGK{eMTTQ&Ex1AA zcnHrAF@`;fF>tzHyFm396;T=yGX3p z3aJ&MZYEeZt@5@Z?r)Ni?Zxm$ZrSYS73ga%gjm+f%j0ZX^U1= zN^BENkmui_i$=Agvahqqn^kJ-RgR}>o3C}izNvyE%{LZw)C8@t0qL?5z zd1CDPdrT3P+q&pmPQ<26av)>l-I*p0Np1%~yc7@N@DjGI z4jMT}Hjj8aL^ak?-11Q{p98T5@;QKMIwS$-)4l!e(54}uuz|VjQJOYc#YHF!tA`Dc zuteif@S-)XAQY%z%sj!`WmXe7^~aU%aLCd1I^noJ~cOq9Aa-op)yXv4^C6$Z~o-w>%^40eK< zH~R)BYL21TPh6_L)&u@SRcwe10JP`^i*EihwRB+SE{G8imOd=uzJikC&m~<@Zj3wC z3{PI!ETM&?n!np2c!`t;%nEu03ClnWMvww&M{qbLDsIhbl}{1nyu&5ftwYwWzccHY zZRr;2L}6J8xf^m65zou5y6KoFVe=E$!OYk#4J`ZJi8oj~<7P@w$MC~kS!S;36-4Pe zfF)Ex#$Owkb4;@OzJLc*$%iiYG`>tqwnKPbhFUN*6W*Ce<%$N+Pc4JR8n zQ^f#0V_U8$wAX?(V?Ybh#coIE2`%K9s)3~&_%Xf7uYQ6Rd4Ucsv1;$n01Id3o4>+$s%L|*q3vc&i1S|ks4}i*R!Q&0nkwQ|ZMshg#GzubQpXvUypxC(H2$n_}- ztvluwLCg#S*q%bh3%C?_V2K|h;|`xwKC$wS#*QQbjAemzDr)SQ%y(~FL{7}7EX#UE z-{!#`dsSe$-Jb*ya_*XCX#~jjzgTbReBEds<2D!a-K!8%fCCl}ys!#b@Q8diyyE1# zxm#Oj7E)HjpjId%ac^6UPH9}OGJemj{0)5e4eMH1A?@Y|2 z*d0ZP!?`1Ej!Y|mk24?@Y?pmW9bB;Nc%JDkgz?KCih7qa~#J-YxyWI%GnkRuzkL4;vCUFxXC~e&S$+ zAcGa+rVn4>bRh23i9?NM@d=IO{VGxE{}>@UgwgO1JcWG!re>@bX2kUdA1{5{c>Iv1 z7Gv8jx=-lAu=)soHWp3z0kRBo2g(^aAto40Dn&d9La7vi@Nx3zwCZ~ITM>5~mC270 zGrUfM6^gN86H}M6hsH4!aku&Zeh5MAxvHa41}?YjLTCinqI-dyY8cVdz!^d61EXmq zXLn%ZKI-)r_I+N9{%ZFcMa6jBaA+KUuhfHUzI4@-hK+<2_T3<@NA{OQZ_D)s9&o zj3H>jai-}0-XooL7Ew;L-3`hLh>bM0!)c!%h8;42syZC!F4aM~@CQ$J$$6k5hX&JW=wNA05VTI{ccdIWLI55eZetA@^=I1rBs-Y&uf42%Hk`D!oy zcfT*$exVMBs{RF%)3TXn@}F|;MdaF<7lxzTU2R7M6>J9C)QW}*b|e$W*s>(yIz#qi zVqxs*p{WUFVT0Vb2r%TB?lE7m&6wdy$`NWtGFz)4%}!LX`&wM zC&6FMzKhv51`K7n`WYXp%W?ne?f*25==EsS3c9L7i}(Kx#^thA{Yq4d;dp5Sm(rLJ zWWUoTO&*#OFxfHBlt!CWzL4D{#&NI{efw3sB4@7UB!_#Mjw04G0tMSq>i>h!Z%;d* zL+7o>;k5z+jQ}oTAWo!AnPn{;6j-1zK(rh39)VxLgo2Y4ySF*y-VY^LO za&yC3y4AG3l72ML?bcc*yjo$bmBu+1+|rb5n(Z!+W{_wlC9PX}rrz*Mc5l*= z3AUo+MPwtPX>eebBwwBSrRR-%I*(wzjntfDvzh+SB-FLYfoW%nxp`qIG{hQn%gEaY z8kzFQqYsQ2@%SG4y8ywmoo;l>(pCM~4Zkty=9r3W)s5lS9IFz^4UD>{h-Y-P4I3Ca zZ&xOtIs&-qe1}D!eXKBHGpF^z<#6o?cqN8T4+#@sh#zuB;Lsu}O~+KRzFS%g!IicZ zV$TZev=Hkq9CgS-mBqoxN2sA=MxL$qvr&+}N|dB6%tDjYE}* zzL}audD!{GZRbn`vPM!T7id1b!|!*MSwXld1QwN|#*M_3Zd4>NMYhPbAs5#u&ew6q zcE^miTbhiS_luCfQI&TbW!@fcKvb^`{0CO2XD$S$TCtuwsu(Ihczm{8{a-_2rPes* z5W)wCtPwufsEXk<&YtN=1(M3Tq(9Ufp3mz|n#^e0U3`8au&m(vAOR^fG3^ww0X0V> z%?iw8Ok@0A@jvsd+96R(eFlNvs1br`qRvIKDkn)+eQ;-GLT3yrX3Pji)w(CLB0>NFOl;3BZ4;eu7#Z4-~*hlN5n4Kwo7GHe77Sxh}|*jtOp=7eWhfaK2O`1MBaF ze`*u-0X766EvDQhNHfU2;Q4Bami!>GI(li>)Pe-OX&qCesirb4Wq7(7qz*dzdiWpK zdD7(rZ+2~*ft|UpxDxRhP1Zs44pPV_;pk8^k;m#Qbc-qCPAn1z29U?7d1@H&!;BA0 z?8KcIfnNGg%;>RwKKkbgx+YU@y|h@v)DZ$$`e2|Fq#18C{{d+efa4v9RQu@!Z5y5S z+Gqb8d;2aaifcJ``Q9el(eh#(ED5=oV~=sC=%BNbcpDquAFb2g`A(=4G zMAG#akh1>Z7$9K4Y6dQ^Cw4(E@HrjJ2hj$>L0ug1!@IEF4c&Eim$Z2TtuXfH|7M|u zX<}Tz0InnyA~KZQTHEN5*5e?&U&zu zl8*BsaK6Lsz$CHjp4`!_`}m6xLCyGU6pq1if->^}n>M@xbARtVqoC}rkhSdx2oeu9i zly}~cH@#pWNOM90*?}M0m}^SpD5d3Z0PcFM5eyAI)9^F)L3ybWcao-!v})7+2v5*W z!>scwHt&U+quBKokhIv}_~0g!`;LpN^1fF+3%lV$(yZ1u!PN;%1K|{o1~OqB<<>`U zM2UaX(ZS&$7w{;MQicBH0=-6atU3T!hGNegvq=SX2Kkm{76}*;p;2{7U-#DU2L0aM zn{)=p=U}S@17ZyZ>}rHodi3{W@R*_mf<%$!cP1743lMPdY_WHcOfvn~JF;rX)W8ma zEOS#wk^wl0CF4Szx}p|i+-=6ad!-beh@DGI%*EQ7DfdXJi9dAe~-XPZa1sdh`z1AU9pC zS)fs|qa5I~erq<%me2oZxbM6~^USIOT{{s16vu*$Y literal 0 HcmV?d00001 diff --git a/tailwind.config.cjs b/tailwind.config.cjs index b2fb69d..4313fe2 100644 --- a/tailwind.config.cjs +++ b/tailwind.config.cjs @@ -49,4 +49,9 @@ module.exports = { rtl: false, darkTheme: "dark", }, + purge: { + options: { + safelist: ['alert-success', 'alert-error', 'alert-info', 'alert-warning'] + } + } }; \ No newline at end of file