Merge pull request #150 from SkewedAspect/remove-decoders

Remove decoders
SkewedAspect · Dec 10, 2024 · a2b375a · a2b375a
2 parents 545ff1a + 52f2be1
commit a2b375a
Show file tree

Hide file tree

Showing 171 changed files with 232 additions and 1,105 deletions.
diff --git a/knexfile.ts b/knexfile.ts
@@ -6,7 +6,7 @@ import 'dotenv/config';
 import configUtil from '@strata-js/util-config';
 import type { Knex } from 'knex';
 
-import { ServerConfig } from './src/common/interfaces/config';
+import { ServerConfig } from './src/server/interfaces/config';
 
 //----------------------------------------------------------------------------------------------------------------------
 
@@ -18,11 +18,11 @@ configUtil.load(`./config/${ env }.yml`);
 module.exports = {
     ...configUtil.get<ServerConfig>().database ?? {},
     migrations: {
-        directory: './src/server/knex/migrations'
+        directory: './src/server/knex/migrations',
     },
     seeds: {
-        directory: './src/server/knex/seeds'
-    }
+        directory: './src/server/knex/seeds',
+    },
 } satisfies Knex.Config;
 
 //----------------------------------------------------------------------------------------------------------------------
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -24,7 +24,6 @@
     "body-parser": "^1.20.3",
     "connect-session-knex": "^5.0.0",
     "cookie-parser": "^1.4.6",
-    "decoders": "^1.23.3",
     "dotenv": "^16.4.5",
     "express": "^5.0.1",
     "express-session": "^1.18.0",

diff --git a/src/client/components/character/addEditModal.vue b/src/client/components/character/addEditModal.vue
@@ -206,7 +206,7 @@
     import { maxLength, minLength, required } from '@vuelidate/validators';
 
     // Interfaces
-    import { Character } from '../../../common/interfaces/common';
+    import { Character } from '../../../common/models';
 
     // Managers
     import systemsMan from '../../lib/managers/systems';

diff --git a/src/client/components/character/charThumbnail.vue b/src/client/components/character/charThumbnail.vue
@@ -51,7 +51,7 @@
 <!--------------------------------------------------------------------------------------------------------------------->
 
 <script lang="ts" setup>
-    import { Character } from '../../../common/interfaces/common';
+    import { Character } from '../../../common/models';
 
     //------------------------------------------------------------------------------------------------------------------
     // Component Definition

diff --git a/src/client/components/character/deleteModal.vue b/src/client/components/character/deleteModal.vue
@@ -53,7 +53,7 @@
     import { ref } from 'vue';
 
     // Interfaces
-    import { Character } from '../../../common/interfaces/common';
+    import { Character } from '../../../common/models';
 
     // Components
     import CloseButton from '../ui/closeButton.vue';

diff --git a/src/client/components/character/scopeBadge.vue b/src/client/components/character/scopeBadge.vue
@@ -14,7 +14,7 @@
     import { computed } from 'vue';
 
     // Models
-    import { Supplement } from '../../../common/interfaces/common';
+    import { Supplement } from '../../../common/models';
 
     //------------------------------------------------------------------------------------------------------------------
     // Component Definition

diff --git a/src/client/components/character/supplementSearch.vue b/src/client/components/character/supplementSearch.vue
@@ -61,7 +61,7 @@
     import { computed, ref } from 'vue';
 
     // Models
-    import { Supplement, SupplementInst } from '../../../common/interfaces/systems/supplements';
+    import { Supplement, SupplementInst } from '../../../common/models/systems';
 
     // Components
     import { VueBootstrapAutocomplete } from '@morgul/vue-bootstrap-autocomplete';

diff --git a/src/client/components/character/supplementSelect.vue b/src/client/components/character/supplementSelect.vue
@@ -135,7 +135,7 @@
     import { storeToRefs } from 'pinia';
 
     // Models
-    import { Supplement, SupplementInst } from '../../../common/interfaces/systems/supplements';
+    import { Supplement, SupplementInst } from '../../../common/models/systems';
 
     // Managers
     import authMan from '../../lib/managers/auth';

diff --git a/src/client/components/notes/addEditModal.vue b/src/client/components/notes/addEditModal.vue
@@ -70,7 +70,7 @@
     import { computed, ref } from 'vue';
 
     // Models
-    import { NotebookPage } from '../../lib/models/notebook';
+    import { NotebookPage } from '../../../common/models';
 
     // Components
     import MarkdownEditor from '../ui/markdownEditor.vue';

