diff options
author | Zero~Informatique | 2020-01-31 09:17:57 +0100 |
---|---|---|
committer | Zero~Informatique | 2020-01-31 09:27:06 +0100 |
commit | 170da2d55fec0359cbac780786383710b734eda7 (patch) | |
tree | eb6fe6f60e9b83a9e5886b504aa65521711fd4a3 /viewer | |
parent | a7d459a2620fa9523dd7ce8c9de519133ad5b1b7 (diff) | |
download | ldgallery-170da2d55fec0359cbac780786383710b734eda7.tar.gz |
viewer: code cleaning, moved some views to components
Diffstat (limited to 'viewer')
-rw-r--r-- | viewer/package.json | 2 | ||||
-rw-r--r-- | viewer/src/@types/Operation.ts (renamed from viewer/src/@types/tag/Operation.ts) | 0 | ||||
-rw-r--r-- | viewer/src/@types/gallery.d.ts (renamed from viewer/src/@types/gallery/index.d.ts) | 0 | ||||
-rw-r--r-- | viewer/src/@types/tag.d.ts (renamed from viewer/src/@types/tag/index.d.ts) | 0 | ||||
-rw-r--r-- | viewer/src/components/LdBreadcrumb.vue (renamed from viewer/src/views/TopBreadcrumb.vue) | 2 | ||||
-rw-r--r-- | viewer/src/components/LdCommand.vue (renamed from viewer/src/views/TopCommand.vue) | 2 | ||||
-rw-r--r-- | viewer/src/components/LdPicture.vue (renamed from viewer/src/views/GalleryPicture.vue) | 2 | ||||
-rw-r--r-- | viewer/src/components/LdProposition.vue | 4 | ||||
-rw-r--r-- | viewer/src/components/LdTagInput.vue | 2 | ||||
-rw-r--r-- | viewer/src/components/LdThumbnail.vue (renamed from viewer/src/views/GalleryThumbnail.vue) | 2 | ||||
-rw-r--r-- | viewer/src/views/GalleryDirectory.vue | 8 | ||||
-rw-r--r-- | viewer/src/views/GallerySearch.vue | 7 | ||||
-rw-r--r-- | viewer/src/views/MainGallery.vue | 10 | ||||
-rw-r--r-- | viewer/src/views/PanelTop.vue | 13 |
14 files changed, 21 insertions, 33 deletions
diff --git a/viewer/package.json b/viewer/package.json index f5ff0fc..1521dc5 100644 --- a/viewer/package.json +++ b/viewer/package.json | |||
@@ -47,4 +47,4 @@ | |||
47 | "vue-cli-plugin-i18n": "^0.6.1", | 47 | "vue-cli-plugin-i18n": "^0.6.1", |
48 | "vue-template-compiler": "^2.6.10" | 48 | "vue-template-compiler": "^2.6.10" |
49 | } | 49 | } |
50 | } \ No newline at end of file | 50 | } |
diff --git a/viewer/src/@types/tag/Operation.ts b/viewer/src/@types/Operation.ts index f1e7a41..f1e7a41 100644 --- a/viewer/src/@types/tag/Operation.ts +++ b/viewer/src/@types/Operation.ts | |||
diff --git a/viewer/src/@types/gallery/index.d.ts b/viewer/src/@types/gallery.d.ts index b112b6d..b112b6d 100644 --- a/viewer/src/@types/gallery/index.d.ts +++ b/viewer/src/@types/gallery.d.ts | |||
diff --git a/viewer/src/@types/tag/index.d.ts b/viewer/src/@types/tag.d.ts index 1d5df88..1d5df88 100644 --- a/viewer/src/@types/tag/index.d.ts +++ b/viewer/src/@types/tag.d.ts | |||
diff --git a/viewer/src/views/TopBreadcrumb.vue b/viewer/src/components/LdBreadcrumb.vue index 9104b80..8c5b7eb 100644 --- a/viewer/src/views/TopBreadcrumb.vue +++ b/viewer/src/components/LdBreadcrumb.vue | |||
@@ -34,7 +34,7 @@ import { Component, Vue } from "vue-property-decorator"; | |||
34 | import Tools from "@/tools"; | 34 | import Tools from "@/tools"; |
35 | 35 | ||
36 | @Component | 36 | @Component |
37 | export default class TopBreadcrumb extends Vue { | 37 | export default class LdBreadcrumb extends Vue { |
38 | getIcon(item: Gallery.Item) { | 38 | getIcon(item: Gallery.Item) { |
39 | return Tools.getIcon(item); | 39 | return Tools.getIcon(item); |
40 | } | 40 | } |
diff --git a/viewer/src/views/TopCommand.vue b/viewer/src/components/LdCommand.vue index dc79fa7..484e56a 100644 --- a/viewer/src/views/TopCommand.vue +++ b/viewer/src/components/LdCommand.vue | |||
@@ -40,7 +40,7 @@ import { Component, Vue } from "vue-property-decorator"; | |||
40 | import { RawLocation } from "vue-router"; | 40 | import { RawLocation } from "vue-router"; |
41 | 41 | ||
42 | @Component | 42 | @Component |
43 | export default class TopCommand extends Vue { | 43 | export default class LdCommand extends Vue { |
44 | commandTagsIcon(): string { | 44 | commandTagsIcon(): string { |
45 | return this.$uiStore.fullWidth ? "tags" : "window-close"; | 45 | return this.$uiStore.fullWidth ? "tags" : "window-close"; |
46 | } | 46 | } |
diff --git a/viewer/src/views/GalleryPicture.vue b/viewer/src/components/LdPicture.vue index 9f26282..b6a719f 100644 --- a/viewer/src/views/GalleryPicture.vue +++ b/viewer/src/components/LdPicture.vue | |||
@@ -33,7 +33,7 @@ | |||
33 | import { Component, Vue, Prop } from "vue-property-decorator"; | 33 | import { Component, Vue, Prop } from "vue-property-decorator"; |
34 | 34 | ||
35 | @Component | 35 | @Component |
36 | export default class GalleryPicture extends Vue { | 36 | export default class LdPicture extends Vue { |
37 | @Prop({ required: true }) readonly picture!: Gallery.Picture; | 37 | @Prop({ required: true }) readonly picture!: Gallery.Picture; |
38 | 38 | ||
39 | dragging: boolean = false; | 39 | dragging: boolean = false; |
diff --git a/viewer/src/components/LdProposition.vue b/viewer/src/components/LdProposition.vue index a380021..6be0aee 100644 --- a/viewer/src/components/LdProposition.vue +++ b/viewer/src/components/LdProposition.vue | |||
@@ -37,10 +37,10 @@ | |||
37 | 37 | ||
38 | <script lang="ts"> | 38 | <script lang="ts"> |
39 | import { Component, Vue } from "vue-property-decorator"; | 39 | import { Component, Vue } from "vue-property-decorator"; |
40 | import { Operation } from "@/@types/tag/Operation"; | 40 | import { Operation } from "@/@types/Operation"; |
41 | 41 | ||
42 | @Component | 42 | @Component |
43 | export default class LdTagInput extends Vue { | 43 | export default class LdProposition extends Vue { |
44 | get Operation() { | 44 | get Operation() { |
45 | return Operation; | 45 | return Operation; |
46 | } | 46 | } |
diff --git a/viewer/src/components/LdTagInput.vue b/viewer/src/components/LdTagInput.vue index 7bbecec..eff02e6 100644 --- a/viewer/src/components/LdTagInput.vue +++ b/viewer/src/components/LdTagInput.vue | |||
@@ -40,7 +40,7 @@ | |||
40 | 40 | ||
41 | <script lang="ts"> | 41 | <script lang="ts"> |
42 | import { Component, Vue } from "vue-property-decorator"; | 42 | import { Component, Vue } from "vue-property-decorator"; |
43 | import { Operation } from "@/@types/tag/Operation"; | 43 | import { Operation } from "@/@types/Operation"; |
44 | import Tools from "@/tools"; | 44 | import Tools from "@/tools"; |
45 | 45 | ||
46 | @Component | 46 | @Component |
diff --git a/viewer/src/views/GalleryThumbnail.vue b/viewer/src/components/LdThumbnail.vue index 2a372cd..44a4c00 100644 --- a/viewer/src/views/GalleryThumbnail.vue +++ b/viewer/src/components/LdThumbnail.vue | |||
@@ -39,7 +39,7 @@ import { Component, Vue, Prop } from "vue-property-decorator"; | |||
39 | import Tools from "@/tools"; | 39 | import Tools from "@/tools"; |
40 | 40 | ||
41 | @Component | 41 | @Component |
42 | export default class GalleryThumbnail extends Vue { | 42 | export default class LdThumbnail extends Vue { |
43 | @Prop({ required: true }) readonly item!: Gallery.Item; | 43 | @Prop({ required: true }) readonly item!: Gallery.Item; |
44 | 44 | ||
45 | loading: boolean = false; | 45 | loading: boolean = false; |
diff --git a/viewer/src/views/GalleryDirectory.vue b/viewer/src/views/GalleryDirectory.vue index d01032d..baf627e 100644 --- a/viewer/src/views/GalleryDirectory.vue +++ b/viewer/src/views/GalleryDirectory.vue | |||
@@ -21,7 +21,7 @@ | |||
21 | <div class="thumbnail-tiles"> | 21 | <div class="thumbnail-tiles"> |
22 | <div v-for="(item) in orderedItems" :key="item.path"> | 22 | <div v-for="(item) in orderedItems" :key="item.path"> |
23 | <router-link :to="item.path"> | 23 | <router-link :to="item.path"> |
24 | <gallery-thumbnail :item="item" /> | 24 | <ld-thumbnail :item="item" /> |
25 | </router-link> | 25 | </router-link> |
26 | </div> | 26 | </div> |
27 | <div> | 27 | <div> |
@@ -33,12 +33,8 @@ | |||
33 | <script lang="ts"> | 33 | <script lang="ts"> |
34 | import { Component, Vue, Prop } from "vue-property-decorator"; | 34 | import { Component, Vue, Prop } from "vue-property-decorator"; |
35 | import Tools from "@/tools"; | 35 | import Tools from "@/tools"; |
36 | import GalleryThumbnail from "./GalleryThumbnail.vue"; | ||
37 | import Gallery from "./Gallery.vue"; | ||
38 | 36 | ||
39 | @Component({ | 37 | @Component |
40 | components: { GalleryThumbnail }, | ||
41 | }) | ||
42 | export default class GalleryDirectory extends Vue { | 38 | export default class GalleryDirectory extends Vue { |
43 | @Prop({ required: true }) readonly directory!: Gallery.Directory; | 39 | @Prop({ required: true }) readonly directory!: Gallery.Directory; |
44 | 40 | ||
diff --git a/viewer/src/views/GallerySearch.vue b/viewer/src/views/GallerySearch.vue index 870d3e2..4e843b9 100644 --- a/viewer/src/views/GallerySearch.vue +++ b/viewer/src/views/GallerySearch.vue | |||
@@ -21,7 +21,7 @@ | |||
21 | <div class="thumbnail-tiles"> | 21 | <div class="thumbnail-tiles"> |
22 | <div v-for="(item) in items" :key="item.path"> | 22 | <div v-for="(item) in items" :key="item.path"> |
23 | <router-link :to="item.path" @click.native="$uiStore.setModeNavigation()"> | 23 | <router-link :to="item.path" @click.native="$uiStore.setModeNavigation()"> |
24 | <gallery-thumbnail :item="item" /> | 24 | <ld-thumbnail :item="item" /> |
25 | </router-link> | 25 | </router-link> |
26 | </div> | 26 | </div> |
27 | <div v-if="items.length===0">{{$t('search.no-results')}}</div> | 27 | <div v-if="items.length===0">{{$t('search.no-results')}}</div> |
@@ -33,11 +33,8 @@ | |||
33 | 33 | ||
34 | <script lang="ts"> | 34 | <script lang="ts"> |
35 | import { Component, Vue, Prop } from "vue-property-decorator"; | 35 | import { Component, Vue, Prop } from "vue-property-decorator"; |
36 | import GalleryThumbnail from "./GalleryThumbnail.vue"; | ||
37 | 36 | ||
38 | @Component({ | 37 | @Component |
39 | components: { GalleryThumbnail }, | ||
40 | }) | ||
41 | export default class GalleryPicture extends Vue { | 38 | export default class GalleryPicture extends Vue { |
42 | @Prop({ required: true }) readonly items!: Gallery.Item[]; | 39 | @Prop({ required: true }) readonly items!: Gallery.Item[]; |
43 | } | 40 | } |
diff --git a/viewer/src/views/MainGallery.vue b/viewer/src/views/MainGallery.vue index 06cf512..5767cce 100644 --- a/viewer/src/views/MainGallery.vue +++ b/viewer/src/views/MainGallery.vue | |||
@@ -21,21 +21,23 @@ | |||
21 | <div> | 21 | <div> |
22 | <gallery-search v-if="$uiStore.isModeSearch" :items="currentSearch" /> | 22 | <gallery-search v-if="$uiStore.isModeSearch" :items="currentSearch" /> |
23 | <gallery-directory v-else-if="checkType('directory')" :directory="$galleryStore.currentItem" /> | 23 | <gallery-directory v-else-if="checkType('directory')" :directory="$galleryStore.currentItem" /> |
24 | <gallery-picture v-else-if="checkType('picture')" :picture="$galleryStore.currentItem" /> | 24 | <ld-picture v-else-if="checkType('picture')" :picture="$galleryStore.currentItem" /> |
25 | <div v-else>{{$t("gallery.unknowntype")}}</div> | 25 | <div v-else>{{$t("gallery.unknowntype")}}</div> |
26 | </div> | 26 | </div> |
27 | </template> | 27 | </template> |
28 | 28 | ||
29 | <script lang="ts"> | 29 | <script lang="ts"> |
30 | import { Component, Vue, Prop, Watch } from "vue-property-decorator"; | 30 | import { Component, Vue, Prop, Watch } from "vue-property-decorator"; |
31 | import { Operation } from "@/@types/tag/Operation"; | 31 | import { Operation } from "@/@types/Operation"; |
32 | import Tools from "@/tools"; | 32 | import Tools from "@/tools"; |
33 | import GallerySearch from "./GallerySearch.vue"; | 33 | import GallerySearch from "./GallerySearch.vue"; |
34 | import GalleryDirectory from "./GalleryDirectory.vue"; | 34 | import GalleryDirectory from "./GalleryDirectory.vue"; |
35 | import GalleryPicture from "./GalleryPicture.vue"; | ||
36 | 35 | ||
37 | @Component({ | 36 | @Component({ |
38 | components: { GallerySearch, GalleryDirectory, GalleryPicture }, | 37 | components: { |
38 | GallerySearch, | ||
39 | GalleryDirectory, | ||
40 | }, | ||
39 | }) | 41 | }) |
40 | export default class Gallery extends Vue { | 42 | export default class Gallery extends Vue { |
41 | @Prop(String) readonly pathMatch!: string; | 43 | @Prop(String) readonly pathMatch!: string; |
diff --git a/viewer/src/views/PanelTop.vue b/viewer/src/views/PanelTop.vue index 3553789..60722cd 100644 --- a/viewer/src/views/PanelTop.vue +++ b/viewer/src/views/PanelTop.vue | |||
@@ -19,22 +19,15 @@ | |||
19 | 19 | ||
20 | <template> | 20 | <template> |
21 | <div class="flex"> | 21 | <div class="flex"> |
22 | <top-command /> |