Skip to content

Commit

Permalink
- Update dependencies
Browse files Browse the repository at this point in the history
- Update login page
  • Loading branch information
Blari committed Feb 2, 2021
1 parent f140ec2 commit 8fcedaf
Show file tree
Hide file tree
Showing 5 changed files with 50 additions and 42 deletions.
5 changes: 5 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# Changelog
## [v1.0.3]

- Update dependencies
- Update login page

## [v1.0.2]

- Update dependencies
Expand Down
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,21 @@
"lint": "vue-cli-service lint"
},
"dependencies": {
"apexcharts": "^3.22.0",
"core-js": "^3.6.5",
"apexcharts": "^3.24.0",
"core-js": "^3.8.3",
"css-loader": "^4.3.0",
"font-awesome": "^4.7.0",
"highcharts": "^8.2.0",
"highcharts": "^8.2.2",
"highcharts-vue": "^1.3.5",
"vue": "^2.6.12",
"vue-apexcharts": "^1.6.0",
"vue-router": "^3.4.6",
"vue-toastification": "^1.7.8",
"vue-router": "^3.5.1",
"vue-toastification": "^1.7.11",
"vue2-google-maps": "^0.10.7",
"vue2-perfect-scrollbar": "^1.5.0",
"vuetify": "^2.3.18",
"vuetify": "^2.4.3",
"vuetrend": "^0.3.4",
"vuex": "^3.5.1"
"vuex": "^3.6.2"
},
"devDependencies": {
"@vue/cli-plugin-babel": "~4.5.7",
Expand Down
13 changes: 7 additions & 6 deletions src/pages/Login/Login.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
@import "../../styles/app";

body {
background-color: #F6F7FF !important
}
.container {
font-family: "Roboto", "Helvetica", "Arial", sans-serif;
padding: 0;
Expand Down Expand Up @@ -34,9 +36,10 @@
width: 100%;
height: 100vh;
background-color: #F6F7FF;
overflow-y: auto;
.login-wrapper {
width: 320px;
height: 620px;
height: auto;
.login-slogan {
color: #4a4a4a;
}
Expand All @@ -54,11 +57,9 @@

}
.v-footer {
padding: 0;
margin: 0;
bottom: 50px;
position: absolute;
bottom: 0;
background-color: #F6F7FF;
}
}
}

7 changes: 2 additions & 5 deletions src/pages/Login/Login.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
</div>
</v-col>
<v-col cols="12" lg="5" class="login-part d-flex align-center justify-center">
<v-row no-gutters>
<v-row no-gutters class="align-start">
<v-col cols="12" class="login-part d-flex align-center justify-center flex-column">
<div class="login-wrapper">
<div class="login-wrapper pt-md-4 pt-0">
<v-tabs grow>
<v-tabs-slider></v-tabs-slider>
<v-tab :href="`#tab-login`">
Expand Down Expand Up @@ -179,9 +179,6 @@
}
}
</script>

<style src="./Login.scss" lang="scss"/>
53 changes: 29 additions & 24 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1777,10 +1777,10 @@ anymatch@~3.1.1:
normalize-path "^3.0.0"
picomatch "^2.0.4"

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

core-js@^3.8.3:
version "3.8.3"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.8.3.tgz#c21906e1f14f3689f93abcc6e26883550dd92dd0"
integrity sha512-KPYXeVZYemC2TkNEkX/01I+7yd+nX3KddKwZ1Ww7SKWdI2wQprSgLmrTddT8nw92AjEklTsPBoSdQBhbI1bQ6Q==

[email protected], core-util-is@~1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
Expand Down Expand Up @@ -4433,10 +4438,10 @@ highcharts-vue@^1.3.5:
resolved "https://registry.yarnpkg.com/highcharts-vue/-/highcharts-vue-1.3.5.tgz#9a3e5f6050bf0227c19238433abfb17ab7262db3"
integrity sha512-By1kc3m8XoI20pMshs/ue69j4rH6eQioDPoIrtC20RTti4QyvNAx8DisGSO3GAWe9sn50hPk8NsyxcwZIGaz3Q==

