Skip to content

Commit 2cee582

Browse files
authored
Merge pull request #1 from flatlogic/update
Fix vuex and charts errors
2 parents 907ffa3 + a66cf11 commit 2cee582

File tree

4 files changed

+34
-28
lines changed

4 files changed

+34
-28
lines changed

changelog.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Changelog
22

3+
## [3.3.2] [27/04/2023]
4+
5+
- Fix vuex errors
6+
- Fix charts errors
7+
8+
### Updated
9+
- Update dependency
10+
311
## [3.3.1] [04/07/2022]
412

513
- Fix auth page style and several errors

package.json

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "light-blue-vue",
3-
"version": "3.3.0",
3+
"version": "3.3.2",
44
"private": true,
55
"scripts": {
66
"start": "vue-cli-service serve --port 3000",
@@ -10,10 +10,10 @@
1010
"node": "node server.js"
1111
},
1212
"dependencies": {
13-
"@amcharts/amcharts4": "^4.10.25",
14-
"@amcharts/amcharts4-geodata": "^4.1.23",
13+
"@amcharts/amcharts4": "^4.10.35",
14+
"@amcharts/amcharts4-geodata": "^4.1.26",
1515
"@ckeditor/ckeditor5-build-classic": "^12.4.0",
16-
"@ckeditor/ckeditor5-vue": "^1.0.0",
16+
"@ckeditor/ckeditor5-vue": "^1.0.3",
1717
"@fullcalendar/core": "^4.4.2",
1818
"@fullcalendar/daygrid": "^4.4.2",
1919
"@fullcalendar/interaction": "^4.4.2",
@@ -24,42 +24,42 @@
2424
"apexcharts": "^3.22.1",
2525
"awesome-bootstrap-checkbox": "^1.0.1",
2626
"axios": "^0.23.0",
27-
"bootstrap": "^5.1.3",
27+
"bootstrap": "^5.2.3",
2828
"bootstrap-vue": "2.22.0",
2929
"chart.js": "^2.9.4",
30-
"chroma-js": "^2.1.1",
30+
"chroma-js": "^2.4.2",
3131
"core-js": "2.6.12",
32-
"cross-env": "^7.0.2",
32+
"cross-env": "^7.0.3",
3333
"css-loader": "^1.0.1",
3434
"echarts": "4.9.0",
3535
"expose-loader": "^0.7.5",
3636
"font-awesome": "4.7.0",
3737
"glyphicons-halflings": "^1.9.1",
3838
"highcharts": "^7.2.2",
39-
"highcharts-vue": "^1.3.5",
39+
"highcharts-vue": "^1.4.0",
4040
"imports-loader": "^0.8.0",
4141
"jsonwebtoken": "^8.5.1",
4242
"line-awesome": "1.3.0",
43-
"mavon-editor": "^2.9.0",
43+
"mavon-editor": "^2.10.4",
4444
"moment": "^2.29.1",
4545
"rickshaw": "1.7.1",
4646
"skycons": "^1.0.0",
47-
"v-calendar": "^1.0.8",
47+
"v-calendar": "^1.1.1",
4848
"v-mask": "^1.3.4",
4949
"vee-validate": "^2.2.15",
50-
"vue": "^2.6.14",
51-
"vue-apexcharts": "^1.6.0",
50+
"vue": "^2.7.14",
51+
"vue-apexcharts": "^1.6.2",
5252
"vue-bootstrap-slider": "2.1.8",
5353
"vue-carousel": "^0.18.0",
5454
"vue-chartjs": "^3.5.1",
55-
"vue-code-highlight": "^0.7.6",
56-
"vue-color": "^2.7.1",
55+
"vue-code-highlight": "^0.7.8",
56+
"vue-color": "^2.8.1",
5757
"vue-draggable-nested-tree": "^2.2.20",
5858
"vue-echarts": "^4.1.0",
5959
"vue-form-wizard": "^0.8.4",
6060
"vue-gallery": "^1.5.0",
6161
"vue-input-tag": "^2.0.7",
62-
"vue-router": "^3.5.2",
62+
"vue-router": "^3.6.5",
6363
"vue-select": "^2.6.4",
6464
"vue-tables-2": "^1.6.25",
6565
"vue-textarea-autosize": "^1.1.1",
@@ -77,10 +77,10 @@
7777
"@vue/cli-plugin-babel": "^3.12.0",
7878
"@vue/cli-plugin-eslint": "^3.12.0",
7979
"@vue/cli-service": "^3.12.0",
80-
"sass": "^1.53.0",
81-
"sass-loader": "^10.3.0",
82-
"vue-template-compiler": "^2.6.14",
83-
"webpack": "^5.73.0"
80+
"sass": "^1.62.1",
81+
"sass-loader": "^10.4.1",
82+
"vue-template-compiler": "^2.7.14",
83+
"webpack": "^5.81.0"
8484
},
8585
"resolutions": {
8686
"core-js": "3.23.2"
@@ -112,4 +112,4 @@
112112
"last 2 versions",
113113
"not ie <= 8"
114114
]
115-
}
115+
}

src/components/Layout/Layout.vue

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,16 @@ export default {
2929
name: 'Layout',
3030
components: { Sidebar, Header, Helper },
3131
methods: {
32-
...mapActions(
33-
'layout', ['switchSidebar', 'changeSidebarActive'],
34-
),
32+
...mapActions([
33+
'layout'/'switchSidebar', 'changeSidebarActive',
34+
]),
3535
setTheme(){
3636
let theme = localStorage.getItem("theme")
3737
document.querySelector('body').setAttribute("class", `light-blue ${'theme--' + (theme || 'dark')}`)
3838
}
3939
},
4040
computed: {
41-
...mapState('layout', {
42-
43-
}),
41+
...mapState(['layout']),
4442
},
4543
created() {
4644
this.setTheme()

src/pages/Visits/Visits.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@
299299
</table>
300300
</div>
301301
<div class="widget-body mt-xlg chart-overflow-bottom">
302-
<area-chart class="area-chart" height="100px" :options="{legend: false, scales: {yAxes: [{display: false}], xAxes: [{display: false}]}}" :chart-data="dataCollection"></area-chart>
302+
<area-chart class="area-chart" :height="100" :options="{legend: false, scales: {yAxes: [{display: false}], xAxes: [{display: false}]}}" :chart-data="dataCollection"></area-chart>
303303
</div>
304304
</Widget>
305305
</b-col>
@@ -348,7 +348,7 @@ export default {
348348
}
349349
},
350350
checkedArr: [false, false, false],
351-
dataCollection: null,
351+
dataCollection: {},
352352
};
353353
},
354354
methods: {

0 commit comments

Comments
 (0)