Refactored to eliminate modules

final-hill · Jun 27, 2024 · d88d492 · d88d492
1 parent 02faa43
commit d88d492
Show file tree

Hide file tree

Showing 91 changed files with 210 additions and 361 deletions.
diff --git a/...nment/application/AssumptionInteractor.ts → application/AssumptionInteractor.ts b/...nment/application/AssumptionInteractor.ts → application/AssumptionInteractor.ts
diff --git a/...plication/ConstraintCategoryInteractor.ts → application/ConstraintCategoryInteractor.ts b/...plication/ConstraintCategoryInteractor.ts → application/ConstraintCategoryInteractor.ts
diff --git a/...nment/application/ConstraintInteractor.ts → application/ConstraintInteractor.ts b/...nment/application/ConstraintInteractor.ts → application/ConstraintInteractor.ts
diff --git a/...vironment/application/EffectInteractor.ts → application/EffectInteractor.ts b/...vironment/application/EffectInteractor.ts → application/EffectInteractor.ts
diff --git a/...plication/FunctionalBehaviorInteractor.ts → application/FunctionalBehaviorInteractor.ts b/...plication/FunctionalBehaviorInteractor.ts → application/FunctionalBehaviorInteractor.ts
diff --git a/...ent/application/GlossaryTermInteractor.ts → application/GlossaryTermInteractor.ts b/...ent/application/GlossaryTermInteractor.ts → application/GlossaryTermInteractor.ts
diff --git a/modules/goals/application/GoalInteractor.ts → application/GoalInteractor.ts b/modules/goals/application/GoalInteractor.ts → application/GoalInteractor.ts
diff --git a/...onment/application/InvariantInteractor.ts → application/InvariantInteractor.ts b/...onment/application/InvariantInteractor.ts → application/InvariantInteractor.ts
diff --git a/modules/goals/application/LimitInteractor.ts → application/LimitInteractor.ts b/modules/goals/application/LimitInteractor.ts → application/LimitInteractor.ts
diff --git a/...cation/NonFunctionalBehaviorInteractor.ts → ...cation/NonFunctionalBehaviorInteractor.ts b/...cation/NonFunctionalBehaviorInteractor.ts → ...cation/NonFunctionalBehaviorInteractor.ts
diff --git a/...s/goals/application/ObstacleInteractor.ts → application/ObstacleInteractor.ts b/...s/goals/application/ObstacleInteractor.ts → application/ObstacleInteractor.ts
diff --git a/...es/goals/application/OutcomeInteractor.ts → application/OutcomeInteractor.ts b/...es/goals/application/OutcomeInteractor.ts → application/OutcomeInteractor.ts
diff --git a/...s/project/application/PersonInteractor.ts → application/PersonInteractor.ts b/...s/project/application/PersonInteractor.ts → application/PersonInteractor.ts
diff --git a/...olution/application/SolutionInteractor.ts → application/SolutionInteractor.ts b/...olution/application/SolutionInteractor.ts → application/SolutionInteractor.ts
diff --git a/...lication/StakeholderCategoryInteractor.ts → application/StakeholderCategoryInteractor.ts b/...lication/StakeholderCategoryInteractor.ts → application/StakeholderCategoryInteractor.ts
diff --git a/...oals/application/StakeholderInteractor.ts → application/StakeholderInteractor.ts b/...oals/application/StakeholderInteractor.ts → application/StakeholderInteractor.ts
diff --git a/...tion/StakeholderSegmentationInteractor.ts → ...tion/StakeholderSegmentationInteractor.ts b/...tion/StakeholderSegmentationInteractor.ts → ...tion/StakeholderSegmentationInteractor.ts
diff --git a/...s/system/application/UseCaseInteractor.ts → application/UseCaseInteractor.ts b/...s/system/application/UseCaseInteractor.ts → application/UseCaseInteractor.ts
diff --git a/.../environment/data/AssumptionRepository.ts → data/AssumptionRepository.ts b/.../environment/data/AssumptionRepository.ts → data/AssumptionRepository.ts
diff --git a/...ment/data/ConstraintCategoryRepository.ts → data/ConstraintCategoryRepository.ts b/...ment/data/ConstraintCategoryRepository.ts → data/ConstraintCategoryRepository.ts
diff --git a/.../environment/data/ConstraintRepository.ts → data/ConstraintRepository.ts b/.../environment/data/ConstraintRepository.ts → data/ConstraintRepository.ts
diff --git a/modules/environment/data/EffectRepository.ts → data/EffectRepository.ts b/modules/environment/data/EffectRepository.ts → data/EffectRepository.ts
diff --git a/...stem/data/FunctionalBehaviorRepository.ts → data/FunctionalBehaviorRepository.ts b/...stem/data/FunctionalBehaviorRepository.ts → data/FunctionalBehaviorRepository.ts
diff --git a/...nvironment/data/GlossaryTermRepository.ts → data/GlossaryTermRepository.ts b/...nvironment/data/GlossaryTermRepository.ts → data/GlossaryTermRepository.ts
diff --git a/modules/goals/data/GoalRepository.ts → data/GoalRepository.ts b/modules/goals/data/GoalRepository.ts → data/GoalRepository.ts
diff --git a/...s/environment/data/InvariantRepository.ts → data/InvariantRepository.ts b/...s/environment/data/InvariantRepository.ts → data/InvariantRepository.ts
diff --git a/modules/goals/data/LimitRepository.ts → data/LimitRepository.ts b/modules/goals/data/LimitRepository.ts → data/LimitRepository.ts
diff --git a/...m/data/NonFunctionalBehaviorRepository.ts → data/NonFunctionalBehaviorRepository.ts b/...m/data/NonFunctionalBehaviorRepository.ts → data/NonFunctionalBehaviorRepository.ts
diff --git a/modules/goals/data/ObstacleRepository.ts → data/ObstacleRepository.ts b/modules/goals/data/ObstacleRepository.ts → data/ObstacleRepository.ts
diff --git a/modules/goals/data/OutcomeRepository.ts → data/OutcomeRepository.ts b/modules/goals/data/OutcomeRepository.ts → data/OutcomeRepository.ts
diff --git a/modules/project/data/PersonRepository.ts → data/PersonRepository.ts b/modules/project/data/PersonRepository.ts → data/PersonRepository.ts
diff --git a/modules/solution/data/SolutionRepository.ts → data/SolutionRepository.ts b/modules/solution/data/SolutionRepository.ts → data/SolutionRepository.ts
diff --git a/...als/data/StakeholderCategoryRepository.ts → data/StakeholderCategoryRepository.ts b/...als/data/StakeholderCategoryRepository.ts → data/StakeholderCategoryRepository.ts
diff --git a/modules/goals/data/StakeholderRepository.ts → data/StakeholderRepository.ts b/modules/goals/data/StakeholderRepository.ts → data/StakeholderRepository.ts
diff --git a/...data/StakeholderSegmentationRepository.ts → data/StakeholderSegmentationRepository.ts b/...data/StakeholderSegmentationRepository.ts → data/StakeholderSegmentationRepository.ts
diff --git a/modules/system/data/UseCaseRepository.ts → data/UseCaseRepository.ts b/modules/system/data/UseCaseRepository.ts → data/UseCaseRepository.ts
diff --git a/modules/environment/domain/Assumption.ts → domain/Assumption.ts b/modules/environment/domain/Assumption.ts → domain/Assumption.ts
diff --git a/modules/system/domain/Behavior.ts → domain/Behavior.ts b/modules/system/domain/Behavior.ts → domain/Behavior.ts
diff --git a/modules/environment/domain/Constraint.ts → domain/Constraint.ts b/modules/environment/domain/Constraint.ts → domain/Constraint.ts
diff --git a/.../environment/domain/ConstraintCategory.ts → domain/ConstraintCategory.ts b/.../environment/domain/ConstraintCategory.ts → domain/ConstraintCategory.ts
diff --git a/modules/environment/domain/Effect.ts → domain/Effect.ts b/modules/environment/domain/Effect.ts → domain/Effect.ts
diff --git a/modules/system/domain/Example.ts → domain/Example.ts b/modules/system/domain/Example.ts → domain/Example.ts
diff --git a/modules/system/domain/FunctionalBehavior.ts → domain/FunctionalBehavior.ts b/modules/system/domain/FunctionalBehavior.ts → domain/FunctionalBehavior.ts
diff --git a/modules/environment/domain/GlossaryTerm.ts → domain/GlossaryTerm.ts b/modules/environment/domain/GlossaryTerm.ts → domain/GlossaryTerm.ts
diff --git a/modules/goals/domain/Goal.ts → domain/Goal.ts b/modules/goals/domain/Goal.ts → domain/Goal.ts
diff --git a/modules/goals/domain/Goals.ts → domain/Goals.ts b/modules/goals/domain/Goals.ts → domain/Goals.ts
diff --git a/modules/environment/domain/Invariant.ts → domain/Invariant.ts b/modules/environment/domain/Invariant.ts → domain/Invariant.ts
diff --git a/modules/goals/domain/Limit.ts → domain/Limit.ts b/modules/goals/domain/Limit.ts → domain/Limit.ts
@@ -1,4 +1,4 @@
-import Requirement from "../../../domain/Requirement";
+import Requirement from "./Requirement";
 
 /**
  * Exclusion from scope of requirements

diff --git a/...es/system/domain/NonFunctionalBehavior.ts → domain/NonFunctionalBehavior.ts b/...es/system/domain/NonFunctionalBehavior.ts → domain/NonFunctionalBehavior.ts
diff --git a/modules/goals/domain/Obstacle.ts → domain/Obstacle.ts b/modules/goals/domain/Obstacle.ts → domain/Obstacle.ts
diff --git a/modules/goals/domain/Outcome.ts → domain/Outcome.ts b/modules/goals/domain/Outcome.ts → domain/Outcome.ts
diff --git a/modules/project/domain/Person.ts → domain/Person.ts b/modules/project/domain/Person.ts → domain/Person.ts
diff --git a/domain/Scenario.ts b/domain/Scenario.ts
@@ -1,4 +1,4 @@
-import Example from "../modules/system/domain/Example";
+import Example from "./Example";
 import type { Properties } from "~/domain/Properties";
 import type { Uuid } from "~/domain/Uuid";
 

diff --git a/modules/solution/domain/Solution.ts → domain/Solution.ts b/modules/solution/domain/Solution.ts → domain/Solution.ts
@@ -1,6 +1,6 @@
 import Entity from "~/domain/Entity.js";
-import type { Properties } from "../../../domain/Properties.js";
-import type { Uuid } from "../../../domain/Uuid.js";
+import type { Properties } from "./Properties.js";
+import type { Uuid } from "./Uuid.js";
 import slugify from "~/lib/slugify.js";
 
 /**

diff --git a/modules/goals/domain/Stakeholder.ts → domain/Stakeholder.ts b/modules/goals/domain/Stakeholder.ts → domain/Stakeholder.ts
diff --git a/modules/goals/domain/StakeholderCategory.ts → domain/StakeholderCategory.ts b/modules/goals/domain/StakeholderCategory.ts → domain/StakeholderCategory.ts
diff --git a/...s/goals/domain/StakeholderSegmentation.ts → domain/StakeholderSegmentation.ts b/...s/goals/domain/StakeholderSegmentation.ts → domain/StakeholderSegmentation.ts
diff --git a/modules/system/domain/TestCase.ts → domain/TestCase.ts b/modules/system/domain/TestCase.ts → domain/TestCase.ts
diff --git a/modules/system/domain/UseCase.ts → domain/UseCase.ts b/modules/system/domain/UseCase.ts → domain/UseCase.ts
@@ -1,4 +1,4 @@
-import Scenario from "../../../domain/Scenario";
+import Scenario from "./Scenario";
 import type { Uuid } from "~/domain/Uuid";
 import type { Properties } from "~/domain/Properties";
 

diff --git a/middleware/solutionSlug.global.ts.disabled → middleware/solutionSlug.ts.disabled b/middleware/solutionSlug.global.ts.disabled → middleware/solutionSlug.ts.disabled
@@ -1,11 +1,11 @@
-import SolutionInteractor from "~/modules/solution/application/SolutionInteractor"
-import SolutionRepository from "~/modules/solution/data/SolutionRepository"
+import SolutionInteractor from "~/application/SolutionInteractor"
+import SolutionRepository from "~/data/SolutionRepository"
 
 export default defineNuxtRouteMiddleware(async (to, from) => {
-    const slug = to.params.solutionSlug
+    const slug = to.params.slug
 
     if (slug) {
-        solutionInteractor = new SolutionInteractor(new SolutionRepository()),
+        const solutionInteractor = new SolutionInteractor(new SolutionRepository()),
             solution = (await solutionInteractor.getAll({
                 slug: typeof slug === 'string' ? slug : slug[0]
             }))[0]

diff --git a/modules/environment/index.ts b/modules/environment/index.ts
diff --git a/modules/goals/index.ts b/modules/goals/index.ts
diff --git a/modules/project/index.ts b/modules/project/index.ts
diff --git a/modules/solution/index.ts b/modules/solution/index.ts
diff --git a/modules/solution/ui/pages/solution.vue b/modules/solution/ui/pages/solution.vue
diff --git a/modules/system/index.ts b/modules/system/index.ts
diff --git a/package.json b/package.json
@@ -20,7 +20,7 @@
         "//preview": "nuxt preview",
         "generate-pwa-assets": "pwa-assets-generator",
         "generate": "nuxt generate",
-        "dev": "nuxt dev --no-fork --https",
+        "dev": "nuxt dev --no-fork",
         "serve": "npx serve .output/public",
         "postinstall": "nuxt prepare",
         "typecheck": "nuxi typecheck"

diff --git a/...solution/ui/pages/solution/edit-entry.vue → pages/solution/[slug]/edit-entry.vue b/...solution/ui/pages/solution/edit-entry.vue → pages/solution/[slug]/edit-entry.vue
@@ -1,12 +1,14 @@
 <script lang="ts" setup>
 import slugify from '~/lib/slugify';
-import SolutionRepository from '~/modules/solution/data/SolutionRepository';
-import Solution from '../solution.vue';
-import SolutionInteractor from '~/modules/solution/application/SolutionInteractor';
+import SolutionRepository from '~/data/SolutionRepository';
+import SolutionInteractor from '~/application/SolutionInteractor';
+import Solution from '~/domain/Solution';
 
 useHead({ title: 'Edit Solution' })
+definePageMeta({ name: 'Edit Solution' })
 
-const slug = useRoute().params.solutionSlug as string,
+const router = useRouter(),
+    slug = useRoute().params.slug as string,
     solutionInteractor = new SolutionInteractor(new SolutionRepository()),
     solution = (await solutionInteractor.getAll({ slug }))[0],
     name = ref(solution.name),
@@ -21,7 +23,7 @@ const updateSolution = async () => {
         slug: newSlug.value
     });
 
-    router.push({ name: 'Solution', params: { solutionSlug: newSlug.value } });
+    router.push({ name: 'Solution', params: { slug: newSlug.value } });
 }
 
 const cancel = () => {

diff --git a/modules/environment/ui/pages/Assumptions.vue → ...lution/[slug]/environment/Assumptions.vue b/modules/environment/ui/pages/Assumptions.vue → ...lution/[slug]/environment/Assumptions.vue
@@ -1,15 +1,16 @@
 <script lang="ts" setup>
-import SolutionRepository from '~/modules/solution/data/SolutionRepository';
-import AssumptionRepository from '../../data/AssumptionRepository';
-import type Assumption from '../../domain/Assumption';
-import { FilterMatchMode } from 'primevue/api';
+import type Assumption from '~/domain/Assumption';
 import { emptyUuid, type Uuid } from '~/domain/Uuid';
-import SolutionInteractor from '~/modules/solution/application/SolutionInteractor';
-import AssumptionInteractor from '../../application/AssumptionInteractor';
+import SolutionRepository from '~/data/SolutionRepository';
+import AssumptionRepository from '~/data/AssumptionRepository';
+import SolutionInteractor from '~/application/SolutionInteractor';
+import AssumptionInteractor from '~/application/AssumptionInteractor';
+import { FilterMatchMode } from 'primevue/api';
 
 useHead({ title: 'Assumptions' })
+definePageMeta({ name: 'Assumptions' })
 
-const slug = useRoute().params.solutionSlug as string,
+const slug = useRoute().params.slug as string,
     solutionInteractor = new SolutionInteractor(new SolutionRepository()),
     solution = (await solutionInteractor.getAll({ slug }))[0],
     solutionId = solution.id,

diff --git a/modules/environment/ui/pages/Components.vue → ...olution/[slug]/environment/Components.vue b/modules/environment/ui/pages/Components.vue → ...olution/[slug]/environment/Components.vue
@@ -1,15 +1,16 @@
 <script lang="ts" setup>
 import { FilterMatchMode } from 'primevue/api';
 import { emptyUuid, type Uuid } from '~/domain/Uuid';
-import SolutionRepository from '~/modules/solution/data/SolutionRepository';
+import SolutionRepository from '~/data/SolutionRepository';
 import type Component from '~/domain/Component';
-import SolutionInteractor from '~/modules/solution/application/SolutionInteractor';
+import SolutionInteractor from '~/application/SolutionInteractor';
 import ComponentRepository from '~/data/ComponentRepository';
 import ComponentInteractor from '~/application/ComponentInteractor';
 
 useHead({ title: 'Components' })
+definePageMeta({ name: 'Components' })
 
-const slug = useRoute().params.solutionSlug as string,
+const slug = useRoute().params.slug as string,
     solutionInteractor = new SolutionInteractor(new SolutionRepository()),
     componentInteractor = new ComponentInteractor(new ComponentRepository()),
     solution = (await solutionInteractor.getAll({ slug }))[0],

diff --git a/modules/environment/ui/pages/Constraints.vue → ...lution/[slug]/environment/Constraints.vue b/modules/environment/ui/pages/Constraints.vue → ...lution/[slug]/environment/Constraints.vue
@@ -1,18 +1,19 @@
 <script lang="ts" setup>
-import SolutionRepository from '~/modules/solution/data/SolutionRepository';
+import SolutionRepository from '~/data/SolutionRepository';
 import { FilterMatchMode } from 'primevue/api';
 import { emptyUuid, type Uuid } from '~/domain/Uuid';
-import ConstraintRepository from '../../data/ConstraintRepository';
-import type Constraint from '../../domain/Constraint';
-import SolutionInteractor from '~/modules/solution/application/SolutionInteractor';
-import ConstraintCategoryRepository from '../../data/ConstraintCategoryRepository';
-import ConstraintInteractor from '../../application/ConstraintInteractor';
-import type ConstraintCategory from '../../domain/ConstraintCategory';
-import ConstraintCategoryInteractor from '../../application/ConstraintCategoryInteractor';
+import ConstraintRepository from '~/data/ConstraintRepository';
+import type Constraint from '~/domain/Constraint';
+import SolutionInteractor from '~/application/SolutionInteractor';
+import ConstraintCategoryRepository from '~/data/ConstraintCategoryRepository';
+import ConstraintInteractor from '~/application/ConstraintInteractor';
+import type ConstraintCategory from '~/domain/ConstraintCategory';
+import ConstraintCategoryInteractor from '~/application/ConstraintCategoryInteractor';
 
 useHead({ title: 'Constraints' })
+definePageMeta({ name: 'Constraints' })
 
-const slug = useRoute().params.solutionSlug as string,
+const slug = useRoute().params.slug as string,
     solutionInteractor = new SolutionInteractor(new SolutionRepository()),
     solution = (await solutionInteractor.getAll({ slug }))[0],
     solutionId = solution.id,

diff --git a/modules/environment/ui/pages/Effects.vue → ...s/solution/[slug]/environment/Effects.vue b/modules/environment/ui/pages/Effects.vue → ...s/solution/[slug]/environment/Effects.vue
@@ -1,15 +1,16 @@
 <script lang="ts" setup>
 import { FilterMatchMode } from 'primevue/api';
 import { emptyUuid, type Uuid } from '~/domain/Uuid';
-import SolutionRepository from '~/modules/solution/data/SolutionRepository';
-import EffectRepository from '../../data/EffectRepository';
-import type Effect from '../../domain/Effect';
-import SolutionInteractor from '~/modules/solution/application/SolutionInteractor';
-import EffectInteractor from '../../application/EffectInteractor';
+import SolutionRepository from '~/data/SolutionRepository';
+import EffectRepository from '~/data/EffectRepository';
+import type Effect from '~/domain/Effect';
+import SolutionInteractor from '~/application/SolutionInteractor';
+import EffectInteractor from '~/application/EffectInteractor';
 
 useHead({ title: 'Effects' })
+definePageMeta({ name: 'Effects' })
 
-const slug = useRoute().params.solutionSlug as string,
+const slug = useRoute().params.slug as string,
     solutionInteractor = new SolutionInteractor(new SolutionRepository()),
     solution = (await solutionInteractor.getAll({ slug }))[0],
     solutionId = solution.id,

diff --git a/modules/environment/ui/pages/Glossary.vue → .../solution/[slug]/environment/Glossary.vue b/modules/environment/ui/pages/Glossary.vue → .../solution/[slug]/environment/Glossary.vue
@@ -1,15 +1,16 @@
 <script lang="ts" setup>
-import SolutionRepository from '~/modules/solution/data/SolutionRepository';
-import GlossaryTermRepository from '../../data/GlossaryTermRepository';
-import type GlossaryTerm from '../../domain/GlossaryTerm';
+import SolutionRepository from '~/data/SolutionRepository';
+import GlossaryTermRepository from '~/data/GlossaryTermRepository';
+import type GlossaryTerm from '~/domain/GlossaryTerm';
 import { FilterMatchMode } from 'primevue/api';
 import { emptyUuid, type Uuid } from '~/domain/Uuid';
-import SolutionInteractor from '~/modules/solution/application/SolutionInteractor';
-import GlossaryTermInteractor from '../../application/GlossaryTermInteractor';
+import SolutionInteractor from '~/application/SolutionInteractor';
+import GlossaryTermInteractor from '~/application/GlossaryTermInteractor';
 
 useHead({ title: 'Glossary' })
+definePageMeta({ name: 'Glossary' })
 
-const slug = useRoute().params.solutionSlug as string,
+const slug = useRoute().params.slug as string,
     glossaryTermRepository = new GlossaryTermRepository(),
     solutionInteractor = new SolutionInteractor(new SolutionRepository()),
     glossaryTermInteractor = new GlossaryTermInteractor(glossaryTermRepository),

diff --git a/modules/environment/ui/pages/Invariants.vue → ...olution/[slug]/environment/Invariants.vue b/modules/environment/ui/pages/Invariants.vue → ...olution/[slug]/environment/Invariants.vue
@@ -1,15 +1,16 @@
 <script lang="ts" setup>
 import { FilterMatchMode } from 'primevue/api';
 import { emptyUuid, type Uuid } from '~/domain/Uuid';
-import SolutionRepository from '~/modules/solution/data/SolutionRepository';
-import InvariantRepository from '../../data/InvariantRepository';
-import type Invariant from '../../domain/Invariant';
-import SolutionInteractor from '~/modules/solution/application/SolutionInteractor';
-import InvariantInteractor from '../../application/InvariantInteractor';
+import SolutionRepository from '~/data/SolutionRepository';
+import InvariantRepository from '~/data/InvariantRepository';
+import type Invariant from '~/domain/Invariant';
+import SolutionInteractor from '~/application/SolutionInteractor';
+import InvariantInteractor from '~/application/InvariantInteractor';
 
 useHead({ title: 'Invariants' })
+definePageMeta({ name: 'Invariants' })
 
-const slug = useRoute().params.solutionSlug as string,
+const slug = useRoute().params.slug as string,
     solutionInteractor = new SolutionInteractor(new SolutionRepository()),
     solution = (await solutionInteractor.getAll({ slug }))[0],
     solutionId = solution.id,