From d86d5e860e16630590dfa1d2f5f238becca3fa6d Mon Sep 17 00:00:00 2001 From: amir baharlou Date: Wed, 6 Dec 2023 07:53:29 +0330 Subject: [PATCH 1/3] add options --- src/pages/social/SetAppointment.vue | 207 ++++++++++++++++++++++++++-- 1 file changed, 192 insertions(+), 15 deletions(-) diff --git a/src/pages/social/SetAppointment.vue b/src/pages/social/SetAppointment.vue index 40783fd..07323d0 100644 --- a/src/pages/social/SetAppointment.vue +++ b/src/pages/social/SetAppointment.vue @@ -24,7 +24,15 @@ import { LocalStorage } from 'quasar'; dense :options="dayOptions" :label="$t('social.selectDay')" - /> + > + +
+ > + +
-
-
- {{ item.name }} -
-
+ + +
+
+ {{ item.name }} +
+ +
+ Reserved By: {{ item.reserved.name }} +
+ +
+
+
+ + -- GitLab From a322951e5b908228f378f9331b6ec980b6ac537f Mon Sep 17 00:00:00 2001 From: amir baharlou Date: Wed, 6 Dec 2023 17:52:34 +0330 Subject: [PATCH 2/3] add appointment --- src/base-url/index.js | 7 + src/css/quasar.variables.scss | 8 +- src/i18n/en-US/index.js | 1 + src/layouts/SocialLayout.vue | 9 +- src/pages/social/SetAppointment.vue | 446 +++++++++++++++++----------- 5 files changed, 287 insertions(+), 184 deletions(-) diff --git a/src/base-url/index.js b/src/base-url/index.js index 5b48e6b..55cbe16 100644 --- a/src/base-url/index.js +++ b/src/base-url/index.js @@ -178,3 +178,10 @@ export const API_URL_CHAT = { newMsg: id => `/chat/msg/${id}`, seenMsg: id => `/chat/seen_chat/${id}` } + +export const API_URL_MEETINGTABLE = { + setMeet: id => `/meeting-table/reserve/${id}`, + canselMeet: id => `/meeting-table/cancel/${id}`, + getSetAppointment: '/meeting-table', + getCsv: '/meeting-table/csv' +} diff --git a/src/css/quasar.variables.scss b/src/css/quasar.variables.scss index 275ee2e..59a33cf 100644 --- a/src/css/quasar.variables.scss +++ b/src/css/quasar.variables.scss @@ -109,10 +109,14 @@ $flex-gutter: ( ); -$breakpoint-xs: 600px !default; -$breakpoint-sm: 905px !default; +$breakpoint-xs: 280px !default; +$breakpoint-ms: 360px !default; +$breakpoint-sm: 769px !default; $breakpoint-md: 1240px !default; $breakpoint-lg: 1440px !default; +$breakpoint-xl: 1920px !default; + +$sizes: ('none': 0, 'xs': ($breakpoint-xs), 'ms': ($breakpoint-ms), 'sm': ($breakpoint-sm), 'md': ($breakpoint-md), 'lg': ($breakpoint-lg), 'xl': ($breakpoint-xl)) !default; // Colors diff --git a/src/i18n/en-US/index.js b/src/i18n/en-US/index.js index 259150b..4330560 100644 --- a/src/i18n/en-US/index.js +++ b/src/i18n/en-US/index.js @@ -732,6 +732,7 @@ export default { inputChatPlaceholder: 'Write Something ...' }, social: { + search: 'Search', companies: 'Companies', appointment: 'Appointment', company: 'Company', diff --git a/src/layouts/SocialLayout.vue b/src/layouts/SocialLayout.vue index 5342e4a..2a7f113 100644 --- a/src/layouts/SocialLayout.vue +++ b/src/layouts/SocialLayout.vue @@ -17,8 +17,9 @@ :dir="ltrDir ? 'ltr' : 'rtl'" > -
- + TELECOME 2023 +
[ label: t('event.createEvent'), icon: roundEvent, badge: false, - show: userStore.user.user_type === 'COMPANY', + show: false, route: { name: 'CreateEvent' } }, { diff --git a/src/pages/social/SetAppointment.vue b/src/pages/social/SetAppointment.vue index 07323d0..f92e79a 100644 --- a/src/pages/social/SetAppointment.vue +++ b/src/pages/social/SetAppointment.vue @@ -1,125 +1,161 @@ -import { LocalStorage } from 'quasar';