diff --git a/package-lock.json b/package-lock.json index 0bb7e2d589..c2cb74e258 100755 --- a/package-lock.json +++ b/package-lock.json @@ -522,6 +522,17 @@ "babel-types": "6.26.0" } }, + "babel-helper-builder-react-jsx": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.26.0.tgz", + "integrity": "sha1-Of+DE7dci2Xc7/HzHTg+D/KkCKA=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "esutils": "2.0.2" + } + }, "babel-helper-call-delegate": { "version": "6.24.1", "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz", @@ -689,6 +700,18 @@ "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=", "dev": true }, + "babel-plugin-syntax-flow": { + "version": "6.18.0", + "resolved": "http://registry.npmjs.org/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz", + "integrity": "sha1-TDqyCiryaqIM0lmVw5jE63AxDI0=", + "dev": true + }, + "babel-plugin-syntax-jsx": { + "version": "6.18.0", + "resolved": "http://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz", + "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=", + "dev": true + }, "babel-plugin-syntax-object-rest-spread": { "version": "6.13.0", "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz", @@ -957,6 +980,16 @@ "babel-runtime": "6.26.0" } }, + "babel-plugin-transform-flow-strip-types": { + "version": "6.22.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz", + "integrity": "sha1-hMtnKTXUNxT9wyvOhFaNh0Qc988=", + "dev": true, + "requires": { + "babel-plugin-syntax-flow": "6.18.0", + "babel-runtime": "6.26.0" + } + }, "babel-plugin-transform-object-rest-spread": { "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz", @@ -967,6 +1000,46 @@ "babel-runtime": "6.26.0" } }, + "babel-plugin-transform-react-display-name": { + "version": "6.25.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.25.0.tgz", + "integrity": "sha1-Z+K/Hx6ck6sI25Z5LgU5K/LMKNE=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0" + } + }, + "babel-plugin-transform-react-jsx": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz", + "integrity": "sha1-hAoCjn30YN/DotKfDA2R9jduZqM=", + "dev": true, + "requires": { + "babel-helper-builder-react-jsx": "6.26.0", + "babel-plugin-syntax-jsx": "6.18.0", + "babel-runtime": "6.26.0" + } + }, + "babel-plugin-transform-react-jsx-self": { + "version": "6.22.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx-self/-/babel-plugin-transform-react-jsx-self-6.22.0.tgz", + "integrity": "sha1-322AqdomEqEh5t3XVYvL7PBuY24=", + "dev": true, + "requires": { + "babel-plugin-syntax-jsx": "6.18.0", + "babel-runtime": "6.26.0" + } + }, + "babel-plugin-transform-react-jsx-source": { + "version": "6.22.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx-source/-/babel-plugin-transform-react-jsx-source-6.22.0.tgz", + "integrity": "sha1-ZqwSFT9c0tF7PBkmj0vwGX9E7NY=", + "dev": true, + "requires": { + "babel-plugin-syntax-jsx": "6.18.0", + "babel-runtime": "6.26.0" + } + }, "babel-plugin-transform-regenerator": { "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz", @@ -1033,6 +1106,29 @@ "semver": "5.5.0" } }, + "babel-preset-flow": { + "version": "6.23.0", + "resolved": "https://registry.npmjs.org/babel-preset-flow/-/babel-preset-flow-6.23.0.tgz", + "integrity": "sha1-5xIYiHCFrpoktb5Baa/7WZgWxJ0=", + "dev": true, + "requires": { + "babel-plugin-transform-flow-strip-types": "6.22.0" + } + }, + "babel-preset-react": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-preset-react/-/babel-preset-react-6.24.1.tgz", + "integrity": "sha1-umnfrqRfw+xjm2pOzqbhdwLJE4A=", + "dev": true, + "requires": { + "babel-plugin-syntax-jsx": "6.18.0", + "babel-plugin-transform-react-display-name": "6.25.0", + "babel-plugin-transform-react-jsx": "6.24.1", + "babel-plugin-transform-react-jsx-self": "6.22.0", + "babel-plugin-transform-react-jsx-source": "6.22.0", + "babel-preset-flow": "6.23.0" + } + }, "babel-register": { "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz", @@ -1365,10 +1461,10 @@ "hoek": "2.16.3" } }, - "bootstrap-sass": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/bootstrap-sass/-/bootstrap-sass-3.3.7.tgz", - "integrity": "sha1-ZZbHq0D2Y3OTMjqwvIDQZPxjBJg=", + "bootstrap": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.2.1.tgz", + "integrity": "sha512-tt/7vIv3Gm2mnd/WeDx36nfGGHleil0Wg8IeB7eMrVkY0fZ5iTaBisSh8oNANc2IBsCc6vCgCNTIM/IEN0+50Q==", "dev": true }, "brace-expansion": { @@ -10073,6 +10169,16 @@ "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=", "dev": true }, + "prop-types": { + "version": "15.6.2", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.2.tgz", + "integrity": "sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ==", + "dev": true, + "requires": { + "loose-envify": "1.3.1", + "object-assign": "4.1.1" + } + }, "proxy-addr": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.2.tgz", @@ -10285,6 +10391,30 @@ } } }, + "react": { + "version": "16.7.0", + "resolved": "https://registry.npmjs.org/react/-/react-16.7.0.tgz", + "integrity": "sha512-StCz3QY8lxTb5cl2HJxjwLFOXPIFQp+p+hxQfc8WE0QiLfCtIlKj8/+5tjjKm8uSTlAW+fCPaavGFS06V9Ar3A==", + "dev": true, + "requires": { + "loose-envify": "1.3.1", + "object-assign": "4.1.1", + "prop-types": "15.6.2", + "scheduler": "0.12.0" + } + }, + "react-dom": { + "version": "16.7.0", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.7.0.tgz", + "integrity": "sha512-D0Ufv1ExCAmF38P2Uh1lwpminZFRXEINJe53zRAbm4KPwSyd6DY/uDoS0Blj9jvPpn1+wivKpZYc8aAAN/nAkg==", + "dev": true, + "requires": { + "loose-envify": "1.3.1", + "object-assign": "4.1.1", + "prop-types": "15.6.2", + "scheduler": "0.12.0" + } + }, "read-all-stream": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz", @@ -10796,6 +10926,16 @@ "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", "dev": true }, + "scheduler": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.12.0.tgz", + "integrity": "sha512-t7MBR28Akcp4Jm+QoR63XgAi9YgCUmgvDHqf5otgAj4QvdoBE4ImCX0ffehefePPG+aitiYHp0g/mW6s4Tp+dw==", + "dev": true, + "requires": { + "loose-envify": "1.3.1", + "object-assign": "4.1.1" + } + }, "schema-utils": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz", @@ -12795,12 +12935,6 @@ "indexof": "0.0.1" } }, - "vue": { - "version": "2.5.13", - "resolved": "https://registry.npmjs.org/vue/-/vue-2.5.13.tgz", - "integrity": "sha512-3D+lY7HTkKbtswDM4BBHgqyq+qo8IAEE8lz8va1dz3LLmttjgo0FxairO4r1iN2OBqk8o1FyL4hvzzTFEdQSEw==", - "dev": true - }, "vue-hot-reload-api": { "version": "2.2.4", "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.2.4.tgz", diff --git a/package.json b/package.json old mode 100755 new mode 100644 index bd9df38cf5..544d582ad9 --- a/package.json +++ b/package.json @@ -3,22 +3,25 @@ "scripts": { "dev": "npm run development", "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", - "watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "watch": "npm run development -- --watch", "watch-poll": "npm run watch -- --watch-poll", "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", "prod": "npm run production", "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", - "bootstrap-sass": "^3.3.7", + "axios": "^0.18", + "babel-preset-react": "^6.23.0", + "bootstrap": "^4.0.0", "cross-env": "^5.1", - "jquery": "^3.1.1", - "laravel-mix": "^1.0", - "lodash": "^4.17.4", - "vue": "^2.5.7" - }, - "dependencies": { - "font-awesome": "^4.7.0" + "jquery": "^3.2", + "laravel-mix": "^4.0.7", + "lodash": "^4.17.5", + "popper.js": "^1.12", + "react": "^16.2.0", + "react-dom": "^16.2.0", + "resolve-url-loader": "^2.3.1", + "sass": "^1.15.2", + "sass-loader": "^7.1.0" } } diff --git a/public/v2/assets/images/basic-logo-ff3.png b/public/v2/assets/images/basic-logo-ff3.png new file mode 100644 index 0000000000..abc3542fbf Binary files /dev/null and b/public/v2/assets/images/basic-logo-ff3.png differ diff --git a/public/v2/assets/js/dashboard.js b/public/v2/assets/js/dashboard.js index 32bf37853f..1c0d71fbb3 100755 --- a/public/v2/assets/js/dashboard.js +++ b/public/v2/assets/js/dashboard.js @@ -9,16 +9,16 @@ shim: { 'core': ['bootstrap', 'jquery'], }, paths: { -'core': 'assets/js/core', -'jquery': 'assets/js/vendors/jquery-3.2.1.min', -'bootstrap': 'assets/js/vendors/bootstrap.bundle.min', -'sparkline': 'assets/js/vendors/jquery.sparkline.min', -'selectize': 'assets/js/vendors/selectize.min', -'tablesorter': 'assets/js/vendors/jquery.tablesorter.min', -'vector-map': 'assets/js/vendors/jquery-jvectormap-2.0.3.min', -'vector-map-de': 'assets/js/vendors/jquery-jvectormap-de-merc', -'vector-map-world': 'assets/js/vendors/jquery-jvectormap-world-mill', -'circle-progress': 'assets/js/vendors/circle-progress.min', +'core': 'v2/assets/js/core', +'jquery': 'v2/assets/js/vendors/jquery-3.2.1.min', +'bootstrap': 'v2/assets/js/vendors/bootstrap.bundle.min', +'sparkline': 'v2/assets/js/vendors/jquery.sparkline.min', +'selectize': 'v2/assets/js/vendors/selectize.min', +'tablesorter': 'v2/assets/js/vendors/jquery.tablesorter.min', +'vector-map': 'v2/assets/js/vendors/jquery-jvectormap-2.0.3.min', +'vector-map-de': 'v2/assets/js/vendors/jquery-jvectormap-de-merc', +'vector-map-world': 'v2/assets/js/vendors/jquery-jvectormap-world-mill', +'circle-progress': 'v2/assets/js/vendors/circle-progress.min', } }); window.tabler = { diff --git a/public/v2/assets/plugins/charts-c3/plugin.js b/public/v2/assets/plugins/charts-c3/plugin.js index f4b2e8b538..d4c9201960 100755 --- a/public/v2/assets/plugins/charts-c3/plugin.js +++ b/public/v2/assets/plugins/charts-c3/plugin.js @@ -4,7 +4,7 @@ require.config({ 'd3': ['core'], }, paths: { - 'd3': 'assets/plugins/charts-c3/js/d3.v3.min', - 'c3': 'assets/plugins/charts-c3/js/c3.min', + 'd3': 'v2/assets/plugins/charts-c3/js/d3.v3.min', + 'c3': 'v2/assets/plugins/charts-c3/js/c3.min', } }); \ No newline at end of file diff --git a/public/v2/assets/plugins/input-mask/plugin.js b/public/v2/assets/plugins/input-mask/plugin.js index 0e93c49016..616ef6c31c 100755 --- a/public/v2/assets/plugins/input-mask/plugin.js +++ b/public/v2/assets/plugins/input-mask/plugin.js @@ -3,6 +3,6 @@ require.config({ 'input-mask': ['jquery', 'core'] }, paths: { - 'input-mask': 'assets/plugins/input-mask/js/jquery.mask.min' + 'input-mask': 'v2/assets/plugins/input-mask/js/jquery.mask.min' } }); \ No newline at end of file diff --git a/resources/js/app.js b/resources/js/app.js new file mode 100644 index 0000000000..583ecced87 --- /dev/null +++ b/resources/js/app.js @@ -0,0 +1,16 @@ + +/** + * First we will load all of this project's JavaScript dependencies which + * includes React and other helpers. It's a great starting point while + * building robust, powerful web applications using React + Laravel. + */ + +require('./bootstrap'); + +/** + * Next, we will create a fresh React component instance and attach it to + * the page. Then, you may begin adding components to this application + * or customize the JavaScript scaffolding to fit your unique needs. + */ + +require('./components/Example'); diff --git a/resources/js/bootstrap.js b/resources/js/bootstrap.js new file mode 100644 index 0000000000..c1f8ac3923 --- /dev/null +++ b/resources/js/bootstrap.js @@ -0,0 +1,56 @@ + +window._ = require('lodash'); + +/** + * We'll load jQuery and the Bootstrap jQuery plugin which provides support + * for JavaScript based Bootstrap features such as modals and tabs. This + * code may be modified to fit the specific needs of your application. + */ + +try { + window.Popper = require('popper.js').default; + window.$ = window.jQuery = require('jquery'); + + require('bootstrap'); +} catch (e) {} + +/** + * We'll load the axios HTTP library which allows us to easily issue requests + * to our Laravel back-end. This library automatically handles sending the + * CSRF token as a header based on the value of the "XSRF" token cookie. + */ + +window.axios = require('axios'); + +window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest'; + +/** + * Next we will register the CSRF Token as a common header with Axios so that + * all outgoing HTTP requests automatically have it attached. This is just + * a simple convenience so we don't have to attach every token manually. + */ + +let token = document.head.querySelector('meta[name="csrf-token"]'); + +if (token) { + window.axios.defaults.headers.common['X-CSRF-TOKEN'] = token.content; +} else { + console.error('CSRF token not found: https://laravel.com/docs/csrf#csrf-x-csrf-token'); +} + +/** + * Echo exposes an expressive API for subscribing to channels and listening + * for events that are broadcast by Laravel. Echo and event broadcasting + * allows your team to easily build robust real-time web applications. + */ + +// import Echo from 'laravel-echo' + +// window.Pusher = require('pusher-js'); + +// window.Echo = new Echo({ +// broadcaster: 'pusher', +// key: process.env.MIX_PUSHER_APP_KEY, +// cluster: process.env.MIX_PUSHER_APP_CLUSTER, +// encrypted: true +// }); diff --git a/resources/js/components/Example.js b/resources/js/components/Example.js new file mode 100644 index 0000000000..937bb985df --- /dev/null +++ b/resources/js/components/Example.js @@ -0,0 +1,26 @@ +import React, { Component } from 'react'; +import ReactDOM from 'react-dom'; + +export default class Example extends Component { + render() { + return ( +
+
+
+
+
Example Component
+ +
+ I'm an example component! +
+
+
+
+
+ ); + } +} + +if (document.getElementById('example')) { + ReactDOM.render(, document.getElementById('example')); +} diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index 4a72affcd0..937e69ef85 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -41,6 +41,7 @@ return [ 'cancel' => 'Cancel', 'from' => 'From', 'to' => 'To', + 'structure' => 'Structure', 'help_translating' => 'This help text is not yet available in your language. Will you help translate?', 'showEverything' => 'Show everything', 'never' => 'Never', @@ -113,6 +114,7 @@ return [ 'cannot_redirect_to_account' => 'Firefly III cannot redirect you to the correct page. Apologies.', 'sum_of_expenses' => 'Sum of expenses', 'sum_of_income' => 'Sum of income', + 'liabilities' => 'Liabilities', 'spent_in_specific_budget' => 'Spent in budget ":budget"', 'sum_of_expenses_in_budget' => 'Spent total in budget ":budget"', 'left_in_budget_limit' => 'Left to spend according to budgeting', @@ -913,7 +915,10 @@ return [ 'income' => 'Revenue / income', 'transfers' => 'Transfers', 'moneyManagement' => 'Money management', + 'money_management' => 'Money management', + 'tools' => 'Tools', 'piggyBanks' => 'Piggy banks', + 'piggy_banks' => 'Piggy banks', 'bills' => 'Bills', 'withdrawal' => 'Withdrawal', 'opening_balance' => 'Opening balance', diff --git a/resources/views/v2/index.twig b/resources/views/v2/index.twig index 3464da5d40..1e2f7bbf8a 100644 --- a/resources/views/v2/index.twig +++ b/resources/views/v2/index.twig @@ -1,6 +1,8 @@ {% extends "./layout/default" %} {% block content %}
+ +
@@ -73,6 +75,7 @@
+
diff --git a/resources/views/v2/layout/default.twig b/resources/views/v2/layout/default.twig index 3e149284ab..c05f8a6610 100644 --- a/resources/views/v2/layout/default.twig +++ b/resources/views/v2/layout/default.twig @@ -20,8 +20,8 @@ Firefly III - - + +