Skip to content

Commit 203ce29

Browse files
committed
Dashboard: fix charts adaptive, fix percent position, justify content;
Helper: fix link to documentation; Invoice: fix table colors, change logo, add breadcrumbs; Calendar: fix icon color; Maps: fix widget justify; Progress: change bg color; Table: fix checkbox style; Grid: fix position, widget icons, add spaces; Charts: fix several charts; Upd dependencies, changelog.
1 parent 26819cb commit 203ce29

File tree

19 files changed

+331
-100
lines changed

19 files changed

+331
-100
lines changed

changelog.md

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,53 @@
11
# Changelog
2-
## [3.1.6]
2+
## [3.1.7]
3+
### Updated
4+
- Update dependency
5+
6+
### Fixed
7+
Much work has been done to improve and correct a lot of small bugs :)
38

9+
## [3.1.6]
410
### Updated
511
- Update dependency
6-
## [3.1.5]
712

13+
## [3.1.5]
814
### Fixed
915
- Update dependency
1016
- Fix animate class
1117
- Fix link to git repo
1218

1319
## [3.1.4]
14-
1520
### Fixed
1621

1722
- Fix invalid token validation
1823

1924
## [3.1.3]
20-
2125
### Fixed
2226

2327
- fixed issue with themes
2428

2529
## [3.1.2]
26-
2730
### Updated
2831

2932
- updated seed version
3033
- updated documentation
3134

3235
## [3.1.1]
33-
3436
### Fixed
3537

3638
- Design fixes
3739

3840
## [3.1.0]
39-
4041
### Updated
4142

4243
- Added brand new design!
4344

4445
## [3.0.5]
45-
4646
### Fixed
4747

4848
- fix bugs
4949

5050
## [3.0.4]
51-
5251
### Updated
5352

5453
- added documentation menu