diff --git a/src/client/components/notes/deleteModal.vue b/src/client/components/notes/deleteModal.vue
@@ -59,7 +59,7 @@
     import { ref } from 'vue';
 
     // Managers
-    import { NotebookPage } from '../../lib/models/notebook';
+    import { NotebookPage } from '../../../common/models';
 
     // Components
     import { BModal } from 'bootstrap-vue-next';

diff --git a/src/client/components/notes/noteBook.vue b/src/client/components/notes/noteBook.vue
@@ -78,7 +78,7 @@
     import { computed, ref } from 'vue';
 
     // Models
-    import { NotebookPage } from '../../lib/models/notebook';
+    import { NotebookPage } from '../../../common/models';
 
     // Stores
     import { useNotebookStore } from '../../lib/stores/notebook';

diff --git a/src/client/components/systems/coc/bioCard.vue b/src/client/components/systems/coc/bioCard.vue
@@ -82,8 +82,8 @@
     import { truncate } from 'lodash';
 
     // Interfaces
-    import { Character } from '../../../../common/interfaces/common';
-    import { CoCSystemDetails, CocBiography } from '../../../../common/interfaces/systems/coc';
+    import { Character } from '../../../../common/models';
+    import { CoCSystemDetails, CocBiography } from '../../../../common/models/systems';
 
     // Stores
     import { useCharactersStore } from '../../../lib/stores/characters';

diff --git a/src/client/components/systems/coc/charCard.vue b/src/client/components/systems/coc/charCard.vue
@@ -103,12 +103,12 @@
     import { storeToRefs } from 'pinia';
 
     // Models
-    import { Character } from '../../../../common/interfaces/common';
+    import { Character } from '../../../../common/models';
     import {
         CoCCharacteristics,
         CoCSystemDetails,
         validCoCCharacteristicNames,
-    } from '../../../../common/interfaces/systems/coc';
+    } from '../../../../common/models/systems';
 
     // Stores
     import { useCharactersStore } from '../../../lib/stores/characters';

diff --git a/src/client/components/systems/coc/cocCharacter.vue b/src/client/components/systems/coc/cocCharacter.vue
@@ -37,8 +37,8 @@
     import { storeToRefs } from 'pinia';
 
     // Interfaces
-    import { Character } from '../../../../common/interfaces/common';
-    import { CoCSystemDetails } from '../../../../common/interfaces/systems/coc';
+    import { Character } from '../../../../common/models';
+    import { CoCSystemDetails } from '../../../../common/models/systems';
 
     // Stores
     import { useCharactersStore } from '../../../lib/stores/characters';

diff --git a/src/client/components/systems/coc/modals/editBioModal.vue b/src/client/components/systems/coc/modals/editBioModal.vue
@@ -124,8 +124,8 @@
     import { ref } from 'vue';
 
     // Interfaces
-    import { Character } from '../../../../../common/interfaces/common';
-    import { CoCSystemDetails, CocBiography } from '../../../../../common/interfaces/systems/coc';
+    import { Character } from '../../../../../common/models';
+    import { CoCSystemDetails, CocBiography } from '../../../../../common/models/systems';
 
     // Components
     import { BModal } from 'bootstrap-vue-next';

diff --git a/src/client/components/systems/coc/modals/editCharacteristicsModal.vue b/src/client/components/systems/coc/modals/editCharacteristicsModal.vue
@@ -75,11 +75,11 @@
     import { computed, ref } from 'vue';
 
     // Models
-    import { Character } from '../../../../../common/interfaces/common';
+    import { Character } from '../../../../../common/models';
     import {
         CoCCharacteristics,
         CoCSystemDetails,
-    } from '../../../../../common/interfaces/systems/coc';
+    } from '../../../../../common/models/systems';
 
     // Utils
     import { startCase } from '../../../../lib/utils/misc';

diff --git a/src/client/components/systems/coc/rollsBlock.vue b/src/client/components/systems/coc/rollsBlock.vue
@@ -74,7 +74,7 @@
     import { computed, ref } from 'vue';
 
     // Interfaces
-    import { DiceRoll } from '../../../../common/interfaces/common';
+    import { DiceRoll } from '../../../../common/models';
 
     // Utils
     import diceUtil from '../../../lib/utils/dice';

