diff --git a/frontend/src/components/transactions/Index.vue b/frontend/src/components/transactions/Index.vue index 4b6a49701b..7fc40fbd60 100644 --- a/frontend/src/components/transactions/Index.vue +++ b/frontend/src/components/transactions/Index.vue @@ -19,15 +19,364 @@ --> - - \ No newline at end of file + \ No newline at end of file diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index f07befef00..db929662e6 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -148,6 +148,11 @@ "role": "Role", "iban": "IBAN", "interest": "Interest", + "description": "Description", + "date": "Date", + "source_account": "Source account", + "destination_account": "Destination account", + "category": "Category", "interest_period": "Interest period", "liability_type": "Type of liability", "liability_direction": "Liability in\/out", diff --git a/frontend/src/pages/transactions/index.js b/frontend/src/pages/transactions/index.js index 905fb5924f..dfdb9c33f4 100644 --- a/frontend/src/pages/transactions/index.js +++ b/frontend/src/pages/transactions/index.js @@ -18,17 +18,21 @@ * along with this program. If not, see . */ +require('../../bootstrap'); import Vue from "vue"; import store from "../../components/store"; import Index from "../../components/transactions/Index"; - -require('../../bootstrap'); +import {BPagination, BTable} from 'bootstrap-vue'; +import Calendar from "../../components/dashboard/Calendar"; // i18n let i18n = require('../../i18n'); - let props = {}; + +Vue.component('b-table', BTable); +Vue.component('b-pagination', BPagination); + new Vue({ i18n, store, @@ -36,7 +40,23 @@ new Vue({ return createElement(Index, {props: props}); }, beforeCreate() { + // init the old root store (TODO remove me) this.$store.commit('initialiseStore'); - //this.$store.dispatch('updateCurrencyPreference'); + this.$store.dispatch('updateCurrencyPreference'); + + // init the new root store (dont care about results) + this.$store.dispatch('root/initialiseStore'); + + // also init the dashboard store. + this.$store.dispatch('dashboard/index/initialiseStore'); }, }).$mount('#transactions_index'); + +new Vue({ + i18n, + store, + el: "#calendar", + render: (createElement) => { + return createElement(Calendar, {props: props}); + }, + }); \ No newline at end of file diff --git a/resources/views/v2/transactions/indexx.twig b/resources/views/v2/transactions/index.twig similarity index 56% rename from resources/views/v2/transactions/indexx.twig rename to resources/views/v2/transactions/index.twig index 3dc2125261..8ff1cc70c6 100644 --- a/resources/views/v2/transactions/indexx.twig +++ b/resources/views/v2/transactions/index.twig @@ -8,6 +8,18 @@ {% endblock %} +{% block control %} +
+
+
{{ 'date_range'|_ }}
+
+
+
+
{{ 'list_options'|_ }}
+
+
+{% endblock %} + {% block styles %} {% endblock %}