-
{entry.lexeme}
+
{entry.main.lexeme.default}
{#if selectedFields.local_orthography}
- {#each get_local_orthographies(entry) as orthography}
-
{orthography},
- {/each}
+
{get_local_orthographies(entry.main.lexeme).join(', ')}
{/if}
- {#if selectedFields.phonetic && entry.phonetic}
- [{entry.phonetic}]
+ {#if selectedFields.phonetic && entry.main.phonetic}
+ [{entry.main.phonetic}]
{/if}
{#each entry.senses || [] as sense}
- {#if selectedFields.parts_of_speech && sense.parts_of_speech_keys}
{add_periods_and_comma_separate_parts_of_speech(sense.parts_of_speech_keys)}{/if}
+ {#if selectedFields.parts_of_speech && sense.parts_of_speech}
{add_periods_and_comma_separate_parts_of_speech(sense.parts_of_speech)}{/if}
{#if selectedFields.gloss && sense.glosses}
@@ -43,19 +50,19 @@
glosses: sense.glosses,
dictionary_gloss_languages: dictionary.glossLanguages,
t: $page.data.t,
- }).join(', '))}{selectedFields.example_sentence && sense.example_sentences?.length > 0 ? ';' : ''}
+ }).join(', '))}{selectedFields.example_sentence && sense.sentence_ids?.length > 0 ? ';' : ''}
{/if}
- {#if selectedFields.example_sentence}
+ {#if selectedFields.example_sentence && first_sentence}
{order_example_sentences({
- example_sentences: sense.example_sentences?.[0],
+ sentence: first_sentence,
dictionary_gloss_languages: dictionary.glossLanguages,
}).join(' / ')}
{/if}
{#if selectedFields.semantic_domains}
- {@const semantic_domains = [...sense.translated_ld_semantic_domains || [], ...sense.write_in_semantic_domains || []]}
+ {@const semantic_domains = [...sense.semantic_domains || [], ...sense.write_in_semantic_domains || []]}
{#if semantic_domains.length}
{#if showLabels}
@@ -63,65 +70,101 @@
{$page.data.t('entry_field.semantic_domains')}:
{/if}
- {semantic_domains.join(', ')}
+ {semantic_domains.map(domain => $page.data.t({ dynamicKey: `sd.${domain}`, fallback: domain })).join(', ')}
{/if}
{/if}
{#if selectedFields.noun_class && sense.noun_class}
-
+
{#if showLabels}
{$page.data.t('entry_field.noun_class')}:
{/if}
{sense.noun_class}
-
+
{/if}
- {/each}
-
- {#each selectedPrintFields as key}
-
+ {#if selectedFields.plural_form && sense.plural_form}
+
{#if showLabels}
- {$page.data.t(`entry_field.${key}`)}:
+ {$page.data.t('entry_field.plural_form')}:
{/if}
- {#if key === 'notes'}
- {@html sanitize(entry[key])}
- {:else if key === 'dialects'}
- {entry[key].join(', ')}
- {:else}
- {entry[key]}
+ {sense.plural_form?.default}
+
+ {/if}
+
+ {#if selectedFields.variant && sense.variant}
+
+ {#if showLabels}
+ {$page.data.t('entry_field.variant')}:
{/if}
-
- {/each}
-
+ {sense.variant?.default}
+
+ {/if}
+ {/each}
+
+ {#if selectedFields.notes && entry.main.notes}
+
+ {#if showLabels}
+ {$page.data.t('entry_field.notes')}:
+ {/if}
+ {@html sanitize(entry.main.notes.default)}
+
+ {/if}
+
+ {#if selectedFields.dialects && entry.dialect_ids?.length}
+
+ {#if showLabels}
+ {$page.data.t(`entry_field.dialects`)}:
+ {/if}
+ {$dialects.filter(dialect => entry.dialect_ids.includes(dialect.id)).map(dialect => dialect.name.default).join(', ')}
+
+ {/if}
+
+ {#if selectedFields.interlinearization && entry.main.interlinearization}
+
+ {#if showLabels}
+ {$page.data.t(`entry_field.interlinearization`)}:
+ {/if}
+ {entry.main.interlinearization}
+
+ {/if}
+
+ {#if selectedFields.morphology && entry.main.morphology}
+
+ {#if showLabels}
+ {$page.data.t(`entry_field.morphology`)}:
+ {/if}
+ {entry.main.morphology}
+
+ {/if}
- {#if selectedFields.sources && entry.sources}
+ {#if selectedFields.sources && entry.main.sources}
{#if showLabels}
{$page.data.t('entry_field.sources')}:
{/if}
- {entry.sources.join(', ')}
+ {entry.main.sources.join(', ')}
{/if}
-
- {#if selectedFields.speaker && entry.sound_files?.[0].speakerName}
+ {#if selectedFields.speaker && speaker_name}
{#if showLabels}
{$page.data.t('entry_field.speaker')}:
{/if}
- {entry.sound_files?.[0].speakerName}
+ {speaker_name}
{/if}
](https://svelte.dev/)
[
](https://kit.svelte.dev/)
[
](https://unocss.dev/integrations/svelte-scoped)
-[
](https://firebase.google.com/)
-[-9-orange.svg){kind=icon}
](https://firebase.google.com/)
+[
](https://firebase.google.com/)
[
](https://vercel.com/)
-[
](https://www.algolia.com/)
-
-Firebase is used for:
-
-- Authentication
-- Cloud Firestore
-- Storage
-
-These functions are being transitioned to Supabase with the exception of Storage, images will remain in GCP. Supabase may support this directly in the future.
+[
](https://www.orama.com/)
+[
](https://cloud.google.com/storage)
## Contributing
-- Choose an already approved task from the [Development Roadmap](https://github.com/jwrunner/Living-Dictionaries/projects/1) or [create an issue](https://github.com/jwrunner/Living-Dictionaries/issues) to propose a new feature (please await discussion before creating a pull request).
+- Choose an already approved task from the [Development Roadmap](https://github.com/jwrunner/Living-Dictionaries/projects/1) or [create an issue](https://github.com/jwrunner/Living-Dictionaries/issues) to propose a new feature (please await discussion before creating a pull request).
- Read [CONTRIBUTING](https://livingdictionaries.app/kitbook/docs/CONTRIBUTING) and then move on to all the other pages under "Docs" in the Kitbook to understand how to set up a dev environment, repo conventions, commit conventions, and more.
-
-
diff --git a/package.json b/package.json
index 44f50437e..3fc10c07e 100644
--- a/package.json
+++ b/package.json
@@ -3,6 +3,8 @@
"type": "module",
"scripts": {
"dev": "pnpm --filter=site dev",
+ "prod": "pnpm --filter=site prod",
+ "mixed": "pnpm --filter=site mixed",
"dev:open": "pnpm --filter=site dev --open",
"build": "pnpm --filter=site build",
"preview": "pnpm --filter=site preview",
@@ -19,22 +21,22 @@
"lint:inspect": "npx @eslint/config-inspector",
"lint:inspect-future": "eslint --inspect-config",
"reset-db": "pnpm --filter=site reset-db",
- "generate-types": "supabase gen types typescript --local --schema public > packages/site/src/lib/supabase/generated.types.ts",
+ "generate-types": "supabase gen types typescript --local --schema public > packages/types/supabase/generated.types.ts",
"check-packages": "pnpm update --interactive --recursive --latest"
},
"devDependencies": {
- "@antfu/eslint-config": "^2.12.1",
- "@typescript-eslint/eslint-plugin": "6.21.0",
- "eslint": "^8.56.0",
- "eslint-plugin-svelte": "^2.33.2",
+ "@antfu/eslint-config": "^2.27.3",
+ "@typescript-eslint/eslint-plugin": "8.3.0",
+ "eslint": "^9.9.1",
+ "eslint-plugin-svelte": "^2.43.0",
"eslint-plugin-svelte-stylistic": "^0.0.4",
- "lint-staged": "^13.2.2",
- "simple-git-hooks": "^2.11.0",
- "start-server-and-test": "^2.0.3",
+ "lint-staged": "^15.2.9",
+ "simple-git-hooks": "^2.11.1",
+ "start-server-and-test": "^2.0.5",
"supabase": "^1.145.4",
"svelte": "^4.2.12",
"typescript": "~5.1.6",
- "vitest": "^1.4.0"
+ "vitest": "^2.1.3"
},
"simple-git-hooks": {
"pre-commit": "pnpm lint-staged"
diff --git a/packages/functions/package.json b/packages/functions/package.json
index 1cc22153f..86131acad 100644
--- a/packages/functions/package.json
+++ b/packages/functions/package.json
@@ -30,6 +30,6 @@
"@types/node": "^18.11.18",
"node-fetch": "^2.6.7",
"typescript": "^5.1.6",
- "vitest": "^1.4.0"
+ "vitest": "^2.0.5"
}
}
diff --git a/packages/functions/tsconfig.json b/packages/functions/tsconfig.json.bak
similarity index 100%
rename from packages/functions/tsconfig.json
rename to packages/functions/tsconfig.json.bak
diff --git a/packages/scripts/.gitignore b/packages/scripts/.gitignore
index 7f2090e84..032816f4e 100644
--- a/packages/scripts/.gitignore
+++ b/packages/scripts/.gitignore
@@ -2,4 +2,5 @@ logs
service-account*
.env
sheets-viewer-SA.json
-.env.supabase
\ No newline at end of file
+.env.supabase
+.env.production.supabase
\ No newline at end of file
diff --git a/packages/scripts/config-firebase.ts b/packages/scripts/config-firebase.ts
index b84985f6e..f66131373 100644
--- a/packages/scripts/config-firebase.ts
+++ b/packages/scripts/config-firebase.ts
@@ -1,4 +1,3 @@
-import fs from 'node:fs'
import { program } from 'commander'
import { cert, initializeApp } from 'firebase-admin/app'
import { FieldValue, getFirestore } from 'firebase-admin/firestore'
@@ -7,8 +6,7 @@ import { getAuth } from 'firebase-admin/auth'
// import serviceAccountDev from './service-account-dev.json';
// import serviceAccountProd from './service-account-prod.json';
import { serviceAccountDev, serviceAccountProd } from './service-accounts'
-
-/// LOGGER///
+import './record-logs'
program
// .version('0.0.1')
@@ -34,11 +32,5 @@ export const db = getFirestore()
export const timestamp = FieldValue.serverTimestamp()
export const storage = getStorage()
export const auth = getAuth()
-const logFile = fs.createWriteStream(`./logs/${Date.now()}.txt`, { flags: 'w' }) // 'a' to append, 'w' to truncate the file every time the process starts.
-console.log = function (data: any) {
- logFile.write(`${JSON.stringify(data)}\n`)
- process.stdout.write(`${JSON.stringify(data)}\n`)
-}
-/// END-LOGGER///
-console.log(`Running on ${environment}`)
+console.log(`Firebase running on ${environment}`)
diff --git a/packages/scripts/config-supabase.ts b/packages/scripts/config-supabase.ts
index 3e36fd64d..066714030 100644
--- a/packages/scripts/config-supabase.ts
+++ b/packages/scripts/config-supabase.ts
@@ -1,31 +1,63 @@
import PG from 'pg'
import { createClient } from '@supabase/supabase-js'
-import type { Database } from '@living-dictionaries/site/src/lib/supabase/database.types'
+import type { Database } from '@living-dictionaries/types'
import * as dotenv from 'dotenv'
+import './record-logs'
-dotenv.config({ path: '.env.supabase' })
+// TODO: change to .env.development and .env.production
+dotenv.config({ path: '.env.supabase' }) // local project variables
+// dotenv.config({ path: '.env.production.supabase' }) // production project variables
-export const supabase = createClient
-