diff --git a/src/client/components/systems/eote/armorCard.vue b/src/client/components/systems/eote/armorCard.vue
@@ -109,7 +109,7 @@
     import { useCharactersStore } from '../../../lib/stores/characters';
 
     // Models
-    import { EoteArmorRef, EoteCharacter } from '../../../../common/interfaces/systems/eote';
+    import { EoteArmorRef, EoteCharacter } from '../../../../common/models/systems';
 
     // Managers
     import eoteMan from '../../../lib/managers/systems/eote';

diff --git a/src/client/components/systems/eote/bioCard.vue b/src/client/components/systems/eote/bioCard.vue
@@ -60,7 +60,7 @@
     import { storeToRefs } from 'pinia';
 
     // Interfaces
-    import { EoteOrGenCharacter } from '../../../../common/interfaces/systems/eote';
+    import { EoteOrGenCharacter } from '../../../../common/models/systems';
 
     // Stores
     import { useCharactersStore } from '../../../lib/stores/characters';

diff --git a/src/client/components/systems/eote/charCard.vue b/src/client/components/systems/eote/charCard.vue
@@ -66,7 +66,7 @@
     import { storeToRefs } from 'pinia';
 
     // Models
-    import { EoteCharacteristics, EoteOrGenCharacter } from '../../../../common/interfaces/systems/eote';
+    import { EoteCharacteristics, EoteOrGenCharacter } from '../../../../common/models/systems';
 
     // Stores
     import { useCharactersStore } from '../../../lib/stores/characters';

diff --git a/src/client/components/systems/eote/components/criticalCard.vue b/src/client/components/systems/eote/components/criticalCard.vue
@@ -56,7 +56,7 @@
     import { computed, ref } from 'vue';
 
     // Models
-    import { EoteCritical } from '../../../../../common/interfaces/systems/eote';
+    import { EoteCritical } from '../../../../../common/models/systems';
 
     // Utils
     import { shortID } from '../../../../lib/utils/misc';

diff --git a/src/client/components/systems/eote/components/forcePowerCard.vue b/src/client/components/systems/eote/components/forcePowerCard.vue
@@ -62,7 +62,7 @@
     import { computed, ref } from 'vue';
 
     // Models
-    import { EoteForcePower, EoteForcePowerInst } from '../../../../../common/interfaces/systems/eote';
+    import { EoteForcePower, EoteForcePowerInst } from '../../../../../common/models/systems';
 
     // Managers
     import eoteMan from '../../../../lib/managers/systems/eote';

diff --git a/src/client/components/systems/eote/components/qualityEdit.vue b/src/client/components/systems/eote/components/qualityEdit.vue
@@ -59,7 +59,7 @@
     import { computed, ref } from 'vue';
 
     // Models
-    import { EoteQuality, EoteQualityRef } from '../../../../../common/interfaces/systems/eote';
+    import { EoteQuality, EoteQualityRef } from '../../../../../common/models/systems';
 
     // Managers
     import eoteMan from '../../../../lib/managers/systems/eote';

diff --git a/src/client/components/systems/eote/components/talentCard.vue b/src/client/components/systems/eote/components/talentCard.vue
@@ -59,7 +59,7 @@
     import { computed, ref } from 'vue';
 
     // Models
-    import { EoteTalentInst, GenesysTalent } from '../../../../../common/interfaces/systems/eote';
+    import { EoteTalentInst, GenesysTalent } from '../../../../../common/models/systems';
 
     // Utils
     import { shortID } from '../../../../lib/utils/misc';

diff --git a/src/client/components/systems/eote/criticalsCard.vue b/src/client/components/systems/eote/criticalsCard.vue
@@ -74,7 +74,7 @@
     import { useCharactersStore } from '../../../lib/stores/characters';
 
     // Models
-    import { EoteCritical, EoteOrGenCharacter } from '../../../../common/interfaces/systems/eote';
+    import { EoteCritical, EoteOrGenCharacter } from '../../../../common/models/systems';
 
     // Managers
     import diceMan from '../../../lib/utils/dice';

diff --git a/src/client/components/systems/eote/defensesCard.vue b/src/client/components/systems/eote/defensesCard.vue
@@ -57,7 +57,7 @@
     import { useCharactersStore } from '../../../lib/stores/characters';
 
     // Models
-    import { EoteOrGenCharacter } from '../../../../common/interfaces/systems/eote';
+    import { EoteOrGenCharacter } from '../../../../common/models/systems';
 
     // Components
     import RpgkCard from '../../ui/rpgkCard.vue';

