diff --git a/frontend/package.json b/frontend/package.json index d45c29e34..3dde845f4 100755 --- a/frontend/package.json +++ b/frontend/package.json @@ -18,7 +18,6 @@ "@babel/preset-env": "^7.13.12", "@vue/cli-plugin-unit-jest": "^4.5.12", "@vue/test-utils": "^1.1.3", - "apexcharts": "^3.28.3", "apollo-boost": "^0.4.9", "axios": "^0.21.1", "babel-core": "^7.0.0-bridge.0", @@ -62,7 +61,6 @@ "sweetalert2": "^9.5.4", "vee-validate": "^3.4.5", "vue": "^2.6.11", - "vue-apexcharts": "^1.6.2", "vue-apollo": "^3.0.7", "vue-bootstrap-typeahead": "^0.2.6", "vue-cli-plugin-i18n": "^1.0.1", diff --git a/frontend/src/components/charts/ChartExample.vue b/frontend/src/components/charts/ChartExample.vue deleted file mode 100644 index 7c740f512..000000000 --- a/frontend/src/components/charts/ChartExample.vue +++ /dev/null @@ -1,112 +0,0 @@ - - - diff --git a/frontend/src/components/charts/series.js b/frontend/src/components/charts/series.js deleted file mode 100644 index 759a2d401..000000000 --- a/frontend/src/components/charts/series.js +++ /dev/null @@ -1,224 +0,0 @@ -export const series = [ - { - name: 'obb.docker', - data: [ - { - x: '2018-09-25', - y: 900, - }, - { - x: '2018-09-26', - y: 900, - }, - { - x: '2018-09-27', - y: 900, - }, - { - x: '2018-09-28', - y: 900, - }, - { - x: '2018-09-29', - y: 900, - }, - { - x: '2018-09-30', - y: 900, - }, - { - x: '2018-10-01', - y: 900, - }, - { - x: '2018-10-02', - y: 1125, - }, - ], - }, - { - name: 'filato.dk', - data: [ - { - x: '2018-09-25', - y: 1251.45, - }, - { - x: '2018-09-26', - y: 984.94, - }, - { - x: '2018-09-27', - y: 1170.34, - }, - { - x: '2018-09-28', - y: 1193.51, - }, - { - x: '2018-09-29', - y: 1251.45, - }, - { - x: '2018-09-30', - y: 1147.16, - }, - { - x: '2018-10-01', - y: 1263.04, - }, - { - x: '2018-10-02', - y: 1158.75, - }, - ], - }, - { - name: 'rito.dk', - data: [ - { - x: '2018-09-25', - y: 1193.06, - }, - { - x: '2018-09-26', - y: 1193.06, - }, - { - x: '2018-09-27', - y: 1068.08, - }, - { - x: '2018-09-28', - y: 909, - }, - { - x: '2018-09-29', - y: 965.81, - }, - { - x: '2018-09-30', - y: 965.81, - }, - { - x: '2018-10-01', - y: 1022.63, - }, - { - x: '2018-10-02', - y: 1136.25, - }, - ], - }, - { - name: 'fruhyasinth.dk', - data: [ - { - x: '2018-09-25', - y: 1064.7, - }, - { - x: '2018-09-26', - y: 1146.6, - }, - { - x: '2018-09-27', - y: 1216.8, - }, - { - x: '2018-09-28', - y: 959.4, - }, - { - x: '2018-09-29', - y: 1193.4, - }, - { - x: '2018-09-30', - y: 1017.9, - }, - { - x: '2018-10-01', - y: 1275.3, - }, - { - x: '2018-10-02', - y: 1170, - }, - ], - }, - { - name: 'bilka.dk', - data: [ - { - x: '2018-09-25', - y: 973.35, - }, - { - x: '2018-09-26', - y: 1147.16, - }, - { - x: '2018-09-27', - y: 1263.04, - }, - { - x: '2018-09-28', - y: 927, - }, - { - x: '2018-09-29', - y: 950.18, - }, - { - x: '2018-09-30', - y: 1123.99, - }, - { - x: '2018-10-01', - y: 1158.75, - }, - { - x: '2018-10-02', - y: 1158.75, - }, - ], - }, - { - name: 'hobbii.dk', - data: [ - { - x: '2018-09-25', - y: 963.9, - }, - { - x: '2018-09-26', - y: 1136.03, - }, - { - x: '2018-09-27', - y: 1216.35, - }, - { - x: '2018-09-28', - y: 1067.18, - }, - { - x: '2018-09-29', - y: 952.43, - }, - { - x: '2018-09-30', - y: 929.48, - }, - { - x: '2018-10-01', - y: 1204.88, - }, - { - x: '2018-10-02', - y: 1147.5, - }, - ], - }, -] diff --git a/frontend/src/i18n.js b/frontend/src/i18n.js index 946507c82..98e4ec971 100644 --- a/frontend/src/i18n.js +++ b/frontend/src/i18n.js @@ -4,9 +4,6 @@ import VueI18n from 'vue-i18n' import en from 'vee-validate/dist/locale/en' import de from 'vee-validate/dist/locale/de' -import enCharts from 'apexcharts/dist/locales/en' -import deCharts from 'apexcharts/dist/locales/de' - Vue.use(VueI18n) function loadLocaleMessages() { @@ -20,14 +17,12 @@ function loadLocaleMessages() { if (locale === 'de') { messages[locale] = { validations: de, - charts: deCharts, ...messages[locale], } } if (locale === 'en') { messages[locale] = { validations: en, - charts: enCharts, ...messages[locale], } } diff --git a/frontend/src/main.js b/frontend/src/main.js index 67863daff..fd06bf9c0 100755 --- a/frontend/src/main.js +++ b/frontend/src/main.js @@ -7,8 +7,6 @@ import { ApolloClient, ApolloLink, InMemoryCache, HttpLink } from 'apollo-boost' import VueApollo from 'vue-apollo' import CONFIG from './config' -import VueApexCharts from 'vue-apexcharts' - import addNavigationGuards from './routes/guards' import { store } from './store/store' @@ -55,9 +53,6 @@ loadAllRules(i18n) addNavigationGuards(router, store) -Vue.use(VueApexCharts) -Vue.component('apexchart', VueApexCharts) - /* eslint-disable no-new */ new Vue({ el: '#app', diff --git a/frontend/src/views/Pages/AccountOverview.spec.js b/frontend/src/views/Pages/AccountOverview.spec.js index 0ea413fa7..785a2b372 100644 --- a/frontend/src/views/Pages/AccountOverview.spec.js +++ b/frontend/src/views/Pages/AccountOverview.spec.js @@ -26,10 +26,12 @@ describe('AccountOverview', () => { wrapper = Wrapper() }) - it('has a status line', () => { - expect(wrapper.find('div.gdd-status').exists()).toBeTruthy() + it('has a status gdd-status-gdd', () => { + expect(wrapper.find('div.gdd-status-gdd').exists()).toBeTruthy() + }) + it('has a status gdd-status-gdt', () => { + expect(wrapper.find('div.gdd-status-gdt').exists()).toBeTruthy() }) - it('has a transactions table', () => { expect(wrapper.find('div.gdd-transaction-list').exists()).toBeTruthy() }) diff --git a/frontend/src/views/Pages/AccountOverview.vue b/frontend/src/views/Pages/AccountOverview.vue index 9a26caac6..d8ccfa638 100644 --- a/frontend/src/views/Pages/AccountOverview.vue +++ b/frontend/src/views/Pages/AccountOverview.vue @@ -6,11 +6,11 @@ @@ -19,11 +19,11 @@ @@ -31,22 +31,6 @@
- - - GDD Bar -
- -
-
- - GDD Line -
- -
-
-
-
- @@ -61,16 +45,12 @@ /> -
- example -