Merge branches 'main' and 'main' of https://bitbucket.org/studiotem/jandl-taskmanager-app

app/src/plugins/app/_layout/app/_components/a-header.vue

@@ -85,7 +85,7 @@ export default {
 	methods: {
 		async logOut() {
 			try {
-				await this.$store.dispatch('wAuth/logout')
+				await this.$store.dispatch('auth/logout')
 				this.$router.push('/')
 				this.$toast.success('Boli ste odhlásený')
 			} catch (error) {

app/src/plugins/app@vendor/vue-cal/cell.vue

@@ -106,6 +106,7 @@ export default {
       return {
         'vuecal__cell-split': true,
         'vuecal__cell-split--highlighted': this.highlightedSplit === split.id,
+        'vuecal__cell-split--weekend': split.isWeekend,
         [split.class]: !!split.class
       }
     },

app/src/plugins/lib@auth/login/_components/a-login-form.vue

@@ -2,7 +2,7 @@
 	<v-form>
 		<v-text-field v-model="form.email" label="E-mail" variant="solo" autocomplete="email" class="mb-2" bg-color="white" :hint="v$.form.email.$errors ? errorUtils.parseErrors(v$.form.email.$errors) : null" :class="{ error: v$.form.email.$errors.length }" />
 
-		<v-text-field v-model="form.password" :type="showPassword ? 'text' : 'password'" variant="solo" bg-color="white" class="mb-2" :counter="8" label="Password" autocomplete="current-password" :hint="v$.form.password.$errors ? errorUtils.parseErrors(v$.form.password.$errors) : null"
+		<v-text-field v-model="form.password" :type="showPassword ? 'text' : 'password'" variant="solo" bg-color="white" class="mb-2" :counter="12" label="Heslo" autocomplete="current-password" :hint="v$.form.password.$errors ? errorUtils.parseErrors(v$.form.password.$errors) : null"
 			:class="{ error: v$.form.password.$errors.length }" :append-icon="showPassword ? 'mdi-eye' : 'mdi-eye-off'" @click:append="showPassword = !showPassword"  />
 
 		<div class="d-flex flex-column">
@@ -31,7 +31,7 @@ export default {
 		return {
 			form: {
 				email: {required, email },
-				password: {required, minLength: minLength(8)}
+				password: {required, minLength: minLength(12)}
 			}
 		}
 	},
@@ -41,7 +41,7 @@ export default {
 			if (!(await this.v$.$validate())) return console.log(this.v$)
 
 			try {
-				await this.$axios.post_data('v1/auth/login', this.form)
+				await this.$store.dispatch('auth/login', this.form)
 				this.$router.push({ name: 'Overview - Ongoing tasks'})
 			} catch (error) {
 				this.$toast.error(error)

app/src/plugins/lib@auth/reset-password/_components/a-reset-password-form.vue

@@ -4,9 +4,9 @@
 
 		<v-text-field v-model="form.email" label="E-mail" autocomplete="email" bg-color="white" variant="solo" type="email" class="mb-2" :hint="v$.form.email.$errors ? errorUtils.parseErrors(v$.form.email.$errors) : null" :class="{ error: v$.form.email.$errors.length }" />
 
-		<v-text-field v-model="form.password" label="Password" autocomplete="new-password" bg-color="white" variant="solo" :type="showPassword ? 'text' : 'password'" class="mb-2" :hint="v$.form.password.$errors ? errorUtils.parseErrors(v$.form.password.$errors) : null" :class="{ error: v$.form.password.$errors.length }" :counter="8"  :append-icon="showPassword ? 'mdi-eye' : 'mdi-eye-off'" @click:append="showPassword = !showPassword" />
+		<v-text-field v-model="form.password" label="Heslo" autocomplete="new-password" bg-color="white" variant="solo" :type="showPassword ? 'text' : 'password'" class="mb-2" :hint="v$.form.password.$errors ? errorUtils.parseErrors(v$.form.password.$errors) : null" :class="{ error: v$.form.password.$errors.length }" :counter="12"  :append-icon="showPassword ? 'mdi-eye' : 'mdi-eye-off'" @click:append="showPassword = !showPassword" />
 
-		<v-text-field v-model="form.password_confirmation" autocomplete="new-password" bg-color="white" variant="solo" label="Password confirmation" :type="showConfirmationPassword ? 'text' : 'password'" :counter="8" class="mb-2" :hint="v$.form.password_confirmation.$errors ? errorUtils.parseErrors(v$.form.password_confirmation.$errors) : null" :class="{ error: v$.form.password_confirmation.$errors.length }"  :append-icon="showConfirmationPassword ? 'mdi-eye' : 'mdi-eye-off'" @click:append="showConfirmationPassword = !showConfirmationPassword" />
+		<v-text-field v-model="form.password_confirmation" autocomplete="new-password" bg-color="white" variant="solo" label="Potvrdenie hesla" :type="showConfirmationPassword ? 'text' : 'password'" :counter="12" class="mb-2" :hint="v$.form.password_confirmation.$errors ? errorUtils.parseErrors(v$.form.password_confirmation.$errors) : null" :class="{ error: v$.form.password_confirmation.$errors.length }"  :append-icon="showConfirmationPassword ? 'mdi-eye' : 'mdi-eye-off'" @click:append="showConfirmationPassword = !showConfirmationPassword" />
 
 		<div class="d-flex flex-column">
 			<v-btn class="button" color="#7F39FB" @click="submit()">Change password</v-btn>
@@ -35,8 +35,8 @@ export default {
 			form: {
 				code: { required, integer, minLength: minLength(6), maxLength: maxLength(6) },
 				email: { required, email },
-				password: { required, minLength: minLength(8) },
-				password_confirmation: { required, minLength: minLength(8), sameAs: sameAs(this.form.password)}
+				password: { required, minLength: minLength(12) },
+				password_confirmation: { required, minLength: minLength(12), sameAs: sameAs(this.form.password)}
 			}
 		}
 	},

app/src/plugins/tm@dashboard/_components/z-timeline.vue

@@ -25,7 +25,6 @@
 		>
 			<template v-slot:split-label="{ split }">
 				<div class="w-100 h-100 d-flex flex-column">
-				<h1 @click="addTimeModal()">Tu mas napojeny modal</h1>
 					<span v-if="split.date" class="d-flex align-center">
 						<img v-if="getHeadingDate(split.date) == 'Dnes'" :src="require('./_img/home-icon.svg')" class="mr-2">
 						<p class="weekday-label">{{ getHeadingDate(split.date) }}</p>
@@ -35,10 +34,10 @@
 					</span>
 
 					<span v-if="split.date">
-						<p class="day-name" >{{ split.date.toLocaleDateString('sk-SK', { weekday: 'long' }) }}</p>
+						<p class="day-name" >{{ split.date.toLocaleDateString('en-EN', { weekday: 'long' }) }}</p>
 					</span>
 
-					<div v-if="split.unscheduledTime && split.initials" class="unscheduled-time d-flex align-center text-left">
+					<div v-if="split.unscheduledTime && split.initials" class="unscheduled-time d-flex align-center text-left" :class="{'vuecal__cell-split--weekend': split.isWeekend}">
 						<div class="unscheduled-time-initials d-flex align-center justify-center me-4">
 							<p>{{split.initials}}</p>
 						</div>
@@ -161,6 +160,7 @@ export default {
 
 		async eventMoved(e) {
 			this.focusedEventId = e.event.id
+			this.addTimeModal(e.event.id)
 			this.$emit('eventMoved', e)
 		},
 
@@ -356,6 +356,12 @@ export default {
 				.vuecal__cell--highlighted,
 				.vuecal__cell--selected
 					background-color: white
+					border-radius: 16px
+
+				.vuecal__cell-split--weekend
+					// background-color: #F2E7FE !important
+					background-color: rgba(255, 124, 124, .3) !important
+					border-radius: 16px
 
 				// EVENT
 

app/src/plugins/tm@dashboard/tasks/_components/a-tasks-filter.vue

@@ -3,7 +3,9 @@
 		<v-select
 			v-model="selectedEmployee"
 			class="subheader-input"
-			:items="employeesNames"
+			:items="employees"
+			item-title="name"
+			item-value="id"
 			label="Zamestnanec"
 			variant="outlined"
 		></v-select>
@@ -43,7 +45,6 @@ export default {
 	data() {
 		return {
 			employees: [],
-			employeesNames: [],
 			selectedDate: "",
 
 			// Kaluza: Napojit funkcnost
@@ -73,9 +74,6 @@ export default {
 
 		async _getEmployees() {
 			this.employees =  await this.$axios.get_auth_data('v1/employees')
-			this.employees.forEach(employee => {
-				this.employeesNames.push(`${employee.name} ${employee.surname} `)
-			})
 		},
 
 		_getWeek(emitDataChanged = true) {

app/src/plugins/tm@dashboard/tasks/tasks.vue

@@ -56,11 +56,17 @@ export default {
 					name: this.timelineData.name + " " + this.timelineData.surname,
 					initials: this.timelineData.name.charAt(0).toUpperCase() + this.timelineData.surname.charAt(0).toUpperCase(),
 					unscheduledTime: Math.floor(this.timelineData.unscheduled_times[i].time / 60) + "," + String(this.timelineData.unscheduled_times[i].time % 60)[0],
-					date: addDays(date, i)
+					date: addDays(date, i),
+					isWeekend: this.isWeekend(addDays(date, i))
 				})
 			}
 		},
 
+		isWeekend(date) {
+			if (date.getDay() == 6 || date.getDay() == 0) return true
+			return false
+		},
+
 		formatTimelineDataToTimelineFormat(date) {
 			// format events
 			this.timelineData.tasks.forEach(event => {

app/src/plugins/tm@dashboard/teams/_components/a-team-filter.vue

@@ -3,7 +3,9 @@
 		<v-select
 			v-model="selectedTeam"
 			class="subheader-input"
-			:items="teamsNames"
+			:items="teams"
+			item-title="name"
+			item-value="id"
 			label="Tím"
 			variant="outlined"
 		></v-select>
@@ -29,6 +31,7 @@
 
 <script>
 import { addDays, subDays } from 'date-fns'
+import { mapGetters } from 'vuex'
 
 export default {
 	props: {
@@ -43,7 +46,6 @@ export default {
 	data() {
 		return {
 			teams: [],
-			teamsNames: [],
 
 			// Kaluza: Napojit funkcionalitu
 			selectedTeam: '',
@@ -55,9 +57,11 @@ export default {
 	},
 
 	computed: {
+		...mapGetters('auth', ['user']),
+		
 		time() {
 			return this.unscheduledTime
-		}
+		},
 	},
 
 	created() {
@@ -75,9 +79,7 @@ export default {
 
 		async _getTeams() {
 			this.teams =  await this.$axios.get_auth_data('v1/teamsx')
-			this.teams.forEach(team => {
-				this.teamsNames.push(team.name)
-			})
+			// this.selectedTeam()
 		},
 
 		_getDay(emitDataChanged = true) {

app/src/plugins/tm@profile/profile/my-profile.vue

@@ -95,7 +95,7 @@ export default {
 		async updateUserInfo() {
 			if (!(await this.v$.$validate())) return
 			try {
-				await this.$store.dispatch('wAuth/updateUserInfo', this.user)
+				await this.$store.dispatch('auth/updateUserInfo', this.user)
 
 				this.$toast.success('Profil bol úspešne zmenený')
 			} catch (error) {

app/src/plugins/w/auth/auth.store.ts

@@ -18,6 +18,8 @@ export default {
 				state.user = data.user
 				localStorage.setItem('wzo_vue_user_user', JSON.stringify(data.user))
 			}
+
+			console.log(state)
 		},
 		auth_error(state: any) {
 			state.token = ''
@@ -158,7 +160,7 @@ export default {
 			return state.user
 		},
 		token: (state: any) => {
-			return state.token
+			return (state.token && state.token != undefined) ? state.token : null
 		}
 	}
 }

app/src/plugins/w/axios/models/axios.ts

@@ -149,6 +149,10 @@ export default {
 	_config(config: any) {
 		if (config) console.error('NOT IMPLEMENTED')
 
+		if (!store.getters['auth/token']) {
+			return {headers: {}}
+		}
+
 		return {
 			headers: {
 				Authorization: `Bearer ${store.getters['auth/token']}`