Skip to content

Commit b95f49a

Browse files
committed
feat(App): update design
1 parent a616cef commit b95f49a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+2689
-3026
lines changed

changelog.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Changelog
2+
3+
## [v2.1.0]
4+
5+
### Updated
6+
7+
- New Design
8+
9+
## [v2.0.0]
10+
11+
### Updated
12+
13+
- Remove All Jquery

package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "1.0.0",
44
"private": true,
55
"scripts": {
6-
"serve": "vue-cli-service serve",
6+
"serve": "vue-cli-service serve --port 3000",
77
"build": "vue-cli-service build",
88
"lint": "vue-cli-service lint",
99
"start": "node server.js"
@@ -16,35 +16,35 @@
1616
"apexcharts": "^3.8.6",
1717
"awesome-bootstrap-checkbox": "^1.0.1",
1818
"bootstrap": "^4.3.1",
19-
"bootstrap-vue": "^2.0.0-rc.11",
20-
"chart.js": "^2.7.3",
19+
"bootstrap-vue": "2.0.3",
20+
"chart.js": "^2.8.0",
2121
"css-loader": "^1.0.0",
22-
"echarts": "^4.3.0",
22+
"echarts": "4.5.0",
2323
"expose-loader": "^0.7.5",
2424
"font-awesome": "4.7.0",
2525
"glyphicons-halflings": "^1.9.1",
2626
"highcharts": "^7.2.0",
2727
"highcharts-vue": "^1.3.5",
2828
"imports-loader": "^0.8.0",
29-
"line-awesome": "icons8/line-awesome",
29+
"line-awesome": "1.3.0",
3030
"node-sass": "^4.9.0",
3131
"sass-loader": "^7.0.1",
32-
"v-calendar": "^0.9.7",
32+
"v-calendar": "^1.0.0-beta.16",
3333
"vue": "^2.5.17",
3434
"vue-apexcharts": "^1.5.0",
35-
"vue-chartjs": "^3.4.0",
35+
"vue-chartjs": "^3.4.2",
3636
"vue-echarts": "^4.0.4",
37-
"vue-toasted": "^1.1.27",
3837
"vue-router": "^3.0.1",
39-
"vue2-google-maps": "^0.10.2",
38+
"vue-toasted": "^1.1.27",
39+
"vue2-google-maps": "0.10.7",
4040
"vuex": "^3.0.1",
4141
"webpack-cli": "^3.1.2"
4242
},
4343
"devDependencies": {
4444
"@vue/cli-plugin-babel": "^3.12.0",
4545
"@vue/cli-plugin-eslint": "^3.12.0",
4646
"@vue/cli-service": "^3.12.0",
47-
"vue-template-compiler": "^2.5.17"
47+
"vue-template-compiler": "^2.6.10"
4848
},
4949
"eslintConfig": {
5050
"root": true,

public/demo/grid/autoload.php

Lines changed: 0 additions & 33 deletions
This file was deleted.

public/demo/grid/default.php

Lines changed: 0 additions & 4 deletions
This file was deleted.

public/demo/grid/news.php

Lines changed: 0 additions & 55 deletions
This file was deleted.

public/demo/grid/shares.php

Lines changed: 0 additions & 53 deletions
This file was deleted.

src/Routes.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import Notifications from '@/pages/Notifications/Notifications';
88
import Icons from '@/pages/Icons/Icons';
99
import Maps from '@/pages/Maps/Maps';
1010
import Charts from '@/pages/Charts/Charts';
11-
import Dashboard from '@/pages/Dashboard/Dashboard';
11+
import Dashboard from '@/pages/Visits/Visits';
1212
import Login from '@/pages/Login/Login';
1313
import ErrorPage from '@/pages/Error/Error';
1414

src/components/Header/Header.scss

Lines changed: 80 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,22 @@
11
@import '../../styles/app';
22

3-
.header {
3+
.app-header.navbar {
44
z-index: 100;
55
padding: 0 1.85rem 0;
66

77
@include media-breakpoint-down(md) {
8-
padding: 7px 10px;
8+
padding: 0 10px;
99
}
1010

11-
:global(.dropdown-menu) {
12-
background-color: transparentize($body-bg, .15);
11+
.dropdown-menu {
1312
color: $text-muted;
1413
margin-top: 12.5px;
14+
background: $default-bg;
15+
border: none;
1516
}
1617

17-
:global(.dropdown-item) {
18-
19-
.avatar {
20-
margin-top: 0;
21-
}
18+
.dropdown-item {
19+
color: $text-color;
2220

2321
&:active,
2422
&:focus,
@@ -29,65 +27,90 @@
2927
}
3028
}
3129

32-
:global(.dropdown-menu-messages) {
33-
min-width: 20rem;
30+
.dropdown-menu-messages {
31+
.dropdown-item {
32+
display: flex;
33+
align-items: center;
34+
}
3435
}
35-
}
36-
37-
.input-group-text {
38-
padding-right: 0;
39-
padding-left: .85rem;
40-
color: $gray-600;
41-
}
4236

43-
.avatar {
44-
margin-top: -7px;
45-
}
37+
.dropdown-menu-settings {
38+
.dropdown-divider {
39+
border-color: $dark;
40+
}
41+
}
4642

47-
.divider {
48-
display: block;
49-
height: 38px;
50-
width: 1px;
51-
margin: 0 15px;
52-
background: linear-gradient(rgba(51,51,51,0), rgba(51,51,51,0.5), rgba(102,102,102,0));
53-
}
5443

55-
.header-alert {
56-
background: $text-transparent;
57-
border: none;
58-
font-size: $font-size-sm;
59-
line-height: 19px;
60-
margin-bottom: 0;
61-
padding: 3px 9px;
62-
text-shadow: none;
63-
border-radius: 10px;
64-
color: $text-color;
65-
66-
:global(.close) {
67-
margin-left: 1rem;
44+
.input-group-text {
45+
padding-left: .85rem;
46+
color: $gray-600;
6847
}
6948

70-
@media (max-width: breakpoint-max('lg')) {
71-
display: none;
49+
.divider {
50+
display: block;
51+
width: 1px;
52+
margin: 0 15px;
53+
background: linear-gradient(rgba($dark, 0), rgba($text-color, 0.5), rgba($dark, 0));
7254
}
73-
}
7455

75-
.navbar-nav-mobile {
76-
flex-direction: row;
56+
.header-alert {
57+
background: $text-transparent;
58+
border: none;
59+
font-size: $font-size-sm;
60+
line-height: 19px;
61+
margin-bottom: 0;
62+
padding: 3px 9px;
63+
text-shadow: none;
64+
border-radius: 10px;
65+
color: $text-color;
66+
67+
.close {
68+
margin-left: 1rem;
69+
}
7770

78-
:global(.nav-link) {
79-
padding-right: $navbar-nav-link-padding-x;
80-
padding-left: $navbar-nav-link-padding-x;
71+
@media (max-width: breakpoint-max('lg')) {
72+
display: none;
73+
}
8174
}
8275

83-
:global(.dropdown-menu) {
84-
position: absolute;
76+
.navbar-nav-mobile {
77+
flex-direction: row;
78+
79+
.nav-item {
80+
display: flex;
81+
align-items: center;
8582

86-
@media (max-width: breakpoint-max('xs')) {
87-
position: fixed;
88-
top: $navbar-height;
89-
right: 1rem;
90-
margin-top: 0;
83+
&.show {
84+
display: flex !important;
85+
}
86+
87+
.nav-link {
88+
display: flex;
89+
align-items: center;
90+
padding-right: $navbar-nav-link-padding-x;
91+
padding-left: $navbar-nav-link-padding-x;
92+
color: $text-color;
93+
94+
&:hover {
95+
color: $header-color;
96+
}
97+
}
98+
}
99+
100+
.navbar-text {
101+
display: flex;
102+
align-items: center;
103+
}
104+
105+
.dropdown-menu {
106+
position: absolute;
107+
108+
@media (max-width: breakpoint-max('xs')) {
109+
position: fixed;
110+
top: $navbar-height;
111+
right: 1rem;
112+
margin-top: 0;
113+
}
91114
}
92115
}
93-
}
116+
}

0 commit comments

Comments
 (0)