diff --git a/src/client/components/systems/eote/eoteCharacter.vue b/src/client/components/systems/eote/eoteCharacter.vue
@@ -78,7 +78,7 @@
     import { useCharactersStore } from '../../../lib/stores/characters';
 
     // Models
-    import { EoteOrGenCharacter } from '../../../../common/interfaces/systems/eote';
+    import { EoteOrGenCharacter } from '../../../../common/models/systems';
 
     // Managers
     import charMan from '../../../lib/managers/character';

diff --git a/src/client/components/systems/eote/expCard.vue b/src/client/components/systems/eote/expCard.vue
@@ -61,7 +61,7 @@
     import { storeToRefs } from 'pinia';
 
     // Models
-    import { EoteOrGenCharacter } from '../../../../common/interfaces/systems/eote';
+    import { EoteOrGenCharacter } from '../../../../common/models/systems';
 
     // Stores
     import { useCharactersStore } from '../../../lib/stores/characters';

diff --git a/src/client/components/systems/eote/forcePool.vue b/src/client/components/systems/eote/forcePool.vue
@@ -62,7 +62,7 @@
     import { storeToRefs } from 'pinia';
 
     // Models
-    import { EoteCharacter } from '../../../../common/interfaces/systems/eote';
+    import { EoteCharacter } from '../../../../common/models/systems';
 
     // Stores
     import { useCharactersStore } from '../../../lib/stores/characters';

diff --git a/src/client/components/systems/eote/forcePowers.vue b/src/client/components/systems/eote/forcePowers.vue
@@ -46,7 +46,7 @@
     import { sortBy } from 'lodash';
 
     // Models
-    import { EoteCharacter, EoteForcePowerInst } from '../../../../common/interfaces/systems/eote';
+    import { EoteCharacter, EoteForcePowerInst } from '../../../../common/models/systems';
 
     // Stores
     import { useCharactersStore } from '../../../lib/stores/characters';

diff --git a/src/client/components/systems/eote/modals/addEditAbilityModal.vue b/src/client/components/systems/eote/modals/addEditAbilityModal.vue
@@ -71,7 +71,7 @@
     import { computed, ref } from 'vue';
 
     // Models
-    import { EoteAbility, EoteForcePower } from '../../../../../common/interfaces/systems/eote';
+    import { EoteAbility, EoteForcePower } from '../../../../../common/models/systems';
 
     // Managers
     import eoteMan from '../../../../lib/managers/systems/eote';

diff --git a/src/client/components/systems/eote/modals/addEditForcePowersModal.vue b/src/client/components/systems/eote/modals/addEditForcePowersModal.vue
@@ -284,7 +284,7 @@
     import { computed, ref } from 'vue';
 
     // Models
-    import { EoteForcePower, EoteQuality } from '../../../../../common/interfaces/systems/eote';
+    import { EoteForcePower, EoteQuality } from '../../../../../common/models/systems';
 
     // Managers
     import eoteMan from '../../../../lib/managers/systems/eote';

diff --git a/src/client/components/systems/eote/modals/addEditMotivationModal.vue b/src/client/components/systems/eote/modals/addEditMotivationModal.vue
@@ -127,7 +127,7 @@
         EoteQuality,
         GenesysMotivation,
         GenesysMotivationType,
-    } from '../../../../../common/interfaces/systems/eote';
+    } from '../../../../../common/models/systems';
 
     // Components
     import EditReference from '../../../character/editReference.vue';

diff --git a/src/client/components/systems/eote/modals/addEditQualityModal.vue b/src/client/components/systems/eote/modals/addEditQualityModal.vue
@@ -84,7 +84,7 @@
     import { computed, ref } from 'vue';
 
     // Models
-    import { EoteQuality } from '../../../../../common/interfaces/systems/eote';
+    import { EoteQuality } from '../../../../../common/models/systems';
 
     // Managers
     import eoteMan from '../../../../lib/managers/systems/eote';

diff --git a/src/client/components/systems/eote/modals/addEditTalentModal.vue b/src/client/components/systems/eote/modals/addEditTalentModal.vue
@@ -126,7 +126,7 @@
     import {
         EoteOrGenesysTalent,
         EoteTalent,
-    } from '../../../../../common/interfaces/systems/eote';
+    } from '../../../../../common/models/systems';
 
     // Managers
     import eoteMan from '../../../../lib/managers/systems/eote';