From 89b9b1a535ca4c6545e98d4125c71a9aa4fb9838 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Micha=C5=82owski?= Date: Tue, 23 Jul 2024 08:16:12 +0200 Subject: [PATCH] frontend - login page updates --- frontend/package.json | 7 +- .../src/assets/scss/custom/_variables.scss | 2 + .../custom/gradido-custom/_components.scss | 4 +- .../custom/gradido-custom/_custom-forms.scss | 2 +- .../custom/gradido-custom/_custom-toogle.scss | 2 +- .../custom/gradido-custom/_datepicker.scss | 4 +- .../scss/custom/gradido-custom/_footer.scss | 2 +- .../gradido-custom/_form-validation.scss | 4 +- .../custom/gradido-custom/_functions.scss | 3 + .../scss/custom/gradido-custom/_navs.scss | 12 +- .../custom/gradido-custom/_nouislider.scss | 2 +- .../scss/custom/gradido-custom/_tables.scss | 8 +- frontend/src/assets/scss/gradido.scss | 15 +- frontend/src/components/Auth/AuthCarousel.vue | 16 +- frontend/src/components/Auth/AuthNavbar.vue | 51 +-- frontend/src/components/Inputs/InputEmail.vue | 213 +++++++--- .../src/components/Inputs/InputPassword.vue | 241 ++++++++---- frontend/src/components/LanguageSwitch2.vue | 4 +- frontend/src/i18n.js | 1 + frontend/src/layouts/AuthLayout.vue | 92 +++-- frontend/src/main.js | 9 + frontend/src/pages/Login.vue | 371 ++++++++++++------ frontend/src/validation-rules.js | 275 ++++++------- frontend/vite.config.js | 6 + frontend/yarn.lock | 189 ++++++++- 25 files changed, 1043 insertions(+), 492 deletions(-) create mode 100644 frontend/src/assets/scss/custom/gradido-custom/_functions.scss diff --git a/frontend/package.json b/frontend/package.json index 69148be57..c0df24cf6 100755 --- a/frontend/package.json +++ b/frontend/package.json @@ -19,10 +19,11 @@ "@babel/node": "^7.13.13", "@babel/preset-env": "^7.13.12", "@vee-validate/rules": "^4.13.2", + "@vee-validate/yup": "^4.13.2", "@vitejs/plugin-vue": "3.2.0", "@vue/apollo-option": "^4.0.0", - "@vue/test-utils": "^1.1.3", "@vue/compat": "^3.4.31", + "@vue/test-utils": "^1.1.3", "apollo-boost": "^0.4.9", "autoprefixer": "^10.4.19", "babel-core": "^7.0.0-bridge.0", @@ -70,7 +71,8 @@ "vue-timers": "^2.0.4", "vue2-transitions": "^0.2.3", "vuex": "^4.1.0", - "vuex-persistedstate": "^4.1.0" + "vuex-persistedstate": "^4.1.0", + "yup": "^1.4.0" }, "devDependencies": { "@apollo/client": "^3.10.8", @@ -88,6 +90,7 @@ "stylelint": "^14.5.3", "stylelint-config-recommended-vue": "^1.3.0", "stylelint-config-standard-scss": "^3.0.0", + "unplugin-vue-components": "^0.27.3", "vue-html-webpack-plugin": "^3.2.2" }, "postcss": { diff --git a/frontend/src/assets/scss/custom/_variables.scss b/frontend/src/assets/scss/custom/_variables.scss index 6182a22f2..bfc5e0256 100644 --- a/frontend/src/assets/scss/custom/_variables.scss +++ b/frontend/src/assets/scss/custom/_variables.scss @@ -979,3 +979,5 @@ $btn-border-radius-sm: $input-border-radius !default; // Import Bootstrap variable defaults @import "bootstrap/scss/variables"; + +@import "gradido-custom/functions"; diff --git a/frontend/src/assets/scss/custom/gradido-custom/_components.scss b/frontend/src/assets/scss/custom/gradido-custom/_components.scss index 400fc0647..f6d8e45e1 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_components.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_components.scss @@ -13,8 +13,8 @@ $box-shadow-sm: 0 0 0.5rem rgba($gray-600, 0.075) !default; $box-shadow: 0 0 2rem 0 rgba($gray-600, 0.15) !default; $box-shadow-lg: 0 0 3rem rgba($gray-600, 0.175) !default; $component-active-color: $white !default; -$component-active-bg: theme-color("primary") !default; -$component-active-border-color: theme-color("primary") !default; +$component-active-bg: $primary !default; +$component-active-border-color: $primary !default; $component-hover-color: $gray-300 !default; $component-hover-bg: $gray-300 !default; $component-hover-border-color: $gray-300 !default; diff --git a/frontend/src/assets/scss/custom/gradido-custom/_custom-forms.scss b/frontend/src/assets/scss/custom/gradido-custom/_custom-forms.scss index 0d9fb946e..f942bec6f 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_custom-forms.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_custom-forms.scss @@ -23,7 +23,7 @@ $custom-control-indicator-checked-border-color: $component-active-border-color ! $custom-control-indicator-checked-box-shadow: $custom-control-indicator-box-shadow !default; // $custom-control-indicator-checked-disabled-bg: rgb(theme-color("primary") 0.5) !default; -$custom-control-indicator-checked-disabled-bg: theme-color("primary") !default; +$custom-control-indicator-checked-disabled-bg: $primary !default; $custom-control-indicator-disabled-bg: $gray-200 !default; $custom-control-label-disabled-color: $gray-600 !default; diff --git a/frontend/src/assets/scss/custom/gradido-custom/_custom-toogle.scss b/frontend/src/assets/scss/custom/gradido-custom/_custom-toogle.scss index ddf88c14c..0356f8667 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_custom-toogle.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_custom-toogle.scss @@ -2,4 +2,4 @@ $custom-toggle-width: 50px !default; $custom-toggle-slider-bg: $gray-200 !default; -$custom-toggle-checked-bg: theme-color("primary") !default; +$custom-toggle-checked-bg: $primary !default; diff --git a/frontend/src/assets/scss/custom/gradido-custom/_datepicker.scss b/frontend/src/assets/scss/custom/gradido-custom/_datepicker.scss index e745c22c5..81dec6bc4 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_datepicker.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_datepicker.scss @@ -12,9 +12,9 @@ $datepicker-disabled-cell-color: $gray-300 !default; $datepicker-disabled-old-new-color: $gray-500 !default; $datepicker-header-cell-border-radius: $border-radius !default; $datepicker-active-color: $white !default; -$datepicker-active-background: theme-color("primary") !default; +$datepicker-active-background: $primary !default; $datepicker-active-box-shadow: none !default; -$datepicker-range-background: theme-color("primary") !default; +$datepicker-range-background: $primary !default; $datepicker-range-cell-focused-background: color.adjust($datepicker-range-background, $lightness: -5%); $datepicker-range-color: $white !default; $datepicker-range-highlighted-bg: $gray-200 !default; diff --git a/frontend/src/assets/scss/custom/gradido-custom/_footer.scss b/frontend/src/assets/scss/custom/gradido-custom/_footer.scss index 8cc541f2e..dbb900109 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_footer.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_footer.scss @@ -3,7 +3,7 @@ $footer-padding-y: 2.5rem; $footer-padding-x: 0; $footer-link-font-size: 0.85rem !default; -$footer-bg: theme-color("secondary") !default; +$footer-bg: $secondary !default; $footer-color: $gray-600 !default; $footer-link-color: $gray-600 !default; $footer-link-hover-color: $gray-700 !default; diff --git a/frontend/src/assets/scss/custom/gradido-custom/_form-validation.scss b/frontend/src/assets/scss/custom/gradido-custom/_form-validation.scss index 0d9243e08..44727ab9c 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_form-validation.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_form-validation.scss @@ -2,6 +2,6 @@ @use "sass:color"; $form-feedback-valid-bg: color.adjust($success, $lightness: 15%) !default; -$form-feedback-valid-color: theme-color("success") !default; +$form-feedback-valid-color: $success !default; $form-feedback-invalid-bg: color.adjust($warning, $lightness: 15%) !default; -$form-feedback-invalid-color: theme-color("warning") !default; +$form-feedback-invalid-color: $warning !default; diff --git a/frontend/src/assets/scss/custom/gradido-custom/_functions.scss b/frontend/src/assets/scss/custom/gradido-custom/_functions.scss new file mode 100644 index 000000000..32ba14bfa --- /dev/null +++ b/frontend/src/assets/scss/custom/gradido-custom/_functions.scss @@ -0,0 +1,3 @@ +@function theme-color($key: "primary") { + @return #172b4d; +} diff --git a/frontend/src/assets/scss/custom/gradido-custom/_navs.scss b/frontend/src/assets/scss/custom/gradido-custom/_navs.scss index 106c58c4a..52819a3e9 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_navs.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_navs.scss @@ -4,17 +4,17 @@ $nav-link-padding-y: 0.25rem !default; $nav-link-padding-x: 0.75rem !default; $nav-link-color: $gray-700 !default; -$nav-link-hover-color: theme-color("primary") !default; +$nav-link-hover-color: $primary !default; $nav-link-disabled-color: $gray-600 !default; $nav-pills-padding-y: 0.75rem !default; $nav-pills-padding-x: 1rem !default; $nav-pills-space-x: 1rem !default; $nav-pills-bg: $white !default; $nav-pills-border-width: 1px !default; -$nav-pills-border-color: theme-color("primary") !default; +$nav-pills-border-color: $primary !default; $nav-pills-border-radius: $border-radius !default; -$nav-pills-link-color: theme-color("primary") !default; -$nav-pills-link-hover-color: color.adjust(theme-color("primary"), $lightness: -5%) !default; -$nav-pills-link-active-color: color-yiq(theme-color("primary")) !default; -$nav-pills-link-active-bg: theme-color("primary") !default; +$nav-pills-link-color: $primary !default; +$nav-pills-link-hover-color: color.adjust($primary, $lightness: -5%) !default; +$nav-pills-link-active-color: color-yiq($primary) !default; +$nav-pills-link-active-bg: $primary !default; $nav-pills-box-shadow: $btn-box-shadow !default; diff --git a/frontend/src/assets/scss/custom/gradido-custom/_nouislider.scss b/frontend/src/assets/scss/custom/gradido-custom/_nouislider.scss index 9d4bb94ca..4833b825d 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_nouislider.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_nouislider.scss @@ -8,7 +8,7 @@ $noui-target-box-shadow: inset 0 1px 2px rgb(90 97 105 / 10%) !default; $noui-slider-connect-bg: $primary !default; $noui-slider-connect-disabled-bg: #b2b2b2 !default; $noui-handle-width: 15px !default; -$noui-handle-bg: theme-color("primary") !default; +$noui-handle-bg: $primary !default; $noui-handle-border: 0 !default; $noui-handle-border-radius: 100% !default; $noui-origin-border-radius: 2px !default; diff --git a/frontend/src/assets/scss/custom/gradido-custom/_tables.scss b/frontend/src/assets/scss/custom/gradido-custom/_tables.scss index 7648d9cc3..89460cee7 100644 --- a/frontend/src/assets/scss/custom/gradido-custom/_tables.scss +++ b/frontend/src/assets/scss/custom/gradido-custom/_tables.scss @@ -17,10 +17,10 @@ $table-head-font-weight: $font-weight-bold !default; $table-head-text-transform: uppercase !default; $table-head-letter-spacing: 1px !default; $table-body-font-size: 0.8125rem !default; -$table-dark-bg: theme-color("default") !default; +$table-dark-bg: $default !default; $table-dark-accent-bg: rgba($white, 0.05) !default; $table-dark-hover-bg: rgba($white, 0.075) !default; -$table-dark-border-color: color.adjust(theme-color("default"), $lightness: 7%) !default; +$table-dark-border-color: color.adjust($default, $lightness: 7%) !default; $table-dark-color: $body-bg !default; -$table-dark-head-bg: color.adjust(theme-color("default"), $lightness: 4%) !default; -$table-dark-head-color: color.adjust(theme-color("default"), $lightness: 35%) !default; +$table-dark-head-bg: color.adjust($default, $lightness: 4%) !default; +$table-dark-head-color: color.adjust($default, $lightness: 35%) !default; diff --git a/frontend/src/assets/scss/gradido.scss b/frontend/src/assets/scss/gradido.scss index d5263ac4b..e1f0ce97c 100644 --- a/frontend/src/assets/scss/gradido.scss +++ b/frontend/src/assets/scss/gradido.scss @@ -1,12 +1,15 @@ // Bootstrap (4.5.3) functions @import "bootstrap/scss/functions"; +@import "bootstrap/scss/variables"; @import "custom/variables"; // @import "~bootstrap/scss/variables"; wird am // ende der custom/variables angehangen // Bootstrap (4.5.3) mixins +@import "bootstrap/scss/maps"; + @import "bootstrap/scss/mixins"; // Bootstrap (4.5.3) components @@ -19,15 +22,15 @@ @import "bootstrap/scss/card"; @import "bootstrap/scss/carousel"; @import "bootstrap/scss/close"; -@import "bootstrap/scss/code"; -@import "bootstrap/scss/custom-forms"; +//@import "bootstrap/scss/code"; +//@import "bootstrap/scss/custom-forms"; // @import "~bootstrap/scss/dropdown"; @import "bootstrap/scss/forms"; // @import "~bootstrap/scss/functions"; @import "bootstrap/scss/grid"; -@import "bootstrap/scss/input-group"; +//@import "bootstrap/scss/input-group"; @import "bootstrap/scss/list-group"; // @import "~bootstrap/scss/mixins"; @@ -35,7 +38,7 @@ @import "bootstrap/scss/nav"; @import "bootstrap/scss/navbar"; @import "bootstrap/scss/pagination"; -@import "bootstrap/scss/print"; +//@import "bootstrap/scss/print"; @import "bootstrap/scss/progress"; @import "bootstrap/scss/reboot"; @import "bootstrap/scss/tables"; @@ -44,12 +47,12 @@ @import "bootstrap/scss/transitions"; @import "bootstrap/scss/type"; @import "bootstrap/scss/utilities"; -@import "bootstrap/scss/variables"; +//@import "bootstrap/scss/variables"; @import "bootstrap/scss/bootstrap-grid"; @import "bootstrap/scss/bootstrap-reboot"; @import "bootstrap/scss/bootstrap"; // Bootstrap-vue (2.21.1) scss -@import "bootstrap-vue/src/index"; +//@import "bootstrap-vue/src/index"; @import "gradido-template"; @import "gradido-template-dark"; diff --git a/frontend/src/components/Auth/AuthCarousel.vue b/frontend/src/components/Auth/AuthCarousel.vue index a050c1554..6fe2af768 100644 --- a/frontend/src/components/Auth/AuthCarousel.vue +++ b/frontend/src/components/Auth/AuthCarousel.vue @@ -1,19 +1,19 @@ diff --git a/frontend/src/components/Auth/AuthNavbar.vue b/frontend/src/components/Auth/AuthNavbar.vue index f7a8b6f0a..e65df8d68 100644 --- a/frontend/src/components/Auth/AuthNavbar.vue +++ b/frontend/src/components/Auth/AuthNavbar.vue @@ -1,29 +1,24 @@ @@ -43,18 +38,30 @@ export default { } -