Skip to content

Commit 8fcedaf

Browse files
committed
- Update dependencies
- Update login page
1 parent f140ec2 commit 8fcedaf

File tree

5 files changed

+50
-42
lines changed

5 files changed

+50
-42
lines changed

changelog.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
# Changelog
2+
## [v1.0.3]
3+
4+
- Update dependencies
5+
- Update login page
6+
27
## [v1.0.2]
38

49
- Update dependencies

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,21 @@
88
"lint": "vue-cli-service lint"
99
},
1010
"dependencies": {
11-
"apexcharts": "^3.22.0",
12-
"core-js": "^3.6.5",
11+
"apexcharts": "^3.24.0",
12+
"core-js": "^3.8.3",
1313
"css-loader": "^4.3.0",
1414
"font-awesome": "^4.7.0",
15-
"highcharts": "^8.2.0",
15+
"highcharts": "^8.2.2",
1616
"highcharts-vue": "^1.3.5",
1717
"vue": "^2.6.12",
1818
"vue-apexcharts": "^1.6.0",
19-
"vue-router": "^3.4.6",
20-
"vue-toastification": "^1.7.8",
19+
"vue-router": "^3.5.1",
20+
"vue-toastification": "^1.7.11",
2121
"vue2-google-maps": "^0.10.7",
2222
"vue2-perfect-scrollbar": "^1.5.0",
23-
"vuetify": "^2.3.18",
23+
"vuetify": "^2.4.3",
2424
"vuetrend": "^0.3.4",
25-
"vuex": "^3.5.1"
25+
"vuex": "^3.6.2"
2626
},
2727
"devDependencies": {
2828
"@vue/cli-plugin-babel": "~4.5.7",

src/pages/Login/Login.scss

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
@import "../../styles/app";
2-
2+
body {
3+
background-color: #F6F7FF !important
4+
}
35
.container {
46
font-family: "Roboto", "Helvetica", "Arial", sans-serif;
57
padding: 0;
@@ -34,9 +36,10 @@
3436
width: 100%;
3537
height: 100vh;
3638
background-color: #F6F7FF;
39+
overflow-y: auto;
3740
.login-wrapper {
3841
width: 320px;
39-
height: 620px;
42+
height: auto;
4043
.login-slogan {
4144
color: #4a4a4a;
4245
}
@@ -54,11 +57,9 @@
5457

5558
}
5659
.v-footer {
57-
padding: 0;
58-
margin: 0;
59-
bottom: 50px;
60+
position: absolute;
61+
bottom: 0;
6062
background-color: #F6F7FF;
6163
}
6264
}
6365
}
64-

src/pages/Login/Login.vue

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
</div>
1010
</v-col>
1111
<v-col cols="12" lg="5" class="login-part d-flex align-center justify-center">
12-
<v-row no-gutters>
12+
<v-row no-gutters class="align-start">
1313
<v-col cols="12" class="login-part d-flex align-center justify-center flex-column">
14-
<div class="login-wrapper">
14+
<div class="login-wrapper pt-md-4 pt-0">
1515
<v-tabs grow>
1616
<v-tabs-slider></v-tabs-slider>
1717
<v-tab :href="`#tab-login`">
@@ -179,9 +179,6 @@
179179
}
180180
}
181181
182-
183-
184-
185182
</script>
186183

187184
<style src="./Login.scss" lang="scss"/>

yarn.lock

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1777,10 +1777,10 @@ anymatch@~3.1.1:
17771777
normalize-path "^3.0.0"
17781778
picomatch "^2.0.4"
17791779

