From a077d58e9cba5a4c9d52145fe0b7d4624cd8006c Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 4 Aug 2019 19:54:31 +0200 Subject: [PATCH] Update libraries, add some views. --- config/intro.php | 24 +- package.json | 4 +- public/v1/js/app.js | 57797 +--------------- .../transactions/CreateTransaction.vue | 2 +- resources/views/v1/accounts/show.twig | 3 +- resources/views/v1/bills/show.twig | 3 +- resources/views/v1/budgets/no-budget.twig | 3 +- resources/views/v1/budgets/show.twig | 3 +- .../views/v1/categories/no-category.twig | 3 +- resources/views/v1/categories/show.twig | 3 +- resources/views/v1/list/groups.twig | 10 +- resources/views/v1/recurring/show.twig | 3 +- resources/views/v1/search/index.twig | 3 +- resources/views/v1/search/search.twig | 2 +- resources/views/v1/transactions/index.twig | 7 +- resources/views/v1/transactions/show.twig | 6 +- yarn.lock | 31 +- 17 files changed, 74 insertions(+), 57833 deletions(-) diff --git a/config/intro.php b/config/intro.php index db614d74ae..f3f3999877 100644 --- a/config/intro.php +++ b/config/intro.php @@ -27,7 +27,7 @@ declare(strict_types=1); return [ // index - 'index' => [ + 'index' => [ 'intro' => [], 'accounts-chart' => ['element' => '#accounts-chart'], 'box_out_holder' => ['element' => '#box_out_holder'], @@ -37,18 +37,28 @@ return [ 'outro' => [], ], // accounts: create - 'accounts_create' => [ + 'accounts_create' => [ 'iban' => ['element' => '#ffInput_iban'], ], + + // transactions: create + 'transactions_create' => [ + 'source' => ['element' => 'input[name="source[]"]'], + 'foreign_currency' => ['element' => 'select[name="foreign_currency[]"]'], + 'more_meta' => ['element' => 'input[name="category[]"]'], + 'split_add' => ['element' => '.split_add_btn'], + ], + + // extra text for asset account creation. - 'accounts_create_asset' => [ + 'accounts_create_asset' => [ 'opening_balance' => ['element' => '#ffInput_opening_balance'], 'currency' => ['element' => '#ffInput_currency_id'], 'virtual' => ['element' => '#ffInput_virtual_balance'], ], // budgets: index - 'budgets_index' => [ + 'budgets_index' => [ 'intro' => [], 'set_budget' => ['element' => '#availableBar',], 'see_expenses_bar' => ['element' => '#spentBar'], @@ -59,17 +69,17 @@ return [ ], // reports: index, default report, audit, budget, cat, tag - 'reports_index' => [ + 'reports_index' => [ 'intro' => [], 'inputReportType' => ['element' => '#inputReportType'], 'inputAccountsSelect' => ['element' => '#inputAccountsSelect'], 'inputDateRange' => ['element' => '#inputDateRange'], 'extra-options-box' => ['element' => '#extra-options-box', 'position' => 'top'], ], - 'reports_report_default' => [ + 'reports_report_default' => [ 'intro' => [], ], - 'reports_report_audit' => [ + 'reports_report_audit' => [ 'intro' => [], 'optionsBox' => ['element' => '#optionsBox'], ], diff --git a/package.json b/package.json index b5262c8ada..77d08087e7 100755 --- a/package.json +++ b/package.json @@ -10,11 +10,11 @@ "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" }, "devDependencies": { - "axios": "^0.17", + "axios": "^0.18.1", "bootstrap-sass": "^3.3.7", "cross-env": "^5.1", "laravel-mix": "^1.0", - "lodash": "^4.17.4", + "lodash": "^4.17.13", "vue": "^2.5.7" }, "dependencies": { diff --git a/public/v1/js/app.js b/public/v1/js/app.js index 342497bfee..074231b3a6 100644 --- a/public/v1/js/app.js +++ b/public/v1/js/app.js @@ -1,57796 +1 @@ -/******/ (function(modules) { // webpackBootstrap -/******/ // The module cache -/******/ var installedModules = {}; -/******/ -/******/ // The require function -/******/ function __webpack_require__(moduleId) { -/******/ -/******/ // Check if module is in cache -/******/ if(installedModules[moduleId]) { -/******/ return installedModules[moduleId].exports; -/******/ } -/******/ // Create a new module (and put it into the cache) -/******/ var module = installedModules[moduleId] = { -/******/ i: moduleId, -/******/ l: false, -/******/ exports: {} -/******/ }; -/******/ -/******/ // Execute the module function -/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); -/******/ -/******/ // Flag the module as loaded -/******/ module.l = true; -/******/ -/******/ // Return the exports of the module -/******/ return module.exports; -/******/ } -/******/ -/******/ -/******/ // expose the modules object (__webpack_modules__) -/******/ __webpack_require__.m = modules; -/******/ -/******/ // expose the module cache -/******/ __webpack_require__.c = installedModules; -/******/ -/******/ // define getter function for harmony exports -/******/ __webpack_require__.d = function(exports, name, getter) { -/******/ if(!__webpack_require__.o(exports, name)) { -/******/ Object.defineProperty(exports, name, { -/******/ configurable: false, -/******/ enumerable: true, -/******/ get: getter -/******/ }); -/******/ } -/******/ }; -/******/ -/******/ // getDefaultExport function for compatibility with non-harmony modules -/******/ __webpack_require__.n = function(module) { -/******/ var getter = module && module.__esModule ? -/******/ function getDefault() { return module['default']; } : -/******/ function getModuleExports() { return module; }; -/******/ __webpack_require__.d(getter, 'a', getter); -/******/ return getter; -/******/ }; -/******/ -/******/ // Object.prototype.hasOwnProperty.call -/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); }; -/******/ -/******/ // __webpack_public_path__ -/******/ __webpack_require__.p = ""; -/******/ -/******/ // Load entry module and return exports -/******/ return __webpack_require__(__webpack_require__.s = 14); -/******/ }) -/************************************************************************/ -/******/ ([ -/* 0 */ -/***/ (function(module, exports) { - -/* - MIT License http://www.opensource.org/licenses/mit-license.php - Author Tobias Koppers @sokra -*/ -// css base code, injected by the css-loader -module.exports = function(useSourceMap) { - var list = []; - - // return the list of modules as css string - list.toString = function toString() { - return this.map(function (item) { - var content = cssWithMappingToString(item, useSourceMap); - if(item[2]) { - return "@media " + item[2] + "{" + content + "}"; - } else { - return content; - } - }).join(""); - }; - - // import a list of modules into the list - list.i = function(modules, mediaQuery) { - if(typeof modules === "string") - modules = [[null, modules, ""]]; - var alreadyImportedModules = {}; - for(var i = 0; i < this.length; i++) { - var id = this[i][0]; - if(typeof id === "number") - alreadyImportedModules[id] = true; - } - for(i = 0; i < modules.length; i++) { - var item = modules[i]; - // skip already imported module - // this implementation is not 100% perfect for weird media query combinations - // when a module is imported multiple times with different media queries. - // I hope this will never occur (Hey this way we have smaller bundles) - if(typeof item[0] !== "number" || !alreadyImportedModules[item[0]]) { - if(mediaQuery && !item[2]) { - item[2] = mediaQuery; - } else if(mediaQuery) { - item[2] = "(" + item[2] + ") and (" + mediaQuery + ")"; - } - list.push(item); - } - } - }; - return list; -}; - -function cssWithMappingToString(item, useSourceMap) { - var content = item[1] || ''; - var cssMapping = item[3]; - if (!cssMapping) { - return content; - } - - if (useSourceMap && typeof btoa === 'function') { - var sourceMapping = toComment(cssMapping); - var sourceURLs = cssMapping.sources.map(function (source) { - return '/*# sourceURL=' + cssMapping.sourceRoot + source + ' */' - }); - - return [content].concat(sourceURLs).concat([sourceMapping]).join('\n'); - } - - return [content].join('\n'); -} - -// Adapted from convert-source-map (MIT) -function toComment(sourceMap) { - // eslint-disable-next-line no-undef - var base64 = btoa(unescape(encodeURIComponent(JSON.stringify(sourceMap)))); - var data = 'sourceMappingURL=data:application/json;charset=utf-8;base64,' + base64; - - return '/*# ' + data + ' */'; -} - - -/***/ }), -/* 1 */ -/***/ (function(module, exports, __webpack_require__) { - -/* - MIT License http://www.opensource.org/licenses/mit-license.php - Author Tobias Koppers @sokra - Modified by Evan You @yyx990803 -*/ - -var hasDocument = typeof document !== 'undefined' - -if (typeof DEBUG !== 'undefined' && DEBUG) { - if (!hasDocument) { - throw new Error( - 'vue-style-loader cannot be used in a non-browser environment. ' + - "Use { target: 'node' } in your Webpack config to indicate a server-rendering environment." - ) } -} - -var listToStyles = __webpack_require__(45) - -/* -type StyleObject = { - id: number; - parts: Array -} - -type StyleObjectPart = { - css: string; - media: string; - sourceMap: ?string -} -*/ - -var stylesInDom = {/* - [id: number]: { - id: number, - refs: number, - parts: Array<(obj?: StyleObjectPart) => void> - } -*/} - -var head = hasDocument && (document.head || document.getElementsByTagName('head')[0]) -var singletonElement = null -var singletonCounter = 0 -var isProduction = false -var noop = function () {} -var options = null -var ssrIdKey = 'data-vue-ssr-id' - -// Force single-tag solution on IE6-9, which has a hard limit on the # of