mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2026-01-10 12:24:50 +00:00
Upgrade frontend.
This commit is contained in:
12
frontend/src/app.scss
vendored
12
frontend/src/app.scss
vendored
@@ -1,6 +1,6 @@
|
||||
/*!
|
||||
* app.scss
|
||||
* Copyright (c) 2020 james@firefly-iii.org
|
||||
* Copyright (c) 2021 james@firefly-iii.org
|
||||
*
|
||||
* This file is part of Firefly III (https://github.com/firefly-iii).
|
||||
*
|
||||
@@ -18,8 +18,12 @@
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
|
||||
// Firefly III colors (?)
|
||||
@import 'scss/variables';
|
||||
$blue: #1E6581;
|
||||
$green: #64B624;
|
||||
$red: #CD5029;
|
||||
|
||||
|
||||
|
||||
// Fonts
|
||||
@@ -40,7 +44,7 @@
|
||||
@import '~admin-lte/build/scss/bootstrap-variables';
|
||||
@import '~bootstrap/scss/bootstrap';
|
||||
|
||||
@import '~bootstrap-vue/src/index.scss';
|
||||
@import '~bootstrap-vue/src/index';
|
||||
|
||||
// Variables and Mixins
|
||||
// ---------------------------------------------------
|
||||
@@ -74,7 +78,7 @@
|
||||
//@import '../social-widgets';
|
||||
|
||||
// admin LTE pages (unused)
|
||||
@import '~admin-lte/build/scss/parts/pages';
|
||||
@import '~admin-lte/build/scss/parts/pages';
|
||||
|
||||
// admin LTE plugins (unused)
|
||||
// @import 'parts/plugins';
|
||||
|
||||
4
frontend/src/bootstrap.js
vendored
4
frontend/src/bootstrap.js
vendored
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
* bootstrap.js
|
||||
* Copyright (c) 2020 james@firefly-iii.org
|
||||
* Copyright (c) 2021 james@firefly-iii.org
|
||||
*
|
||||
* This file is part of Firefly III (https://github.com/firefly-iii).
|
||||
*
|
||||
@@ -52,7 +52,7 @@ if (localeToken) {
|
||||
require('jquery-ui');
|
||||
require('bootstrap'); // bootstrap CSS?
|
||||
|
||||
require('./dist/js/adminlte');
|
||||
require('admin-lte/dist/js/adminlte');
|
||||
require('overlayscrollbars');
|
||||
|
||||
|
||||
|
||||
1887
frontend/src/classic/adminlte.js
vendored
1887
frontend/src/classic/adminlte.js
vendored
File diff suppressed because it is too large
Load Diff
31219
frontend/src/dist/css/adminlte.css
vendored
31219
frontend/src/dist/css/adminlte.css
vendored
File diff suppressed because it is too large
Load Diff
1
frontend/src/dist/css/adminlte.css.map
vendored
1
frontend/src/dist/css/adminlte.css.map
vendored
File diff suppressed because one or more lines are too long
1896
frontend/src/dist/js/adminlte.js
vendored
1896
frontend/src/dist/js/adminlte.js
vendored
File diff suppressed because it is too large
Load Diff
1
frontend/src/dist/js/adminlte.js.map
vendored
1
frontend/src/dist/js/adminlte.js.map
vendored
File diff suppressed because one or more lines are too long
35
frontend/src/pages/dashboard.js
vendored
35
frontend/src/pages/dashboard.js
vendored
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
* dashboard.js
|
||||
* Copyright (c) 2020 james@firefly-iii.org
|
||||
* Copyright (c) 2021 james@firefly-iii.org
|
||||
*
|
||||
* This file is part of Firefly III (https://github.com/firefly-iii).
|
||||
*
|
||||
@@ -18,21 +18,22 @@
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
import Dashboard from "../components/dashboard/Dashboard";
|
||||
import TopBoxes from "../components/dashboard/TopBoxes";
|
||||
import MainAccount from "../components/dashboard/MainAccount";
|
||||
import MainAccountList from "../components/dashboard/MainAccountList";
|
||||
import MainBillsList from "../components/dashboard/MainBillsList";
|
||||
import MainBudgetList from "../components/dashboard/MainBudgetList";
|
||||
import MainCreditList from "../components/dashboard/MainCreditList";
|
||||
import MainDebitList from "../components/dashboard/MainDebitList";
|
||||
import MainPiggyList from "../components/dashboard/MainPiggyList";
|
||||
import TransactionListLarge from "../components/transactions/TransactionListLarge";
|
||||
import TransactionListMedium from "../components/transactions/TransactionListMedium";
|
||||
import TransactionListSmall from "../components/transactions/TransactionListSmall";
|
||||
import Calendar from "../components/dashboard/Calendar";
|
||||
import MainCategoryList from "../components/dashboard/MainCategoryList";
|
||||
import Vue from "vue";
|
||||
|
||||
import Dashboard from '../components/dashboard/Dashboard';
|
||||
import TopBoxes from '../components/dashboard/TopBoxes';
|
||||
import MainAccount from '../components/dashboard/MainAccount';
|
||||
import MainAccountList from '../components/dashboard/MainAccountList';
|
||||
import MainBillsList from '../components/dashboard/MainBillsList';
|
||||
import MainBudgetList from '../components/dashboard/MainBudgetList';
|
||||
import MainCreditList from '../components/dashboard/MainCreditList';
|
||||
import MainDebitList from '../components/dashboard/MainDebitList';
|
||||
import MainPiggyList from '../components/dashboard/MainPiggyList';
|
||||
import TransactionListLarge from '../components/transactions/TransactionListLarge';
|
||||
import TransactionListMedium from '../components/transactions/TransactionListMedium';
|
||||
import TransactionListSmall from '../components/transactions/TransactionListSmall';
|
||||
import Calendar from '../components/dashboard/Calendar';
|
||||
import MainCategoryList from '../components/dashboard/MainCategoryList';
|
||||
import Vue from 'vue';
|
||||
import Vuex from 'vuex'
|
||||
import store from '../components/store';
|
||||
|
||||
@@ -70,7 +71,7 @@ let props = {};
|
||||
new Vue({
|
||||
i18n,
|
||||
store,
|
||||
el: "#dashboard",
|
||||
el: '#dashboard',
|
||||
render: (createElement) => {
|
||||
return createElement(Dashboard, {props: props});
|
||||
},
|
||||
|
||||
10
frontend/src/pages/empty.js
vendored
10
frontend/src/pages/empty.js
vendored
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
* dashboard.js
|
||||
* Copyright (c) 2020 james@firefly-iii.org
|
||||
* empty.js
|
||||
* Copyright (c) 2021 james@firefly-iii.org
|
||||
*
|
||||
* This file is part of Firefly III (https://github.com/firefly-iii).
|
||||
*
|
||||
@@ -18,10 +18,4 @@
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
/**
|
||||
* First we will load Axios via bootstrap.js
|
||||
* jquery and bootstrap-sass preloaded in app.js
|
||||
* vue, uiv and vuei18n are in app_vue.js
|
||||
*/
|
||||
|
||||
require('../bootstrap');
|
||||
|
||||
23
frontend/src/scss/_variables.scss
vendored
23
frontend/src/scss/_variables.scss
vendored
@@ -1,23 +0,0 @@
|
||||
/*!
|
||||
* _variables.scss
|
||||
* Copyright (c) 2021 james@firefly-iii.org
|
||||
*
|
||||
* This file is part of Firefly III (https://github.com/firefly-iii).
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* 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/>.
|
||||
*/
|
||||
|
||||
$blue: #1E6581;
|
||||
$green: #64B624;
|
||||
$red: #CD5029;
|
||||
Reference in New Issue
Block a user