diff --git a/package-lock.json b/package-lock.json index 74d6e6b2..27f5b6a9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,9 +31,7 @@ "uuid": "3.4.0", "vee-validate": "3.2.4", "vue": "2.7.14", - "vue-awesome": "4.0.2", "vue-flatpickr-component": "8.1.5", - "vue-gtag": "1.1.2", "vue-i18n": "8.15.3", "vue-matomo": "^4.2.0", "vue-router": "3.1.5", @@ -26795,11 +26793,6 @@ "dev": true, "optional": true }, - "node_modules/nanoid": { - "version": "2.1.11", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-2.1.11.tgz", - "integrity": "sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA==" - }, "node_modules/nanomatch": { "version": "1.2.13", "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", @@ -34752,21 +34745,6 @@ "csstype": "^3.1.0" } }, - "node_modules/vue-awesome": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/vue-awesome/-/vue-awesome-4.0.2.tgz", - "integrity": "sha512-TE9hVwyVrGnBetO/MJwZ/7qLO6Vgr/WrDtIA7vwNryoLdA2jfRcKRw29KacpU5xj3wzZhHfYJ2xJLxfirhmH5Q==", - "dependencies": { - "nanoid": "^2.1.6" - }, - "engines": { - "node": ">= 4.0.0", - "npm": ">= 3.0.0" - }, - "peerDependencies": { - "vue": "^2.4.0" - } - }, "node_modules/vue-class-component": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/vue-class-component/-/vue-class-component-7.2.3.tgz", @@ -34879,11 +34857,6 @@ "vue": "^2.0.0" } }, - "node_modules/vue-gtag": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vue-gtag/-/vue-gtag-1.1.2.tgz", - "integrity": "sha512-ZPF4y1e04M6M5bkDRKPzZZt/D9r67OBi5tOYRFLdSC1NXrJv0l9Q8dxZjrOqY4VcTeXPlqTj8u3qBb+ScdBpng==" - }, "node_modules/vue-hot-reload-api": { "version": "2.3.4", "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz", @@ -56852,11 +56825,6 @@ "dev": true, "optional": true }, - "nanoid": { - "version": "2.1.11", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-2.1.11.tgz", - "integrity": "sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA==" - }, "nanomatch": { "version": "1.2.13", "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", @@ -63108,14 +63076,6 @@ } } }, - "vue-awesome": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/vue-awesome/-/vue-awesome-4.0.2.tgz", - "integrity": "sha512-TE9hVwyVrGnBetO/MJwZ/7qLO6Vgr/WrDtIA7vwNryoLdA2jfRcKRw29KacpU5xj3wzZhHfYJ2xJLxfirhmH5Q==", - "requires": { - "nanoid": "^2.1.6" - } - }, "vue-class-component": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/vue-class-component/-/vue-class-component-7.2.3.tgz", @@ -63207,11 +63167,6 @@ "flatpickr": "^4.6.1" } }, - "vue-gtag": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vue-gtag/-/vue-gtag-1.1.2.tgz", - "integrity": "sha512-ZPF4y1e04M6M5bkDRKPzZZt/D9r67OBi5tOYRFLdSC1NXrJv0l9Q8dxZjrOqY4VcTeXPlqTj8u3qBb+ScdBpng==" - }, "vue-hot-reload-api": { "version": "2.3.4", "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz", diff --git a/package.json b/package.json index d79580cf..3a05de1f 100644 --- a/package.json +++ b/package.json @@ -41,9 +41,7 @@ "uuid": "3.4.0", "vee-validate": "3.2.4", "vue": "2.7.14", - "vue-awesome": "4.0.2", "vue-flatpickr-component": "8.1.5", - "vue-gtag": "1.1.2", "vue-i18n": "8.15.3", "vue-matomo": "^4.2.0", "vue-router": "3.1.5", diff --git a/src/components/CollectionTagger.vue b/src/components/CollectionTagger.vue deleted file mode 100644 index 62b4a785..00000000 --- a/src/components/CollectionTagger.vue +++ /dev/null @@ -1,143 +0,0 @@ - - - - - diff --git a/src/components/IssuePage.vue b/src/components/IssuePage.vue index 09882ca1..b3fbb063 100644 --- a/src/components/IssuePage.vue +++ b/src/components/IssuePage.vue @@ -4,58 +4,82 @@
- + - +
- +
+ placeholder="search for ..." + v-model.trim="q" + v-on:change.native="search" + />
- + v-on:click="gotoArticle" + /> - + v-on:click="gotoArticle" + />
-
-

{{ issue.newspaper.name }} — +
+

+ {{ issue.newspaper.name }} — - {{ $d(issue.date, 'long') }} + {{ $d(issue.date, 'long') }}

- + v-on:click="gotoPageIndex(currentPageIndex - 1)" + >
{{ $tc('pp', 1, { pages: page.num }) }}
- +
@@ -96,9 +127,14 @@
- {{ $t(`buckets.type.${article.type}`) }} + {{ + $t(`buckets.type.${article.type}`) + }} - {{ article.language }} | + {{ + article.language + }} + | {{ articlePages }}
@@ -109,7 +145,8 @@ :modelValue="mode" @update:modelValue="mode = $event" :options="modeOptions" - type="button" /> + type="button" + /> @@ -119,40 +156,52 @@ + :variant="showOutlines !== '' ? 'primary' : 'outline-primary'" + size="sm" + @click="showOutlines = showOutlines === '' ? 'show-outlines' : ''" + >
-
{{$t('toggle_outlines_on')}}
-
{{$t('toggle_outlines_off')}}
+
{{ $t('toggle_outlines_on') }}
+
{{ $t('toggle_outlines_off') }}
- +
-
-
{{$t('toggle_fullscreen_on')}}
-
{{$t('toggle_fullscreen_off')}}
+
+
{{ $t('toggle_fullscreen_on') }}
+
{{ $t('toggle_fullscreen_off') }}
- +

{{ $t('errors.loggedInOnly') }}

-
- {{ $t('actions.login') }} +
+ {{ + $t('actions.login') + }}
- + v-bind:handler="handler" + /> + + :page="page" + /> diff --git a/src/components/layout/RadioGroupItem.vue b/src/components/layout/RadioGroupItem.vue index cfee4e01..415bed18 100644 --- a/src/components/layout/RadioGroupItem.vue +++ b/src/components/layout/RadioGroupItem.vue @@ -2,16 +2,30 @@ -
- +
+ @@ -21,8 +35,7 @@ diff --git a/src/components/modules/FilterNamedEntity.vue b/src/components/modules/FilterNamedEntity.vue deleted file mode 100644 index 7908a763..00000000 --- a/src/components/modules/FilterNamedEntity.vue +++ /dev/null @@ -1,73 +0,0 @@ - - - - - -{ - "en": { - "label": { - "person": "Person", - "location": "Location" - } - }, - "fr": { - "label": { - "person": "Personne", - "location": "Localisation" - } - }, - "nl": { - "label": { - "person": "Persoon", - "location": "Locatie" - } - } -} - diff --git a/src/components/modules/FilterRegex.vue b/src/components/modules/FilterRegex.vue index ffe41303..2d6d9fad 100644 --- a/src/components/modules/FilterRegex.vue +++ b/src/components/modules/FilterRegex.vue @@ -3,7 +3,8 @@ v-bind:id="filter.key" v-bind:title="filter.query" icon="rocket" - v-on:remove="remove"> + v-on:remove="remove" + > ({ @@ -40,23 +38,23 @@ export default { props: ['filter'], methods: { updateFilter() { - this.$emit('input', FilterFactory.create(this.filter)); + this.$emit('input', FilterFactory.create(this.filter)) }, submitFilter() { - this.$emit('submit'); - this.disabled = true; + this.$emit('submit') + this.disabled = true }, remove() { - this.$emit('remove'); + this.$emit('remove') }, editFilter() { - this.disabled = false; + this.disabled = false }, }, components: { FilterWrapper, }, -}; +} diff --git a/src/components/modules/FilterString.vue b/src/components/modules/FilterString.vue index 6867e706..6a43730f 100644 --- a/src/components/modules/FilterString.vue +++ b/src/components/modules/FilterString.vue @@ -1,4 +1,4 @@ -