package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "light-blue-vue",
3-
"version": "3.1.6",
3+
"version": "3.1.7",
44
"private": true,
55
"scripts": {
66
"start": "vue-cli-service serve --port 3000",
@@ -19,14 +19,14 @@
1919
"@fullcalendar/interaction": "^4.4.2",
2020
"@fullcalendar/timegrid": "^4.4.2",
2121
"@fullcalendar/vue": "^4.4.2",
22-
"animate.css": "^4.1.0",
22+
"animate.css": "^4.1.1",
2323
"animated-number-vue": "^1.0.0",
24-
"apexcharts": "^3.21.0",
24+
"apexcharts": "^3.22.1",
2525
"awesome-bootstrap-checkbox": "^1.0.1",
26-
"axios": "^0.20.0",
27-
"bootstrap": "^4.5.2",
28-
"bootstrap-vue": "2.17.3",
29-
"chart.js": "^2.9.3",
26+
"axios": "^0.21.0",
27+
"bootstrap": "^4.5.3",
28+
"bootstrap-vue": "2.18.1",
29+
"chart.js": "^2.9.4",
3030
"css-loader": "^1.0.1",
3131
"cross-env": "^7.0.2",
3232
"echarts": "4.9.0",
@@ -40,7 +40,7 @@
4040
"jsonwebtoken": "^8.5.1",
4141
"line-awesome": "1.3.0",
4242
"mavon-editor": "^2.9.0",
43-
"moment": "^2.29.0",
43+
"moment": "^2.29.1",
4444
"node-sass": "^4.14.1",
4545
"rickshaw": "1.7.1",
4646
"sass-loader": "^7.3.1",
@@ -60,7 +60,7 @@
6060
"vue-form-wizard": "^0.8.4",
6161
"vue-gallery": "^1.5.0",
6262
"vue-input-tag": "^2.0.7",
63-
"vue-router": "^3.4.3",
63+
"vue-router": "^3.4.8",
6464
"vue-select": "^2.6.4",
6565
"vue-tables-2": "^1.6.25",
6666
"vue-textarea-autosize": "^1.1.1",
@@ -69,7 +69,7 @@
6969
"vue2-datepicker": "^2.13.4",
7070
"vue2-dropzone": "^3.6.0",
7171
"vue2-google-maps": "0.10.7",
72-
"vuedraggable": "^2.24.1",
72+
"vuedraggable": "^2.24.3",
7373
"vuetrend": "^0.3.4",
7474
"vuex": "^3.5.1",
7575
"webpack-cli": "^3.3.12"

src/Routes.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ import SearchPage from '@/pages/Extra/Search/Search';
4545
import TimelinePage from '@/pages/Extra/Timeline/Timeline';
4646
import GalleryPage from '@/pages/Extra/Gallery/Gallery';
4747
import Login from '@/pages/Login/Login';
48+
import LoginDemo from '@/pages/Extra/LoginDemo/LoginDemo';
4849
import Register from '@/pages/Register/Register';
4950
import ErrorPage from '@/pages/Error/Error';
5051
// Ui
@@ -95,6 +96,11 @@ export default new Router({
9596
name: 'Login',
9697
component: Login,
9798
},
99+
{
100+
path: '/login-demo',
101+
name: 'LoginDemo',
102+
component: LoginDemo,
103+
},
98104
{
99105
path: '/register',
100106
name: 'Register',

src/assets/logo.jpg

9.71 KB
Loading

src/components/Helper/Helper.vue

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,11 @@
1818
class="btn btn-warning btn-rounded-f btn-block fs-mini text-white">
1919
Purchase
2020
</a>
21-
<a href='https://demo.flatlogic.com/light-blue-vue/dark/#/documentation'
22-
target="_blank"
23-
role="button"
21+
<router-link
22+
to="/documentation"
2423
class="btn btn-inverse btn-rounded-f btn-block fs-mini">
25-
Documentation
26-
</a>
24+
Documentation
25+
</router-link>
2726
</div>
2827
<div class="d-flex justify-content-between mt-lg">
2928
<a role="button"

src/components/Sidebar/Sidebar.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@
170170
:childrenLinks="[
171171
{ header: 'Calendar', link: '/app/extra/calendar' },
172172
{ header: 'Invoice', link: '/app/extra/invoice' },
173-
{ header: 'Login Page', link: '/login' },
173+
{ header: 'Login Page', link: '/login-demo' },
174174
{ header: 'Error Page', link: '/error' },
175175
{ header: 'Gallery', link: '/app/extra/gallery' },
176176
{ header: 'Search Result', link: '/app/extra/search' },

src/pages/Dashboard/Dashboard.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<div class="sidesWrapper">
55
<div class="analyticsSide">
66
<b-row>
7-
<b-col lg="3" sm="6" xs="12">
7+
<b-col xl="3" sm="6" xs="12">
88
<div class="pb-xlg h-100">
99
<Widget class="h-100 mb-0" title="Visits Today" close :fetchingData="isReceiving">
1010
<div class="d-flex justify-content-between align-items-center mb-lg">
@@ -25,14 +25,14 @@
2525
</Widget>
2626
</div>
2727
</b-col>
28-
<b-col lg="3" sm="6" xs="12">
28+
<b-col xl="3" sm="6" xs="12">
2929
<div class="pb-xlg h-100">
3030
<Widget class="h-100 mb-0" title="Revenue Breakdown" close :fetchingData="isReceiving">
3131
<highcharts :options="donut"></highcharts>
3232
</Widget>
3333
</div>
3434
</b-col>
35-
<b-col lg="3" sm="6" xs="12">
35+
<b-col xl="3" sm="6" xs="12">
3636
<div class="pb-xlg h-100">
3737
<Widget class="h-100 mb-0" title="App Perfomance" close :fetchingData="isReceiving">
3838
<p class="text-muted d-flex flex-wrap">
@@ -62,7 +62,7 @@
6262
</Widget>
6363
</div>
6464
</b-col>
65-
<b-col lg="3" sm="6" xs="12">
65+
<b-col xl="3" sm="6" xs="12">
6666
<div class="pb-xlg h-100">
6767
<Widget class="h-100 mb-0" title="Server Overview" close :fetchingData="isReceiving">
6868
<div class="d-flex align-items-center mb-sm">

src/pages/Extra/Calendar/Calendar.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
class="external-event"
3131
data-event='{ "classNames": ["bg-gray", "text-white"], "title": "Some stuff" }'
3232
>
33-
<i class="fa fa-circle-o fa-fw text-gray-light ml-xs mr-xs"></i>
33+
<i class="fa fa-circle fa-fw text-info ml-xs mr-xs"></i>
3434
Some stuff
3535
</div>
3636
<div

src/pages/Extra/Invoice/Invoice.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
.invoice-page {
44
.invoiceLogo {
5-
max-height: 50px;
5+
max-height: 100px;
6+
border-radius: 10px;
67
}
78

89
.invoiceBody {

src/pages/Extra/Invoice/Invoice.vue

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
11
<template>
22
<b-row>
3+
<b-col cols="12">
4+
<ol class="breadcrumb">
5+
<li class="breadcrumb-item">YOU ARE HERE</li>
6+
<li class="breadcrumb-item active">Invoice</li>
7+
</ol>
8+
</b-col>
39
<b-col lg='11'>
410
<b-row class='invoice-page'>
511
<b-col xs='12'>
612
<Widget>
713
<header>
814
<b-row>
915
<b-col md="6" xs="12" class="b-col-print-6">
10-
<img src="../../../assets/invoice-logo.png" alt="Logo" class='invoiceLogo' />
16+
<img src="../../../assets/logo.jpg" alt="Logo" class='invoiceLogo' />
1117
</b-col>
1218
<b-col md="6" xs="12" class="b-col-print-6">
1319
<h4 class="text-right">
Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
<template>
2+
<div class="auth-page">
3+
<b-container>
4+
<Widget class="widget-auth mx-auto" title="<h3 class='mt-0'>Login to your Web App</h3>" customHeader>
5+
<p class="widget-auth-info">
6+
Use your email to sign in.
7+
</p>
8+
<b-alert class="alert-sm text-center mt-2 widget-middle-overflow rounded-0" variant="default" show>
9+
This is a real app with Node.js backend - use
10+
<br/>
11+
<span class="font-weight-bold">"admin@flatlogic.com / password"</span>
12+
<br/>
13+
to login!
14+
</b-alert>
15+
<form class="mt" @submit.prevent="login">
16+
<b-alert class="alert-sm" variant="danger" :show="!!errorMessage">
17+
{{errorMessage}}
18+
</b-alert>
19+
<b-form-group label="Email" label-for="email">
20+
<b-input-group>
21+
<b-input-group-text slot="prepend"><i class="la la-user text-white"></i></b-input-group-text>
22+
<input id="email"
23+
ref="email"
24+
class="form-control input-transparent pl-3"
25+
type="email"
26+
required
27+
placeholder="Email"/>
28+
</b-input-group>
29+
</b-form-group>
30+
<b-form-group label="Password" label-for="password">
31+
<b-input-group>
32+
<b-input-group-text slot="prepend"><i class="la la-lock text-white"></i></b-input-group-text>
33+
<input id="password"
34+
ref="password"
35+
class="form-control input-transparent pl-3"
36+
type="password"
37+
required
38+
placeholder="Password"/>
39+
</b-input-group>
40+
</b-form-group>
41+
<div class="bg-widget auth-widget-footer">
42+
<b-button type="submit" variant="danger" class="auth-btn" size="sm">
43+
<span class="auth-btn-circle">
44+
<i class="la la-caret-right"></i>
45+
</span>
46+
{{this.isFetching ? 'Loading...' : 'Login'}}
47+
</b-button>
48+
<p class="widget-auth-info mt-4">
49+
Don't have an account? Sign up now!
50+
</p>
51+
<router-link class="d-block text-center mb-4" to="register">Create an Account</router-link>
52+
<div class="social-buttons">
53+
<b-button @click="this.googleLogin" variant="primary" class="social-button">
54+
<i class="social-icon social-google"></i>
55+
<p class="social-text">GOOGLE</p>
56+
</b-button>
57+
<b-button @click="this.microsoftLogin" variant="success" class="social-button">
58+
<i class="social-icon social-microsoft"></i>
59+
<p class="social-text">MICROSOFT</p>
60+
</b-button>
61+
</div>
62+
</div>
63+
</form>
64+
</Widget>
65+
</b-container>
66+
<footer class="auth-footer">
67+
Light Blue Vue Admin Dashboard Template - Made by <a href="https://flatlogic.com" target="_blank">Flatlogic</a>
68+
</footer>
69+
</div>
70+
</template>
71+
72+
<script>
73+
import Widget from '@/components/Widget/Widget';
74+
import {mapState, mapActions} from 'vuex';
75+
76+
import config from '../../../config';
77+
import NavLink from '../../../components/Sidebar/NavLink/NavLink';
78+
79+
export default {
80+
name: 'LoginDemoPage',
81+
components: {NavLink, Widget },
82+
computed: {
83+
...mapState('auth', {
84+
isFetching: state => state.isFetching,
85+
errorMessage: state => state.errorMessage,
86+
}),
87+
},
88+
methods: {
89+
...mapActions('auth', ['loginUser', 'receiveToken', 'receiveLogin']),
90+
login() {
91+
const email = this.$refs.email.value;
92+
const password = this.$refs.password.value;
93+
94+
if (email.length !== 0 && password.length !== 0) {
95+
this.loginUser({email, password});
96+
}
97+
},
98+
googleLogin() {
99+
this.loginUser({social: "google"});
100+
},
101+
microsoftLogin() {
102+
this.loginUser({social: "microsoft"});
103+
}
104+
},
105+
mounted() {
106+
const creds = config.auth;
107+
this.$refs.email.value = creds.email;
108+
this.$refs.password.value = creds.password;
109+
}
110+
};
111+
</script>

src/pages/Maps/Amcharts/Amcharts.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
Amcharts <span class="fw-semi-bold">Maps</span>
99
</h1>
1010
<b-row>
11-
<b-col xs="12" md="10">
11+
<b-col cols="12">
1212
<Widget
1313
title="<h5>Vue Amcharts Maps <small class='text-muted'>Default and customized</small></h5>"
1414
customHeader close collapse

src/pages/Maps/Google/Google.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
Google <span class="fw-semi-bold">Maps</span>
99
</h1>
1010
<b-row>
11-
<b-col xs="12" md="10">
11+
<b-col cols="12">
1212
<Widget
1313
title="<h5>Vue Google Maps <small class='text-muted'>Default and customized</small></h5>"
1414
customHeader close collapse

src/pages/Tables/Basic/Basic.scss

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,10 @@
44
.table th {
55
font-size: $font-size-sm;
66
}
7-
}
7+
.abc-checkbox {
8+
label::before {
9+
background-color: transparent;
10+
border: 1px solid #c1ccd3;
11+
}
12+
}
13+
}

src/pages/Tables/Basic/Basic.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
</div>
6969
<div class="clearfix">
7070
<div class="float-right">
71-
<b-button variant="default" class="mr-xs" size="sm">Send to...</b-button>
71+
<b-button variant="default" class="mr-3" size="sm">Send to...</b-button>
7272
<b-dropdown variant="inverse" class="mr-xs" size="sm" text="Clear" right>
7373
<b-dropdown-item>Clear</b-dropdown-item>
7474
<b-dropdown-item>Move ...</b-dropdown-item>

0 commit comments

Comments
 (0)