1780-
apexcharts@^3.22.0:
1781-
version "3.22.0"
1782-
resolved "https://registry.yarnpkg.com/apexcharts/-/apexcharts-3.22.0.tgz#df6f1030d0d5bba605069907102d2c261afe97cb"
1783-
integrity sha512-DDh2eXnAEA8GoKU/hdicOaS2jzGehXwv8Bj1djYYudkeQzEdglFoWsVyIxff+Ds7+aUtVAJzd/9ythZuyyIbXQ==
1780+
apexcharts@^3.24.0:
1781+
version "3.24.0"
1782+
resolved "https://registry.yarnpkg.com/apexcharts/-/apexcharts-3.24.0.tgz#0fc513e940448524ae9702d39ec287567522d1eb"
1783+
integrity sha512-iT6czJCIVrmAtrcO90MZTQCvC+xi6R6Acf0jNH/d40FVTtCfcqECuKIh5iAMyOTtgUb7+fQ8rbadH2bm1kbL9Q==
17841784
dependencies:
17851785
svg.draggable.js "^2.2.2"
17861786
svg.easing.js "^2.0.0"
@@ -2823,6 +2823,11 @@ core-js@^3.6.5:
28232823
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a"
28242824
integrity sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==
28252825

2826+
core-js@^3.8.3:
2827+
version "3.8.3"
2828+
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.8.3.tgz#c21906e1f14f3689f93abcc6e26883550dd92dd0"
2829+
integrity sha512-KPYXeVZYemC2TkNEkX/01I+7yd+nX3KddKwZ1Ww7SKWdI2wQprSgLmrTddT8nw92AjEklTsPBoSdQBhbI1bQ6Q==
2830+
28262831
[email protected], core-util-is@~1.0.0:
28272832
version "1.0.2"
28282833
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@@ -4433,10 +4438,10 @@ highcharts-vue@^1.3.5:
44334438
resolved "https://registry.yarnpkg.com/highcharts-vue/-/highcharts-vue-1.3.5.tgz#9a3e5f6050bf0227c19238433abfb17ab7262db3"
44344439
integrity sha512-By1kc3m8XoI20pMshs/ue69j4rH6eQioDPoIrtC20RTti4QyvNAx8DisGSO3GAWe9sn50hPk8NsyxcwZIGaz3Q==
44354440

4436-
highcharts@^8.2.0:
4437-
version "8.2.0"
4438-
resolved "https://registry.yarnpkg.com/highcharts/-/highcharts-8.2.0.tgz#3d4893015caf1a7c9ed85284d983911e844649f3"
4439-
integrity sha512-s3R7UEaMWUDJNxFfdjuiOtI8rnSvhEZUNN4TA7LiDRc9Tw7DUKvTv5WXSTYzxojokLbybwwlf9t3jg/meAUTnQ==
4441+
highcharts@^8.2.2:
4442+
version "8.2.2"
4443+
resolved "https://registry.yarnpkg.com/highcharts/-/highcharts-8.2.2.tgz#3eb1a694cff013d3385c3ca8e58e69a27be52cab"
4444+
integrity sha512-F63TXO7RxsvTcpO/KOubQZWualYpCMyCTuKtoWbt7KCsfQ3Kl7Fr6HEyyJdjkYl+XlnmnKlSRi9d3HjLK9Q0wg==
44404445

44414446
highlight.js@^9.6.0:
44424447
version "9.18.3"
@@ -8488,10 +8493,10 @@ vue-loader@^15.9.2:
84888493
vue-hot-reload-api "^2.3.0"
84898494
vue-style-loader "^4.1.0"
84908495

8491-
vue-router@^3.4.6:
8492-
version "3.4.6"
8493-
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.6.tgz#f7bda2c9a43d39837621c9a02ba7789f5daa24b2"
8494-
integrity sha512-kaXnB3pfFxhAJl/Mp+XG1HJMyFqrL/xPqV7oXlpXn4AwMmm6VNgf0nllW8ksflmZANfI4kdo0bVn/FYSsAolPQ==
8496+
vue-router@^3.5.1:
8497+
version "3.5.1"
8498+
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.5.1.tgz#edf3cf4907952d1e0583e079237220c5ff6eb6c9"
8499+
integrity sha512-RRQNLT8Mzr8z7eL4p7BtKvRaTSGdCbTy2+Mm5HTJvLGYSSeG9gDzNasJPP/yOYKLy+/cLG/ftrqq5fvkFwBJEw==
84958500

