Skip to content

Firefly III: a personal finances manager

new stuff

Sander Dorigo74ba2ba41c70
diff --git a/package-lock.json b/package-lock.json
index 7086d39e36..f3a6bef2d3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
{
- "name": "firefly-iii",
+ "name": "release",
"lockfileVersion": 3,
"requires": true,
"packages": {
@@ -1958,6 +1958,7 @@
"hasInstallScript": true,
"license": "MIT",
"optional": true,
+ "peer": true,
"dependencies": {
"detect-libc": "^2.0.3",
"is-glob": "^4.0.3",
@@ -2000,6 +2001,7 @@
"os": [
"android"
],
+ "peer": true,
"engines": {
"node": ">= 10.0.0"
},
@@ -2021,6 +2023,7 @@
"os": [
"darwin"
],
+ "peer": true,
"engines": {
"node": ">= 10.0.0"
},
@@ -2042,6 +2045,7 @@
"os": [
"darwin"
],
+ "peer": true,
"engines": {
"node": ">= 10.0.0"
},
@@ -2063,6 +2067,7 @@
"os": [
"freebsd"
],
+ "peer": true,
"engines": {
"node": ">= 10.0.0"
},
@@ -2084,6 +2089,7 @@
"os": [
"linux"
],
+ "peer": true,
"engines": {
"node": ">= 10.0.0"
},
@@ -2105,6 +2111,7 @@
"os": [
"linux"
],
+ "peer": true,
"engines": {
"node": ">= 10.0.0"
},
@@ -2126,6 +2133,7 @@
"os": [
"linux"
],
+ "peer": true,
"engines": {
"node": ">= 10.0.0"
},
@@ -2147,6 +2155,7 @@
"os": [
"linux"
],
+ "peer": true,
"engines": {
"node": ">= 10.0.0"
},
@@ -2168,6 +2177,7 @@
"os": [
"linux"
],
+ "peer": true,
"engines": {
"node": ">= 10.0.0"
},
@@ -2189,6 +2199,7 @@
"os": [
"linux"
],
+ "peer": true,
"engines": {
"node": ">= 10.0.0"
},
@@ -2210,6 +2221,7 @@
"os": [
"win32"
],
+ "peer": true,
"engines": {
"node": ">= 10.0.0"
},
@@ -2231,6 +2243,7 @@
"os": [
"win32"
],
+ "peer": true,
"engines": {
"node": ">= 10.0.0"
},
@@ -2252,6 +2265,7 @@
"os": [
"win32"
],
+ "peer": true,
"engines": {
"node": ">= 10.0.0"
},
@@ -2267,6 +2281,7 @@
"dev": true,
"license": "MIT",
"optional": true,
+ "peer": true,
"engines": {
"node": ">=12"
},
@@ -7017,12 +7032,6 @@
"node": ">= 0.10"
}
},
- "node_modules/intro.js": {
- "version": "8.3.2",
- "resolved": "https://registry.npmjs.org/intro.js/-/intro.js-8.3.2.tgz",
- "integrity": "sha512-+QsuU8P7Z/O7stAwZ8Uj6CPyKsY6xVx/7hKTVLjlIEPYHaT43XnEUUYHCln6Ehr7GlDuwczh6I8PD/HGf4EG0A==",
- "license": "AGPL-3.0"
- },
"node_modules/ipaddr.js": {
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.4.0.tgz",
@@ -8312,7 +8321,8 @@
"integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
"dev": true,
"license": "MIT",
- "optional": true
+ "optional": true,
+ "peer": true
},
"node_modules/node-forge": {
"version": "1.4.0",
@@ -12435,7 +12445,6 @@
"alpinejs": "^3.15.12",
"bootstrap-icons": "^1.13.1",
"cally": "^0.9.2",
- "intro.js": "^8.3.2",
"shepherd.js": "^15.2.2"
},
"devDependencies": {
diff --git a/resources/assets/v3/js/boot/bootstrap.js b/resources/assets/v3/js/boot/bootstrap.js
index 43241c097f..d13aa47435 100644
--- a/resources/assets/v3/js/boot/bootstrap.js
+++ b/resources/assets/v3/js/boot/bootstrap.js
@@ -17,26 +17,20 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-// import css
-// import "admin-lte/dist/css/adminlte.min.css"
-// import "bootstrap-icons/font/bootstrap-icons.css"
// JS
import "bootstrap"
import "admin-lte"
import Alpine from 'alpinejs'
-import store from "store";
+import store from "../store/store.js";
import axios from 'axios';
import Shepherd from 'shepherd.js';
import "cally";
-import observePlugin from 'store/plugins/observe';
import {getFreshVariable} from "v2/src/store/get-fresh-variable.js";
import {getVariable} from "v2/src/store/get-variable.js";
import {getViewRange} from "v2/src/support/get-viewrange.js";
import {loadTranslations} from "v2/src/support/load-translations.js";
-store.addPlugin(observePlugin);
-
window.bootstrapped = false;
window.store = store;
diff --git a/resources/assets/v3/js/pages/dashboard/dashboard.js b/resources/assets/v3/js/pages/dashboard/dashboard.js
index 5d37e10b37..8adec400df 100644
--- a/resources/assets/v3/js/pages/dashboard/dashboard.js
+++ b/resources/assets/v3/js/pages/dashboard/dashboard.js
@@ -28,7 +28,7 @@ let index = function () {
return {
foo2: 'bar2',
init() {
- console.log('init op index xxx');
+ //console.log('init op index xxx');
}
}
};
@@ -46,7 +46,7 @@ function loadPage(comps) {
Object.keys(comps).forEach(comp => {
let data = comps[comp]();
Alpine.data(comp, () => data);
- console.log(comp);
+ // console.log(comp);
});
Alpine.start();
}
diff --git a/resources/assets/v3/js/store/store.js b/resources/assets/v3/js/store/store.js
new file mode 100644
index 0000000000..c6b382995b
--- /dev/null
+++ b/resources/assets/v3/js/store/store.js
@@ -0,0 +1,6 @@
+let engine = require('store/src/store-engine')
+
+let storages = require('store/storages/all')
+let plugins = [require('store/plugins/observe')]
+
+module.exports = engine.createStore(storages, plugins)
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 35725ba7e1..31dccb88a4 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.v2.session')
+@extends('layout.v3.auth')
@section('content')
@if(true===$IS_DEMO_SITE)
diff --git a/resources/views/layout/v3/auth.blade.php b/resources/views/layout/v3/auth.blade.php
new file mode 100644
index 0000000000..80ca01ce77
--- /dev/null
+++ b/resources/views/layout/v3/auth.blade.php
@@ -0,0 +1,66 @@
+<!doctype html>
+<html lang="{{ __('config.html_language') }}">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <meta charset="UTF-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="csrf-token" content="{{ csrf_token() }}">
+ <meta name="robots" content="noindex, nofollow, noarchive, noodp, NoImageIndex, noydir">
+ <meta name="apple-mobile-web-app-capable" content="yes">
+ <meta name="mobile-web-app-capable" content="yes">
+ <!--
+ If the base href URL begins with "http://" but you are sure it should start with "https://",
+ please visit the following page: https://bit.ly/FF3-broken-base-href
+ -->
+ <base href="{{ route('index', null, true) }}/">
+ <title>{{ __('firefly.login_page_title') }}</title>
+
+ <!--begin::Theme Init (prevents flash of incorrect theme on load, #6043)-->
+ <!--end::Theme Init-->
+
+ <!--begin::Accessibility Meta Tags-->
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes"/>
+ <meta name="theme-color" content="#007bff" media="(prefers-color-scheme: light)"/>
+ <meta name="theme-color" content="#1a1a1a" media="(prefers-color-scheme: dark)"/>
+ <!--end::Accessibility Meta Tags-->
+
+ <!--begin::Accessibility Features-->
+ <!-- Skip links will be dynamically added by accessibility.js -->
+ <meta name="color-scheme" content="light dark">
+
+ <x-layout.fav-icons/>
+ <!--end::Accessibility Features-->
+
+</head>
+<!--end::Head-->
+<!--begin::Body-->
+<body class="login-page bg-body-secondary">
+<div class="login-box">
+ <div class="card card-outline card-primary">
+ <div class="card-header">
+ <a
+ href="../index2.html"
+ class="link-dark text-center link-offset-2 link-opacity-100 link-opacity-50-hover"
+ >
+ <h1 class="mb-0"><b>Admin</b>LTE</h1>
+ </a>
+ </div>
+ <div class="card-body login-card-body">
+ <p class="login-box-msg">Sign in to start your sessionXXX</p>
+
+
+
+ @yield('content')
+
+
+ <!-- begin niuwe code -->
+ </div>
+ <!-- /.login-box -->
+ </div>
+</div>
+
+@yield('scripts')
+
+</body>
+<!--end::Body-->
+</html>