From d46a9151fc30564b68fc1d6d10f20ec1614b4657 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Glasn=C3=A1k?= Date: Thu, 12 Jan 2023 14:45:18 +0100 Subject: [PATCH] [Review] --- .../app/_layout/app/_components/a-header.vue | 2 + .../plugins/lib@auth/_theme/auth.theme.css | 93 --------- .../lib@auth/_theme/auth.theme.css.map | 1 - .../_components/a-forgot-password-form.vue | 1 + .../login/_components/a-login-form.vue | 1 + .../_components/a-reset-password-form.vue | 1 + app/src/plugins/lib@search/search/search.vue | 2 +- .../_components/a-project-calendar.vue | 182 +++++++++--------- .../projects/_components/a-project-filter.vue | 125 +++++------- .../tm@dashboard/projects/projects.vue | 96 ++++----- .../tasks/_components/a-tasks-filter.vue | 7 + .../tasks/_components/z-timeline.vue | 17 +- app/src/plugins/tm@dashboard/tasks/tasks.vue | 18 ++ .../teams/_components/a-team-filter.vue | 1 + app/src/plugins/tm@dashboard/teams/teams.vue | 9 +- .../tm@modal/blocker/z-blocker-modal.vue | 2 +- .../master-task/z-master-task-modal.vue | 10 +- .../tm@modal/sub-task/z-sub-task-modal.vue | 11 +- .../plugins/tm@modal/team/z-team-modal.vue | 14 -- .../_components/z-tasks-search.vue | 3 +- .../_components/a-ongoing-table.vue | 1 + .../tasks-ongoing/tasks-ongoing.vue | 9 +- .../_components/a-unscheduled-table.vue | 1 + .../tasks-unscheduled/tasks-unscheduled.vue | 5 +- .../teams/_components/a-teams-table.vue | 1 + app/src/plugins/tm@overview/teams/teams.vue | 2 + .../plugins/tm@profile/profile/my-profile.vue | 3 + 27 files changed, 279 insertions(+), 339 deletions(-) delete mode 100644 app/src/plugins/lib@auth/_theme/auth.theme.css delete mode 100644 app/src/plugins/lib@auth/_theme/auth.theme.css.map diff --git a/app/src/plugins/app/_layout/app/_components/a-header.vue b/app/src/plugins/app/_layout/app/_components/a-header.vue index b6627e1..b0cc9ed 100644 --- a/app/src/plugins/app/_layout/app/_components/a-header.vue +++ b/app/src/plugins/app/_layout/app/_components/a-header.vue @@ -79,6 +79,7 @@ export default { }, async created() { + // Kravarik: Toto negetuj takto ale cez ...mapGetters z auth store try { this.user = await this.$axios.get_auth_data('v1/auth/info') } catch (error) { @@ -93,6 +94,7 @@ export default { this.$router.push('/') this.$toast.success('Boli ste odhlásený') } catch (error) { + // Kravarik: Do toastu posielaj len error, on si to vo vnutri vyparsuje (ak ne tak to treba dokodit v toaste) this.$toast.error(error.data.error) } }, diff --git a/app/src/plugins/lib@auth/_theme/auth.theme.css b/app/src/plugins/lib@auth/_theme/auth.theme.css deleted file mode 100644 index cd92a36..0000000 --- a/app/src/plugins/lib@auth/_theme/auth.theme.css +++ /dev/null @@ -1,93 +0,0 @@ -.auth-card { - position: absolute; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); - border: 1px solid rgba(0, 0, 0, 0.1); - border-radius: 16px; - padding: 30px; - width: 100%; - max-width: 486px; - margin: auto; -} -.auth-card img { - position: absolute; - right: 60px; - bottom: 188px; - cursor: pointer; -} -.auth-card .button { - color: white !important; -} -.auth-card .v-field { - border-bottom: 1px solid rgba(0, 0, 0, 0); -} -.auth-card .error .v-field { - border-bottom: 1px solid red; -} - -@media screen and (max-width: 904px) { - .auth-card { - position: relative; - padding: 0; - border: none; - top: 0; - left: 0; - transform: translate(0, 0); - } - .auth-card h1 { - font-size: 19px; - } - .auth-card p { - font-size: 15px; - } - .auth-card .v-icon { - position: absolute !important; - right: 15px; - } -} -.v-field--variant-solo { - box-shadow: none !important; - border: 1px solid rgba(0, 0, 0, 0.1) !important; -} - -.auth-card .error .v-field { - border: 0.5px solid red !important; -} - -.error .v-field { - border: 0.5px solid red !important; -} - -.error .dp__input { - border: 0.5px solid red !important; -} - -.v-input__append { - margin: 0 !important; -} -.v-input__append .v-icon { - position: absolute !important; - right: 45px; -} - -input::-webkit-outer-spin-button, -input::-webkit-inner-spin-button { - -webkit-appearance: none; -} - -.error-message { - position: absolute; - top: 50%; - left: 30px; - color: red; - opacity: 0.8; -} - -.v-select .v-field--variant-solo { - border: none !important; -} - -.v-messages__message { - color: red !important; -}/*# sourceMappingURL=auth.theme.css.map */ \ No newline at end of file diff --git a/app/src/plugins/lib@auth/_theme/auth.theme.css.map b/app/src/plugins/lib@auth/_theme/auth.theme.css.map deleted file mode 100644 index f1f1314..0000000 --- a/app/src/plugins/lib@auth/_theme/auth.theme.css.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"sources":["auth.theme.sass","auth.theme.css"],"names":[],"mappings":"AAAA;EACC,kBAAA;EACA,QAAA;EACA,SAAA;EACA,gCAAA;EACA,oCAAA;EACA,mBAAA;EACA,aAAA;EACA,WAAA;EACA,gBAAA;EACA,YAAA;ACCD;ADCC;EACC,kBAAA;EACA,WAAA;EACA,aAAA;EACA,eAAA;ACCF;ADCC;EACC,uBAAA;ACCF;ADCC;EACC,yCAAA;ACCF;ADCC;EACC,4BAAA;ACCF;;ADCA;EACC;IACC,kBAAA;IACA,UAAA;IACA,YAAA;IACA,MAAA;IACA,OAAA;IACA,0BAAA;ECEA;EDAA;IACC,eAAA;ECED;EDAA;IACC,eAAA;ECED;EDAA;IACC,6BAAA;IACA,WAAA;ECED;AACF;ADDA;EACC,2BAAA;EACA,+CAAA;ACGD;;ADDA;EACC,kCAAA;ACID;;ADFA;EACC,kCAAA;ACKD;;ADHA;EACC,kCAAA;ACMD;;ADJA;EACC,oBAAA;ACOD;ADLC;EACC,6BAAA;EACA,WAAA;ACOF;;ADLA;;EAEC,wBAAA;ACQD;;ADNA;EACC,kBAAA;EACA,QAAA;EACA,UAAA;EACA,UAAA;EACA,YAAA;ACSD;;ADPA;EACC,uBAAA;ACUD;;ADRA;EACC,qBAAA;ACWD","file":"auth.theme.css"} \ No newline at end of file diff --git a/app/src/plugins/lib@auth/forgot-password/_components/a-forgot-password-form.vue b/app/src/plugins/lib@auth/forgot-password/_components/a-forgot-password-form.vue index 9a7b124..7329f09 100644 --- a/app/src/plugins/lib@auth/forgot-password/_components/a-forgot-password-form.vue +++ b/app/src/plugins/lib@auth/forgot-password/_components/a-forgot-password-form.vue @@ -40,6 +40,7 @@ export default { await this.$axios.post_data('v1/auth/forgot', this.form) this.$router.push({ name: 'Reset password' }) } catch (error) { + // Kravarik: Error upravit this.$toast.error(error.data.error) } } diff --git a/app/src/plugins/lib@auth/login/_components/a-login-form.vue b/app/src/plugins/lib@auth/login/_components/a-login-form.vue index 08bfe8a..6bff824 100644 --- a/app/src/plugins/lib@auth/login/_components/a-login-form.vue +++ b/app/src/plugins/lib@auth/login/_components/a-login-form.vue @@ -44,6 +44,7 @@ export default { await this.$axios.post_data('v1/auth/login', this.form) this.$router.push({ name: 'Overview - Ongoing tasks'}) } catch (error) { + // Kravarik: Error upravit this.$toast.error(error.data.error) } } diff --git a/app/src/plugins/lib@auth/reset-password/_components/a-reset-password-form.vue b/app/src/plugins/lib@auth/reset-password/_components/a-reset-password-form.vue index 22eecdf..552cb38 100644 --- a/app/src/plugins/lib@auth/reset-password/_components/a-reset-password-form.vue +++ b/app/src/plugins/lib@auth/reset-password/_components/a-reset-password-form.vue @@ -49,6 +49,7 @@ export default { await this.$axios.post_data('v1/auth/reset', this.form) this.$router.push({ name: 'Login' }) } catch (error) { + // Kravarik: Error upravit this.$toast.error(error.data.error) } } diff --git a/app/src/plugins/lib@search/search/search.vue b/app/src/plugins/lib@search/search/search.vue index f09bbfc..b38d276 100644 --- a/app/src/plugins/lib@search/search/search.vue +++ b/app/src/plugins/lib@search/search/search.vue @@ -17,7 +17,7 @@ export default { return { search: null } - }, + }, created() { this.eventBus.on('onSearch', (search) => { diff --git a/app/src/plugins/tm@dashboard/projects/_components/a-project-calendar.vue b/app/src/plugins/tm@dashboard/projects/_components/a-project-calendar.vue index dea2f51..4ccbe61 100644 --- a/app/src/plugins/tm@dashboard/projects/_components/a-project-calendar.vue +++ b/app/src/plugins/tm@dashboard/projects/_components/a-project-calendar.vue @@ -1,96 +1,104 @@ + &:deep(.w-day-header) + text-align: left + padding-left: 10px + &:deep(.fc-daygrid-day-number) + color: black + &:deep(.fc-col-header-cell-cushion) + font-size: 20px + font-weight: 500 + line-height: 45px + text-transform: capitalize + color: black + &:deep(.fc-theme-standard .fc-scrollgrid) + border: none + &:deep(.fc-event-start) + border-top-left-radius: 30px + border-bottom-left-radius: 30px + &:deep(.fc-event-end) + border-top-right-radius: 30px + border-bottom-right-radius: 30px + &:deep(.fc-event) + font-size: 12px + padding-left: 10px + margin-top: 5px + &:after + background: unset + &:deep(.fc-day-today) + background: white + a + background: #3700B3 + width: 32px + height: 32px + color: white + text-align: center + border-radius: 50% + border: 5px solid white + line-height: 15px + diff --git a/app/src/plugins/tm@dashboard/projects/_components/a-project-filter.vue b/app/src/plugins/tm@dashboard/projects/_components/a-project-filter.vue index 4180e54..be4d4e3 100644 --- a/app/src/plugins/tm@dashboard/projects/_components/a-project-filter.vue +++ b/app/src/plugins/tm@dashboard/projects/_components/a-project-filter.vue @@ -1,89 +1,66 @@