From 15ce77e2d6cb3de386492d3bec50e07a482de96f Mon Sep 17 00:00:00 2001 From: Dawid Urbas Date: Thu, 1 Feb 2024 14:41:52 +0000 Subject: [PATCH] Fix PR --- package.json | 2 +- src/main/binaries.ts | 4 +-- src/renderer/src/lib/locale/en/common.json | 2 +- src/renderer/src/routes/+page.svelte | 2 +- .../src/routes/main/app-store/+page.svelte | 32 +++++++++++-------- .../app-store/components/InputModal.svelte | 3 +- .../main/app-store/components/Modal.svelte | 9 ++---- .../routes/main/components/MainHeader.svelte | 2 +- .../settings/components/InstallAppForm.svelte | 4 ++- tsconfig.json | 2 +- 10 files changed, 31 insertions(+), 31 deletions(-) diff --git a/package.json b/package.json index cbaf6134..fa8cc1f3 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "dev": "concurrently -p \"[{time}] [{name}]\" -n=sveltekit,electron -c=red,blue \"electron-vite dev --watch\" \"yarn run dev:sveltekit\"", "build": "yarn build:sveltekit && yarn typecheck && electron-vite build", "setup": "cd rust-utils && yarn && yarn build && cd ..", - "fetch:default-apps": "curl -L --output resources/default-apps/kando.webhapp https://drive.switch.ch/index.php/s/nSXZlwCYFAl9aRD/download", + "fetch:default-apps": "curl -L --output resources/default-apps/kando.webhapp https://github.com/holochain-apps/kando/releases/download/v0.8.18/kando.webhapp", "postinstall": "electron-builder install-app-deps", "build:win": "yarn build && electron-builder --win --config", "build:mac": "yarn build && electron-builder --mac --config", diff --git a/src/main/binaries.ts b/src/main/binaries.ts index 090ddeb4..ffc77d6a 100644 --- a/src/main/binaries.ts +++ b/src/main/binaries.ts @@ -5,12 +5,12 @@ import * as path from 'path'; import { HolochainLairVersionSchema } from '../types'; -const getFilePath = (relativePath) => path.join(app.getAppPath(), relativePath); +const getFilePath = (relativePath: string) => path.join(app.getAppPath(), relativePath); const getPackageJSONPath = () => getFilePath(app.isPackaged ? '../app.asar.unpacked/package.json' : './package.json'); -const readJSONFile = (filePath) => JSON.parse(readFileSync(filePath, 'utf8')); +const readJSONFile = (filePath: string) => JSON.parse(readFileSync(filePath, 'utf8')); const packageJSON = readJSONFile(getPackageJSONPath()); diff --git a/src/renderer/src/lib/locale/en/common.json b/src/renderer/src/lib/locale/en/common.json index 5e216adb..d7451113 100644 --- a/src/renderer/src/lib/locale/en/common.json +++ b/src/renderer/src/lib/locale/en/common.json @@ -38,5 +38,5 @@ "setupProgress": "Setup Progress", "startingHolochain": "Starting Holochain...", "startingLairKeystore": "Starting Lair Keystore...", - "whatDoYouWantToLaunch": "What do you want to launch?" + "whatDoYouWantToInstall": "What do you want to install?" } diff --git a/src/renderer/src/routes/+page.svelte b/src/renderer/src/routes/+page.svelte index 512c352a..3f886e43 100644 --- a/src/renderer/src/routes/+page.svelte +++ b/src/renderer/src/routes/+page.svelte @@ -18,7 +18,7 @@ return showModalError({ modalStore, errorTitle: $i18n.t('appError'), - errorMessage: setupData.error.message + errorMessage: $i18n.t(setupData.error.message) }); } diff --git a/src/renderer/src/routes/main/app-store/+page.svelte b/src/renderer/src/routes/main/app-store/+page.svelte index 8085042e..da352cdf 100644 --- a/src/renderer/src/routes/main/app-store/+page.svelte +++ b/src/renderer/src/routes/main/app-store/+page.svelte @@ -25,6 +25,8 @@ let searchInput = ''; + $: isKandoInSearch = 'kando'.includes(searchInput.toLowerCase()); + function handlePress(event: CustomEvent) { if (!(event.detail instanceof KeyboardEvent)) return; @@ -41,20 +43,22 @@
-
- -
-

{$i18n.t('kando')}

-

- Holochain hApp for collaborative KanBan boards. Real-time collaboration delivered by syn -

+ {#if isKandoInSearch} +
+ +
+

{$i18n.t('kando')}

+

+ Holochain hApp for collaborative KanBan boards. Real-time collaboration delivered by syn +

+
+
- -
+ {/if}
diff --git a/src/renderer/src/routes/main/app-store/components/InputModal.svelte b/src/renderer/src/routes/main/app-store/components/InputModal.svelte index 488e90c5..2d0d77c0 100644 --- a/src/renderer/src/routes/main/app-store/components/InputModal.svelte +++ b/src/renderer/src/routes/main/app-store/components/InputModal.svelte @@ -3,7 +3,6 @@ export let label = ''; export let id: string; - export let pl = 'pl-16'; export let value: string; @@ -12,7 +11,7 @@ - +