highcharts@^8.2.0:
version "8.2.0"
resolved "https://registry.yarnpkg.com/highcharts/-/highcharts-8.2.0.tgz#3d4893015caf1a7c9ed85284d983911e844649f3"
integrity sha512-s3R7UEaMWUDJNxFfdjuiOtI8rnSvhEZUNN4TA7LiDRc9Tw7DUKvTv5WXSTYzxojokLbybwwlf9t3jg/meAUTnQ==
highcharts@^8.2.2:
version "8.2.2"
resolved "https://registry.yarnpkg.com/highcharts/-/highcharts-8.2.2.tgz#3eb1a694cff013d3385c3ca8e58e69a27be52cab"
integrity sha512-F63TXO7RxsvTcpO/KOubQZWualYpCMyCTuKtoWbt7KCsfQ3Kl7Fr6HEyyJdjkYl+XlnmnKlSRi9d3HjLK9Q0wg==

highlight.js@^9.6.0:
version "9.18.3"
Expand Down Expand Up @@ -8488,10 +8493,10 @@ vue-loader@^15.9.2:
vue-hot-reload-api "^2.3.0"
vue-style-loader "^4.1.0"

vue-router@^3.4.6:
version "3.4.6"
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.6.tgz#f7bda2c9a43d39837621c9a02ba7789f5daa24b2"
integrity sha512-kaXnB3pfFxhAJl/Mp+XG1HJMyFqrL/xPqV7oXlpXn4AwMmm6VNgf0nllW8ksflmZANfI4kdo0bVn/FYSsAolPQ==
vue-router@^3.5.1:
version "3.5.1"
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.5.1.tgz#edf3cf4907952d1e0583e079237220c5ff6eb6c9"
integrity sha512-RRQNLT8Mzr8z7eL4p7BtKvRaTSGdCbTy2+Mm5HTJvLGYSSeG9gDzNasJPP/yOYKLy+/cLG/ftrqq5fvkFwBJEw==

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

vue-toastification@^1.7.8:
version "1.7.8"
resolved "https://registry.yarnpkg.com/vue-toastification/-/vue-toastification-1.7.8.tgz#fd970f0a4656ac25e9d63ff5d863cdf27d9a1d9c"
integrity sha512-LGYK29D7Stv7In8ebYJKZu6zYpnzMC5vvhVmlzuiBjpK41OEUYL05Nox1DISUJebS9OgD2HCm3Qb4k4+CbaqSw==
vue-toastification@^1.7.11:
version "1.7.11"
resolved "https://registry.yarnpkg.com/vue-toastification/-/vue-toastification-1.7.11.tgz#3e46157b7361f5005b1a60112bc91f5bd00c66d7"
integrity sha512-CT/DYttb/VtWDNdhJG0BskLVfveZq5rGOgO/u3qTX+RPQQzX0WSai8VVxxUuvR8UpxfSGPS+JQleR33bo3Vadg==

vue2-google-maps@^0.10.7:
version "0.10.7"
Expand Down Expand Up @@ -8549,20 +8554,20 @@ vuetify-loader@^1.6.0:
file-loader "^4.0.0"
loader-utils "^1.2.0"

vuetify@^2.3.18:
version "2.3.18"
resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-2.3.18.tgz#1168c0e2ab4eee5e915d007e31066e68fb13e59f"
integrity sha512-cn+sZ19HY9qC7WHqcoCaZQZshyki5zqone37GJmgmoCvQaYraM3ptrcvSj8sR6fDuBHz4OLIfAIeLDyhz66hcw==
vuetify@^2.4.3:
version "2.4.3"
resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-2.4.3.tgz#8d6f15dde396e81f64e130d8ac0bc272e030879c"
integrity sha512-i2/Df0U0sedlaCbft4NMbna7WXbTCBhKVYTMjBrLVzrYTTWqzSO7ZCxLuDRY7MjwQhn7AOec7ent9U/NyIICqA==

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

vuex@^3.5.1:
version "3.5.1"
resolved "https://registry.yarnpkg.com/vuex/-/vuex-3.5.1.tgz#f1b8dcea649bc25254cf4f4358081dbf5da18b3d"
integrity sha512-w7oJzmHQs0FM9LXodfskhw9wgKBiaB+totOdb8sNzbTB2KDCEEwEs29NzBZFh/lmEK1t5tDmM1vtsO7ubG1DFw==
vuex@^3.6.2:
version "3.6.2"
resolved "https://registry.yarnpkg.com/vuex/-/vuex-3.6.2.tgz#236bc086a870c3ae79946f107f16de59d5895e71"
integrity sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw==

watchpack-chokidar2@^2.0.0:
version "2.0.0"
Expand Down

0 comments on commit 8fcedaf

Please sign in to comment.