Rebuild frontend

This commit is contained in:
James Cole
2021-02-17 06:46:26 +01:00
parent c34a5ed3e4
commit 20c45aa0e0
47 changed files with 76 additions and 24 deletions

View File

@@ -28,6 +28,7 @@ php /sites/FF3/dev/tools/cli.php ff3:json-translations v2
# remove old stuff
rm -rf public/
rm -rf ../public/fonts
rm -rf ../public/images
rm -rf ../public/v2/js
rm -rf ../public/v2/css
mkdir -p public/js

View File

@@ -33,6 +33,7 @@
"icheck-bootstrap": "^3.0.1",
"jquery": "^3.5.1",
"jquery-ui": "^1.12.1",
"leaflet": "^1.7.1",
"overlayscrollbars": "^1.13.1",
"popper.js": "^1.16.1",
"tempusdominus": "^5.16.0",
@@ -41,6 +42,7 @@
"vue-router": "^3.4.9",
"vue-simple-suggest": "^1.10.3",
"vue-typeahead-bootstrap": "^2.5.5",
"vue2-leaflet": "^2.6.0",
"vuex": "^3.6.0"
}
}

View File

@@ -95,7 +95,10 @@ export default {
]
),
getACURL: function (types, query) {
return document.getElementsByTagName('base')[0].href + 'api/v1/autocomplete/accounts?types=' + types.join(',') + '&query=' + query;
let URL = './api/v1/autocomplete/accounts?types=' + types.join(',') + '&query=' + query;
//console.log('AC URL is ' + URL);
return URL;
},
clearAccount: function () {
this.accounts = this.initialSet;
@@ -103,15 +106,18 @@ export default {
this.accountName = '';
},
lookupAccount: debounce(function () {
//console.log('In lookupAccount()');
if (0 === this.accountTypes.length) {
// set the types from the default types for this direction:
this.accountTypes = 'source' === this.direction ? this.sourceAllowedTypes : this.destinationAllowedTypes;
}
// update autocomplete URL:
axios.get(this.getACURL(this.accountTypes, this.account.name))
axios.get(this.getACURL(this.accountTypes, this.accountName))
.then(response => {
//console.log('Got a response!');
this.accounts = response.data;
//console.log(response.data);
})
}, 300),
@@ -130,8 +136,10 @@ export default {
},
watch: {
selectedAccount: function (value) {
this.accountName = this.account.name_with_balance;
//console.log('Now in selectedAccount');
//console.log(value);
this.account = value;
this.accountName = this.account.name_with_balance;
},
account: function (value) {
this.updateField({field: this.accountKey, index: this.index, value: value});

View File

@@ -56,6 +56,7 @@
"account_role_defaultAsset": "\u0421\u043c\u0435\u0442\u043a\u0430 \u0437\u0430 \u0430\u043a\u0442\u0438\u0432\u0438 \u043f\u043e \u043f\u043e\u0434\u0440\u0430\u0437\u0431\u0438\u0440\u0430\u043d\u0435",
"account_role_savingAsset": "\u0421\u043f\u0435\u0441\u0442\u043e\u0432\u043d\u0430 \u0441\u043c\u0435\u0442\u043a\u0430",
"account_role_sharedAsset": "\u0421\u043c\u0435\u0442\u043a\u0430 \u0437\u0430 \u0441\u043f\u043e\u0434\u0435\u043b\u0435\u043d\u0438 \u0430\u043a\u0442\u0438\u0432\u0438",
"clear_location": "\u0418\u0437\u0447\u0438\u0441\u0442\u0438 \u043c\u0435\u0441\u0442\u043e\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435\u0442\u043e",
"account_role_ccAsset": "\u041a\u0440\u0435\u0434\u0438\u0442\u043d\u0430 \u043a\u0430\u0440\u0442\u0430",
"account_role_cashWalletAsset": "\u041f\u0430\u0440\u0438\u0447\u0435\u043d \u043f\u043e\u0440\u0442\u0444\u0435\u0439\u043b",
"daily_budgets": "\u0414\u043d\u0435\u0432\u043d\u0438 \u0431\u044e\u0434\u0436\u0435\u0442\u0438",

View File

@@ -56,6 +56,7 @@
"account_role_defaultAsset": "V\u00fdchoz\u00ed \u00fa\u010det aktiv",
"account_role_savingAsset": "Spo\u0159ic\u00ed \u00fa\u010det",
"account_role_sharedAsset": "Sd\u00edlen\u00fd \u00fa\u010det aktiv",
"clear_location": "Vymazat um\u00edst\u011bn\u00ed",
"account_role_ccAsset": "Kreditn\u00ed karta",
"account_role_cashWalletAsset": "Pen\u011b\u017eenka",
"daily_budgets": "Daily budgets",

View File

@@ -56,6 +56,7 @@
"account_role_defaultAsset": "Standard-Bestandskonto",
"account_role_savingAsset": "Sparkonto",
"account_role_sharedAsset": "Gemeinsames Bestandskonto",
"clear_location": "Ort leeren",
"account_role_ccAsset": "Kreditkarte",
"account_role_cashWalletAsset": "Geldb\u00f6rse",
"daily_budgets": "Tagesbudgets",

View File

@@ -56,6 +56,7 @@
"account_role_defaultAsset": "\u0392\u03b1\u03c3\u03b9\u03ba\u03cc\u03c2 \u03bb\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03cc\u03c2 \u03ba\u03b5\u03c6\u03b1\u03bb\u03b1\u03af\u03bf\u03c5",
"account_role_savingAsset": "\u039b\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03cc\u03c2 \u03b1\u03c0\u03bf\u03c4\u03b1\u03bc\u03af\u03b5\u03c5\u03c3\u03b7\u03c2",
"account_role_sharedAsset": "\u039a\u03bf\u03b9\u03bd\u03cc\u03c2 \u03bb\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03cc\u03c2 \u03ba\u03b5\u03c6\u03b1\u03bb\u03b1\u03af\u03bf\u03c5",
"clear_location": "\u0395\u03ba\u03ba\u03b1\u03b8\u03ac\u03c1\u03b9\u03c3\u03b7 \u03c4\u03bf\u03c0\u03bf\u03b8\u03b5\u03c3\u03af\u03b1\u03c2",
"account_role_ccAsset": "\u03a0\u03b9\u03c3\u03c4\u03c9\u03c4\u03b9\u03ba\u03ae \u03ba\u03ac\u03c1\u03c4\u03b1",
"account_role_cashWalletAsset": "\u03a0\u03bf\u03c1\u03c4\u03bf\u03c6\u03cc\u03bb\u03b9 \u03bc\u03b5\u03c4\u03c1\u03b7\u03c4\u03ce\u03bd",
"daily_budgets": "\u0397\u03bc\u03b5\u03c1\u03ae\u03c3\u03b9\u03bf\u03b9 \u03c0\u03c1\u03bf\u03cb\u03c0\u03bf\u03bb\u03bf\u03b3\u03b9\u03c3\u03bc\u03bf\u03af",

View File

@@ -56,6 +56,7 @@
"account_role_defaultAsset": "Default asset account",
"account_role_savingAsset": "Savings account",
"account_role_sharedAsset": "Shared asset account",
"clear_location": "Clear location",
"account_role_ccAsset": "Credit card",
"account_role_cashWalletAsset": "Cash wallet",
"daily_budgets": "Daily budgets",

View File

@@ -56,6 +56,7 @@
"account_role_defaultAsset": "Default asset account",
"account_role_savingAsset": "Savings account",
"account_role_sharedAsset": "Shared asset account",
"clear_location": "Clear location",
"account_role_ccAsset": "Credit card",
"account_role_cashWalletAsset": "Cash wallet",
"daily_budgets": "Daily budgets",

View File

@@ -56,6 +56,7 @@
"account_role_defaultAsset": "Cuentas de ingresos por defecto",
"account_role_savingAsset": "Cuentas de ahorros",
"account_role_sharedAsset": "Cuenta de ingresos compartida",
"clear_location": "Eliminar ubicaci\u00f3n",
"account_role_ccAsset": "Tarjeta de Cr\u00e9dito",
"account_role_cashWalletAsset": "Billetera de efectivo",
"daily_budgets": "Presupuestos diarios",

View File

@@ -56,6 +56,7 @@
"account_role_defaultAsset": "Oletusk\u00e4ytt\u00f6tili",
"account_role_savingAsset": "S\u00e4\u00e4st\u00f6tili",
"account_role_sharedAsset": "Jaettu k\u00e4ytt\u00f6tili",
"clear_location": "Tyhjenn\u00e4 sijainti",
"account_role_ccAsset": "Luottokortti",
"account_role_cashWalletAsset": "K\u00e4teinen",
"daily_budgets": "Daily budgets",

View File

@@ -56,6 +56,7 @@
"account_role_defaultAsset": "Compte d'actif par d\u00e9faut",
"account_role_savingAsset": "Compte d\u2019\u00e9pargne",
"account_role_sharedAsset": "Compte d'actif partag\u00e9",
"clear_location": "Effacer la localisation",
"account_role_ccAsset": "Carte de cr\u00e9dit",
"account_role_cashWalletAsset": "Porte-monnaie",
"daily_budgets": "Budgets quotidiens",

View File

@@ -56,6 +56,7 @@
"account_role_defaultAsset": "Alap\u00e9rtelmezett eszk\u00f6zsz\u00e1mla",
"account_role_savingAsset": "Megtakar\u00edt\u00e1si sz\u00e1mla",
"account_role_sharedAsset": "Megosztott eszk\u00f6zsz\u00e1mla",
"clear_location": "Hely t\u00f6rl\u00e9se",
"account_role_ccAsset": "Hitelk\u00e1rtya",
"account_role_cashWalletAsset": "K\u00e9szp\u00e9nz",
"daily_budgets": "Daily budgets",

View File

@@ -56,6 +56,7 @@
"account_role_defaultAsset": "Conto attivit\u00e0 predefinito",
"account_role_savingAsset": "Conto risparmio",
"account_role_sharedAsset": "Conto attivit\u00e0 condiviso",
"clear_location": "Rimuovi dalla posizione",
"account_role_ccAsset": "Carta di credito",
"account_role_cashWalletAsset": "Portafoglio",
"daily_budgets": "Budget giornalieri",

View File

@@ -56,6 +56,7 @@
"account_role_defaultAsset": "Standard aktivakonto",
"account_role_savingAsset": "Sparekonto",
"account_role_sharedAsset": "Delt aktivakonto",
"clear_location": "T\u00f8m lokasjon",
"account_role_ccAsset": "Kredittkort",
"account_role_cashWalletAsset": "Kontant lommebok",
"daily_budgets": "Daily budgets",

View File

@@ -56,6 +56,7 @@
"account_role_defaultAsset": "Standaard betaalrekening",
"account_role_savingAsset": "Spaarrekening",
"account_role_sharedAsset": "Gedeelde betaalrekening",
"clear_location": "Wis locatie",
"account_role_ccAsset": "Credit card",
"account_role_cashWalletAsset": "Cash",
"daily_budgets": "Dagelijkse budgetten",

View File

@@ -56,6 +56,7 @@
"account_role_defaultAsset": "Domy\u015blne konto aktyw\u00f3w",
"account_role_savingAsset": "Konto oszcz\u0119dno\u015bciowe",
"account_role_sharedAsset": "Wsp\u00f3\u0142dzielone konto aktyw\u00f3w",
"clear_location": "Wyczy\u015b\u0107 lokalizacj\u0119",
"account_role_ccAsset": "Karta kredytowa",
"account_role_cashWalletAsset": "Portfel got\u00f3wkowy",
"daily_budgets": "Bud\u017cety dzienne",

View File

@@ -56,6 +56,7 @@
"account_role_defaultAsset": "Conta padr\u00e3o",
"account_role_savingAsset": "Conta poupan\u00e7a",
"account_role_sharedAsset": "Contas de ativos compartilhadas",
"clear_location": "Limpar localiza\u00e7\u00e3o",
"account_role_ccAsset": "Cart\u00e3o de cr\u00e9dito",
"account_role_cashWalletAsset": "Carteira de dinheiro",
"daily_budgets": "Or\u00e7amentos di\u00e1rios",

View File

@@ -56,6 +56,7 @@
"account_role_defaultAsset": "Conta de activos padr\u00e3o",
"account_role_savingAsset": "Contas poupan\u00e7a",
"account_role_sharedAsset": "Conta de activos partilhados",
"clear_location": "Limpar localiza\u00e7\u00e3o",
"account_role_ccAsset": "Cart\u00e3o de credito",
"account_role_cashWalletAsset": "Carteira de dinheiro",
"daily_budgets": "Or\u00e7amento di\u00e1rio",

View File

@@ -56,6 +56,7 @@
"account_role_defaultAsset": "Contul implicit activ",
"account_role_savingAsset": "Cont de economii",
"account_role_sharedAsset": "Contul de active partajat",
"clear_location": "\u0218terge\u021bi loca\u021bia",
"account_role_ccAsset": "Card de credit",
"account_role_cashWalletAsset": "Cash - Numerar",
"daily_budgets": "Daily budgets",

View File

@@ -56,6 +56,7 @@
"account_role_defaultAsset": "\u0421\u0447\u0451\u0442 \u043f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e",
"account_role_savingAsset": "\u0421\u0431\u0435\u0440\u0435\u0433\u0430\u0442\u0435\u043b\u044c\u043d\u044b\u0439 \u0441\u0447\u0435\u0442",
"account_role_sharedAsset": "\u041e\u0431\u0449\u0438\u0439 \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0439 \u0441\u0447\u0451\u0442",
"clear_location": "\u041e\u0447\u0438\u0441\u0442\u0438\u0442\u044c \u043c\u0435\u0441\u0442\u043e\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435",
"account_role_ccAsset": "\u041a\u0440\u0435\u0434\u0438\u0442\u043d\u0430\u044f \u043a\u0430\u0440\u0442\u0430",
"account_role_cashWalletAsset": "\u041d\u0430\u043b\u0438\u0447\u043d\u044b\u0435",
"daily_budgets": "\u0411\u044e\u0434\u0436\u0435\u0442\u044b \u043d\u0430 \u0434\u0435\u043d\u044c",

View File

@@ -56,6 +56,7 @@
"account_role_defaultAsset": "Predvolen\u00fd \u00fa\u010det akt\u00edv",
"account_role_savingAsset": "\u0160etriaci \u00fa\u010det",
"account_role_sharedAsset": "Zdie\u013ean\u00fd \u00fa\u010det akt\u00edv",
"clear_location": "Odstr\u00e1ni\u0165 poz\u00edciu",
"account_role_ccAsset": "Kreditn\u00e1 karta",
"account_role_cashWalletAsset": "Pe\u0148a\u017eenka",
"daily_budgets": "Denn\u00e9 rozpo\u010dty",

View File

@@ -56,6 +56,7 @@
"account_role_defaultAsset": "F\u00f6rvalt tillg\u00e5ngskonto",
"account_role_savingAsset": "Sparkonto",
"account_role_sharedAsset": "Delat tillg\u00e5ngskonto",
"clear_location": "Rena plats",
"account_role_ccAsset": "Kreditkort",
"account_role_cashWalletAsset": "Pl\u00e5nbok",
"daily_budgets": "Dagliga budgetar",

View File

@@ -56,6 +56,7 @@
"account_role_defaultAsset": "t\u00e0i kho\u1ea3n m\u1eb7c \u0111\u1ecbnh",
"account_role_savingAsset": "T\u00e0i kho\u1ea3n ti\u1ebft ki\u1ec7m",
"account_role_sharedAsset": "t\u00e0i kho\u1ea3n d\u00f9ng chung",
"clear_location": "X\u00f3a v\u1ecb tr\u00ed",
"account_role_ccAsset": "Th\u1ebb t\u00edn d\u1ee5ng",
"account_role_cashWalletAsset": "V\u00ed ti\u1ec1n m\u1eb7t",
"daily_budgets": "Daily budgets",

View File

@@ -56,6 +56,7 @@
"account_role_defaultAsset": "\u9884\u8bbe\u8d44\u4ea7\u5e10\u6237",
"account_role_savingAsset": "\u50a8\u84c4\u5e10\u6237",
"account_role_sharedAsset": "\u5171\u7528\u8d44\u4ea7\u5e10\u6237",
"clear_location": "\u6e05\u9664\u4f4d\u7f6e",
"account_role_ccAsset": "\u4fe1\u7528\u5361",
"account_role_cashWalletAsset": "\u73b0\u91d1\u94b1\u5305",
"daily_budgets": "Daily budgets",

View File

@@ -56,6 +56,7 @@
"account_role_defaultAsset": "\u9810\u8a2d\u8cc7\u7522\u5e33\u6236",
"account_role_savingAsset": "\u5132\u84c4\u5e33\u6236",
"account_role_sharedAsset": "\u5171\u7528\u8cc7\u7522\u5e33\u6236",
"clear_location": "\u6e05\u9664\u4f4d\u7f6e",
"account_role_ccAsset": "\u4fe1\u7528\u5361",
"account_role_cashWalletAsset": "\u73fe\u91d1\u9322\u5305",
"daily_budgets": "Daily budgets",

View File

@@ -22,6 +22,7 @@ const mix = require('laravel-mix');
require('laravel-mix-bundle-analyzer');
// production
mix.webpackConfig({
resolve: {
@@ -74,6 +75,7 @@ mix
// move to right dir
.copy('public/js','../public/v2/js')
.copy('fonts','../public/fonts')
.copy('images','../public/images')
.copy('public/css','../public/v2/css')
;

View File

@@ -839,9 +839,9 @@
integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
"@popperjs/core@^2.6.0":
version "2.6.0"
resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.6.0.tgz#f022195afdfc942e088ee2101285a1d31c7d727f"
integrity sha512-cPqjjzuFWNK3BSKLm0abspP0sp/IGOli4p5I5fKFAzdS8fvjdOwDCfZqAaIiXd9lPkOWi3SUUfZof3hEb7J/uw==
version "2.7.0"
resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.7.0.tgz#5f7760965170f7f1e2910d2498c5be88b47a2a8c"
integrity sha512-V3WyEc8ZyAuOQ2fpFuTuYYOd2tV4NePeSdxaHYgYAOs7ERLxlcFi2XsmgI5LJFdAUmJKXsg8jaIiVTkTHQygQw==
"@types/chart.js@^2.7.55":
version "2.9.30"
@@ -2626,9 +2626,9 @@ ejs@^2.6.1:
integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
electron-to-chromium@^1.3.649:
version "1.3.665"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.665.tgz#6d0937376f6a919c0f289202c4be77790a6175e5"
integrity sha512-LIjx1JheOz7LM8DMEQ2tPnbBzJ4nVG1MKutsbEMLnJfwfVdPIsyagqfLp56bOWhdBrYGXWHaTayYkllIU2TauA==
version "1.3.666"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.666.tgz#59f3ce1e45b860a0ebe439b72664354efbb8bc62"
integrity sha512-/mP4HFQ0fKIX4sXltG6kfcoGrfNDZwCIyWbH2SIcVaa9u7Rm0HKjambiHNg5OEruicTl9s1EwbERLwxZwk19aw==
elliptic@^6.5.3:
version "6.5.4"
@@ -4233,6 +4233,11 @@ last-call-webpack-plugin@^3.0.0:
lodash "^4.17.5"
webpack-sources "^1.1.0"
leaflet@^1.7.1:
version "1.7.1"
resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.7.1.tgz#10d684916edfe1bf41d688a3b97127c0322a2a19"
integrity sha512-/xwPEBidtg69Q3HlqPdU3DnrXQOvQU/CCHA1tcDQVzOwm91YMYaILjNp7L4Eaw5Z4sOYdbBz6koWyibppd8Zqw==
loader-runner@^2.4.0:
version "2.4.0"
resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
@@ -6682,9 +6687,9 @@ type@^1.0.1:
integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==
type@^2.0.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/type/-/type-2.2.0.tgz#3edd448793f517d8b9dd108b486a043f5befd91f"
integrity sha512-M/u37b4oSGlusaU8ZB96BfFPWQ8MbsZYXB+kXGMiDj6IKinkcNaQvmirBuWj8mAXqP6LYn1rQvbTYum3yPhaOA==
version "2.3.0"
resolved "https://registry.yarnpkg.com/type/-/type-2.3.0.tgz#ada7c045f07ead08abf9e2edd29be1a0c0661132"
integrity sha512-rgPIqOdfK/4J9FhiVrZ3cveAjRRo5rsQBAIhnylX874y1DX/kEKSVdLsnuHB6l1KTjHyU01VjiMBHgU2adejyg==
typedarray@^0.0.6:
version "0.0.6"
@@ -6964,6 +6969,11 @@ vue-typeahead-bootstrap@^2.5.5:
resize-observer-polyfill "^1.5.0"
vue "^2.5.17"
vue2-leaflet@^2.6.0:
version "2.6.0"
resolved "https://registry.yarnpkg.com/vue2-leaflet/-/vue2-leaflet-2.6.0.tgz#c83c60a745fbc2a74d9dbd0f75b2a5ae07d220a9"
integrity sha512-JG+w9TtNuk1yRpPta+RjzH6J+opdRUPzSo8UuBnwk+a/6XD0f2tsaB6g3D6ZpBgIE4wZA2dbZ0dZFz2ulYMj3A==
vue@^2.5.17, vue@^2.6.10, vue@^2.6.12:
version "2.6.12"
resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.12.tgz#f5ebd4fa6bd2869403e29a896aed4904456c9123"