84968501
vue-style-loader@^4.1.0, vue-style-loader@^4.1.2:
84978502
version "4.1.2"
@@ -8514,10 +8519,10 @@ vue-template-es2015-compiler@^1.9.0:
85148519
resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825"
85158520
integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==
85168521

8517-
vue-toastification@^1.7.8:
8518-
version "1.7.8"
8519-
resolved "https://registry.yarnpkg.com/vue-toastification/-/vue-toastification-1.7.8.tgz#fd970f0a4656ac25e9d63ff5d863cdf27d9a1d9c"
8520-
integrity sha512-LGYK29D7Stv7In8ebYJKZu6zYpnzMC5vvhVmlzuiBjpK41OEUYL05Nox1DISUJebS9OgD2HCm3Qb4k4+CbaqSw==
8522+
vue-toastification@^1.7.11:
8523+
version "1.7.11"
8524+
resolved "https://registry.yarnpkg.com/vue-toastification/-/vue-toastification-1.7.11.tgz#3e46157b7361f5005b1a60112bc91f5bd00c66d7"
8525+
integrity sha512-CT/DYttb/VtWDNdhJG0BskLVfveZq5rGOgO/u3qTX+RPQQzX0WSai8VVxxUuvR8UpxfSGPS+JQleR33bo3Vadg==
85218526

85228527
vue2-google-maps@^0.10.7:
85238528
version "0.10.7"
@@ -8549,20 +8554,20 @@ vuetify-loader@^1.6.0:
85498554
file-loader "^4.0.0"
85508555
loader-utils "^1.2.0"
85518556

8552-
vuetify@^2.3.18:
8553-
version "2.3.18"
8554-
resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-2.3.18.tgz#1168c0e2ab4eee5e915d007e31066e68fb13e59f"
8555-
integrity sha512-cn+sZ19HY9qC7WHqcoCaZQZshyki5zqone37GJmgmoCvQaYraM3ptrcvSj8sR6fDuBHz4OLIfAIeLDyhz66hcw==
8557+
vuetify@^2.4.3:
8558+
version "2.4.3"
8559+
resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-2.4.3.tgz#8d6f15dde396e81f64e130d8ac0bc272e030879c"
8560+
integrity sha512-i2/Df0U0sedlaCbft4NMbna7WXbTCBhKVYTMjBrLVzrYTTWqzSO7ZCxLuDRY7MjwQhn7AOec7ent9U/NyIICqA==
85568561

85578562
vuetrend@^0.3.4:
85588563
version "0.3.4"
85598564
resolved "https://registry.yarnpkg.com/vuetrend/-/vuetrend-0.3.4.tgz#35e1dafb0f7cf4d66f69e289ee7028b9e12783d9"
85608565
integrity sha512-UaOJhMnkoiRBlGB9k2FX5GqotJyoyYUpyTAjfBiB7K5ESt3KzRoaplfG7j7SAnH4ITk4DjVDC9WB2IX80TVYmQ==
85618566

8562-
vuex@^3.5.1:
8563-
version "3.5.1"
8564-
resolved "https://registry.yarnpkg.com/vuex/-/vuex-3.5.1.tgz#f1b8dcea649bc25254cf4f4358081dbf5da18b3d"
8565-
integrity sha512-w7oJzmHQs0FM9LXodfskhw9wgKBiaB+totOdb8sNzbTB2KDCEEwEs29NzBZFh/lmEK1t5tDmM1vtsO7ubG1DFw==
8567+
vuex@^3.6.2:
8568+
version "3.6.2"
8569+
resolved "https://registry.yarnpkg.com/vuex/-/vuex-3.6.2.tgz#236bc086a870c3ae79946f107f16de59d5895e71"
8570+
integrity sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw==
85668571

85678572
watchpack-chokidar2@^2.0.0:
85688573
version "2.0.0"

0 commit comments

Comments
 (0)