From 69c01a67de2276776c0423a26e656bdc5988b22f Mon Sep 17 00:00:00 2001 From: Leo Nicolle Date: Sun, 21 Jan 2024 19:40:27 +0100 Subject: [PATCH 01/92] forgotten merge conflicts --- client/src/worker/workers/definition.ts | 8 -------- database/src/db.ts | 25 ------------------------- 2 files changed, 33 deletions(-) diff --git a/client/src/worker/workers/definition.ts b/client/src/worker/workers/definition.ts index fde58e6..d1ccd8c 100644 --- a/client/src/worker/workers/definition.ts +++ b/client/src/worker/workers/definition.ts @@ -3,17 +3,9 @@ import { definitionSearch } from '../utils/definition-search'; onmessage = function (e) { const { type, data } = e.data; -<<<<<<< HEAD if (e.data.definitions !== undefined) { const { definitions } = e.data as { definitions: string; }; definitionSearch.loadDefinitions(definitions); -======= - if (e.data.definitions) { - const { definitions } = e.data as { definitions: string; }; - console.time('definitions-load'); - definitionSearch.loadDefinitions(definitions); - console.timeEnd('definitions-load'); ->>>>>>> @{-1} return this.postMessage({ type: 'loaded' }); } if (type === 'searchdefinition') { diff --git a/database/src/db.ts b/database/src/db.ts index 6a19f13..c1343b1 100644 --- a/database/src/db.ts +++ b/database/src/db.ts @@ -7,7 +7,6 @@ export abstract class Database { abstract updateGrid(grid: Grid): Promise; abstract deleteGrid(gridId: string): Promise; abstract getGrid(gridId: string): Promise; -<<<<<<< HEAD abstract getStyles(): Promise<(GridStyle | SolutionStyle)[]>; abstract getStyle(optionId: string): Promise; abstract pushStyle(option: any): Promise; @@ -26,29 +25,5 @@ export abstract class Database { abstract pushFont(font: Font): Promise; abstract deleteFont(wordId: string): Promise; abstract isSignedIn(): Promise; -======= - abstract getStyles() : Promise<(GridStyle | SolutionStyle)[]>; - abstract getStyle(optionId: string) : Promise; - abstract pushStyle(option: any) : Promise; - abstract updateOption(option: any) : Promise; - abstract deleteStyle(optionId: string) : Promise; - abstract getWords() : Promise; - abstract getWord(wordId: string) : Promise; - abstract pushWord(word: any) : Promise; - abstract deleteWord(wordId: string) : Promise; - abstract getBannedWords() : Promise; - abstract getBannedWord(wordId: string) : Promise; - abstract pushBannedWord(word: any) : Promise; - abstract deleteBannedWord(wordId: string) : Promise; - abstract getDefinitions() : Promise; - abstract getDefinition(wordId: string) : Promise; - abstract pushDefinition(word: any, def: string) : Promise; - abstract deleteDefinition(wordId: string) : Promise; - abstract getFonts() : Promise; - abstract getFont(fontId: string) : Promise; - abstract pushFont(font: Font) : Promise; - abstract deleteFont(wordId: string) : Promise; - abstract isSignedIn() : Promise; ->>>>>>> @{-1} } From d3eef1c012a59cfd4f9655bc5b2923a12898df69 Mon Sep 17 00:00:00 2001 From: Leo Nicolle Date: Mon, 22 Jan 2024 20:26:01 +0100 Subject: [PATCH 02/92] line spacing + text algns --- client/src/components/Solutions.vue | 24 +-- .../src/components/forms/AlignmentSelect.vue | 29 ++++ client/src/components/forms/GridStyleForm.vue | 12 +- client/src/components/forms/LineSpacing.vue | 138 ++++++++++++++++++ client/src/components/svg-renderer/Grid.vue | 12 +- database/src/idb.ts | 23 ++- grid/src/types.ts | 40 ++++- 7 files changed, 240 insertions(+), 38 deletions(-) create mode 100644 client/src/components/forms/AlignmentSelect.vue create mode 100644 client/src/components/forms/LineSpacing.vue diff --git a/client/src/components/Solutions.vue b/client/src/components/Solutions.vue index b3d5a07..cedd01f 100644 --- a/client/src/components/Solutions.vue +++ b/client/src/components/Solutions.vue @@ -1,26 +1,13 @@ \ No newline at end of file diff --git a/client/src/layouts/GridLayout.vue b/client/src/layouts/GridLayout.vue index 9f47bcf..4014627 100644 --- a/client/src/layouts/GridLayout.vue +++ b/client/src/layouts/GridLayout.vue @@ -53,10 +53,6 @@ -
- - -
@@ -214,12 +210,6 @@ watch(selectedElements, () => { overflow: hidden; } -.outside { - position: absolute; - bottom: 100%; - right: 100%; -} - .add svg { transform: scale(5); } diff --git a/client/src/layouts/Main.vue b/client/src/layouts/Main.vue index 25256c5..90ec5d7 100644 --- a/client/src/layouts/Main.vue +++ b/client/src/layouts/Main.vue @@ -34,7 +34,6 @@ -
@@ -389,4 +388,8 @@ nav { padding-bottom: 10px; padding-right: 10px; } + +#outside { + transform: translate(100vw, 100vh); +} \ No newline at end of file diff --git a/client/src/views/Grids.vue b/client/src/views/Grids.vue index 423cb57..e58fba2 100644 --- a/client/src/views/Grids.vue +++ b/client/src/views/Grids.vue @@ -16,15 +16,17 @@ - + +
+ +
+
- + diff --git a/client/src/js/useModel.ts b/client/src/js/useModel.ts index 9980d11..31cfb33 100644 --- a/client/src/js/useModel.ts +++ b/client/src/js/useModel.ts @@ -2,8 +2,8 @@ import { computed } from 'vue'; type modValProp = { modelValue: T; -} -export function useModel(props: modValProp, emit: any) { +}; +export function useModel(props: modValProp, emit: any) { return computed({ get: () => props.modelValue, set: (value) => { diff --git a/client/src/views/editors/SolutionsEditor.vue b/client/src/views/editors/SolutionsEditor.vue index 8378046..a2be104 100644 --- a/client/src/views/editors/SolutionsEditor.vue +++ b/client/src/views/editors/SolutionsEditor.vue @@ -1,8 +1,8 @@