Skip to content

Commit b51ab2c

Browse files
committed
update login page, tables page, charts page, notifications page, dashboard page. remove jquery from tha app
1 parent 5498f0c commit b51ab2c

25 files changed

+1153
-2809
lines changed

package.json

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,27 @@
1010
},
1111
"dependencies": {
1212
"animate.css": "^3.6.1",
13+
"apexcharts": "^3.8.6",
1314
"awesome-bootstrap-checkbox": "^1.0.1",
1415
"bootstrap": "^4.1.1",
15-
"bootstrap-vue": "^2.0.0-rc.11",
16+
"bootstrap-vue": "^2.0.0-rc.24",
1617
"css-loader": "^1.0.0",
18+
"echarts": "^4.3.0",
1719
"expose-loader": "^0.7.5",
1820
"font-awesome": "4.7.0",
1921
"glyphicons-halflings": "1.9.1",
22+
"highcharts": "^7.2.0",
23+
"highcharts-vue": "^1.3.5",
2024
"imports-loader": "^0.8.0",
2125
"line-awesome": "icons8/line-awesome",
2226
"node-sass": "^4.9.0",
2327
"rickshaw": "1.6.6",
2428
"sass-loader": "^7.0.1",
2529
"vue": "^2.5.17",
30+
"vue-apexcharts": "^1.5.0",
31+
"vue-echarts": "^4.0.4",
2632
"vue-router": "^3.0.1",
33+
"vue-toasted": "^1.1.27",
2734
"vue-touch": "2.0.0-beta.4",
2835
"vue2-google-maps": "^0.10.2",
2936
"vuetrend": "^0.3.2",
@@ -34,8 +41,8 @@
3441
"@vue/cli-plugin-babel": "^3.0.5",
3542
"@vue/cli-plugin-eslint": "^3.0.5",
3643
"@vue/cli-service": "^3.0.5",
37-
"vue-template-compiler": "^2.5.17",
38-
"core-js": "^2.6.5"
44+
"core-js": "^2.6.5",
45+
"vue-template-compiler": "^2.5.17"
3946
},
4047
"eslintConfig": {
4148
"root": true,

src/assets/microsoft.png

7.54 KB
Loading
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.sparkline-chart .apexcharts-canvas {
2+
background: transparent;
3+
}
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
<template>
2+
<apexchart class="sparkline-chart" style="display: inline-block" :type="type" :height="height" :width="width" :options="sparkOptions" :series="data"/>
3+
</template>
4+
5+
<script>
6+
7+
export default {
8+
name: 'Sparklines',
9+
props: {
10+
type: { type: String, default: "bar" },
11+
data: { type: Array },
12+
height: { type: [Number, String], default: 20 },
13+
width: { type: [Number, String], default: 50 },
14+
options: { type: Object },
15+
},
16+
computed: {
17+
sparkOptions() {
18+
return {
19+
chart: {
20+
height: this.height,
21+
width: this.width,
22+
sparkline: {
23+
enabled: true
24+
}
25+
},
26+
plotOptions: {
27+
bar: {
28+
columnWidth: '60%'
29+
}
30+
},
31+
xaxis: {
32+
crosshairs: {
33+
width: 1
34+
},
35+
},
36+
tooltip: {
37+
fixed: {
38+
enabled: false
39+
},
40+
x: {
41+
show: false
42+
},
43+
y: {
44+
title: {
45+
formatter: function () {
46+
return ''
47+
}
48+
}
49+
},
50+
marker: {
51+
show: false
52+
}
53+
}, ...this.options
54+
}
55+
}
56+
}
57+
}
58+
</script>
59+
<style src="./Sparklines.scss" lang="scss"></style>

src/main.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// The Vue build version to load with the `import` command
22
// (runtime-only or standalone) has been set in webpack.base.conf with an alias.
3-
import 'expose-loader?jQuery!jquery' // eslint-disable-line
4-
import 'expose-loader?$!jquery' // eslint-disable-line
53
import Vue from 'vue';
64
import BootstrapVue from 'bootstrap-vue';
75
import * as VueGoogleMaps from 'vue2-google-maps';
86
import VueTouch from 'vue-touch';
97
import Trend from 'vuetrend';
8+
import Toasted from 'vue-toasted';
9+
import VueApexCharts from 'vue-apexcharts';
1010

1111
import store from './store';
1212
import router from './Routes';
@@ -20,6 +20,8 @@ Vue.use(VueGoogleMaps, {
2020
key: 'AIzaSyB7OXmzfQYua_1LEhRdqsoYzyJOPh9hGLg',
2121
},
2222
});
23+
Vue.use(Toasted, {duration: 10000});
24+
Vue.component('apexchart', VueApexCharts);
2325

2426
Vue.config.productionTip = false;
2527

src/pages/Charts/Charts.scss

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

0 commit comments

Comments
 (0)