Skip to content

Commit

Permalink
Remove inversify.
Browse files Browse the repository at this point in the history
  • Loading branch information
RillingDev committed Nov 6, 2022
1 parent 9f715d7 commit 93cce25
Show file tree
Hide file tree
Showing 75 changed files with 419 additions and 751 deletions.
22 changes: 0 additions & 22 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,12 @@
"bootstrap": "^4.6.1",
"bootstrap-vue": "^2.21.2",
"html2canvas": "^1.4.1",
"inversify": "^6.0.1",
"lightdash": "^13.0.3",
"lodash": "^4.17.21",
"lodash-es": "^4.17.21",
"loglevel": "^1.8.0",
"pako": "^2.0.4",
"pinia": "^2.0.23",
"reflect-metadata": "^0.1.13",
"tippy.js": "^6.3.7",
"vue": "^2.7.13",
"vue-select": "^3.18.3",
Expand Down
12 changes: 2 additions & 10 deletions src/application/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,18 @@
</template>

<script lang="ts">
import type { CardDatabase } from "@/core/lib";
import { getLogger, TYPES } from "@/core/lib";
import { getLogger } from "@/core/lib";
import { applicationContainer } from "./inversify.config";
import { APPLICATION_TYPES } from "./types";
import { defineComponent, onMounted } from "vue";
import { BOverlay } from "bootstrap-vue";
import { showError, useToast } from "./composition/feedback";
import YgoDeck from "./components/deck/YgoDeck.vue";
import YgoBuilder from "./components/builder/YgoBuilder.vue";
import YgoToolbar from "./components/toolbar/YgoToolbar.vue";
import type { DeckUrlController } from "./controller/DeckUrlController";
import { useDataStore } from "@/application/store/data";
import { useDeckStore } from "@/application/store/deck";
import { storeToRefs } from "pinia";
const cardDatabase = applicationContainer.get<CardDatabase>(TYPES.CardDatabase);
const deckUrlController = applicationContainer.get<DeckUrlController>(
APPLICATION_TYPES.DeckUrlController
);
import { cardDatabase, deckUrlController } from "@/application/container";
const logger = getLogger("App");
Expand Down
8 changes: 3 additions & 5 deletions src/application/bridge.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { Card, CardDatabase, Deck } from "@/core/lib";
import { DeckPart, FindCardBy, getLogger, TYPES } from "@/core/lib";
import type { Card, Deck } from "@/core/lib";
import { DeckPart, FindCardBy, getLogger } from "@/core/lib";
import type {
ApplicationApi,
ApplicationEvent,
Expand All @@ -8,15 +8,13 @@ import type {
ExternalDeck,
SlimExternalCard,
} from "./api";
import { applicationContainer } from "@/application/inversify.config";
import { useDataStore } from "@/application/store/data";
import { useDeckStore } from "@/application/store/deck";
import { getExistingElseThrow } from "lightdash";
import { cardDatabase } from "@/application/container";

const logger = getLogger("bridge");

const cardDatabase = applicationContainer.get<CardDatabase>(TYPES.CardDatabase);

const toExternalDeck = ({ name, parts }: Deck): ExternalDeck<ExternalCard> => {
return {
name,
Expand Down
8 changes: 1 addition & 7 deletions src/application/components/YgoCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,7 @@
import type { PropType } from "vue";
import { computed, defineComponent } from "vue";
import type { Card } from "@/core/lib";
import type { ResourceService } from "@/ygoprodeck/lib";
import { YGOPRODECK_TYPES } from "@/ygoprodeck/lib";
import { applicationContainer } from "../inversify.config";
const resourceService = applicationContainer.get<ResourceService>(
YGOPRODECK_TYPES.ResourceService
);
import { resourceService } from "@/application/container";
export default defineComponent({
components: {},
Expand Down
34 changes: 8 additions & 26 deletions src/application/components/YgoFilter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -191,54 +191,36 @@

<script lang="ts">
import type {
BanlistService,
BanState,
CardDatabase,
CardFilter,
CardPredicate,
CardPredicateService,
CardSet,
CardType,
EnvironmentConfig,
FilterService,
} from "@/core/lib";
import {
CardTypeCategory,
DEFAULT_BAN_STATE_ARR,
Environment,
TYPES,
} from "@/core/lib";
import type { PropType } from "vue";
import { computed, defineComponent, reactive, readonly, watch } from "vue";
import { clone } from "lodash";
import VSelect from "vue-select";
import { applicationContainer } from "../inversify.config";
import YgoCollectionFilter from "./yugiohprodeck/YgoCollectionFilter.vue";
import type { YgoprodeckController } from "../controller/YgoprodeckController";
import { APPLICATION_TYPES } from "../types";
import { useId } from "@/application/composition/id";
import { useDataStore } from "@/application/store/data";
import { useFormatStore } from "@/application/store/format";
import { useCollectionStore } from "@/application/store/collection";
import { storeToRefs } from "pinia";
const cardPredicateService = applicationContainer.get<CardPredicateService>(
TYPES.CardPredicateService
);
const cardDatabase = applicationContainer.get<CardDatabase>(TYPES.CardDatabase);
const banlistService = applicationContainer.get<BanlistService>(
TYPES.BanlistService
);
const filterService = applicationContainer.get<FilterService>(
TYPES.FilterService
);
const environmentConfig = applicationContainer.get<EnvironmentConfig>(
TYPES.EnvironmentConfig
);
const ygoprodeckController = applicationContainer.get<YgoprodeckController>(
APPLICATION_TYPES.YgoprodeckController
);
import {
banlistService,
cardDatabase,
cardPredicateService,
environmentConfig,
filterService,
ygoprodeckController,
} from "@/application/container";
export default defineComponent({
components: {
Expand Down
15 changes: 3 additions & 12 deletions src/application/components/YgoPrice.vue
Original file line number Diff line number Diff line change
Expand Up @@ -41,21 +41,12 @@
</template>

<script lang="ts">
import { applicationContainer } from "../inversify.config";
import type {
Card,
CardService,
PriceLookupResult,
PriceService,
Vendor,
} from "@/core/lib";
import { DEFAULT_VENDOR_ARR, TYPES } from "@/core/lib";
import type { Card, PriceLookupResult, Vendor } from "@/core/lib";
import { DEFAULT_VENDOR_ARR } from "@/core/lib";
import type { PropType } from "vue";
import { computed, defineComponent, ref } from "vue";
import { BTooltip } from "bootstrap-vue";
const priceService = applicationContainer.get<PriceService>(TYPES.PriceService);
const cardService = applicationContainer.get<CardService>(TYPES.CardService);
import { cardService, priceService } from "@/tooltip/container";
export default defineComponent({
components: { BTooltip },
Expand Down
30 changes: 8 additions & 22 deletions src/application/components/builder/YgoBuilder.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,8 @@
</template>

<script lang="ts">
import { applicationContainer } from "../../inversify.config";
import type {
Card,
CardDatabase,
CardFilter,
CardPredicateService,
FilterService,
SortingOptions,
SortingService,
} from "@/core/lib";
import { SortingOrder, SortingStrategy, TYPES } from "@/core/lib";
import type { Card, CardFilter, SortingOptions } from "@/core/lib";
import { SortingOrder, SortingStrategy } from "@/core/lib";
import YgoFilter from "../YgoFilter.vue";
import YgoSortingOptions from "./YgoSortingOptions.vue";
import YgoBuilderMatches from "./YgoBuilderMatches.vue";
Expand All @@ -44,17 +35,12 @@ import { BSidebar } from "bootstrap-vue";
import { useDataStore } from "@/application/store/data";
import { useFormatStore } from "@/application/store/format";
import { storeToRefs } from "pinia";
const cardDatabase = applicationContainer.get<CardDatabase>(TYPES.CardDatabase);
const sortingService = applicationContainer.get<SortingService>(
TYPES.SortingService
);
const filterService = applicationContainer.get<FilterService>(
TYPES.FilterService
);
const cardPredicateService = applicationContainer.get<CardPredicateService>(
TYPES.CardPredicateService
);
import {
cardDatabase,
cardPredicateService,
filterService,
sortingService,
} from "@/application/container";
export default defineComponent({
components: {
Expand Down
8 changes: 3 additions & 5 deletions src/application/components/builder/YgoBuilderMatches.vue
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@
import type { PropType } from "vue";
import { computed, defineComponent } from "vue";
import { browserSupportsTouch } from "@/browser-common/lib";
import type { Card, DeckService } from "@/core/lib";
import { CardTypeCategory, TYPES } from "@/core/lib";
import type { Card } from "@/core/lib";
import { CardTypeCategory } from "@/core/lib";
import Draggable from "vuedraggable";
import type { DraggableMoveValidatorData } from "../../composition/dragging";
import {
Expand All @@ -76,14 +76,12 @@ import {
import { showSuccess, useToast } from "../../composition/feedback";
import { useInfiniteScrolling } from "../../composition/infiniteScrolling";
import { useTooltip } from "../../composition/tooltip";
import { applicationContainer } from "../../inversify.config";
import YgoCard from "../YgoCard.vue";
import { useDeckStore } from "@/application/store/deck";
import { useCollectionStore } from "@/application/store/collection";
import { useFormatStore } from "@/application/store/format";
import { storeToRefs } from "pinia";
const deckService = applicationContainer.get<DeckService>(TYPES.DeckService);
import { deckService } from "@/application/container";
export default defineComponent({
components: {
Expand Down
8 changes: 3 additions & 5 deletions src/application/components/deck/YgoDeck.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,15 @@
</div>
</template>
<script lang="ts">
import type { DeckPart, DeckService } from "@/core/lib";
import { DECK_PART_ARR, TYPES } from "@/core/lib";
import type { DeckPart } from "@/core/lib";
import { DECK_PART_ARR } from "@/core/lib";
import type { PropType } from "vue";
import { computed, defineComponent, readonly } from "vue";
import YgoPrice from "../YgoPrice.vue";
import { applicationContainer } from "../../inversify.config";
import YgoDeckPart from "./YgoDeckPart.vue";
import { useDeckStore } from "@/application/store/deck";
import { storeToRefs } from "pinia";
const deckService = applicationContainer.get<DeckService>(TYPES.DeckService);
import { deckService } from "@/application/container";
export default defineComponent({
components: {
Expand Down
13 changes: 3 additions & 10 deletions src/application/components/deck/YgoDeckPart.vue
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
<script lang="ts">
import type { PropType } from "vue";
import { computed, defineComponent } from "vue";
import type { Card, DeckPart, DeckPartConfig, DeckService } from "@/core/lib";
import { DefaultDeckPartConfig, getLogger, TYPES } from "@/core/lib";
import type { Card, DeckPart, DeckPartConfig } from "@/core/lib";
import { DefaultDeckPartConfig, getLogger } from "@/core/lib";
import Draggable from "vuedraggable";
import type {
DraggableChangeEventData,
Expand All @@ -55,19 +55,12 @@ import {
findDeckPartForDraggableValidatorData,
} from "../../composition/dragging";
import { useTooltip } from "../../composition/tooltip";
import type { DeckController } from "../../controller/DeckController";
import { applicationContainer } from "../../inversify.config";
import { APPLICATION_TYPES } from "../../types";
import YgoCard from "../YgoCard.vue";
import YgoPrice from "../YgoPrice.vue";
import { useDeckStore } from "@/application/store/deck";
import { useFormatStore } from "@/application/store/format";
import { storeToRefs } from "pinia";
const deckController = applicationContainer.get<DeckController>(
APPLICATION_TYPES.DeckController
);
const deckService = applicationContainer.get<DeckService>(TYPES.DeckService);
import { deckController, deckService } from "@/application/container";
const logger = getLogger("YgoDeckPart");
Expand Down
12 changes: 2 additions & 10 deletions src/application/components/toolbar/YgoBuyLink.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,10 @@

<script lang="ts">
import { computed, defineComponent } from "vue";
import type { DeckExportService, EnvironmentConfig } from "@/core/lib";
import { Environment, TYPES } from "@/core/lib";
import { applicationContainer } from "../../inversify.config";
import { Environment } from "@/core/lib";
import { useDeckStore } from "@/application/store/deck";
import { storeToRefs } from "pinia";
const deckExportService = applicationContainer.get<DeckExportService>(
TYPES.DeckExportService
);
const environmentConfig = applicationContainer.get<EnvironmentConfig>(
TYPES.EnvironmentConfig
);
import { deckExportService, environmentConfig } from "@/application/container";
export default defineComponent({
components: {},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,13 @@

<script lang="ts">
import { defineComponent } from "vue";
import { DeckFileService, TYPES } from "@/core/lib";
import { applicationContainer } from "../../../inversify.config";
import { DeckFileService } from "@/core/lib";
import { BDropdownItemButton } from "bootstrap-vue";
import { downloadFile } from "../../../composition/io/downloadFile";
import { showSuccess, useToast } from "../../../composition/feedback";
import { useDeckStore } from "@/application/store/deck";
import { storeToRefs } from "pinia";
const deckFileService = applicationContainer.get<DeckFileService>(
TYPES.DeckFileService
);
import { deckFileService } from "@/application/container";
export default defineComponent({
components: { BDropdownItemButton },
Expand Down

0 comments on commit 93cce25

Please sign in to comment.