diff --git a/src/base-url/index.js b/src/base-url/index.js index 7fe6bf1c5b2924fb1e482211ad05cdfc07ece96e..95e83d26aa62a28ff0552c5c4382240e4c2e8fb8 100644 --- a/src/base-url/index.js +++ b/src/base-url/index.js @@ -179,6 +179,13 @@ export const API_URL_CHAT = { 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' +} + export const API_URL_TELECOM = { participantList: '/meeting-table/companies/available', addCompanies: '/meeting-table/companies/add', diff --git a/src/components/stage-layout/EventDrawer.vue b/src/components/stage-layout/EventDrawer.vue index b131a558e9abbd66d3625e2b64a6845379d6a317..38f13e11405fb0526c59bd652f8b9520968f7ce4 100644 --- a/src/components/stage-layout/EventDrawer.vue +++ b/src/components/stage-layout/EventDrawer.vue @@ -181,7 +181,7 @@ const routeId = route.params.id const userStore = useUserStore() const tab = ref('eventprofile') -const colSize = computed(() => $q.screen.sizes.md > $q.screen.width) +const colSize = computed(() => $q.screen.sizes.sm > $q.screen.width) const drawer = ref(false) const miniState = ref(true) diff --git a/src/css/quasar.variables.scss b/src/css/quasar.variables.scss index 275ee2e3f2f9672f3e9c3268fbc73e4759c63ffd..59a33cff3908a2d391d87de5fb8d75c8638bc91c 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 259150b08c8db1013bc6de1d83b75edd65694190..4330560268373da6b2c3bcb0fedbaeaf945d2530 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/MobileSocialLayout.vue b/src/layouts/MobileSocialLayout.vue index 920d73b66a474d71e5124d47d0d13a9898da258d..6e07b08d9b3ea27b1c8bfd797b5fb7a4cd5a64e4 100644 --- a/src/layouts/MobileSocialLayout.vue +++ b/src/layouts/MobileSocialLayout.vue @@ -96,11 +96,13 @@ import stickySupport from 'components/stickySupport.vue' import { roundMenu, roundHome, + roundEvent, roundRssFeed, roundListAlt, // roundVideocam, + roundBusiness, roundStorefront, - roundEvent + roundEventAvailable // roundWorkspaces } from '@quasar/extras/material-icons-round' @@ -122,10 +124,12 @@ const profileData = ref({}) const refDrawer = ref(null) dayjs.tz.setDefault(userStore.getTimezone) -const colSize = computed(() => $q.screen.sizes.md > $q.screen.width) +const colSize = computed(() => $q.screen.sizes.sm > $q.screen.width) const ltrDir = computed(() => LocalStorage.getItem('ltrDir')) const checkLogin = computed(() => !!userStore.token) +const owner = computed(() => userStore.user.id === stageStore.event?.user_info?.id) + const checkBuy = computed(() => { if (checkLogin.value) { if (stageStore.event.user_info?.id === userStore.user.id) return false @@ -184,7 +188,7 @@ const menus = computed(() => [ label: 'Feed', icon: roundRssFeed, badge: false, - show: true, + show: false, route: { name: 'SocialFeed' } }, { @@ -198,8 +202,22 @@ const menus = computed(() => [ label: t('event.createEvent'), icon: roundEvent, badge: false, - show: userStore.user.user_type === 'COMPANY', + show: false, route: { name: 'CreateEvent' } + }, + { + label: t('social.companies'), + icon: roundBusiness, + badge: false, + show: owner.value, + route: { name: 'AddCompanies' } + }, + { + label: t('social.appointment'), + icon: roundEventAvailable, + badge: false, + show: true, + route: { name: 'setAppointment' } } ]) diff --git a/src/layouts/SocialLayout.vue b/src/layouts/SocialLayout.vue index 5342e4af5ec30e4cd94f18a0adf9649f017408a1..a6ab9f7c0fe0a290c06921ca0dc63b666e8a3555 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/AddCompanies.vue b/src/pages/social/AddCompanies.vue index a76f0913e72dfede37656fdd300d6e6119fafc3e..8cecd617e08db3fbb2249c2fa0fc832f78d60f05 100644 --- a/src/pages/social/AddCompanies.vue +++ b/src/pages/social/AddCompanies.vue @@ -11,7 +11,7 @@ :dir="ltrDir ? 'ltr' : 'rtl'" >
@@ -59,7 +59,7 @@
-
-

- {{ $t('social.appointment') }} -

-
-
-
- {{ $t('social.day') }} ({{ $t('required') }}) + +
+
+
+ {{ $t('social.appointment') }}
- -
-
-
- {{ $t('social.time') }} ({{ $t('required') }}) +
+
-
-
- -
-
+
+ + + + +
+
+ + + + +
-
-
+ +
+ + + - {{ item.name }} -
+ +
+
+
+ {{ item.name }} +
+ +
+ Reserved By: {{ item.reserved_by.name }} +
+ +
+
+
+
-
+ + +