From dd95c92e04829604caf80e9e2a857d8f70abfbf5 Mon Sep 17 00:00:00 2001
From: Mahmoud-Emad <mahmmoud.hassanein@gmail.com>
Date: Thu, 29 May 2025 10:45:43 +0300
Subject: [PATCH] ci: Rename environment variables in CI/CD

- Rename environment variables to use the `CSHR_` prefix for
  better organization and clarity. This improves maintainability
  and avoids naming conflicts.
- Update `.gitignore` to include the new environment file path.
- Update client-side environment variables to use the `CSHR_`
  prefix, ensuring consistency across the application.
- Update the client-side config file to match the new environment
  variable names.
---
 .github/workflows/test.yml                    |  16 +-
 .gitignore                                    |   2 +-
 client/env.d.ts                               |   4 +-
 client/package.json                           |   3 +-
 client/public/config.js                       |   8 +-
 client/src/clients/api/vacations.ts           |   7 +
 client/src/clients/index.ts                   |   6 +-
 client/src/components/CalenderComponent.vue   | 484 ++++++++++++++++--
 client/src/components/CshrToolbar.vue         |  15 +
 client/src/components/SideDrawer.vue          |  99 +++-
 client/src/components/calenderRequest.vue     |  52 +-
 client/src/components/cards/vacationCard.vue  | 204 ++++++--
 .../src/components/dashboard/UpdateUser.vue   |   2 +-
 client/src/components/profileImage.vue        |   2 +-
 client/src/index.ts                           |   4 +-
 client/src/stores/WSConnection.ts             |   4 +-
 client/src/utils/add_update_user_form.ts      |   2 +-
 client/tsconfig.node.json                     |   6 +-
 config/.env.template                          |  36 +-
 docker/backend.Dockerfile                     |  32 +-
 docker/docker-compose.yml                     |  40 +-
 docker/frontend.Dockerfile                    |   8 +-
 docker/scripts/backend/backend.sh             |   8 +-
 docker/scripts/backend/config.sh              |  36 +-
 docker/scripts/frontend/build-env.sh          |   4 +-
 server/celery_app.py                          |  10 +-
 .../cshr/consumers/notifications_consumer.py  |  78 ++-
 server/cshr/management/commands/create.py     |   2 +-
 server/cshr/serializers/Image_upload.py       |  30 +-
 server/cshr/utils/redis_functions.py          |   4 +-
 server/cshr/utils/send_email.py               |   8 +-
 server/cshr/views/vacations.py                |   3 +-
 server/poetry.lock                            | 158 ++++--
 server/pyproject.toml                         |   1 +
 server/settings.py                            |  40 +-
 server/views.py                               |  12 +-
 terraform/main.tf                             |  20 +-
 terraform/main.tf.template                    |  18 +-
 38 files changed, 1139 insertions(+), 329 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9fdc41180..05bf94a69 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -22,14 +22,14 @@ jobs:
     - name: Create env file
       run: |
           touch .env
-          echo DJANGO_SECRET_KEY=${{ secrets.DJANGO_SECRET_KEY }} >> .env
-          echo DJANGO_DEBUG=${{ secrets.DJANGO_DEBUG }} >> .env
-          echo EMAIL=${{ secrets.EMAIL }} >> .env
-          echo EMAIL_PASSWORD=${{ secrets.EMAIL_PASSWORD }} >> .env
-          echo EMAIL_HOST=${{ secrets.EMAIL_HOST }} >> .env
-          echo REDIS_HOST=${{ secrets.REDIS_HOST}} >> .env
-          echo SERVER_DOMAIN_NAME=${{ secrets.SERVER_DOMAIN_NAME }} >> .env
-          echo CLIENT_DOMAIN_NAME=${{ secrets.CLIENT_DOMAIN_NAME }} >> .env
+          echo CSHR_DJANGO_SECRET_KEY=${{ secrets.CSHR_DJANGO_SECRET_KEY }} >> .env
+          echo CSHR_DJANGO_DEBUG=${{ secrets.CSHR_DJANGO_DEBUG }} >> .env
+          echo CSHR_EMAIL=${{ secrets.CSHR_EMAIL }} >> .env
+          echo CSHR_EMAIL_PASSWORD=${{ secrets.CSHR_EMAIL_PASSWORD }} >> .env
+          echo CSHR_EMAIL_HOST=${{ secrets.CSHR_EMAIL_HOST }} >> .env
+          echo CSHR_REDIS_HOST=${{ secrets.CSHR_REDIS_HOST}} >> .env
+          echo CSHR_SERVER_DOMAIN_NAME=${{ secrets.CSHR_SERVER_DOMAIN_NAME }} >> .env
+          echo CSHR_CLIENT_DOMAIN_NAME=${{ secrets.CSHR_CLIENT_DOMAIN_NAME }} >> .env
           cat .env
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v3
diff --git a/.gitignore b/.gitignore
index d24ee920f..d69a8e42f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -118,7 +118,7 @@ celerybeat.pid
 .venv
 env/
 venv/
-ENV/
+CSHR_ENV/
 env.bak/
 venv.bak/
 
diff --git a/client/env.d.ts b/client/env.d.ts
index 0f899a7d5..6a09fbd5e 100644
--- a/client/env.d.ts
+++ b/client/env.d.ts
@@ -5,6 +5,6 @@ interface ImportMetaEnv {
   VITE_TITLE: string
   VITE_FAVICON: string
   VITE_LOGO: string
-  SERVER_DOMAIN_NAME_API: string
-  SERVER_DOMAIN_NAME_WS: string
+  CSHR_SERVER_DOMAIN_NAME_API: string
+  CSHR_SERVER_DOMAIN_NAME_WS: string
 }
diff --git a/client/package.json b/client/package.json
index e7de5e545..d84b4ab86 100644
--- a/client/package.json
+++ b/client/package.json
@@ -57,5 +57,6 @@
     "vite-plugin-vuetify": "^2.0.1",
     "vitest": "^1.0.4",
     "vue-tsc": "^1.8.25"
-  }
+  },
+  "packageManager": "pnpm@10.11.0+sha512.6540583f41cc5f628eb3d9773ecee802f4f9ef9923cc45b69890fb47991d4b092964694ec3a4f738a420c918a333062c8b925d312f42e4f0c263eb603551f977"
 }
diff --git a/client/public/config.js b/client/public/config.js
index b1a3eb9ea..f38564bc4 100644
--- a/client/public/config.js
+++ b/client/public/config.js
@@ -1,6 +1,6 @@
 window.env = {
-  // SERVER_DOMAIN_NAME_API: 'https://cshrserver.gent01.qa.grid.tf/api', // Added for testing, this is a staging API
-  // SERVER_DOMAIN_NAME_WS: 'wss://cshrserver.gent01.qa.grid.tf/ws/notification', // Added for testing, this is a staging API
-  SERVER_DOMAIN_NAME_API: 'http://127.0.0.1:8000/api', // Added for testing, this is the local server API
-  SERVER_DOMAIN_NAME_WS: 'ws://127.0.0.1:8000/ws/notification', // Added for testing, this is the local server API
+  // CSHR_SERVER_DOMAIN_NAME_API: 'https://cshrserver.gent01.qa.grid.tf/api', // Added for testing, this is a staging API
+  // CSHR_SERVER_DOMAIN_NAME_WS: 'wss://cshrserver.gent01.qa.grid.tf/ws/notification', // Added for testing, this is a staging API
+  CSHR_SERVER_DOMAIN_NAME_API: 'http://127.0.0.1:8000/api', // Added for testing, this is the local server API
+  CSHR_SERVER_DOMAIN_NAME_WS: 'ws://127.0.0.1:8000/ws/notification', // Added for testing, this is the local server API
 };
\ No newline at end of file
diff --git a/client/src/clients/api/vacations.ts b/client/src/clients/api/vacations.ts
index be8d4cdba..267253df0 100644
--- a/client/src/clients/api/vacations.ts
+++ b/client/src/clients/api/vacations.ts
@@ -95,6 +95,13 @@ export class VacationsApi extends ApiClientBase {
     })
   }
 
+  async delete(id: number) {
+    ApiClientBase.assertUser()
+    return this.unwrap(() => this.$http.delete<any>(this.getUrl(`/${id}`)), {
+      transform: (d) => d.results
+    })
+  }
+
   async requestToCancel(id: number) {
     return this.unwrap(() => this.$http.put<any>(this.getUrl(`/request-to-cancel/${id}`)), {
       transform: (d) => d.results
diff --git a/client/src/clients/index.ts b/client/src/clients/index.ts
index bb5694e85..e5b28db76 100644
--- a/client/src/clients/index.ts
+++ b/client/src/clients/index.ts
@@ -2,13 +2,13 @@ import axios from 'axios'
 
 import { ApiClient } from './api'
 
-console.log(`API connected on: ${window.env.SERVER_DOMAIN_NAME_API}`);
-console.log(`WS connected on: ${window.env.SERVER_DOMAIN_NAME_WS}`);
+console.log(`API connected on: ${window.env.CSHR_SERVER_DOMAIN_NAME_API}`);
+console.log(`WS connected on: ${window.env.CSHR_SERVER_DOMAIN_NAME_WS}`);
 
 const accessToken = localStorage.getItem("access_token")
 export const $api = new ApiClient({
   $http: axios.create({
-    baseURL: window.env.SERVER_DOMAIN_NAME_API,
+    baseURL: window.env.CSHR_SERVER_DOMAIN_NAME_API,
     headers: {
       Authorization: `Bearer ${accessToken}`,
     },
diff --git a/client/src/components/CalenderComponent.vue b/client/src/components/CalenderComponent.vue
index f49263fc5..5381c2a06 100644
--- a/client/src/components/CalenderComponent.vue
+++ b/client/src/components/CalenderComponent.vue
@@ -1,39 +1,108 @@
 <template>
-  <v-row class="justify-center py-4">
-    <v-col cols="2">
-      <v-checkbox v-model="filters.vacation" color="#fcd091" label="Vacations" />
-    </v-col>
-    <v-col cols="2">
-      <v-checkbox v-model="filters.meeting" color="#efeaea" label="Meetings" />
-    </v-col>
-    <v-col cols="2">
-      <v-checkbox v-model="filters.event" color="#47a2ff" label="Events" />
-    </v-col>
-    <v-col cols="2">
-      <v-checkbox v-model="filters.holiday" color="#5effb4" label="Holidays" />
-    </v-col>
-    <v-col cols="2">
-      <v-checkbox v-model="filters.birthday" color="#e0adf0" label="Birthdays" />
-    </v-col>
-  </v-row>
+  <!-- Collapsible Filter Section -->
+  <v-card class="ma-2 ma-sm-4 ma-md-7 mx-2 mx-sm-4 mx-md-7" rounded="lg">
+    <v-card-title class="d-flex align-center justify-space-between pa-3 pa-sm-4">
+      <div class="d-flex align-center">
+        <v-icon class="me-2" color="primary">mdi-filter-variant</v-icon>
+        <span class="text-subtitle-1 text-sm-h6 font-weight-medium">Filters</span>
+      </div>
+      <v-btn
+        :icon="showFilters ? 'mdi-chevron-up' : 'mdi-chevron-down'"
+        variant="text"
+        :size="$vuetify.display.mobile ? 'small' : 'default'"
+        color="primary"
+        @click="showFilters = !showFilters"
+      />
+    </v-card-title>
+
+    <v-expand-transition>
+      <div v-show="showFilters">
+        <v-divider />
+        <v-card-text class="pa-3 pa-sm-4 pa-md-6">
+          <v-row class="justify-center" :dense="$vuetify.display.mobile">
+            <v-col cols="6" sm="4" md="2" class="d-flex justify-center pa-1 pa-sm-2">
+              <v-checkbox
+                v-model="filters.vacation"
+                color="#fcd091"
+                label="Vacations"
+                hide-details
+                :density="$vuetify.display.mobile ? 'compact' : 'comfortable'"
+                class="text-body-2 text-sm-body-1" />
+            </v-col>
+            <v-col cols="6" sm="4" md="2" class="d-flex justify-center pa-1 pa-sm-2">
+              <v-checkbox
+                v-model="filters.meeting"
+                color="#efeaea"
+                label="Meetings"
+                hide-details
+                :density="$vuetify.display.mobile ? 'compact' : 'comfortable'"
+                class="text-body-2 text-sm-body-1" />
+            </v-col>
+            <v-col cols="6" sm="4" md="2" class="d-flex justify-center pa-1 pa-sm-2">
+              <v-checkbox
+                v-model="filters.event"
+                color="#47a2ff"
+                label="Events"
+                hide-details
+                :density="$vuetify.display.mobile ? 'compact' : 'comfortable'"
+                class="text-body-2 text-sm-body-1" />
+            </v-col>
+            <v-col cols="6" sm="4" md="2" class="d-flex justify-center pa-1 pa-sm-2">
+              <v-checkbox
+                v-model="filters.holiday"
+                color="#5effb4"
+                label="Holidays"
+                hide-details
+                :density="$vuetify.display.mobile ? 'compact' : 'comfortable'"
+                class="text-body-2 text-sm-body-1" />
+            </v-col>
+            <v-col cols="6" sm="4" md="2" class="d-flex justify-center pa-1 pa-sm-2">
+              <v-checkbox
+                v-model="filters.birthday"
+                color="#e0adf0"
+                label="Birthdays"
+                hide-details
+                :density="$vuetify.display.mobile ? 'compact' : 'comfortable'"
+                class="text-body-2 text-sm-body-1" />
+            </v-col>
+            <v-col cols="6" sm="4" md="2" class="d-flex justify-center pa-1 pa-sm-2">
+              <v-checkbox
+                v-model="filters.myRequests"
+                color="#ff9800"
+                label="My Requests"
+                hide-details
+                :density="$vuetify.display.mobile ? 'compact' : 'comfortable'"
+                class="text-body-2 text-sm-body-1" />
+            </v-col>
+          </v-row>
+        </v-card-text>
+      </div>
+    </v-expand-transition>
+  </v-card>
   <v-divider class="d-flex mx-auto" style="width: 90%"></v-divider>
-  <div class="ma-7 px-7">
+
+  <!-- Calendar Container - Responsive Layout -->
+  <div class="ma-2 ma-sm-4 ma-md-7 px-2 px-sm-4 px-md-7 calendar-container">
     <div class="loading-container d-flex align-center justify-center my-5" v-if="isLoading">
       <v-alert density="compact" class="pa-5" type="info" text="Events are loading..."></v-alert>
     </div>
 
-    <FullCalendar class="fc" :options="{
-      ...options,
-      events: filteredEvents as any
-    }">
+    <FullCalendar class="fc" :options="calendarOptions">
     </FullCalendar>
   </div>
 
-  <!-- Dialogs -->
+  <!-- Responsive Dialogs -->
   <!-- Create new event dialog -->
-  <v-dialog width='900' max-width='1200' v-if="selectedEventType.isNewEvent" :routeQuery="dates?.startStr"
-    :modelValue="selectedEventType.isNewEvent" @click:outside="closeDialog(CalendarEventSelection.NewEvent)">
-    <v-card>
+  <v-dialog
+    v-if="selectedEventType.isNewEvent"
+    route-query="new-event"
+    :modelValue="selectedEventType.isNewEvent"
+    @click:outside="closeDialog(CalendarEventSelection.NewEvent)"
+    :width="$vuetify.display.xs ? '100vw' : $vuetify.display.sm ? '95vw' : '900'"
+    :max-width="$vuetify.display.mobile ? '100vw' : '1200'"
+    :fullscreen="$vuetify.display.xs"
+    scrollable>
+    <v-card :class="$vuetify.display.mobile ? 'h-100' : ''">
       <calender-request :dates="dates" @close-dialog="closeDialog(CalendarEventSelection.NewEvent)"
         @create-vacation="createVacation($event)" @create-meeting="createMeeting($event)"
         @create-event="createEvent($event)" />
@@ -41,46 +110,76 @@
   </v-dialog>
 
   <!-- View meeting dialog -->
-  <v-dialog v-if="selectedEventType.isViewRequest && selectedEventType.isMeeting && selectedEvent"
-    :routeQuery="selectedEvent.id" :modelValue="selectedEventType.isMeeting"
-    @click:outside="closeDialog(CalendarEventSelection.Meeting)">
-    <v-card>
+  <v-dialog
+    v-if="selectedEventType.isViewRequest && selectedEventType.isMeeting && selectedEvent"
+    route-query="meeting-view"
+    :modelValue="selectedEventType.isMeeting"
+    @click:outside="closeDialog(CalendarEventSelection.Meeting)"
+    :width="$vuetify.display.xs ? '100vw' : $vuetify.display.sm ? '90vw' : '600'"
+    :max-width="$vuetify.display.mobile ? '100vw' : '800'"
+    :fullscreen="$vuetify.display.xs"
+    scrollable>
+    <v-card :class="$vuetify.display.mobile ? 'h-100' : ''" rounded="lg">
       <meeting-card :meeting="selectedEvent" @close-dialog="closeDialog(CalendarEventSelection.Meeting)" />
     </v-card>
   </v-dialog>
 
   <!-- View holiday dialog -->
-  <v-dialog v-if="selectedEventType.isViewRequest && selectedEventType.isHoliday && selectedEvent"
-    :routeQuery="selectedEvent.id" :modelValue="selectedEventType.isHoliday"
-    @click:outside="closeDialog(CalendarEventSelection.PublicHoliday)">
-    <v-card>
+  <v-dialog
+    v-if="selectedEventType.isViewRequest && selectedEventType.isHoliday && selectedEvent"
+    route-query="holiday-view"
+    :modelValue="selectedEventType.isHoliday"
+    @click:outside="closeDialog(CalendarEventSelection.PublicHoliday)"
+    :width="$vuetify.display.xs ? '100vw' : $vuetify.display.sm ? '90vw' : '600'"
+    :max-width="$vuetify.display.mobile ? '100vw' : '800'"
+    :fullscreen="$vuetify.display.xs"
+    scrollable>
+    <v-card :class="$vuetify.display.mobile ? 'h-100' : ''" rounded="lg">
       <holiday-card :holiday="selectedEvent" @close-dialog="closeDialog(CalendarEventSelection.PublicHoliday)" />
     </v-card>
   </v-dialog>
 
-  <!-- View holiday dialog -->
-  <v-dialog v-if="selectedEventType.isViewRequest && selectedEventType.isBirthday && selectedEvent"
-    :routeQuery="selectedEvent.id" :modelValue="selectedEventType.isBirthday"
-    @click:outside="closeDialog(CalendarEventSelection.Birthday)">
-    <v-card>
+  <!-- View birthday dialog -->
+  <v-dialog
+    v-if="selectedEventType.isViewRequest && selectedEventType.isBirthday && selectedEvent"
+    route-query="birthday-view"
+    :modelValue="selectedEventType.isBirthday"
+    @click:outside="closeDialog(CalendarEventSelection.Birthday)"
+    :width="$vuetify.display.xs ? '100vw' : $vuetify.display.sm ? '90vw' : '600'"
+    :max-width="$vuetify.display.mobile ? '100vw' : '800'"
+    :fullscreen="$vuetify.display.xs"
+    scrollable>
+    <v-card :class="$vuetify.display.mobile ? 'h-100' : ''" rounded="lg">
       <birthday-card :birthday="selectedEvent" @close-dialog="closeDialog(CalendarEventSelection.Birthday)" />
     </v-card>
   </v-dialog>
 
   <!-- View event dialog -->
-  <v-dialog v-if="selectedEventType.isViewRequest && selectedEventType.isEvent && selectedEvent"
-    :routeQuery="selectedEvent.id" :modelValue="selectedEventType.isEvent"
-    @click:outside="closeDialog(CalendarEventSelection.Event)">
-    <v-card>
+  <v-dialog
+    v-if="selectedEventType.isViewRequest && selectedEventType.isEvent && selectedEvent"
+    route-query="event-view"
+    :modelValue="selectedEventType.isEvent"
+    @click:outside="closeDialog(CalendarEventSelection.Event)"
+    :width="$vuetify.display.xs ? '100vw' : $vuetify.display.sm ? '90vw' : '600'"
+    :max-width="$vuetify.display.mobile ? '100vw' : '800'"
+    :fullscreen="$vuetify.display.xs"
+    scrollable>
+    <v-card :class="$vuetify.display.mobile ? 'h-100' : ''" rounded="lg">
       <event-card :event="selectedEvent" @close-dialog="closeDialog(CalendarEventSelection.Event)" />
     </v-card>
   </v-dialog>
 
   <!-- View vacation dialog -->
-  <v-dialog v-if="selectedEventType.isViewRequest && selectedEventType.isVacation && selectedEvent"
-    :routeQuery="selectedEvent" :modelValue="selectedEventType.isVacation"
-    @click:outside="closeDialog(CalendarEventSelection.Vacation)">
-    <v-card>
+  <v-dialog
+    v-if="selectedEventType.isViewRequest && selectedEventType.isVacation && selectedEvent"
+    route-query="vacation-view"
+    :modelValue="selectedEventType.isVacation"
+    @click:outside="closeDialog(CalendarEventSelection.Vacation)"
+    :width="$vuetify.display.xs ? '100vw' : $vuetify.display.sm ? '90vw' : '700'"
+    :max-width="$vuetify.display.mobile ? '100vw' : '900'"
+    :fullscreen="$vuetify.display.xs"
+    scrollable>
+    <v-card :class="$vuetify.display.mobile ? 'h-100' : ''" rounded="lg">
       <vacation-card :vacation="(selectedEvent as Api.Vacation)"
         @close-dialog="closeDialog(CalendarEventSelection.Vacation)" @update-vacation="updateVacation($event)"
         @cancel-vacation="cancelVacation()" />
@@ -89,7 +188,7 @@
 </template>
 
 <script lang="ts" setup>
-import { onMounted, reactive, ref, watch } from 'vue'
+import { onMounted, reactive, ref, watch, computed } from 'vue'
 import { type CalendarApi, type CalendarOptions } from '@fullcalendar/core'
 import { useApi } from '@/hooks'
 import { useAsyncState } from '@vueuse/core'
@@ -109,9 +208,11 @@ import { normalizeEvent, normalizeVacation } from '@/utils/helpers'
 import { normalizedBirthday, normalizeHoliday, normalizeMeeting } from '@/utils'
 import { ApiClientBase } from '@/clients/api/base'
 import { useHomeEventsStore } from '@/stores/homeEvents'
+import { useDisplay } from 'vuetify'
 
 const homeEventsStore = useHomeEventsStore()
 const filteredEvents = ref<Api.Home[]>([])
+const { mobile, xs, sm } = useDisplay()
 
 const currentDate = ref<Date>(new Date())
 const calendar = ref<CalendarApi>()
@@ -124,9 +225,12 @@ const filters = reactive({
   event: true,
   vacation: true,
   holiday: true,
-  birthday: true
+  birthday: true,
+  myRequests: true
 })
 
+const showFilters = ref(true)
+
 const selectedEventType = reactive({
   isMeeting: false,
   isEvent: false,
@@ -194,6 +298,22 @@ const updateEventCalendarType = (event: any) => {
 
 const filterEvents = () => {
   filteredEvents.value = homeEventsStore.events.filter((event) => {
+    // Check if event is a request made by the current user
+    const isMyRequest = (
+      // Vacation requests applied by user
+      (event.type === 'vacation' && event.extendedProps?.applying_user?.id === me?.id) ||
+      // Meeting requests created by user
+      (event.type === 'meeting' && event.extendedProps?.created_by?.id === me?.id) ||
+      // Event requests created by user
+      (event.type === 'event' && event.extendedProps?.created_by?.id === me?.id)
+    )
+
+    // If "My Requests" is enabled, show ONLY user's requests (exclusive filter)
+    if (filters.myRequests) {
+      return isMyRequest
+    }
+
+    // Standard filtering when "My Requests" is not enabled - show events based on type filters
     return (
       (event.type === 'meeting' && filters.meeting) ||
       (event.type === 'event' && filters.event) ||
@@ -367,7 +487,7 @@ async function createEvent(event: Api.Event) {
 //   }
 
 //   if (status === 'approved') {
-//     homeEventsStore.vacations[vacationIndex].approval_user = 
+//     homeEventsStore.vacations[vacationIndex].approval_user =
 //   }
 
 //   closeDialog(CalendarEventSelection.Vacation)
@@ -401,7 +521,8 @@ async function cancelVacation() {
   closeDialog(CalendarEventSelection.Vacation)
 }
 
-const options = reactive<CalendarOptions>({
+// Calendar options - Original desktop layout with responsive enhancements
+const calendarOptions = computed<CalendarOptions>(() => ({
   plugins: [dayGridPlugin, timeGridPlugin, listPlugin, interactionPlugin],
   // dayMaxEventRows: true,
   dayMaxEvents: true,
@@ -415,16 +536,17 @@ const options = reactive<CalendarOptions>({
   weekends: true,
   select: onSelect,
   eventClick: onClick,
-  events: [],
+  events: filteredEvents.value as any,
   editable: false,
   datesSet: (arg) => (currentDate.value = arg.view.currentStart)
-})
+}))
 
 watch(currentDate, () => loadEvents(), { deep: true })
 watch(filters, filterEvents, { deep: true })
 </script>
 
 <style>
+/* Base Calendar Styles */
 .fc {
   font-size: 0.875rem !important;
 }
@@ -470,4 +592,260 @@ button {
     background-color: rgb(100, 99, 99) !important;
   }
 }
+
+/* Responsive Calendar Styles */
+
+/* Tablet Responsive (≤960px) */
+@media (max-width: 960px) {
+  .fc {
+    font-size: 0.8rem !important;
+  }
+
+  .fc-toolbar {
+    flex-wrap: wrap;
+    gap: 0.5rem;
+  }
+
+  .fc-button {
+    padding: 0.4rem 0.8rem !important;
+    font-size: 0.8rem !important;
+    min-height: 36px !important;
+  }
+
+  .fc-toolbar-title {
+    font-size: 1.2rem !important;
+  }
+
+  .fc-daygrid-day {
+    min-height: 70px !important;
+  }
+}
+
+/* Mobile Responsive (≤600px) */
+@media (max-width: 600px) {
+  .fc {
+    font-size: 0.75rem !important;
+    height: auto !important;
+    min-height: 500px !important;
+  }
+
+  .fc .fc-view-harness {
+    min-height: 500px !important;
+  }
+
+  .fc-daygrid {
+    min-height: 450px !important;
+  }
+
+  /* Responsive Toolbar Layout */
+  .fc-toolbar {
+    flex-direction: column !important;
+    gap: 0.75rem !important;
+    align-items: center !important;
+    padding: 0.5rem 0 !important;
+  }
+
+  .fc-toolbar-chunk {
+    display: flex !important;
+    justify-content: center !important;
+    align-items: center !important;
+    width: 100% !important;
+  }
+
+  /* Reorder toolbar elements for mobile */
+  .fc-toolbar-chunk:first-child {
+    order: 2; /* Navigation buttons */
+  }
+
+  .fc-toolbar-chunk:nth-child(2) {
+    order: 1; /* Title */
+  }
+
+  .fc-toolbar-chunk:last-child {
+    order: 3; /* View buttons */
+  }
+
+  /* Enhanced Mobile Buttons */
+  .fc-button-group {
+    display: flex !important;
+    gap: 0.5rem !important;
+    flex-wrap: wrap !important;
+    justify-content: center !important;
+  }
+
+  .fc-button {
+    padding: 0.6rem 1rem !important;
+    font-size: 0.8rem !important;
+    min-width: 70px !important;
+    min-height: 44px !important;
+    border-radius: 8px !important;
+    font-weight: 500 !important;
+    transition: all 0.2s ease !important;
+    border: 1px solid rgba(0,0,0,0.12) !important;
+  }
+
+  /* Button styling for better mobile UX */
+  .fc-button:not(.fc-button-active) {
+    background: var(--v-theme-surface) !important;
+    color: var(--v-theme-on-surface) !important;
+  }
+
+  .fc-button:hover:not(.fc-button-active) {
+    background: var(--v-theme-surface-variant) !important;
+    transform: translateY(-1px) !important;
+    box-shadow: 0 2px 8px rgba(0,0,0,0.15) !important;
+  }
+
+  .fc-button-active {
+    background: var(--v-theme-primary) !important;
+    color: var(--v-theme-on-primary) !important;
+    box-shadow: 0 2px 8px rgba(0,0,0,0.2) !important;
+  }
+
+  .fc-button-active:hover {
+    background: var(--v-theme-primary) !important;
+    transform: translateY(-1px) !important;
+    box-shadow: 0 4px 12px rgba(0,0,0,0.25) !important;
+  }
+
+  /* Mobile Title */
+  .fc-toolbar-title {
+    font-size: 1.1rem !important;
+    text-align: center !important;
+    margin: 0 !important;
+    font-weight: 600 !important;
+  }
+
+  /* Mobile Calendar Grid - Larger Touch Targets */
+  .fc-daygrid-day {
+    min-height: 80px !important;
+  }
+
+  .fc-daygrid-day-frame {
+    min-height: 80px !important;
+  }
+
+  .fc-daygrid-day-events {
+    margin-bottom: 4px !important;
+  }
+
+  .fc-daygrid-day-number {
+    padding: 8px !important;
+    font-size: 0.9rem !important;
+    font-weight: 500 !important;
+  }
+
+  .fc-daygrid-event {
+    font-size: 0.7rem !important;
+    margin: 2px 1px !important;
+    min-height: 20px !important;
+  }
+
+  .fc-event {
+    padding: 3px 6px !important;
+    border-radius: 4px !important;
+  }
+
+  /* Better touch targets for day cells */
+  .fc-daygrid-day-top {
+    padding: 4px !important;
+  }
+
+  /* Mobile List View */
+  .fc-list-event-title {
+    font-size: 0.8rem !important;
+  }
+
+  .fc-list-event-time {
+    font-size: 0.7rem !important;
+  }
+
+  /* Mobile Day Headers */
+  .fc-col-header-cell {
+    padding: 0.5rem 0.25rem !important;
+  }
+
+  .fc-col-header-cell-cushion {
+    font-size: 0.75rem !important;
+  }
+}
+
+/* Extra Small Mobile (≤480px) */
+@media (max-width: 480px) {
+  .fc {
+    font-size: 0.7rem !important;
+    min-height: 450px !important;
+  }
+
+  .fc .fc-view-harness {
+    min-height: 450px !important;
+  }
+
+  .fc-daygrid {
+    min-height: 400px !important;
+  }
+
+  .fc-toolbar-title {
+    font-size: 1rem !important;
+  }
+
+  .fc-button {
+    padding: 0.5rem 0.75rem !important;
+    font-size: 0.75rem !important;
+    min-width: 60px !important;
+    min-height: 40px !important;
+  }
+
+  .fc-button-group {
+    gap: 0.25rem !important;
+  }
+
+  .fc-daygrid-day {
+    min-height: 70px !important;
+  }
+
+  .fc-daygrid-day-frame {
+    min-height: 70px !important;
+  }
+
+  .fc-daygrid-day-number {
+    padding: 6px !important;
+    font-size: 0.8rem !important;
+  }
+
+  .fc-daygrid-event {
+    font-size: 0.65rem !important;
+    min-height: 18px !important;
+  }
+
+  .fc-event {
+    padding: 2px 4px !important;
+  }
+
+  .fc-col-header-cell-cushion {
+    font-size: 0.7rem !important;
+  }
+}
+
+/* Ultra Small Mobile (≤360px) */
+@media (max-width: 360px) {
+  .calendar-container {
+    overflow-x: auto !important;
+  }
+
+  .fc {
+    min-width: 320px !important;
+    font-size: 0.65rem !important;
+  }
+
+  .fc-button {
+    padding: 0.4rem 0.6rem !important;
+    font-size: 0.7rem !important;
+    min-width: 50px !important;
+  }
+
+  .fc-toolbar-title {
+    font-size: 0.9rem !important;
+  }
+}
 </style>
diff --git a/client/src/components/CshrToolbar.vue b/client/src/components/CshrToolbar.vue
index c202f1c68..419696037 100644
--- a/client/src/components/CshrToolbar.vue
+++ b/client/src/components/CshrToolbar.vue
@@ -1,5 +1,13 @@
 <template>
   <VToolbar color="primary">
+    <!-- Mobile menu button -->
+    <VBtn
+      v-if="showMenuButton"
+      icon="mdi-menu"
+      @click="$emit('toggle-drawer')"
+      color="white"
+      class="mr-2" />
+
     <VSpacer />
     <VMenu v-model="menu">
       <template #activator="{ props }">
@@ -83,6 +91,13 @@ import { ApiClientBase } from '@/clients/api/base'
 export default {
   name: 'CshrToolbar',
   components: { NotificationDetailsDialog, profileImage },
+  props: {
+    showMenuButton: {
+      type: Boolean,
+      default: false
+    }
+  },
+  emits: ['logout', 'toggle-drawer'],
   setup(_, { emit }) {
     const $api = useApi()
     const user = useAsyncState(async () => await $api.myprofile.getUser(), null)
diff --git a/client/src/components/SideDrawer.vue b/client/src/components/SideDrawer.vue
index 020615472..4e79aad12 100644
--- a/client/src/components/SideDrawer.vue
+++ b/client/src/components/SideDrawer.vue
@@ -1,22 +1,37 @@
 <template>
   <v-card class="layout-container">
-    <v-navigation-drawer v-if="$route.path != '/login'" theme="dark" permanent temporary class="fixed-sidebar">
+    <v-navigation-drawer
+      v-if="$route.path != '/login'"
+      v-model="drawer"
+      theme="dark"
+      :permanent="!mobile"
+      :temporary="mobile"
+      class="fixed-sidebar"
+      :width="250">
       <router-link to="/">
         <v-img :src="logo" max-width="110" class="ml-3 mt-5 mb-4"></v-img>
       </router-link>
       <v-divider></v-divider>
       <v-list color="transparent">
         <template v-for="item in filteredItems" :key="item.title">
-          <v-list-item :to="item.path" :prepend-icon="item.icon" color="white"
-            :class="{ 'router-link-active': $route.path === item.path }">
+          <v-list-item
+            :to="item.path"
+            :prepend-icon="item.icon"
+            color="white"
+            :class="{ 'router-link-active': $route.path === item.path }"
+            @click="onNavItemClick">
             {{ item.title }}
           </v-list-item>
         </template>
       </v-list>
     </v-navigation-drawer>
 
-    <div :class="$route.path != '/login' ? 'main-container' : ''">
-      <CshrToolbar v-if="$route.path != '/login'" @logout="logout" />
+    <div :class="$route.path != '/login' ? getMainContainerClass : ''">
+      <CshrToolbar
+        v-if="$route.path != '/login'"
+        @logout="logout"
+        @toggle-drawer="toggleDrawer"
+        :show-menu-button="mobile" />
       <div class="scrollable-content">
         <template v-if="isReadyRouter.state.value">
           <router-view />
@@ -33,10 +48,11 @@
 import { useRoute, useRouter } from 'vue-router'
 import { useAsyncState } from '@vueuse/core'
 import logo from '@/assets/cshr_logo.png'
-import { computed } from 'vue'
+import { computed, ref, watch } from 'vue'
 import CshrToolbar from './CshrToolbar.vue'
 import { $api } from '@/clients'
 import { ApiClientBase } from '@/clients/api/base'
+import { useDisplay } from 'vuetify'
 
 export default {
   name: 'SideDrawer',
@@ -47,12 +63,25 @@ export default {
     const $route = useRoute()
     const $router = useRouter()
     const user = ApiClientBase.user
+    const { mobile } = useDisplay()
+
+    // Drawer state management
+    const drawer = ref(!mobile.value) // Open by default on desktop, closed on mobile
 
     const isReadyRouter = useAsyncState(async () => {
       await $router.isReady()
       return true
     }, false)
 
+    // Watch for screen size changes and auto-close drawer on mobile
+    watch(mobile, (isMobile) => {
+      if (isMobile) {
+        drawer.value = false
+      } else {
+        drawer.value = true
+      }
+    })
+
     const navItems = [
       {
         icon: 'mdi-calendar',
@@ -119,13 +148,37 @@ export default {
       $router.push('/login')
     }
 
+    function toggleDrawer() {
+      drawer.value = !drawer.value
+    }
+
+    function onNavItemClick() {
+      // Close drawer on mobile when navigating
+      if (mobile.value) {
+        drawer.value = false
+      }
+    }
+
+    // Computed class for main container based on drawer state
+    const getMainContainerClass = computed(() => {
+      if (mobile.value) {
+        return 'main-container-mobile'
+      }
+      return 'main-container'
+    })
+
     return {
       isReadyRouter,
       logo,
       $route,
       navItems,
       filteredItems,
-      logout
+      logout,
+      drawer,
+      mobile,
+      toggleDrawer,
+      onNavItemClick,
+      getMainContainerClass
     }
   }
 }
@@ -146,15 +199,25 @@ export default {
   left: 0;
   bottom: 0;
   width: 250px;
-  z-index: 10;
+  z-index: 1000;
 }
 
-/* Main container styles */
+/* Main container styles - Desktop */
 .main-container {
   flex: 1;
   display: flex;
   flex-direction: column;
   margin-left: 250px;
+  transition: margin-left 0.3s ease;
+}
+
+/* Main container styles - Mobile */
+.main-container-mobile {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  margin-left: 0;
+  width: 100%;
 }
 
 /* Navbar styles */
@@ -176,4 +239,22 @@ export default {
   flex: 1;
   overflow-y: auto;
 }
+
+/* Responsive styles */
+@media (max-width: 960px) {
+  .main-container {
+    margin-left: 0;
+  }
+
+  .fixed-sidebar {
+    z-index: 1001; /* Higher z-index for mobile overlay */
+  }
+}
+
+/* Mobile specific styles */
+@media (max-width: 600px) {
+  .layout-container {
+    position: relative;
+  }
+}
 </style>
\ No newline at end of file
diff --git a/client/src/components/calenderRequest.vue b/client/src/components/calenderRequest.vue
index f97826671..26faae215 100644
--- a/client/src/components/calenderRequest.vue
+++ b/client/src/components/calenderRequest.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-card elevation="0" color="" class="">
+  <v-card elevation="0" color="" class="calendar-request-card">
     <v-card-title class="bg-graytitle">
       <div class="d-flex flex-row-reverse">
         <v-icon size="small" class="" @click.stop="$emit('close-dialog', false)">
@@ -7,14 +7,24 @@
         </v-icon>
       </div>
     </v-card-title>
-    <v-container class="pa-6">
+    <v-container class="pa-2 pa-sm-4 pa-md-6">
       <div class="d-flex justify-center">
-        <v-tabs v-model="tab" color="">
-          <v-tab v-for="tab in tabs" :key="tab" :value="tab"> {{ tab }}</v-tab>
+        <v-tabs
+          v-model="tab"
+          color=""
+          :direction="$vuetify.display.xs ? 'vertical' : 'horizontal'"
+          class="responsive-tabs">
+          <v-tab
+            v-for="tab in tabs"
+            :key="tab"
+            :value="tab"
+            :class="$vuetify.display.xs ? 'text-caption' : ''">
+            {{ tab }}
+          </v-tab>
         </v-tabs>
       </div>
 
-      <v-window v-model="tab">
+      <v-window v-model="tab" class="mt-4">
         <v-window-item value="Leave">
           <leaveRequest :dates="dates" @create-event="createLeave($event)"></leaveRequest>
         </v-window-item>
@@ -78,3 +88,35 @@ export default {
   }
 }
 </script>
+
+<style scoped>
+.calendar-request-card {
+  min-height: 400px;
+}
+
+.responsive-tabs {
+  width: 100%;
+}
+
+/* Mobile responsive styles */
+@media (max-width: 600px) {
+  .calendar-request-card {
+    min-height: 350px;
+  }
+
+  .responsive-tabs .v-tab {
+    min-width: 60px;
+    padding: 8px 12px;
+    font-size: 0.8rem;
+  }
+}
+
+/* Extra small mobile styles */
+@media (max-width: 480px) {
+  .responsive-tabs .v-tab {
+    min-width: 50px;
+    padding: 6px 8px;
+    font-size: 0.75rem;
+  }
+}
+</style>
diff --git a/client/src/components/cards/vacationCard.vue b/client/src/components/cards/vacationCard.vue
index f4c58ebaf..7145d6349 100644
--- a/client/src/components/cards/vacationCard.vue
+++ b/client/src/components/cards/vacationCard.vue
@@ -18,74 +18,100 @@
             :disabled="!form?.isValid">Update</v-btn>
           <v-btn v-if="couldRequestToCancel" color="error" class="mx-1 my-2" @click="requestToCancel">Request to
             Cancel</v-btn>
-          <v-btn v-if="vacation.status === 'pending' && couldDelete" color="error" class="mx-1 my-2"
-            @click="handleDelete">Cancel</v-btn>
+          <v-btn v-if="couldCancel" color="error" class="mx-1 my-2"
+            @click="showDeleteConfirmation = true">
+            {{ isOfficeAdmin && vacationData.applying_user.id !== user?.id ? 'Cancel Vacation' : 'Cancel' }}
+          </v-btn>
         </v-row>
-        <div v-if="couldApprove && vacation.status == 'requested_to_cancel'">
+
+        <!-- Cancel Confirmation Dialog -->
+        <VDialog v-model="showDeleteConfirmation" max-width="500px" @click:outside="closeDialog">
+          <v-card>
+            <v-card-title class="text-h5">Confirm Cancellation</v-card-title>
+            <v-card-text>
+              <p v-if="isOfficeAdmin && vacationData.applying_user.id !== user?.id">
+                Are you sure you want to cancel {{ vacationData.applying_user.full_name }}'s vacation?
+              </p>
+              <p v-else>
+                Are you sure you want to cancel this vacation?
+              </p>
+              <v-alert v-if="vacationData.status === 'approved'" type="warning" class="mt-2">
+                This vacation is currently approved. Canceling it will restore the deducted balance back to the associated vacation reason.
+              </v-alert>
+              <v-alert v-if="isOfficeAdmin && vacationData.applying_user.id !== user?.id" type="info" class="mt-2">
+                {{ vacationData.applying_user.full_name }} will be notified that you canceled their vacation.
+              </v-alert>
+            </v-card-text>
+            <v-card-actions>
+              <v-spacer></v-spacer>
+              <v-btn color="blue-darken-1" variant="text" @click="closeDialog">Cancel</v-btn>
+              <v-btn color="error" variant="text" @click="deleteVacation">Confirm</v-btn>
+            </v-card-actions>
+          </v-card>
+        </VDialog>
+        <div v-if="couldApprove && vacationData.status == 'requested_to_cancel'">
           <v-divider class="my-2"></v-divider>
           <v-alert class="my-2" type="warning">
-            {{ vacation.applying_user.full_name }} is requesting an action to cancel the vacation request.
+            {{ vacationData.applying_user.full_name }} is requesting an action to cancel the vacation request.
           </v-alert>
         </div>
         <v-divider class="my-2"></v-divider>
-        <v-alert v-if="vacation.is_old_balance && vacation.status === 'pending'" type="warning">
+        <v-alert v-if="vacationData.is_old_balance && vacationData.status === 'pending'" type="warning">
           Please keep in mind that this vacation is requested from the transferred vacation balance.
         </v-alert>
         <v-card elevation="0" class="pa-4">
           <v-row class="py-2">
-            <v-col cols="6" class="d-flex">
+            <v-col cols="12" sm="6" class="d-flex">
               <v-icon class="mr-2">mdi-account</v-icon>
               <p>
                 Applying User :
                 <span color="warning" class="mx-2">
-                  {{ vacation.applying_user.full_name }}
+                  {{ vacationData.applying_user.full_name }}
                 </span>
               </p>
             </v-col>
-            <v-col cols="6" class="d-flex" v-if="vacation.status === 'approved'">
+            <v-col cols="12" sm="6" class="d-flex" v-if="vacationData.status === 'approved'">
               <v-icon class="mr-2">mdi-account</v-icon>
               <p>
                 Approval User :
                 <span color="warning" class="mx-2">
-                  {{ vacation.approval_user.full_name }}
+                  {{ vacationData.approval_user.full_name }}
                 </span>
               </p>
             </v-col>
-            <v-col cols="6" class="d-flex items-center">
+            <v-col cols="12" sm="6" class="d-flex items-center">
               <v-icon class="mr-2">mdi-star-four-points</v-icon>
               <p>
                 Status :
-                <strong :style="{ color: getStatusColor(vacation.status) }">
-                  {{ formatRequestStatus(vacation.status) }}
+                <strong :style="{ color: getStatusColor(vacationData.status) }">
+                  {{ formatRequestStatus(vacationData.status) }}
                 </strong>
               </p>
             </v-col>
             <v-col cols="12" class="d-flex items-center">
-              <v-switch v-model="vacation!.is_old_balance" v-if="vacation && vacation.is_old_balance" hide-details inset
+              <v-switch v-model="vacationData.is_old_balance" v-if="vacationData && vacationData.is_old_balance" hide-details inset
                 :label="`Consumed from the transferred vacation balance`" :readonly="true" color="success"></v-switch>
             </v-col>
           </v-row>
           <v-row>
-            <v-col cols="6">
+            <v-col cols="12">
               <v-text-field color="info" item-color="info" base-color="info" variant="outlined" hide-details="auto"
                 label="From" v-model="startDate" :readonly="!couldUpdate" type="datetime-local"
                 :rules="[validateStartDate]" @input="validateForm">
               </v-text-field>
             </v-col>
-            <v-col cols="6">
+            <v-col cols="12">
               <v-text-field color="info" item-color="info" base-color="info" variant="outlined" hide-details="auto"
                 label="To" v-model="endDate" :readonly="!couldUpdate" type="datetime-local" :rules="[validateEndDate]"
                 @input="validateForm">
               </v-text-field>
             </v-col>
-          </v-row>
-          <v-row>
-            <v-col cols="6">
+            <v-col cols="12">
               <v-autocomplete color="info" item-color="info" base-color="info" variant="outlined" v-model="leaveReason"
                 :items="leaveReasons" label="Reason" return-object item-title="name" :readonly="!couldUpdate">
               </v-autocomplete>
             </v-col>
-            <v-col cols="6">
+            <v-col cols="12">
               <v-text-field color="info" item-color="info" base-color="info" variant="outlined" hide-details="auto"
                 label="Requested Days" v-model="actualDays" readonly>
               </v-text-field>
@@ -94,7 +120,7 @@
         </v-card>
       </v-form>
       <v-divider class="my-2 mb-2 pb-4"></v-divider>
-      <ActionButtons :vacation="vacation" :display-close-btn="true" @update:close-dialog="$emit('close-dialog', $event)"
+      <ActionButtons :vacation="vacationData" :display-close-btn="true" @update:close-dialog="$emit('close-dialog', $event)"
         @update:vacation="setVacationData($event)" />
     </v-container>
   </v-card>
@@ -111,11 +137,13 @@ import type { PropType } from 'vue';
 import { formatRequestStatus, getStatusColor } from '@/utils';
 import ActionButtons from "@/components/requests/ActionButtons.vue"
 import { debounce } from 'lodash';
+import { $notifier } from '@/plugins/notifier';
+import { VDialog } from 'vuetify/components';
 
 
 export default {
   name: 'vacationCard',
-  components: { ActionButtons },
+  components: { ActionButtons, VDialog },
   props: {
     vacation: {
       type: Object as PropType<Api.Vacation>,
@@ -134,6 +162,18 @@ export default {
     const startDate = ref<string>(props.vacation.from_date);
     const endDate = ref<string>(props.vacation.end_date);
     const actualDays = ref<number>(props.vacation.actual_days);
+    const showDeleteConfirmation = ref<boolean>(false);
+
+    // Make vacation data reactive to prop changes
+    const vacationData = ref<Api.Vacation>(props.vacation);
+
+    // Watch for prop changes and update reactive data
+    watch(() => props.vacation, (newVacation) => {
+      vacationData.value = newVacation;
+      startDate.value = newVacation.from_date;
+      endDate.value = newVacation.end_date;
+      actualDays.value = newVacation.actual_days;
+    }, { deep: true });
 
     const vacationDays = useAsyncState(async () => {
       return $api.vacations.calculate.list({
@@ -157,18 +197,18 @@ export default {
 
     const couldUpdate = computed(() => {
       const currentUser = user.value?.fullUser;
-      const vacationUser = props.vacation?.applying_user;
-      if (user.value && props.vacation.status === 'pending') {
+      const vacationUser = vacationData.value?.applying_user;
+      if (user.value && vacationData.value.status === 'pending') {
         return (
           (currentUser?.id === vacationUser.id) ||
-          (currentUser?.user_type !== "User") && (currentUser && props.vacation.approvals.includes(currentUser.id))
+          (currentUser?.user_type !== "User") && (currentUser && vacationData.value.approvals.includes(currentUser.id))
         );
       }
       return false;
     });
 
     const couldRequestToCancel = computed(() => {
-      return props.vacation.status === 'approved' && props.vacation.applying_user.id === user.value!.id
+      return vacationData.value.status === 'approved' && vacationData.value.applying_user.id === user.value!.id
     });
 
     const balance = useAsyncState(
@@ -190,7 +230,7 @@ export default {
       if (!user.value) return false;
 
       const { id, location, user_type } = user.value.fullUser;
-      const applyingUser = props.vacation.applying_user;
+      const applyingUser = vacationData.value.applying_user;
 
       // Check if the logged-in user is the same as the applying user, or if they are an admin in the same location
       const isSameUser = applyingUser.id === id;
@@ -199,6 +239,38 @@ export default {
       return isSameUser || isAdminInSameLocation;
     });
 
+    // Check if the current user is an office admin
+    const isOfficeAdmin = computed(() => {
+      if (!user.value) return false;
+      return user.value.fullUser.user_type === "Admin";
+    });
+
+    // Check if the current user can cancel the vacation (combines couldDelete and admin logic)
+    const couldCancel = computed(() => {
+      if (!user.value) return false;
+
+      // Don't show cancel button if vacation is already canceled, rejected, or expired
+      const nonCancelableStatuses = ['canceled', 'rejected', 'expired'];
+      if (nonCancelableStatuses.includes(vacationData.value.status)) {
+        return false;
+      }
+
+      const { id, location, user_type } = user.value.fullUser;
+      const applyingUser = vacationData.value.applying_user;
+
+      // Admin can cancel any vacation in their location (except already canceled/rejected/expired)
+      if (user_type === "Admin" && applyingUser.location.name === location.name) {
+        return true;
+      }
+
+      // User can cancel their own pending vacation
+      if (applyingUser.id === id && vacationData.value.status === 'pending') {
+        return true;
+      }
+
+      return false;
+    });
+
     const couldApprove = computed(() => {
       if (user.value?.id && props.vacation.approvals?.includes(user.value?.id)) {
         return true
@@ -248,18 +320,69 @@ export default {
       return true
     }
 
-    async function handleDelete() {
-      return useAsyncState($api.vacations.cancel(props.vacation.id), [], {
-        onSuccess() {
-          ctx.emit('cancel-vacation')
-          window.connections.ws.value!.send(
-            JSON.stringify({
-              event: 'cancel_request',
-              request_id: props.vacation.id
-            })
-          )
+
+
+    // Function to close the dialog
+    function closeDialog() {
+      showDeleteConfirmation.value = false;
+    }
+
+    // Function to delete a vacation and restore balance if approved
+    async function deleteVacation() {
+      try {
+        // Close the confirmation dialog immediately
+        closeDialog();
+
+        // Call the API to cancel the vacation (which handles balance restoration)
+        const { state, isLoading, error, execute } = useAsyncState(
+          () => $api.vacations.cancel(props.vacation.id),
+          null,
+          { immediate: false }
+        );
+
+        await execute();
+
+        if (error.value) {
+          $notifier.error({
+            title: 'Error',
+            message: 'Failed to cancel vacation: ' + (error.value?.message || 'Unknown error')
+          });
+          return;
         }
-      })
+
+        // Update the UI with the canceled vacation data
+        if (state.value) {
+          ctx.emit('update-vacation', state.value);
+        }
+
+        // Show success message
+        $notifier.success({
+          title: 'Success',
+          message: 'Vacation successfully canceled' +
+            (props.vacation.status === 'approved' ? ' and balance restored' : '')
+        });
+
+        // Notify other components about the cancellation
+        ctx.emit('cancel-vacation');
+
+        // Send websocket notification for real-time updates with a small delay
+        // to ensure the notification is created in the database
+        if (window.connections.ws.value) {
+          setTimeout(() => {
+            window.connections.ws.value!.send(
+              JSON.stringify({
+                event: 'cancel_request',
+                request_id: props.vacation.id
+              })
+            );
+          }, 100); // 100ms delay
+        }
+      } catch (error: any) {
+        $notifier.error({
+          title: 'Error',
+          message: 'Failed to cancel vacation: ' + (error?.message || 'Unknown error')
+        });
+      }
     }
 
     async function requestToCancel() {
@@ -315,13 +438,13 @@ export default {
       couldApprove,
       couldUpdate,
       couldDelete,
+      couldCancel,
       user,
       actualDays,
       validateForm,
       validateEndDate,
       validateStartDate,
       updateVacation,
-      handleDelete,
       requestToCancel,
       capitalize,
       formatRequestStatus,
@@ -329,6 +452,11 @@ export default {
       formatDateTime,
       couldRequestToCancel,
       setVacationData,
+      isOfficeAdmin,
+      showDeleteConfirmation,
+      closeDialog,
+      deleteVacation,
+      vacationData,
     }
   }
 }
diff --git a/client/src/components/dashboard/UpdateUser.vue b/client/src/components/dashboard/UpdateUser.vue
index a11f0b2a5..25a7985c6 100644
--- a/client/src/components/dashboard/UpdateUser.vue
+++ b/client/src/components/dashboard/UpdateUser.vue
@@ -196,7 +196,7 @@ export default {
       if (!imageUrl) return clearImage();
 
       if (!imageUrl.startsWith('http')) {
-        imageUrl = window.env.SERVER_DOMAIN_NAME_API.replace('api', '') + selectedUser.value!.image.replace('/', '');
+        imageUrl = window.env.CSHR_SERVER_DOMAIN_NAME_API.replace('api', '') + selectedUser.value!.image.replace('/', '');
       }
 
       try {
diff --git a/client/src/components/profileImage.vue b/client/src/components/profileImage.vue
index f9492a21d..a84a237a2 100644
--- a/client/src/components/profileImage.vue
+++ b/client/src/components/profileImage.vue
@@ -49,7 +49,7 @@ export default {
       const { image } = props.user;
       if (image) {
         if (image.startsWith('http')) return image;
-        return window.env.SERVER_DOMAIN_NAME_API.replace('api', '') + image.replace('/', '');
+        return window.env.CSHR_SERVER_DOMAIN_NAME_API.replace('api', '') + image.replace('/', '');
       }
       return image;
     })
diff --git a/client/src/index.ts b/client/src/index.ts
index e066fb053..aa02a74e0 100644
--- a/client/src/index.ts
+++ b/client/src/index.ts
@@ -5,8 +5,8 @@ export {};
 declare global {
   interface Window {
     env: {
-      SERVER_DOMAIN_NAME_API: string;
-      SERVER_DOMAIN_NAME_WS: string;
+      CSHR_SERVER_DOMAIN_NAME_API: string;
+      CSHR_SERVER_DOMAIN_NAME_WS: string;
     };
     connections: {
       ws: Ref<WebSocket | null>;
diff --git a/client/src/stores/WSConnection.ts b/client/src/stores/WSConnection.ts
index 39c25cc0c..026aff80e 100644
--- a/client/src/stores/WSConnection.ts
+++ b/client/src/stores/WSConnection.ts
@@ -26,7 +26,7 @@ export const useWSConnectionStore = defineStore('WSConnectionStore', () => {
   // Actions
   const connect = (): Ref<WebSocket | null> => {
     if (me) {
-      WSConnection.value = new WebSocket(`${window.env.SERVER_DOMAIN_NAME_WS}/${me.id}/?token=Bearer ` + localStorage.getItem("USER_ACCESS_KEY"));
+      WSConnection.value = new WebSocket(`${window.env.CSHR_SERVER_DOMAIN_NAME_WS}/${me.id}/?token=Bearer ` + localStorage.getItem("USER_ACCESS_KEY"));
     }
     return WSConnection;
   };
@@ -34,7 +34,7 @@ export const useWSConnectionStore = defineStore('WSConnectionStore', () => {
   const reconnect = async (): Promise<Ref<WebSocket | null>> => {
     const user = await useAsyncState(() => $api.myprofile.getUser(), null).execute();
     if (user) {
-      WSConnection.value = new WebSocket(`${window.env.SERVER_DOMAIN_NAME_WS}/${user.id}/?token=Bearer ` + localStorage.getItem("USER_ACCESS_KEY"));
+      WSConnection.value = new WebSocket(`${window.env.CSHR_SERVER_DOMAIN_NAME_WS}/${user.id}/?token=Bearer ` + localStorage.getItem("USER_ACCESS_KEY"));
     }
     return WSConnection;
   };
diff --git a/client/src/utils/add_update_user_form.ts b/client/src/utils/add_update_user_form.ts
index e1faa9a9c..6964b88fb 100644
--- a/client/src/utils/add_update_user_form.ts
+++ b/client/src/utils/add_update_user_form.ts
@@ -96,7 +96,7 @@ export const userBalance = ref<InputInterface[]>([
     {
         label: 'Compensation',
         key: 'compensation',
-        value: 30,
+        value: 0,
         type: 'number',
         rules: getBalanceRules('compensation', 0),
         isLoading: false,
diff --git a/client/tsconfig.node.json b/client/tsconfig.node.json
index 46cf2e142..88063e096 100644
--- a/client/tsconfig.node.json
+++ b/client/tsconfig.node.json
@@ -12,6 +12,8 @@
     "noEmit": true,
     "module": "ESNext",
     "moduleResolution": "Bundler",
-    "types": ["node"]
+    "types": [
+      "node"
+    ]
   }
-}
+}
\ No newline at end of file
diff --git a/config/.env.template b/config/.env.template
index 45ee53b11..668c95bab 100644
--- a/config/.env.template
+++ b/config/.env.template
@@ -8,34 +8,34 @@
 # === Django ===
 # Generate yours with:
 # python3 -c 'from django.utils.crypto import get_random_string; print(get_random_string(50))'
-DJANGO_SECRET_KEY=<DJANGO_SECRET_KEY>
+CSHR_DJANGO_SECRET_KEY=<CSHR_DJANGO_SECRET_KEY>
 # --- > Change to ON when you on local machine OFF when you are on production
-DJANGO_DEBUG=ON # Keep it on.
+CSHR_DJANGO_DEBUG=ON # Keep it on.
 # ---> Mail service configurations
-EMAIL=<EMAIL>
-EMAIL_PASSWORD=<EMAIL_PASSWORD>
-EMAIL_HOST=<EMAIL_HOST>
+CSHR_EMAIL=<EMAIL>
+CSHR_EMAIL_PASSWORD=<EMAIL_PASSWORD>
+CSHR_EMAIL_HOST=<EMAIL_HOST>
 
 
 # Servers configurations
-CLIENT_DOMAIN_NAME=<CLIENT_DOMAIN_NAME>
-SERVER_DOMAIN_NAME=<SERVER_DOMAIN_NAME>
-SERVER_DOMAIN_NAME_API=<SERVER_DOMAIN_NAME_API> # The API server domain.
-SERVER_DOMAIN_NAME_WS=<SERVER_DOMAIN_NAME_WS> # The Websocket server domain.
+CSHR_CLIENT_DOMAIN_NAME=<CSHR_CLIENT_DOMAIN_NAME>
+CSHR_SERVER_DOMAIN_NAME=<CSHR_SERVER_DOMAIN_NAME>
+CSHR_SERVER_DOMAIN_NAME_API=<CSHR_SERVER_DOMAIN_NAME_API> # The API server domain.
+CSHR_SERVER_DOMAIN_NAME_WS=<CSHR_SERVER_DOMAIN_NAME_WS> # The Websocket server domain.
 
-DJANGO_SUPERUSER_EMAIL=<DJANGO_SUPERUSER_EMAIL>
-DJANGO_SUPERUSER_PASSWORD=<DJANGO_SUPERUSER_PASSWORD>
+CSHR_DJANGO_SUPERUSER_EMAIL=<CSHR_DJANGO_SUPERUSER_EMAIL>
+CSHR_DJANGO_SUPERUSER_PASSWORD=<CSHR_DJANGO_SUPERUSER_PASSWORD>
 
 # Database configurations
 # ---> Redis
-REDIS_HOST=<REDIS_HOST>
+CSHR_REDIS_HOST=<CSHR_REDIS_HOST>
 # ---> Postgres
-DATABASE_NAME=<DATABASE_NAME>
-DATABASE_USER=<DATABASE_USER>
-DATABASE_PASSWORD=<DATABASE_PASSWORD>
-DATABASE_HOST=<DATABASE_HOST>
-DATABASE_PORT=<DATABASE_PORT>
+CSHR_DATABASE_NAME=<CSHR_DATABASE_NAME>
+CSHR_DATABASE_USER=<CSHR_DATABASE_USER>
+CSHR_DATABASE_PASSWORD=<CSHR_DATABASE_PASSWORD>
+CSHR_DATABASE_HOST=<CSHR_DATABASE_HOST>
+CSHR_DATABASE_PORT=<CSHR_DATABASE_PORT>
 
 # Development ---> To use the development version e.g. sqlite database.
 # Production ---> To use the development version e.g. postgres database.
-ENV="production | development"
+CSHR_ENV="production | development"
diff --git a/docker/backend.Dockerfile b/docker/backend.Dockerfile
index f6ec39f51..cdfa1481f 100644
--- a/docker/backend.Dockerfile
+++ b/docker/backend.Dockerfile
@@ -1,22 +1,22 @@
 FROM ubuntu:22.04
 
 # Set the environment variable
-ENV DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC
-ENV REDIS_HOST=$REDIS_HOST
-ENV DJANGO_DEBUG=$DJANGO_DEBUG
-ENV EMAIL=$EMAIL
-ENV EMAIL_PASSWORD=$EMAIL_PASSWORD
-ENV EMAIL_HOST=$EMAIL_HOST
-ENV DJANGO_SUPERUSER_EMAIL=$DJANGO_SUPERUSER_EMAIL
-ENV DJANGO_SUPERUSER_PASSWORD=$DJANGO_SUPERUSER_PASSWORD
-ENV SERVER_DOMAIN_NAME=$SERVER_DOMAIN_NAME
-ENV CLIENT_DOMAIN_NAME=$CLIENT_DOMAIN_NAME
-ENV ENV=$ENV
-ENV DATABASE_NAME=$DATABASE_NAME
-ENV DATABASE_USER=$DATABASE_USER
-ENV DATABASE_PASSWORD=$DATABASE_PASSWORD
-ENV DATABASE_HOST=$DATABASE_HOST
-ENV DATABASE_PORT=$DATABASE_PORT
+CSHR_ENV DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC
+CSHR_ENV CSHR_REDIS_HOST=$CSHR_REDIS_HOST
+CSHR_ENV CSHR_DJANGO_DEBUG=$CSHR_DJANGO_DEBUG
+CSHR_ENV EMAIL=$EMAIL
+CSHR_ENV EMAIL_PASSWORD=$EMAIL_PASSWORD
+CSHR_ENV EMAIL_HOST=$EMAIL_HOST
+CSHR_ENV CSHR_DJANGO_SUPERUSER_EMAIL=$CSHR_DJANGO_SUPERUSER_EMAIL
+CSHR_ENV CSHR_DJANGO_SUPERUSER_PASSWORD=$CSHR_DJANGO_SUPERUSER_PASSWORD
+CSHR_ENV CSHR_SERVER_DOMAIN_NAME=$CSHR_SERVER_DOMAIN_NAME
+CSHR_ENV CSHR_CLIENT_DOMAIN_NAME=$CSHR_CLIENT_DOMAIN_NAME
+CSHR_ENV CSHR_ENV=$CSHR_ENV
+CSHR_ENV CSHR_DATABASE_NAME=$CSHR_DATABASE_NAME
+CSHR_ENV CSHR_DATABASE_USER=$CSHR_DATABASE_USER
+CSHR_ENV CSHR_DATABASE_PASSWORD=$CSHR_DATABASE_PASSWORD
+CSHR_ENV CSHR_DATABASE_HOST=$CSHR_DATABASE_HOST
+CSHR_ENV CSHR_DATABASE_PORT=$CSHR_DATABASE_PORT
 
 RUN echo deb http://be.archive.ubuntu.com/ubuntu/ focal main restricted universe multiverse >> /etc/apt/sources.list
 RUN apt-get -y update && \
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 05dc8d362..ecb3ac353 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -7,9 +7,9 @@ services:
     ports:
       - "5432:5432"
     environment:
-      - POSTGRES_DB=${DATABASE_NAME}
-      - POSTGRES_USER=${DATABASE_USER}
-      - POSTGRES_PASSWORD=${DATABASE_PASSWORD}
+      - POSTGRES_DB=${CSHR_DATABASE_NAME}
+      - POSTGRES_USER=${CSHR_DATABASE_USER}
+      - POSTGRES_PASSWORD=${CSHR_DATABASE_PASSWORD}
     restart: always
     volumes:
       - postgres_data:/var/lib/postgresql/data
@@ -35,25 +35,25 @@ services:
       - "8000:8000"
     environment:
       # Backend configurations
-      - ENV=${ENV}
-      - DJANGO_DEBUG=${DJANGO_DEBUG}
-      - DJANGO_SUPERUSER_EMAIL=${DJANGO_SUPERUSER_EMAIL}
-      - DJANGO_SUPERUSER_PASSWORD=${DJANGO_SUPERUSER_PASSWORD}
+      - CSHR_ENV=${CSHR_ENV}
+      - CSHR_DJANGO_DEBUG=${CSHR_DJANGO_DEBUG}
+      - CSHR_DJANGO_SUPERUSER_EMAIL=${CSHR_DJANGO_SUPERUSER_EMAIL}
+      - CSHR_DJANGO_SUPERUSER_PASSWORD=${CSHR_DJANGO_SUPERUSER_PASSWORD}
       # Mail service configurations
-      - EMAIL=${EMAIL}
-      - EMAIL_PASSWORD=${EMAIL_PASSWORD}
-      - EMAIL_HOST=${EMAIL_HOST}
+      - CSHR_EMAIL=${CSHR_EMAIL}
+      - CSHR_EMAIL_PASSWORD=${CSHR_EMAIL_PASSWORD}
+      - CSHR_EMAIL_HOST=${CSHR_EMAIL_HOST}
       # Servers configurations
-      - SERVER_DOMAIN_NAME=${SERVER_DOMAIN_NAME}
-      - CLIENT_DOMAIN_NAME=${CLIENT_DOMAIN_NAME}
+      - CSHR_SERVER_DOMAIN_NAME=${CSHR_SERVER_DOMAIN_NAME}
+      - CSHR_CLIENT_DOMAIN_NAME=${CSHR_CLIENT_DOMAIN_NAME}
       # Database configurations
-      - DATABASE_NAME=${DATABASE_NAME}
-      - DATABASE_USER=${DATABASE_USER}
-      - DATABASE_PASSWORD=${DATABASE_PASSWORD}
-      - DATABASE_PORT=${DATABASE_PORT}
+      - CSHR_DATABASE_NAME=${CSHR_DATABASE_NAME}
+      - CSHR_DATABASE_USER=${CSHR_DATABASE_USER}
+      - CSHR_DATABASE_PASSWORD=${CSHR_DATABASE_PASSWORD}
+      - CSHR_DATABASE_PORT=${CSHR_DATABASE_PORT}
 
-      - REDIS_HOST=redis://redis_db:6379
-      - DATABASE_HOST=postgres_db
+      - CSHR_REDIS_HOST=redis://redis_db:6379
+      - CSHR_DATABASE_HOST=postgres_db
     depends_on:
       - redis_db
       - postgres_db
@@ -70,8 +70,8 @@ services:
     ports:
       - "8080:8080"
     environment:
-      - SERVER_DOMAIN_NAME_API=${SERVER_DOMAIN_NAME_API}
-      - SERVER_DOMAIN_NAME_WS=${SERVER_DOMAIN_NAME_WS}
+      - CSHR_SERVER_DOMAIN_NAME_API=${CSHR_SERVER_DOMAIN_NAME_API}
+      - CSHR_SERVER_DOMAIN_NAME_WS=${CSHR_SERVER_DOMAIN_NAME_WS}
     depends_on:
       - backend
     networks:
diff --git a/docker/frontend.Dockerfile b/docker/frontend.Dockerfile
index 8e5f83849..0f8b20e06 100644
--- a/docker/frontend.Dockerfile
+++ b/docker/frontend.Dockerfile
@@ -2,8 +2,8 @@
 FROM node:18.18.2 as build-stage
 WORKDIR /client
 
-ENV SERVER_DOMAIN_NAME_API=$SERVER_DOMAIN_NAME_API
-ENV SERVER_DOMAIN_NAME_WS=$SERVER_DOMAIN_NAME_WS
+CSHR_ENV CSHR_SERVER_DOMAIN_NAME_API=$CSHR_SERVER_DOMAIN_NAME_API
+CSHR_ENV CSHR_SERVER_DOMAIN_NAME_WS=$CSHR_SERVER_DOMAIN_NAME_WS
 
 # Copy package.json and package-lock.json separately to leverage Docker cache
 COPY ./client/package*.json /client
@@ -17,8 +17,8 @@ RUN pnpm build
 FROM nginx:stable-alpine as production-stage
 COPY ./nginx/prod.conf /temp/prod.conf
 
-RUN envsubst '$SERVER_DOMAIN_NAME_API' < /temp/prod.conf > /etc/nginx/conf.d/default.conf
-RUN envsubst '$SERVER_DOMAIN_NAME_WS' < /temp/prod.conf > /etc/nginx/conf.d/default.conf
+RUN envsubst '$CSHR_SERVER_DOMAIN_NAME_API' < /temp/prod.conf > /etc/nginx/conf.d/default.conf
+RUN envsubst '$CSHR_SERVER_DOMAIN_NAME_WS' < /temp/prod.conf > /etc/nginx/conf.d/default.conf
 
 # Copy the build artifacts and build-env.sh from the build-stage
 COPY --from=build-stage /client/dist /usr/share/nginx/html
diff --git a/docker/scripts/backend/backend.sh b/docker/scripts/backend/backend.sh
index e2646e9e8..a472160b5 100644
--- a/docker/scripts/backend/backend.sh
+++ b/docker/scripts/backend/backend.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 
-if [ "$ENV" = "production" ]; then
+if [ "$CSHR_ENV" = "production" ]; then
     echo "Running in production mode."
-    echo "Waiting for PostgreSQL to be running on: $DATABASE_HOST"
+    echo "Waiting for PostgreSQL to be running on: $CSHR_DATABASE_HOST"
 
-    while ! nc -z $DATABASE_HOST $DATABASE_PORT; do
+    while ! nc -z $CSHR_DATABASE_HOST $CSHR_DATABASE_PORT; do
         sleep 0.1
     done
 
@@ -17,7 +17,7 @@ else
     poetry run python3 manage.py makemigrations
     echo "Running the migrate"
     poetry run python3 manage.py migrate
-    echo "Creating a superuser email: $DJANGO_SUPERUSER_EMAIL"
+    echo "Creating a superuser email: $CSHR_DJANGO_SUPERUSER_EMAIL"
     poetry run python3 manage.py createsuperuser --noinput
 fi
 
diff --git a/docker/scripts/backend/config.sh b/docker/scripts/backend/config.sh
index 74f385b5f..044c9d5e3 100755
--- a/docker/scripts/backend/config.sh
+++ b/docker/scripts/backend/config.sh
@@ -1,31 +1,31 @@
 #!/bin/sh
 
 CONFIG_DIR=config
-ENV_DIR=${CONFIG_DIR}/.env
+CSHR_ENV_DIR=${CONFIG_DIR}/.env
 cd server
 poetry config installer.max-workers 10
 poetry install --no-root --no-interaction --no-ansi -vvv
-DJANGO_SECRET_KEY=$(poetry run python3 -c 'from django.utils.crypto import get_random_string; print(get_random_string(50))')
+CSHR_DJANGO_SECRET_KEY=$(poetry run python3 -c 'from django.utils.crypto import get_random_string; print(get_random_string(50))')
 cd ..
 
 exec |
 	# Backend configurations
-	echo 'DJANGO_SECRET_KEY'=$DJANGO_SECRET_KEY > ${ENV_DIR}
-	echo 'ENV'=$ENV >> ${ENV_DIR}
-	echo 'DJANGO_DEBUG'=$DJANGO_DEBUG >> ${ENV_DIR}
-	echo 'DJANGO_SUPERUSER_EMAIL'=$DJANGO_SUPERUSER_EMAIL >> ${ENV_DIR}
-	echo 'DJANGO_SUPERUSER_PASSWORD'=$DJANGO_SUPERUSER_PASSWORD >> ${ENV_DIR}
+	echo 'CSHR_DJANGO_SECRET_KEY'=$CSHR_DJANGO_SECRET_KEY > ${CSHR_ENV_DIR}
+	echo 'CSHR_ENV'=$CSHR_ENV >> ${CSHR_ENV_DIR}
+	echo 'CSHR_DJANGO_DEBUG'=$CSHR_DJANGO_DEBUG >> ${CSHR_ENV_DIR}
+	echo 'CSHR_DJANGO_SUPERUSER_EMAIL'=$CSHR_DJANGO_SUPERUSER_EMAIL >> ${CSHR_ENV_DIR}
+	echo 'CSHR_DJANGO_SUPERUSER_PASSWORD'=$CSHR_DJANGO_SUPERUSER_PASSWORD >> ${CSHR_ENV_DIR}
 	# Mail service configurations
-	echo 'EMAIL'=$EMAIL >> ${ENV_DIR}
-	echo 'EMAIL_PASSWORD'=$EMAIL_PASSWORD >> ${ENV_DIR}
-	echo 'EMAIL_HOST'=$EMAIL_HOST >> ${ENV_DIR}
+	echo 'CSHR_EMAIL'=$CSHR_EMAIL >> ${CSHR_ENV_DIR}
+	echo 'CSHR_EMAIL_PASSWORD'=$CSHR_EMAIL_PASSWORD >> ${CSHR_ENV_DIR}
+	echo 'CSHR_EMAIL_HOST'=$CSHR_EMAIL_HOST >> ${CSHR_ENV_DIR}
 	# Servers configurations
-	echo 'SERVER_DOMAIN_NAME'=$SERVER_DOMAIN_NAME >> ${ENV_DIR}
-	echo 'CLIENT_DOMAIN_NAME'=$CLIENT_DOMAIN_NAME >> ${ENV_DIR}
+	echo 'CSHR_SERVER_DOMAIN_NAME'=$CSHR_SERVER_DOMAIN_NAME >> ${CSHR_ENV_DIR}
+	echo 'CSHR_CLIENT_DOMAIN_NAME'=$CSHR_CLIENT_DOMAIN_NAME >> ${CSHR_ENV_DIR}
 	# Database configurations
-	echo 'REDIS_HOST'=$REDIS_HOST >> ${ENV_DIR}
-	echo 'DATABASE_NAME'=$DATABASE_NAME >> ${ENV_DIR}
-	echo 'DATABASE_USER'=$DATABASE_USER >> ${ENV_DIR}
-	echo 'DATABASE_PASSWORD'=$DATABASE_PASSWORD >> ${ENV_DIR}
-	echo 'DATABASE_HOST'=$DATABASE_HOST >> ${ENV_DIR}
-	echo 'DATABASE_PORT'=$DATABASE_PORT >> ${ENV_DIR}
+	echo 'CSHR_REDIS_HOST'=$CSHR_REDIS_HOST >> ${CSHR_ENV_DIR}
+	echo 'CSHR_DATABASE_NAME'=$CSHR_DATABASE_NAME >> ${CSHR_ENV_DIR}
+	echo 'CSHR_DATABASE_USER'=$CSHR_DATABASE_USER >> ${CSHR_ENV_DIR}
+	echo 'CSHR_DATABASE_PASSWORD'=$CSHR_DATABASE_PASSWORD >> ${CSHR_ENV_DIR}
+	echo 'CSHR_DATABASE_HOST'=$CSHR_DATABASE_HOST >> ${CSHR_ENV_DIR}
+	echo 'CSHR_DATABASE_PORT'=$CSHR_DATABASE_PORT >> ${CSHR_ENV_DIR}
diff --git a/docker/scripts/frontend/build-env.sh b/docker/scripts/frontend/build-env.sh
index c98bf2228..c822f25f5 100644
--- a/docker/scripts/frontend/build-env.sh
+++ b/docker/scripts/frontend/build-env.sh
@@ -3,8 +3,8 @@
 set -ex
 values="
 window.env = {
-  SERVER_DOMAIN_NAME_API: '$SERVER_DOMAIN_NAME_API',
-  SERVER_DOMAIN_NAME_WS: '$SERVER_DOMAIN_NAME_WS',
+  CSHR_SERVER_DOMAIN_NAME_API: '$CSHR_SERVER_DOMAIN_NAME_API',
+  CSHR_SERVER_DOMAIN_NAME_WS: '$CSHR_SERVER_DOMAIN_NAME_WS',
 };
 "
 # decide the config file path
diff --git a/server/celery_app.py b/server/celery_app.py
index d9aba6a9a..245d57fc3 100644
--- a/server/celery_app.py
+++ b/server/celery_app.py
@@ -5,11 +5,11 @@
 
 import os
 
-REDIS_HOST: str = None
+CSHR_REDIS_HOST: str = None
 try:
-    REDIS_HOST = config("REDIS_HOST")
+    CSHR_REDIS_HOST = config("CSHR_REDIS_HOST")
 except Exception:
-    raise ImproperlyConfigured("REDIS_HOST is not defined")
+    raise ImproperlyConfigured("CSHR_REDIS_HOST is not defined")
 
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
 app = Celery("cshr_celery_tasks")
@@ -30,5 +30,5 @@
 }
 
 app.autodiscover_tasks()
-app.conf.broker_url = REDIS_HOST
-app.conf.result_backend = REDIS_HOST
+app.conf.broker_url = CSHR_REDIS_HOST
+app.conf.result_backend = CSHR_REDIS_HOST
diff --git a/server/cshr/consumers/notifications_consumer.py b/server/cshr/consumers/notifications_consumer.py
index 216a71ee0..d586a16cb 100644
--- a/server/cshr/consumers/notifications_consumer.py
+++ b/server/cshr/consumers/notifications_consumer.py
@@ -38,11 +38,6 @@ def to_json(self) -> Dict[str, str]:
         return {"code": self.code, "message": self.message}
 
 
-@database_sync_to_async
-def _get_vacation_applying_user(vacation: Vacation) -> User:
-    return vacation.applying_user
-
-
 @database_sync_to_async
 def _get_vacation_by_id(vacation_id: int) -> Vacation:
     return get_vacation_by_id(vacation_id)
@@ -62,6 +57,38 @@ def _get_user_vacation_notification_based_on_status(
         return None
 
 
+@database_sync_to_async
+def _get_user_vacation_notification_with_retry(
+    vacation: Vacation, status: STATUS_CHOICES, max_retries: int = 5
+) -> Optional[Notification]:
+    """
+    Get vacation notification with retry mechanism to handle timing issues.
+
+    Args:
+        vacation: The vacation object
+        status: The status to search for
+        max_retries: Maximum number of retries
+
+    Returns:
+        Notification object if found, None otherwise
+    """
+    import time
+
+    for attempt in range(max_retries):
+        try:
+            notification = Notification.objects.get(
+                request__id=vacation.id,
+                request_status=status,
+            )
+            return notification
+        except Notification.DoesNotExist:
+            if attempt < max_retries - 1:
+                # Wait a bit before retrying (exponential backoff)
+                time.sleep(0.1 * (2 ** attempt))
+            continue
+    return None
+
+
 @database_sync_to_async
 def _get_notification_receiver_ids(notification: Notification) -> List[int]:
     return list(notification.receivers.all().values_list("id", flat=True))
@@ -169,7 +196,7 @@ async def reject_request(self, data: Dict):
         )
 
     async def cancel_request(self, data: Dict):
-        await self.handle_vacation_request(
+        await self.handle_vacation_request_with_retry(
             data, RequestEvents.CANCEL_REQUEST, STATUS_CHOICES.CANCELED
         )
 
@@ -266,3 +293,42 @@ async def handle_vacation_request(
                 "end_date"
             ].isoformat()
             await self.send_to_group_name(notification_data, group_name)
+
+    async def handle_vacation_request_with_retry(
+        self, data: Dict, event: RequestEvents, status: STATUS_CHOICES
+    ):
+        """
+        Handle vacation request with retry mechanism for finding notifications.
+        This is especially useful for cancel requests where there might be timing issues.
+        """
+        request_id = data.get("request_id")
+        if not request_id:
+            await self.handle_error(
+                400,
+                f"The request event type is '{event.value}', but no vacation ID has been submitted.",
+            )
+            return
+
+        vacation: Vacation = await _get_vacation_by_id(request_id)
+
+        # Use retry mechanism for finding the notification
+        notification: Notification = (
+            await _get_user_vacation_notification_with_retry(vacation, status)
+        )
+
+        if notification is None:
+            print(f"Warning: No notification found for vacation {vacation.id} with status {status} after retries")
+            # Don't send error to client, just log it
+            return
+
+        notification_receiver_ids = await _get_notification_receiver_ids(notification)
+        for receiver_id in notification_receiver_ids:
+            group_name = f"room_{receiver_id}"
+            notification_data = await get_notification_serializer(notification)
+            notification_data["request"]["from_date"] = notification_data["request"][
+                "from_date"
+            ].isoformat()
+            notification_data["request"]["end_date"] = notification_data["request"][
+                "end_date"
+            ].isoformat()
+            await self.send_to_group_name(notification_data, group_name)
diff --git a/server/cshr/management/commands/create.py b/server/cshr/management/commands/create.py
index ab99ae12c..7f2431d59 100644
--- a/server/cshr/management/commands/create.py
+++ b/server/cshr/management/commands/create.py
@@ -45,7 +45,7 @@ def handle(self, *args, **options):
                         )
                     )
             elif option == Option.users:
-                if config("DJANGO_DEBUG") == "ON":
+                if config("CSHR_DJANGO_DEBUG") == "ON":
                     # Create locations and dummey values to avoid errors after migrating the database, the admins should update it later.
                     try:
                         create_users()
diff --git a/server/cshr/serializers/Image_upload.py b/server/cshr/serializers/Image_upload.py
index b672c34ca..90844f01d 100644
--- a/server/cshr/serializers/Image_upload.py
+++ b/server/cshr/serializers/Image_upload.py
@@ -1,4 +1,9 @@
 from rest_framework import serializers
+from django.core.files.base import ContentFile
+import base64
+import six
+import uuid
+import filetype
 
 
 class Base64ImageField(serializers.ImageField):
@@ -13,11 +18,6 @@ class Base64ImageField(serializers.ImageField):
     """
 
     def to_internal_value(self, data):
-        from django.core.files.base import ContentFile
-        import base64
-        import six
-        import uuid
-
         # Check if this is a base64 string
         if isinstance(data, six.string_types):
             # Check if the base64 string is in the "data:" format
@@ -31,24 +31,20 @@ def to_internal_value(self, data):
             except TypeError:
                 self.fail("invalid_image")
 
-            # Generate file name:
+            # Generate file name
             file_name = str(uuid.uuid4())[:12]  # 12 characters are more than enough.
-            # Get the file name extension:
-            file_extension = self.get_file_extension(file_name, decoded_file)
 
-            complete_file_name = "%s.%s" % (
-                file_name,
-                file_extension,
-            )
+            # Get the file extension
+            file_extension = self.get_file_extension(file_name, decoded_file)
+            complete_file_name = f"{file_name}.{file_extension}"
 
             data = ContentFile(decoded_file, name=complete_file_name)
 
         return super(Base64ImageField, self).to_internal_value(data)
 
     def get_file_extension(self, file_name, decoded_file):
-        import imghdr
-
-        extension = imghdr.what(file_name, decoded_file)
-        extension = "jpg" if extension == "jpeg" else extension
-
+        kind = filetype.guess(decoded_file)
+        if kind is None:
+            raise serializers.ValidationError("Invalid image format or unsupported image type.")
+        extension = "jpg" if kind.extension == "jpeg" else kind.extension
         return extension
diff --git a/server/cshr/utils/redis_functions.py b/server/cshr/utils/redis_functions.py
index ab2f6f3f2..7503d9181 100644
--- a/server/cshr/utils/redis_functions.py
+++ b/server/cshr/utils/redis_functions.py
@@ -12,9 +12,9 @@
 from cshr.api.response import CustomResponse
 
 try:
-    _, R_HOST, R_PORT = config("REDIS_HOST").replace("//", "").split(":")
+    _, R_HOST, R_PORT = config("CSHR_REDIS_HOST").replace("//", "").split(":")
 except Exception:
-    raise ImproperlyConfigured("REDIS_HOST is not defined")
+    raise ImproperlyConfigured("CSHR_REDIS_HOST is not defined")
 
 redis_instance = redis.StrictRedis(host=R_HOST, port=R_PORT, db=0)
 
diff --git a/server/cshr/utils/send_email.py b/server/cshr/utils/send_email.py
index e15ffd4fc..25427f6f3 100644
--- a/server/cshr/utils/send_email.py
+++ b/server/cshr/utils/send_email.py
@@ -34,10 +34,10 @@ def get_email_recievers(user: User):
 
 def check_email_configuration():
     arr = [
-        settings.EMAIL_HOST_PASSWORD,
-        settings.EMAIL_HOST_USER,
-        settings.EMAIL_PORT,
-        settings.EMAIL_HOST,
+        settings.CSHR_EMAIL_HOST_PASSWORD,
+        settings.CSHR_EMAIL_HOST_USER,
+        settings.CSHR_EMAIL_PORT,
+        settings.CSHR_EMAIL_HOST,
     ]
     for item in arr:
         if item == "":
diff --git a/server/cshr/views/vacations.py b/server/cshr/views/vacations.py
index dd542d27d..126a2fb4c 100644
--- a/server/cshr/views/vacations.py
+++ b/server/cshr/views/vacations.py
@@ -529,7 +529,8 @@ def put(self, request: Request, id: str, format=None) -> Response:
                 message=f"You are not allowed to perform this action, the request status is '{status}'."
             )
 
-        if vacation.status == STATUS_CHOICES.CANCEL_APPROVED:
+        # Return balance if vacation is approved or cancel_approved
+        if vacation.status in [STATUS_CHOICES.APPROVED, STATUS_CHOICES.CANCEL_APPROVED]:
             balance_calculator = VacationBalanceCalculator(
                 applying_user=vacation.applying_user, vacation=vacation
             )
diff --git a/server/poetry.lock b/server/poetry.lock
index 5fdd2602f..55fa6e414 100644
--- a/server/poetry.lock
+++ b/server/poetry.lock
@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 1.8.5 and should not be changed by hand.
+# This file is automatically @generated by Poetry 2.1.3 and should not be changed by hand.
 
 [[package]]
 name = "amqp"
@@ -6,6 +6,7 @@ version = "5.2.0"
 description = "Low-level AMQP client for Python (fork of amqplib)."
 optional = false
 python-versions = ">=3.6"
+groups = ["main"]
 files = [
     {file = "amqp-5.2.0-py3-none-any.whl", hash = "sha256:827cb12fb0baa892aad844fd95258143bce4027fdac4fccddbc43330fd281637"},
     {file = "amqp-5.2.0.tar.gz", hash = "sha256:a1ecff425ad063ad42a486c902807d1482311481c8ad95a72694b2975e75f7fd"},
@@ -20,6 +21,7 @@ version = "3.8.1"
 description = "ASGI specs, helper code, and adapters"
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "asgiref-3.8.1-py3-none-any.whl", hash = "sha256:3e1e3ecc849832fe52ccf2cb6686b7a55f82bb1d6aee72a58826471390335e47"},
     {file = "asgiref-3.8.1.tar.gz", hash = "sha256:c343bd80a0bec947a9860adb4c432ffa7db769836c64238fc34bdc3fec84d590"},
@@ -37,6 +39,8 @@ version = "5.0.1"
 description = "Timeout context manager for asyncio programs"
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
+markers = "python_full_version <= \"3.11.2\""
 files = [
     {file = "async_timeout-5.0.1-py3-none-any.whl", hash = "sha256:39e3809566ff85354557ec2398b55e096c8364bacac9405a7a1fa429e77fe76c"},
     {file = "async_timeout-5.0.1.tar.gz", hash = "sha256:d9321a7a3d5a6a5e187e824d2fa0793ce379a202935782d555d6e9d2735677d3"},
@@ -48,18 +52,19 @@ version = "24.2.0"
 description = "Classes Without Boilerplate"
 optional = false
 python-versions = ">=3.7"
+groups = ["main"]
 files = [
     {file = "attrs-24.2.0-py3-none-any.whl", hash = "sha256:81921eb96de3191c8258c199618104dd27ac608d9366f5e35d011eae1867ede2"},
     {file = "attrs-24.2.0.tar.gz", hash = "sha256:5cfb1b9148b5b086569baec03f20d7b6bf3bcacc9a42bebf87ffaaca362f6346"},
 ]
 
 [package.extras]
-benchmark = ["cloudpickle", "hypothesis", "mypy (>=1.11.1)", "pympler", "pytest (>=4.3.0)", "pytest-codspeed", "pytest-mypy-plugins", "pytest-xdist[psutil]"]
-cov = ["cloudpickle", "coverage[toml] (>=5.3)", "hypothesis", "mypy (>=1.11.1)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "pytest-xdist[psutil]"]
-dev = ["cloudpickle", "hypothesis", "mypy (>=1.11.1)", "pre-commit", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "pytest-xdist[psutil]"]
+benchmark = ["cloudpickle ; platform_python_implementation == \"CPython\"", "hypothesis", "mypy (>=1.11.1) ; platform_python_implementation == \"CPython\" and python_version >= \"3.9\"", "pympler", "pytest (>=4.3.0)", "pytest-codspeed", "pytest-mypy-plugins ; platform_python_implementation == \"CPython\" and python_version >= \"3.9\" and python_version < \"3.13\"", "pytest-xdist[psutil]"]
+cov = ["cloudpickle ; platform_python_implementation == \"CPython\"", "coverage[toml] (>=5.3)", "hypothesis", "mypy (>=1.11.1) ; platform_python_implementation == \"CPython\" and python_version >= \"3.9\"", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins ; platform_python_implementation == \"CPython\" and python_version >= \"3.9\" and python_version < \"3.13\"", "pytest-xdist[psutil]"]
+dev = ["cloudpickle ; platform_python_implementation == \"CPython\"", "hypothesis", "mypy (>=1.11.1) ; platform_python_implementation == \"CPython\" and python_version >= \"3.9\"", "pre-commit", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins ; platform_python_implementation == \"CPython\" and python_version >= \"3.9\" and python_version < \"3.13\"", "pytest-xdist[psutil]"]
 docs = ["cogapp", "furo", "myst-parser", "sphinx", "sphinx-notfound-page", "sphinxcontrib-towncrier", "towncrier (<24.7)"]
-tests = ["cloudpickle", "hypothesis", "mypy (>=1.11.1)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "pytest-xdist[psutil]"]
-tests-mypy = ["mypy (>=1.11.1)", "pytest-mypy-plugins"]
+tests = ["cloudpickle ; platform_python_implementation == \"CPython\"", "hypothesis", "mypy (>=1.11.1) ; platform_python_implementation == \"CPython\" and python_version >= \"3.9\"", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins ; platform_python_implementation == \"CPython\" and python_version >= \"3.9\" and python_version < \"3.13\"", "pytest-xdist[psutil]"]
+tests-mypy = ["mypy (>=1.11.1) ; platform_python_implementation == \"CPython\" and python_version >= \"3.9\"", "pytest-mypy-plugins ; platform_python_implementation == \"CPython\" and python_version >= \"3.9\" and python_version < \"3.13\""]
 
 [[package]]
 name = "autobahn"
@@ -67,6 +72,7 @@ version = "23.1.2"
 description = "WebSocket client & server library, WAMP real-time framework"
 optional = false
 python-versions = ">=3.7"
+groups = ["main"]
 files = [
     {file = "autobahn-23.1.2.tar.gz", hash = "sha256:c5ef8ca7422015a1af774a883b8aef73d4954c9fcd182c9b5244e08e973f7c3a"},
 ]
@@ -80,7 +86,7 @@ txaio = ">=21.2.1"
 [package.extras]
 all = ["PyGObject (>=3.40.0)", "argon2_cffi (>=20.1.0)", "attrs (>=20.3.0)", "base58 (>=2.1.0)", "cbor2 (>=5.2.0)", "cffi (>=1.14.5)", "click (>=8.1.2)", "ecdsa (>=0.16.1)", "eth-abi @ git+https://github.com/ethereum/eth-abi.git@v4.0.0-beta.2", "flatbuffers (>=22.12.6)", "hkdf (>=0.0.3)", "jinja2 (>=2.11.3)", "mnemonic (>=0.19)", "msgpack (>=1.0.2)", "passlib (>=1.7.4)", "py-ecc (>=5.1.0)", "py-eth-sig-utils (>=0.4.0)", "py-multihash (>=2.0.1)", "py-ubjson (>=0.16.1)", "pynacl (>=1.4.0)", "pyopenssl (>=20.0.1)", "python-snappy (>=0.6.0)", "pytrie (>=0.4.0)", "qrcode (>=7.3.1)", "rlp (>=2.0.1)", "service_identity (>=18.1.0)", "spake2 (>=0.8)", "twisted (>=20.3.0)", "ujson (>=4.0.2)", "web3[ipfs] @ git+https://github.com/ethereum/web3.py.git@v6.0.0-beta.9", "xbr (>=21.2.1)", "yapf (==0.29.0)", "zlmdb (>=21.2.1)", "zope.interface (>=5.2.0)"]
 compress = ["python-snappy (>=0.6.0)"]
-dev = ["backports.tempfile (>=1.0)", "bumpversion (>=0.5.3)", "codecov (>=2.0.15)", "flake8 (<5)", "humanize (>=0.5.1)", "mypy (>=0.610)", "passlib", "pep8-naming (>=0.3.3)", "pip (>=9.0.1)", "pyenchant (>=1.6.6)", "pyflakes (>=1.0.0)", "pyinstaller (>=4.2)", "pylint (>=1.9.2)", "pytest (>=3.4.2)", "pytest-aiohttp", "pytest-asyncio (>=0.14.0)", "pytest-runner (>=2.11.1)", "pyyaml (>=4.2b4)", "qualname", "sphinx (>=1.7.1)", "sphinx-autoapi (>=1.7.0)", "sphinx_rtd_theme (>=0.1.9)", "sphinxcontrib-images (>=0.9.1)", "tox (>=4.2.8)", "tox-gh-actions (>=2.2.0)", "twine (>=3.3.0)", "twisted (>=22.10.0)", "txaio (>=20.4.1)", "watchdog (>=0.8.3)", "wheel (>=0.36.2)", "yapf (==0.29.0)"]
+dev = ["backports.tempfile (>=1.0)", "bumpversion (>=0.5.3)", "codecov (>=2.0.15)", "flake8 (<5)", "humanize (>=0.5.1)", "mypy (>=0.610) ; python_version >= \"3.4\" and platform_python_implementation != \"PyPy\"", "passlib", "pep8-naming (>=0.3.3)", "pip (>=9.0.1)", "pyenchant (>=1.6.6)", "pyflakes (>=1.0.0)", "pyinstaller (>=4.2)", "pylint (>=1.9.2)", "pytest (>=3.4.2)", "pytest-aiohttp", "pytest-asyncio (>=0.14.0)", "pytest-runner (>=2.11.1)", "pyyaml (>=4.2b4)", "qualname", "sphinx (>=1.7.1)", "sphinx-autoapi (>=1.7.0)", "sphinx_rtd_theme (>=0.1.9)", "sphinxcontrib-images (>=0.9.1)", "tox (>=4.2.8)", "tox-gh-actions (>=2.2.0)", "twine (>=3.3.0)", "twisted (>=22.10.0)", "txaio (>=20.4.1)", "watchdog (>=0.8.3)", "wheel (>=0.36.2)", "yapf (==0.29.0)"]
 encryption = ["pynacl (>=1.4.0)", "pyopenssl (>=20.0.1)", "pytrie (>=0.4.0)", "qrcode (>=7.3.1)", "service_identity (>=18.1.0)"]
 nvx = ["cffi (>=1.14.5)"]
 scram = ["argon2_cffi (>=20.1.0)", "cffi (>=1.14.5)", "passlib (>=1.7.4)"]
@@ -95,6 +101,7 @@ version = "24.8.1"
 description = "Self-service finite-state machines for the programmer on the go."
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "Automat-24.8.1-py3-none-any.whl", hash = "sha256:bf029a7bc3da1e2c24da2343e7598affaa9f10bf0ab63ff808566ce90551e02a"},
     {file = "automat-24.8.1.tar.gz", hash = "sha256:b34227cf63f6325b8ad2399ede780675083e439b20c323d376373d8ee6306d88"},
@@ -112,6 +119,8 @@ version = "0.2.1"
 description = "Backport of the standard library zoneinfo module"
 optional = false
 python-versions = ">=3.6"
+groups = ["main"]
+markers = "python_version < \"3.9\""
 files = [
     {file = "backports.zoneinfo-0.2.1-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:da6013fd84a690242c310d77ddb8441a559e9cb3d3d59ebac9aca1a57b2e18bc"},
     {file = "backports.zoneinfo-0.2.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:89a48c0d158a3cc3f654da4c2de1ceba85263fafb861b98b59040a5086259722"},
@@ -143,6 +152,7 @@ version = "4.2.1"
 description = "Python multiprocessing fork with improvements and bugfixes"
 optional = false
 python-versions = ">=3.7"
+groups = ["main"]
 files = [
     {file = "billiard-4.2.1-py3-none-any.whl", hash = "sha256:40b59a4ac8806ba2c2369ea98d876bc6108b051c227baffd928c644d15d8f3cb"},
     {file = "billiard-4.2.1.tar.gz", hash = "sha256:12b641b0c539073fc8d3f5b8b7be998956665c4233c7c1fcd66a7e677c4fb36f"},
@@ -154,6 +164,7 @@ version = "24.8.0"
 description = "The uncompromising code formatter."
 optional = false
 python-versions = ">=3.8"
+groups = ["dev"]
 files = [
     {file = "black-24.8.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:09cdeb74d494ec023ded657f7092ba518e8cf78fa8386155e4a03fdcc44679e6"},
     {file = "black-24.8.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:81c6742da39f33b08e791da38410f32e27d632260e599df7245cccee2064afeb"},
@@ -190,7 +201,7 @@ typing-extensions = {version = ">=4.0.1", markers = "python_version < \"3.11\""}
 
 [package.extras]
 colorama = ["colorama (>=0.4.3)"]
-d = ["aiohttp (>=3.7.4)", "aiohttp (>=3.7.4,!=3.9.0)"]
+d = ["aiohttp (>=3.7.4) ; sys_platform != \"win32\" or implementation_name != \"pypy\"", "aiohttp (>=3.7.4,!=3.9.0) ; sys_platform == \"win32\" and implementation_name == \"pypy\""]
 jupyter = ["ipython (>=7.8.0)", "tokenize-rt (>=3.2.0)"]
 uvloop = ["uvloop (>=0.15.2)"]
 
@@ -200,6 +211,7 @@ version = "5.4.0"
 description = "Distributed Task Queue."
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "celery-5.4.0-py3-none-any.whl", hash = "sha256:369631eb580cf8c51a82721ec538684994f8277637edde2dfc0dacd73ed97f64"},
     {file = "celery-5.4.0.tar.gz", hash = "sha256:504a19140e8d3029d5acad88330c541d4c3f64c789d85f94756762d8bca7e706"},
@@ -221,32 +233,32 @@ vine = ">=5.1.0,<6.0"
 arangodb = ["pyArango (>=2.0.2)"]
 auth = ["cryptography (==42.0.5)"]
 azureblockblob = ["azure-storage-blob (>=12.15.0)"]
-brotli = ["brotli (>=1.0.0)", "brotlipy (>=0.7.0)"]
+brotli = ["brotli (>=1.0.0) ; platform_python_implementation == \"CPython\"", "brotlipy (>=0.7.0) ; platform_python_implementation == \"PyPy\""]
 cassandra = ["cassandra-driver (>=3.25.0,<4)"]
 consul = ["python-consul2 (==0.1.5)"]
 cosmosdbsql = ["pydocumentdb (==2.3.5)"]
-couchbase = ["couchbase (>=3.0.0)"]
+couchbase = ["couchbase (>=3.0.0) ; platform_python_implementation != \"PyPy\" and (platform_system != \"Windows\" or python_version < \"3.10\")"]
 couchdb = ["pycouchdb (==1.14.2)"]
 django = ["Django (>=2.2.28)"]
 dynamodb = ["boto3 (>=1.26.143)"]
 elasticsearch = ["elastic-transport (<=8.13.0)", "elasticsearch (<=8.13.0)"]
-eventlet = ["eventlet (>=0.32.0)"]
+eventlet = ["eventlet (>=0.32.0) ; python_version < \"3.10\""]
 gcs = ["google-cloud-storage (>=2.10.0)"]
 gevent = ["gevent (>=1.5.0)"]
-librabbitmq = ["librabbitmq (>=2.0.0)"]
-memcache = ["pylibmc (==1.6.3)"]
+librabbitmq = ["librabbitmq (>=2.0.0) ; python_version < \"3.11\""]
+memcache = ["pylibmc (==1.6.3) ; platform_system != \"Windows\""]
 mongodb = ["pymongo[srv] (>=4.0.2)"]
 msgpack = ["msgpack (==1.0.8)"]
 pymemcache = ["python-memcached (>=1.61)"]
-pyro = ["pyro4 (==4.82)"]
+pyro = ["pyro4 (==4.82) ; python_version < \"3.11\""]
 pytest = ["pytest-celery[all] (>=1.0.0)"]
 redis = ["redis (>=4.5.2,!=4.5.5,<6.0.0)"]
 s3 = ["boto3 (>=1.26.143)"]
 slmq = ["softlayer-messaging (>=1.0.3)"]
-solar = ["ephem (==4.1.5)"]
+solar = ["ephem (==4.1.5) ; platform_python_implementation != \"PyPy\""]
 sqlalchemy = ["sqlalchemy (>=1.4.48,<2.1)"]
-sqs = ["boto3 (>=1.26.143)", "kombu[sqs] (>=5.3.4)", "pycurl (>=7.43.0.5)", "urllib3 (>=1.26.16)"]
-tblib = ["tblib (>=1.3.0)", "tblib (>=1.5.0)"]
+sqs = ["boto3 (>=1.26.143)", "kombu[sqs] (>=5.3.4)", "pycurl (>=7.43.0.5) ; sys_platform != \"win32\" and platform_python_implementation == \"CPython\"", "urllib3 (>=1.26.16)"]
+tblib = ["tblib (>=1.3.0) ; python_version < \"3.8.0\"", "tblib (>=1.5.0) ; python_version >= \"3.8.0\""]
 yaml = ["PyYAML (>=3.10)"]
 zookeeper = ["kazoo (>=1.3.1)"]
 zstd = ["zstandard (==0.22.0)"]
@@ -257,6 +269,8 @@ version = "1.17.1"
 description = "Foreign Function Interface for Python calling C code."
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
+markers = "platform_python_implementation != \"PyPy\""
 files = [
     {file = "cffi-1.17.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:df8b1c11f177bc2313ec4b2d46baec87a5f3e71fc8b45dab2ee7cae86d9aba14"},
     {file = "cffi-1.17.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:8f2cdc858323644ab277e9bb925ad72ae0e67f69e804f4898c070998d50b1a67"},
@@ -336,6 +350,7 @@ version = "4.1.0"
 description = "Brings async, event-driven capabilities to Django 3.2 and up."
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "channels-4.1.0-py3-none-any.whl", hash = "sha256:a3c4419307f582c3f71d67bfb6eff748ae819c2f360b9b141694d84f242baa48"},
     {file = "channels-4.1.0.tar.gz", hash = "sha256:e0ed375719f5c1851861f05ed4ce78b0166f9245ca0ecd836cb77d4bb531489d"},
@@ -356,6 +371,7 @@ version = "4.2.0"
 description = "Redis-backed ASGI channel layer implementation"
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "channels_redis-4.2.0-py3-none-any.whl", hash = "sha256:2c5b944a39bd984b72aa8005a3ae11637bf29b5092adeb91c9aad4ab819a8ac4"},
     {file = "channels_redis-4.2.0.tar.gz", hash = "sha256:01c26c4d5d3a203f104bba9e5585c0305a70df390d21792386586068162027fd"},
@@ -377,6 +393,7 @@ version = "8.1.7"
 description = "Composable command line interface toolkit"
 optional = false
 python-versions = ">=3.7"
+groups = ["main", "dev"]
 files = [
     {file = "click-8.1.7-py3-none-any.whl", hash = "sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28"},
     {file = "click-8.1.7.tar.gz", hash = "sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de"},
@@ -391,6 +408,7 @@ version = "0.3.1"
 description = "Enables git-like *did-you-mean* feature in click"
 optional = false
 python-versions = ">=3.6.2"
+groups = ["main"]
 files = [
     {file = "click_didyoumean-0.3.1-py3-none-any.whl", hash = "sha256:5c4bb6007cfea5f2fd6583a2fb6701a22a41eb98957e63d0fac41c10e7c3117c"},
     {file = "click_didyoumean-0.3.1.tar.gz", hash = "sha256:4f82fdff0dbe64ef8ab2279bd6aa3f6a99c3b28c05aa09cbfc07c9d7fbb5a463"},
@@ -405,6 +423,7 @@ version = "1.1.1"
 description = "An extension module for click to enable registering CLI commands via setuptools entry-points."
 optional = false
 python-versions = "*"
+groups = ["main"]
 files = [
     {file = "click-plugins-1.1.1.tar.gz", hash = "sha256:46ab999744a9d831159c3411bb0c79346d94a444df9a3a3742e9ed63645f264b"},
     {file = "click_plugins-1.1.1-py2.py3-none-any.whl", hash = "sha256:5d262006d3222f5057fd81e1623d4443e41dcda5dc815c06b442aa3c02889fc8"},
@@ -422,6 +441,7 @@ version = "0.3.0"
 description = "REPL plugin for Click"
 optional = false
 python-versions = ">=3.6"
+groups = ["main"]
 files = [
     {file = "click-repl-0.3.0.tar.gz", hash = "sha256:17849c23dba3d667247dc4defe1757fff98694e90fe37474f3feebb69ced26a9"},
     {file = "click_repl-0.3.0-py3-none-any.whl", hash = "sha256:fb7e06deb8da8de86180a33a9da97ac316751c094c6899382da7feeeeb51b812"},
@@ -440,6 +460,8 @@ version = "0.4.6"
 description = "Cross-platform colored terminal text."
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7"
+groups = ["main", "dev"]
+markers = "platform_system == \"Windows\""
 files = [
     {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"},
     {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"},
@@ -451,6 +473,7 @@ version = "23.10.4"
 description = "Symbolic constants in Python"
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "constantly-23.10.4-py3-none-any.whl", hash = "sha256:3fd9b4d1c3dc1ec9757f3c52aef7e53ad9323dbe39f51dfd4c43853b68dfa3f9"},
     {file = "constantly-23.10.4.tar.gz", hash = "sha256:aa92b70a33e2ac0bb33cd745eb61776594dc48764b06c35e0efd050b7f1c7cbd"},
@@ -462,6 +485,7 @@ version = "1.4.5"
 description = "A Python library that converts cron expressions into human readable strings."
 optional = false
 python-versions = "*"
+groups = ["main"]
 files = [
     {file = "cron_descriptor-1.4.5-py3-none-any.whl", hash = "sha256:736b3ae9d1a99bc3dbfc5b55b5e6e7c12031e7ba5de716625772f8b02dcd6013"},
     {file = "cron_descriptor-1.4.5.tar.gz", hash = "sha256:f51ce4ffc1d1f2816939add8524f206c376a42c87a5fca3091ce26725b3b1bca"},
@@ -476,6 +500,7 @@ version = "43.0.3"
 description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers."
 optional = false
 python-versions = ">=3.7"
+groups = ["main"]
 files = [
     {file = "cryptography-43.0.3-cp37-abi3-macosx_10_9_universal2.whl", hash = "sha256:bf7a1932ac4176486eab36a19ed4c0492da5d97123f1406cf15e41b05e787d2e"},
     {file = "cryptography-43.0.3-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:63efa177ff54aec6e1c0aefaa1a241232dcd37413835a9b674b6e3f0ae2bfd3e"},
@@ -525,6 +550,7 @@ version = "4.1.2"
 description = "Django ASGI (HTTP/WebSocket) server"
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "daphne-4.1.2-py3-none-any.whl", hash = "sha256:618d1322bb4d875342b99dd2a10da2d9aae7ee3645f765965fdc1e658ea5290a"},
     {file = "daphne-4.1.2.tar.gz", hash = "sha256:fcbcace38eb86624ae247c7ffdc8ac12f155d7d19eafac4247381896d6f33761"},
@@ -544,6 +570,7 @@ version = "4.2.17"
 description = "A high-level Python web framework that encourages rapid development and clean, pragmatic design."
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "Django-4.2.17-py3-none-any.whl", hash = "sha256:3a93350214ba25f178d4045c0786c61573e7dbfa3c509b3551374f1e11ba8de0"},
     {file = "Django-4.2.17.tar.gz", hash = "sha256:6b56d834cc94c8b21a8f4e775064896be3b4a4ca387f2612d4406a5927cd2fdc"},
@@ -565,6 +592,7 @@ version = "2.7.0"
 description = "Database-backed Periodic Tasks."
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "django_celery_beat-2.7.0-py3-none-any.whl", hash = "sha256:851c680d8fbf608ca5fecd5836622beea89fa017bc2b3f94a5b8c648c32d84b1"},
     {file = "django_celery_beat-2.7.0.tar.gz", hash = "sha256:8482034925e09b698c05ad61c36ed2a8dbc436724a3fe119215193a4ca6dc967"},
@@ -585,6 +613,7 @@ version = "3.14.0"
 description = "django-cors-headers is a Django application for handling the server headers required for Cross-Origin Resource Sharing (CORS)."
 optional = false
 python-versions = ">=3.7"
+groups = ["main"]
 files = [
     {file = "django_cors_headers-3.14.0-py3-none-any.whl", hash = "sha256:684180013cc7277bdd8702b80a3c5a4b3fcae4abb2bf134dceb9f5dfe300228e"},
     {file = "django_cors_headers-3.14.0.tar.gz", hash = "sha256:5fbd58a6fb4119d975754b2bc090f35ec160a8373f276612c675b00e8a138739"},
@@ -599,6 +628,7 @@ version = "3.8.1"
 description = "A configurable set of panels that display various debug information about the current request/response."
 optional = false
 python-versions = ">=3.7"
+groups = ["main"]
 files = [
     {file = "django_debug_toolbar-3.8.1-py3-none-any.whl", hash = "sha256:879f8a4672d41621c06a4d322dcffa630fc4df056cada6e417ed01db0e5e0478"},
     {file = "django_debug_toolbar-3.8.1.tar.gz", hash = "sha256:24ef1a7d44d25e60d7951e378454c6509bf536dce7e7d9d36e7c387db499bc27"},
@@ -614,6 +644,7 @@ version = "7.0"
 description = "A Django app providing DB, form, and REST framework fields for zoneinfo and pytz timezone objects."
 optional = false
 python-versions = "<4.0,>=3.8"
+groups = ["main"]
 files = [
     {file = "django_timezone_field-7.0-py3-none-any.whl", hash = "sha256:3232e7ecde66ba4464abb6f9e6b8cc739b914efb9b29dc2cf2eee451f7cc2acb"},
     {file = "django_timezone_field-7.0.tar.gz", hash = "sha256:aa6f4965838484317b7f08d22c0d91a53d64e7bbbd34264468ae83d4023898a7"},
@@ -629,6 +660,7 @@ version = "3.15.2"
 description = "Web APIs for Django, made easy."
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "djangorestframework-3.15.2-py3-none-any.whl", hash = "sha256:2b8871b062ba1aefc2de01f773875441a961fefbf79f5eed1e32b2f096944b20"},
     {file = "djangorestframework-3.15.2.tar.gz", hash = "sha256:36fe88cd2d6c6bec23dca9804bab2ba5517a8bb9d8f47ebc68981b56840107ad"},
@@ -644,6 +676,7 @@ version = "5.3.1"
 description = "A minimal JSON Web Token authentication plugin for Django REST Framework"
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "djangorestframework_simplejwt-5.3.1-py3-none-any.whl", hash = "sha256:381bc966aa46913905629d472cd72ad45faa265509764e20ffd440164c88d220"},
     {file = "djangorestframework_simplejwt-5.3.1.tar.gz", hash = "sha256:6c4bd37537440bc439564ebf7d6085e74c5411485197073f508ebdfa34bc9fae"},
@@ -668,6 +701,7 @@ version = "1.21.8"
 description = "Automated generation of real Swagger/OpenAPI 2.0 schemas from Django Rest Framework code."
 optional = false
 python-versions = ">=3.6"
+groups = ["main"]
 files = [
     {file = "drf-yasg-1.21.8.tar.gz", hash = "sha256:cbb7f81c3d140f2207392b4bc5dde65384eeb58e1b7eea1a6d641dec2f7352a9"},
     {file = "drf_yasg-1.21.8-py3-none-any.whl", hash = "sha256:a410b235e7cc2c0f6b9d4f671e8efe6f2d27cba398fbd16064e16ef814998444"},
@@ -686,12 +720,25 @@ uritemplate = ">=3.0.0"
 coreapi = ["coreapi (>=2.3.3)", "coreschema (>=0.0.4)"]
 validation = ["swagger-spec-validator (>=2.1.0)"]
 
+[[package]]
+name = "filetype"
+version = "1.2.0"
+description = "Infer file type and MIME type of any file/buffer. No external dependencies."
+optional = false
+python-versions = "*"
+groups = ["main"]
+files = [
+    {file = "filetype-1.2.0-py2.py3-none-any.whl", hash = "sha256:7ce71b6880181241cf7ac8697a2f1eb6a8bd9b429f7ad6d27b8db9ba5f1c2d25"},
+    {file = "filetype-1.2.0.tar.gz", hash = "sha256:66b56cd6474bf41d8c54660347d37afcc3f7d1970648de365c102ef77548aadb"},
+]
+
 [[package]]
 name = "flake8"
 version = "7.1.1"
 description = "the modular source code checker: pep8 pyflakes and co"
 optional = false
 python-versions = ">=3.8.1"
+groups = ["dev"]
 files = [
     {file = "flake8-7.1.1-py2.py3-none-any.whl", hash = "sha256:597477df7860daa5aa0fdd84bf5208a043ab96b8e96ab708770ae0364dd03213"},
     {file = "flake8-7.1.1.tar.gz", hash = "sha256:049d058491e228e03e67b390f311bbf88fce2dbaa8fa673e7aea87b7198b8d38"},
@@ -708,6 +755,7 @@ version = "21.0.0"
 description = "A featureful, immutable, and correct URL for Python."
 optional = false
 python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+groups = ["main"]
 files = [
     {file = "hyperlink-21.0.0-py2.py3-none-any.whl", hash = "sha256:e6b14c37ecb73e89c77d78cdb4c2cc8f3fb59a885c5b3f819ff4ed80f25af1b4"},
     {file = "hyperlink-21.0.0.tar.gz", hash = "sha256:427af957daa58bc909471c6c40f74c5450fa123dd093fc53efd2e91d2705a56b"},
@@ -722,6 +770,7 @@ version = "3.10"
 description = "Internationalized Domain Names in Applications (IDNA)"
 optional = false
 python-versions = ">=3.6"
+groups = ["main"]
 files = [
     {file = "idna-3.10-py3-none-any.whl", hash = "sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3"},
     {file = "idna-3.10.tar.gz", hash = "sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9"},
@@ -736,6 +785,7 @@ version = "24.7.2"
 description = "A small library that versions your Python projects."
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "incremental-24.7.2-py3-none-any.whl", hash = "sha256:8cb2c3431530bec48ad70513931a760f446ad6c25e8333ca5d95e24b0ed7b8fe"},
     {file = "incremental-24.7.2.tar.gz", hash = "sha256:fb4f1d47ee60efe87d4f6f0ebb5f70b9760db2b2574c59c8e8912be4ebd464c9"},
@@ -754,6 +804,7 @@ version = "0.5.1"
 description = "A port of Ruby on Rails inflector to Python"
 optional = false
 python-versions = ">=3.5"
+groups = ["main"]
 files = [
     {file = "inflection-0.5.1-py2.py3-none-any.whl", hash = "sha256:f38b2b640938a4f35ade69ac3d053042959b62a0f1076a5bbaa1b9526605a8a2"},
     {file = "inflection-0.5.1.tar.gz", hash = "sha256:1a29730d366e996aaacffb2f1f1cb9593dc38e2ddd30c91250c6dde09ea9b417"},
@@ -765,6 +816,7 @@ version = "5.4.2"
 description = "Messaging library for Python."
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "kombu-5.4.2-py3-none-any.whl", hash = "sha256:14212f5ccf022fc0a70453bb025a1dcc32782a588c49ea866884047d66e14763"},
     {file = "kombu-5.4.2.tar.gz", hash = "sha256:eef572dd2fd9fc614b37580e3caeafdd5af46c1eff31e7fba89138cdb406f2cf"},
@@ -782,7 +834,7 @@ azureservicebus = ["azure-servicebus (>=7.10.0)"]
 azurestoragequeues = ["azure-identity (>=1.12.0)", "azure-storage-queue (>=12.6.0)"]
 confluentkafka = ["confluent-kafka (>=2.2.0)"]
 consul = ["python-consul2 (==0.1.5)"]
-librabbitmq = ["librabbitmq (>=2.0.0)"]
+librabbitmq = ["librabbitmq (>=2.0.0) ; python_version < \"3.11\""]
 mongodb = ["pymongo (>=4.1.1)"]
 msgpack = ["msgpack (==1.1.0)"]
 pyro = ["pyro4 (==4.82)"]
@@ -790,7 +842,7 @@ qpid = ["qpid-python (>=0.26)", "qpid-tools (>=0.26)"]
 redis = ["redis (>=4.5.2,!=4.5.5,!=5.0.2)"]
 slmq = ["softlayer-messaging (>=1.0.3)"]
 sqlalchemy = ["sqlalchemy (>=1.4.48,<2.1)"]
-sqs = ["boto3 (>=1.26.143)", "pycurl (>=7.43.0.5)", "urllib3 (>=1.26.16)"]
+sqs = ["boto3 (>=1.26.143)", "pycurl (>=7.43.0.5) ; sys_platform != \"win32\" and platform_python_implementation == \"CPython\"", "urllib3 (>=1.26.16)"]
 yaml = ["PyYAML (>=3.10)"]
 zookeeper = ["kazoo (>=2.8.0)"]
 
@@ -800,6 +852,7 @@ version = "0.7.0"
 description = "McCabe checker, plugin for flake8"
 optional = false
 python-versions = ">=3.6"
+groups = ["dev"]
 files = [
     {file = "mccabe-0.7.0-py2.py3-none-any.whl", hash = "sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e"},
     {file = "mccabe-0.7.0.tar.gz", hash = "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325"},
@@ -811,6 +864,7 @@ version = "1.1.0"
 description = "MessagePack serializer"
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "msgpack-1.1.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:7ad442d527a7e358a469faf43fda45aaf4ac3249c8310a82f0ccff9164e5dccd"},
     {file = "msgpack-1.1.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:74bed8f63f8f14d75eec75cf3d04ad581da6b914001b474a5d3cd3372c8cc27d"},
@@ -884,6 +938,7 @@ version = "1.0.0"
 description = "Type system extensions for programs checked with the mypy type checker."
 optional = false
 python-versions = ">=3.5"
+groups = ["dev"]
 files = [
     {file = "mypy_extensions-1.0.0-py3-none-any.whl", hash = "sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d"},
     {file = "mypy_extensions-1.0.0.tar.gz", hash = "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782"},
@@ -895,6 +950,7 @@ version = "24.2"
 description = "Core utilities for Python packages"
 optional = false
 python-versions = ">=3.8"
+groups = ["main", "dev"]
 files = [
     {file = "packaging-24.2-py3-none-any.whl", hash = "sha256:09abb1bccd265c01f4a3aa3f7a7db064b36514d2cba19a2f694fe6150451a759"},
     {file = "packaging-24.2.tar.gz", hash = "sha256:c228a6dc5e932d346bc5739379109d49e8853dd8223571c7c5b55260edc0b97f"},
@@ -906,6 +962,7 @@ version = "0.12.1"
 description = "Utility library for gitignore style pattern matching of file paths."
 optional = false
 python-versions = ">=3.8"
+groups = ["dev"]
 files = [
     {file = "pathspec-0.12.1-py3-none-any.whl", hash = "sha256:a0d503e138a4c123b27490a4f7beda6a01c6f288df0e4a8b79c7eb0dc7b4cc08"},
     {file = "pathspec-0.12.1.tar.gz", hash = "sha256:a482d51503a1ab33b1c67a6c3813a26953dbdc71c31dacaef9a838c4e29f5712"},
@@ -917,6 +974,7 @@ version = "10.4.0"
 description = "Python Imaging Library (Fork)"
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "pillow-10.4.0-cp310-cp310-macosx_10_10_x86_64.whl", hash = "sha256:4d9667937cfa347525b319ae34375c37b9ee6b525440f3ef48542fcf66f2731e"},
     {file = "pillow-10.4.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:543f3dc61c18dafb755773efc89aae60d06b6596a63914107f75459cf984164d"},
@@ -1005,7 +1063,7 @@ docs = ["furo", "olefile", "sphinx (>=7.3)", "sphinx-copybutton", "sphinx-inline
 fpx = ["olefile"]
 mic = ["olefile"]
 tests = ["check-manifest", "coverage", "defusedxml", "markdown2", "olefile", "packaging", "pyroma", "pytest", "pytest-cov", "pytest-timeout"]
-typing = ["typing-extensions"]
+typing = ["typing-extensions ; python_version < \"3.10\""]
 xmp = ["defusedxml"]
 
 [[package]]
@@ -1014,6 +1072,7 @@ version = "4.3.6"
 description = "A small Python package for determining appropriate platform-specific dirs, e.g. a `user data dir`."
 optional = false
 python-versions = ">=3.8"
+groups = ["dev"]
 files = [
     {file = "platformdirs-4.3.6-py3-none-any.whl", hash = "sha256:73e575e1408ab8103900836b97580d5307456908a03e92031bab39e4554cc3fb"},
     {file = "platformdirs-4.3.6.tar.gz", hash = "sha256:357fb2acbc885b0419afd3ce3ed34564c13c9b95c89360cd9563f73aa5e2b907"},
@@ -1030,6 +1089,7 @@ version = "3.0.48"
 description = "Library for building powerful interactive command lines in Python"
 optional = false
 python-versions = ">=3.7.0"
+groups = ["main"]
 files = [
     {file = "prompt_toolkit-3.0.48-py3-none-any.whl", hash = "sha256:f49a827f90062e411f1ce1f854f2aedb3c23353244f8108b89283587397ac10e"},
     {file = "prompt_toolkit-3.0.48.tar.gz", hash = "sha256:d6623ab0477a80df74e646bdbc93621143f5caf104206aa29294d53de1a03d90"},
@@ -1044,6 +1104,7 @@ version = "2.9.10"
 description = "psycopg2 - Python-PostgreSQL Database Adapter"
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "psycopg2-binary-2.9.10.tar.gz", hash = "sha256:4b3df0e6990aa98acda57d983942eff13d824135fe2250e6522edaa782a06de2"},
     {file = "psycopg2_binary-2.9.10-cp310-cp310-macosx_12_0_x86_64.whl", hash = "sha256:0ea8e3d0ae83564f2fc554955d327fa081d065c8ca5cc6d2abb643e2c9c1200f"},
@@ -1092,6 +1153,7 @@ files = [
     {file = "psycopg2_binary-2.9.10-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:bb89f0a835bcfc1d42ccd5f41f04870c1b936d8507c6df12b7737febc40f0909"},
     {file = "psycopg2_binary-2.9.10-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:f0c2d907a1e102526dd2986df638343388b94c33860ff3bbe1384130828714b1"},
     {file = "psycopg2_binary-2.9.10-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:f8157bed2f51db683f31306aa497311b560f2265998122abe1dce6428bd86567"},
+    {file = "psycopg2_binary-2.9.10-cp313-cp313-win_amd64.whl", hash = "sha256:27422aa5f11fbcd9b18da48373eb67081243662f9b46e6fd07c3eb46e4535142"},
     {file = "psycopg2_binary-2.9.10-cp38-cp38-macosx_12_0_x86_64.whl", hash = "sha256:eb09aa7f9cecb45027683bb55aebaaf45a0df8bf6de68801a6afdc7947bb09d4"},
     {file = "psycopg2_binary-2.9.10-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b73d6d7f0ccdad7bc43e6d34273f70d587ef62f824d7261c4ae9b8b1b6af90e8"},
     {file = "psycopg2_binary-2.9.10-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ce5ab4bf46a211a8e924d307c1b1fcda82368586a19d0a24f8ae166f5c784864"},
@@ -1120,6 +1182,7 @@ version = "0.6.1"
 description = "Pure-Python implementation of ASN.1 types and DER/BER/CER codecs (X.208)"
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "pyasn1-0.6.1-py3-none-any.whl", hash = "sha256:0d632f46f2ba09143da3a8afe9e33fb6f92fa2320ab7e886e2d0f7672af84629"},
     {file = "pyasn1-0.6.1.tar.gz", hash = "sha256:6f580d2bdd84365380830acf45550f2511469f673cb4a5ae3857a3170128b034"},
@@ -1131,6 +1194,7 @@ version = "0.4.1"
 description = "A collection of ASN.1-based protocols modules"
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "pyasn1_modules-0.4.1-py3-none-any.whl", hash = "sha256:49bfa96b45a292b711e986f222502c1c9a5e1f4e568fc30e2574a6c7d07838fd"},
     {file = "pyasn1_modules-0.4.1.tar.gz", hash = "sha256:c28e2dbf9c06ad61c71a075c7e0f9fd0f1b0bb2d2ad4377f240d33ac2ab60a7c"},
@@ -1145,6 +1209,7 @@ version = "2.12.1"
 description = "Python style guide checker"
 optional = false
 python-versions = ">=3.8"
+groups = ["dev"]
 files = [
     {file = "pycodestyle-2.12.1-py2.py3-none-any.whl", hash = "sha256:46f0fb92069a7c28ab7bb558f05bfc0110dac69a0cd23c61ea0040283a9d78b3"},
     {file = "pycodestyle-2.12.1.tar.gz", hash = "sha256:6838eae08bbce4f6accd5d5572075c63626a15ee3e6f842df996bf62f6d73521"},
@@ -1156,6 +1221,8 @@ version = "2.22"
 description = "C parser in Python"
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
+markers = "platform_python_implementation != \"PyPy\""
 files = [
     {file = "pycparser-2.22-py3-none-any.whl", hash = "sha256:c3702b6d3dd8c7abc1afa565d7e63d53a1d0bd86cdc24edd75470f4de499cfcc"},
     {file = "pycparser-2.22.tar.gz", hash = "sha256:491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6"},
@@ -1167,6 +1234,7 @@ version = "3.2.0"
 description = "passive checker of Python programs"
 optional = false
 python-versions = ">=3.8"
+groups = ["dev"]
 files = [
     {file = "pyflakes-3.2.0-py2.py3-none-any.whl", hash = "sha256:84b5be138a2dfbb40689ca07e2152deb896a65c3a3e24c251c5c62489568074a"},
     {file = "pyflakes-3.2.0.tar.gz", hash = "sha256:1c61603ff154621fb2a9172037d84dca3500def8c8b630657d1701f026f8af3f"},
@@ -1178,6 +1246,7 @@ version = "2.9.0"
 description = "JSON Web Token implementation in Python"
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "PyJWT-2.9.0-py3-none-any.whl", hash = "sha256:3b02fb0f44517787776cf48f2ae25d8e14f300e6d7545a4315cee571a415e850"},
     {file = "pyjwt-2.9.0.tar.gz", hash = "sha256:7e1e5b56cc735432a7369cbfa0efe50fa113ebecdc04ae6922deba8b84582d0c"},
@@ -1195,6 +1264,7 @@ version = "24.2.1"
 description = "Python wrapper module around the OpenSSL library"
 optional = false
 python-versions = ">=3.7"
+groups = ["main"]
 files = [
     {file = "pyOpenSSL-24.2.1-py3-none-any.whl", hash = "sha256:967d5719b12b243588573f39b0c677637145c7a1ffedcd495a487e58177fbb8d"},
     {file = "pyopenssl-24.2.1.tar.gz", hash = "sha256:4247f0dbe3748d560dcbb2ff3ea01af0f9a1a001ef5f7c4c647956ed8cbf0e95"},
@@ -1213,6 +1283,7 @@ version = "3.2.0"
 description = "Python Crontab API"
 optional = false
 python-versions = "*"
+groups = ["main"]
 files = [
     {file = "python_crontab-3.2.0-py3-none-any.whl", hash = "sha256:82cb9b6a312d41ff66fd3caf3eed7115c28c195bfb50711bc2b4b9592feb9fe5"},
     {file = "python_crontab-3.2.0.tar.gz", hash = "sha256:40067d1dd39ade3460b2ad8557c7651514cd3851deffff61c5c60e1227c5c36b"},
@@ -1231,6 +1302,7 @@ version = "2.9.0.post0"
 description = "Extensions to the standard Python datetime module"
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7"
+groups = ["main"]
 files = [
     {file = "python-dateutil-2.9.0.post0.tar.gz", hash = "sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3"},
     {file = "python_dateutil-2.9.0.post0-py2.py3-none-any.whl", hash = "sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427"},
@@ -1245,6 +1317,7 @@ version = "3.8"
 description = "Strict separation of settings from code."
 optional = false
 python-versions = "*"
+groups = ["main"]
 files = [
     {file = "python-decouple-3.8.tar.gz", hash = "sha256:ba6e2657d4f376ecc46f77a3a615e058d93ba5e465c01bbe57289bfb7cce680f"},
     {file = "python_decouple-3.8-py3-none-any.whl", hash = "sha256:d0d45340815b25f4de59c974b855bb38d03151d81b037d9e3f463b0c9f8cbd66"},
@@ -1256,6 +1329,7 @@ version = "2024.2"
 description = "World timezone definitions, modern and historical"
 optional = false
 python-versions = "*"
+groups = ["main"]
 files = [
     {file = "pytz-2024.2-py2.py3-none-any.whl", hash = "sha256:31c7c1817eb7fae7ca4b8c7ee50c72f93aa2dd863de768e1ef4245d426aa0725"},
     {file = "pytz-2024.2.tar.gz", hash = "sha256:2aa355083c50a0f93fa581709deac0c9ad65cca8a9e9beac660adcbd493c798a"},
@@ -1267,6 +1341,7 @@ version = "6.0.2"
 description = "YAML parser and emitter for Python"
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "PyYAML-6.0.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:0a9a2848a5b7feac301353437eb7d5957887edbf81d56e903999a75a3d743086"},
     {file = "PyYAML-6.0.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:29717114e51c84ddfba879543fb232a6ed60086602313ca38cce623c1d62cfbf"},
@@ -1329,6 +1404,7 @@ version = "4.6.0"
 description = "Python client for Redis database and key-value store"
 optional = false
 python-versions = ">=3.7"
+groups = ["main"]
 files = [
     {file = "redis-4.6.0-py3-none-any.whl", hash = "sha256:e2b03db868160ee4591de3cb90d40ebb50a90dd302138775937f6a42b7ed183c"},
     {file = "redis-4.6.0.tar.gz", hash = "sha256:585dc516b9eb042a619ef0a39c3d7d55fe81bdb4df09a52c9cdde0d07bf1aa7d"},
@@ -1347,6 +1423,7 @@ version = "24.2.0"
 description = "Service identity verification for pyOpenSSL & cryptography."
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "service_identity-24.2.0-py3-none-any.whl", hash = "sha256:6b047fbd8a84fd0bb0d55ebce4031e400562b9196e1e0d3e0fe2b8a59f6d4a85"},
     {file = "service_identity-24.2.0.tar.gz", hash = "sha256:b8683ba13f0d39c6cd5d625d2c5f65421d6d707b013b375c355751557cbe8e09"},
@@ -1371,19 +1448,20 @@ version = "75.3.0"
 description = "Easily download, build, install, upgrade, and uninstall Python packages"
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "setuptools-75.3.0-py3-none-any.whl", hash = "sha256:f2504966861356aa38616760c0f66568e535562374995367b4e69c7143cf6bcd"},
     {file = "setuptools-75.3.0.tar.gz", hash = "sha256:fba5dd4d766e97be1b1681d98712680ae8f2f26d7881245f2ce9e40714f1a686"},
 ]
 
 [package.extras]
-check = ["pytest-checkdocs (>=2.4)", "pytest-ruff (>=0.2.1)", "ruff (>=0.5.2)"]
-core = ["importlib-metadata (>=6)", "importlib-resources (>=5.10.2)", "jaraco.collections", "jaraco.functools", "jaraco.text (>=3.7)", "more-itertools", "more-itertools (>=8.8)", "packaging", "packaging (>=24)", "platformdirs (>=4.2.2)", "tomli (>=2.0.1)", "wheel (>=0.43.0)"]
+check = ["pytest-checkdocs (>=2.4)", "pytest-ruff (>=0.2.1) ; sys_platform != \"cygwin\"", "ruff (>=0.5.2) ; sys_platform != \"cygwin\""]
+core = ["importlib-metadata (>=6) ; python_version < \"3.10\"", "importlib-resources (>=5.10.2) ; python_version < \"3.9\"", "jaraco.collections", "jaraco.functools", "jaraco.text (>=3.7)", "more-itertools", "more-itertools (>=8.8)", "packaging", "packaging (>=24)", "platformdirs (>=4.2.2)", "tomli (>=2.0.1) ; python_version < \"3.11\"", "wheel (>=0.43.0)"]
 cover = ["pytest-cov"]
 doc = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "pyproject-hooks (!=1.1)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (>=1,<2)", "sphinx-reredirects", "sphinxcontrib-towncrier", "towncrier (<24.7)"]
 enabler = ["pytest-enabler (>=2.2)"]
-test = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "ini2toml[lite] (>=0.14)", "jaraco.develop (>=7.21)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "jaraco.test (>=5.5)", "packaging (>=23.2)", "pip (>=19.1)", "pyproject-hooks (!=1.1)", "pytest (>=6,!=8.1.*)", "pytest-home (>=0.5)", "pytest-perf", "pytest-subprocess", "pytest-timeout", "pytest-xdist (>=3)", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel (>=0.44.0)"]
-type = ["importlib-metadata (>=7.0.2)", "jaraco.develop (>=7.21)", "mypy (==1.12.*)", "pytest-mypy"]
+test = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "ini2toml[lite] (>=0.14)", "jaraco.develop (>=7.21) ; python_version >= \"3.9\" and sys_platform != \"cygwin\"", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "jaraco.test (>=5.5)", "packaging (>=23.2)", "pip (>=19.1)", "pyproject-hooks (!=1.1)", "pytest (>=6,!=8.1.*)", "pytest-home (>=0.5)", "pytest-perf ; sys_platform != \"cygwin\"", "pytest-subprocess", "pytest-timeout", "pytest-xdist (>=3)", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel (>=0.44.0)"]
+type = ["importlib-metadata (>=7.0.2) ; python_version < \"3.10\"", "jaraco.develop (>=7.21) ; sys_platform != \"cygwin\"", "mypy (==1.12.*)", "pytest-mypy"]
 
 [[package]]
 name = "six"
@@ -1391,6 +1469,7 @@ version = "1.16.0"
 description = "Python 2 and 3 compatibility utilities"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*"
+groups = ["main"]
 files = [
     {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"},
     {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"},
@@ -1402,6 +1481,7 @@ version = "0.5.1"
 description = "A non-validating SQL parser."
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "sqlparse-0.5.1-py3-none-any.whl", hash = "sha256:773dcbf9a5ab44a090f3441e2180efe2560220203dc2f8c0b0fa141e18b505e4"},
     {file = "sqlparse-0.5.1.tar.gz", hash = "sha256:bb6b4df465655ef332548e24f08e205afc81b9ab86cb1c45657a7ff173a3a00e"},
@@ -1417,6 +1497,8 @@ version = "2.0.2"
 description = "A lil' TOML parser"
 optional = false
 python-versions = ">=3.8"
+groups = ["main", "dev"]
+markers = "python_version < \"3.11\""
 files = [
     {file = "tomli-2.0.2-py3-none-any.whl", hash = "sha256:2ebe24485c53d303f690b0ec092806a085f07af5a5aa1464f3931eec36caaa38"},
     {file = "tomli-2.0.2.tar.gz", hash = "sha256:d46d457a85337051c36524bc5349dd91b1877838e2979ac5ced3e710ed8a60ed"},
@@ -1428,6 +1510,7 @@ version = "24.10.0"
 description = "An asynchronous networking framework written in Python"
 optional = false
 python-versions = ">=3.8.0"
+groups = ["main"]
 files = [
     {file = "twisted-24.10.0-py3-none-any.whl", hash = "sha256:67aa7c8aa94387385302acf44ade12967c747858c8bcce0f11d38077a11c5326"},
     {file = "twisted-24.10.0.tar.gz", hash = "sha256:02951299672595fea0f70fa2d5f7b5e3d56836157eda68859a6ad6492d36756e"},
@@ -1446,19 +1529,19 @@ typing-extensions = ">=4.2.0"
 zope-interface = ">=5"
 
 [package.extras]
-all-non-platform = ["appdirs (>=1.4.0)", "appdirs (>=1.4.0)", "bcrypt (>=3.1.3)", "bcrypt (>=3.1.3)", "cryptography (>=3.3)", "cryptography (>=3.3)", "cython-test-exception-raiser (>=1.0.2,<2)", "cython-test-exception-raiser (>=1.0.2,<2)", "h2 (>=3.2,<5.0)", "h2 (>=3.2,<5.0)", "httpx[http2] (>=0.27)", "httpx[http2] (>=0.27)", "hypothesis (>=6.56)", "hypothesis (>=6.56)", "idna (>=2.4)", "idna (>=2.4)", "priority (>=1.1.0,<2.0)", "priority (>=1.1.0,<2.0)", "pyhamcrest (>=2)", "pyhamcrest (>=2)", "pyopenssl (>=21.0.0)", "pyopenssl (>=21.0.0)", "pyserial (>=3.0)", "pyserial (>=3.0)", "pywin32 (!=226)", "pywin32 (!=226)", "service-identity (>=18.1.0)", "service-identity (>=18.1.0)"]
+all-non-platform = ["appdirs (>=1.4.0)", "appdirs (>=1.4.0)", "bcrypt (>=3.1.3)", "bcrypt (>=3.1.3)", "cryptography (>=3.3)", "cryptography (>=3.3)", "cython-test-exception-raiser (>=1.0.2,<2)", "cython-test-exception-raiser (>=1.0.2,<2)", "h2 (>=3.2,<5.0)", "h2 (>=3.2,<5.0)", "httpx[http2] (>=0.27)", "httpx[http2] (>=0.27)", "hypothesis (>=6.56)", "hypothesis (>=6.56)", "idna (>=2.4)", "idna (>=2.4)", "priority (>=1.1.0,<2.0)", "priority (>=1.1.0,<2.0)", "pyhamcrest (>=2)", "pyhamcrest (>=2)", "pyopenssl (>=21.0.0)", "pyopenssl (>=21.0.0)", "pyserial (>=3.0)", "pyserial (>=3.0)", "pywin32 (!=226) ; platform_system == \"Windows\"", "pywin32 (!=226) ; platform_system == \"Windows\"", "service-identity (>=18.1.0)", "service-identity (>=18.1.0)"]
 conch = ["appdirs (>=1.4.0)", "bcrypt (>=3.1.3)", "cryptography (>=3.3)"]
 dev = ["coverage (>=7.5,<8.0)", "cython-test-exception-raiser (>=1.0.2,<2)", "httpx[http2] (>=0.27)", "hypothesis (>=6.56)", "pydoctor (>=23.9.0,<23.10.0)", "pyflakes (>=2.2,<3.0)", "pyhamcrest (>=2)", "python-subunit (>=1.4,<2.0)", "sphinx (>=6,<7)", "sphinx-rtd-theme (>=1.3,<2.0)", "towncrier (>=23.6,<24.0)", "twistedchecker (>=0.7,<1.0)"]
 dev-release = ["pydoctor (>=23.9.0,<23.10.0)", "pydoctor (>=23.9.0,<23.10.0)", "sphinx (>=6,<7)", "sphinx (>=6,<7)", "sphinx-rtd-theme (>=1.3,<2.0)", "sphinx-rtd-theme (>=1.3,<2.0)", "towncrier (>=23.6,<24.0)", "towncrier (>=23.6,<24.0)"]
-gtk-platform = ["appdirs (>=1.4.0)", "appdirs (>=1.4.0)", "bcrypt (>=3.1.3)", "bcrypt (>=3.1.3)", "cryptography (>=3.3)", "cryptography (>=3.3)", "cython-test-exception-raiser (>=1.0.2,<2)", "cython-test-exception-raiser (>=1.0.2,<2)", "h2 (>=3.2,<5.0)", "h2 (>=3.2,<5.0)", "httpx[http2] (>=0.27)", "httpx[http2] (>=0.27)", "hypothesis (>=6.56)", "hypothesis (>=6.56)", "idna (>=2.4)", "idna (>=2.4)", "priority (>=1.1.0,<2.0)", "priority (>=1.1.0,<2.0)", "pygobject", "pygobject", "pyhamcrest (>=2)", "pyhamcrest (>=2)", "pyopenssl (>=21.0.0)", "pyopenssl (>=21.0.0)", "pyserial (>=3.0)", "pyserial (>=3.0)", "pywin32 (!=226)", "pywin32 (!=226)", "service-identity (>=18.1.0)", "service-identity (>=18.1.0)"]
+gtk-platform = ["appdirs (>=1.4.0)", "appdirs (>=1.4.0)", "bcrypt (>=3.1.3)", "bcrypt (>=3.1.3)", "cryptography (>=3.3)", "cryptography (>=3.3)", "cython-test-exception-raiser (>=1.0.2,<2)", "cython-test-exception-raiser (>=1.0.2,<2)", "h2 (>=3.2,<5.0)", "h2 (>=3.2,<5.0)", "httpx[http2] (>=0.27)", "httpx[http2] (>=0.27)", "hypothesis (>=6.56)", "hypothesis (>=6.56)", "idna (>=2.4)", "idna (>=2.4)", "priority (>=1.1.0,<2.0)", "priority (>=1.1.0,<2.0)", "pygobject", "pygobject", "pyhamcrest (>=2)", "pyhamcrest (>=2)", "pyopenssl (>=21.0.0)", "pyopenssl (>=21.0.0)", "pyserial (>=3.0)", "pyserial (>=3.0)", "pywin32 (!=226) ; platform_system == \"Windows\"", "pywin32 (!=226) ; platform_system == \"Windows\"", "service-identity (>=18.1.0)", "service-identity (>=18.1.0)"]
 http2 = ["h2 (>=3.2,<5.0)", "priority (>=1.1.0,<2.0)"]
-macos-platform = ["appdirs (>=1.4.0)", "appdirs (>=1.4.0)", "bcrypt (>=3.1.3)", "bcrypt (>=3.1.3)", "cryptography (>=3.3)", "cryptography (>=3.3)", "cython-test-exception-raiser (>=1.0.2,<2)", "cython-test-exception-raiser (>=1.0.2,<2)", "h2 (>=3.2,<5.0)", "h2 (>=3.2,<5.0)", "httpx[http2] (>=0.27)", "httpx[http2] (>=0.27)", "hypothesis (>=6.56)", "hypothesis (>=6.56)", "idna (>=2.4)", "idna (>=2.4)", "priority (>=1.1.0,<2.0)", "priority (>=1.1.0,<2.0)", "pyhamcrest (>=2)", "pyhamcrest (>=2)", "pyobjc-core", "pyobjc-core", "pyobjc-framework-cfnetwork", "pyobjc-framework-cfnetwork", "pyobjc-framework-cocoa", "pyobjc-framework-cocoa", "pyopenssl (>=21.0.0)", "pyopenssl (>=21.0.0)", "pyserial (>=3.0)", "pyserial (>=3.0)", "pywin32 (!=226)", "pywin32 (!=226)", "service-identity (>=18.1.0)", "service-identity (>=18.1.0)"]
-mypy = ["appdirs (>=1.4.0)", "bcrypt (>=3.1.3)", "coverage (>=7.5,<8.0)", "cryptography (>=3.3)", "cython-test-exception-raiser (>=1.0.2,<2)", "h2 (>=3.2,<5.0)", "httpx[http2] (>=0.27)", "hypothesis (>=6.56)", "idna (>=2.4)", "mypy (==1.10.1)", "mypy-zope (==1.0.6)", "priority (>=1.1.0,<2.0)", "pydoctor (>=23.9.0,<23.10.0)", "pyflakes (>=2.2,<3.0)", "pyhamcrest (>=2)", "pyopenssl (>=21.0.0)", "pyserial (>=3.0)", "python-subunit (>=1.4,<2.0)", "pywin32 (!=226)", "service-identity (>=18.1.0)", "sphinx (>=6,<7)", "sphinx-rtd-theme (>=1.3,<2.0)", "towncrier (>=23.6,<24.0)", "twistedchecker (>=0.7,<1.0)", "types-pyopenssl", "types-setuptools"]
-osx-platform = ["appdirs (>=1.4.0)", "appdirs (>=1.4.0)", "bcrypt (>=3.1.3)", "bcrypt (>=3.1.3)", "cryptography (>=3.3)", "cryptography (>=3.3)", "cython-test-exception-raiser (>=1.0.2,<2)", "cython-test-exception-raiser (>=1.0.2,<2)", "h2 (>=3.2,<5.0)", "h2 (>=3.2,<5.0)", "httpx[http2] (>=0.27)", "httpx[http2] (>=0.27)", "hypothesis (>=6.56)", "hypothesis (>=6.56)", "idna (>=2.4)", "idna (>=2.4)", "priority (>=1.1.0,<2.0)", "priority (>=1.1.0,<2.0)", "pyhamcrest (>=2)", "pyhamcrest (>=2)", "pyobjc-core", "pyobjc-core", "pyobjc-framework-cfnetwork", "pyobjc-framework-cfnetwork", "pyobjc-framework-cocoa", "pyobjc-framework-cocoa", "pyopenssl (>=21.0.0)", "pyopenssl (>=21.0.0)", "pyserial (>=3.0)", "pyserial (>=3.0)", "pywin32 (!=226)", "pywin32 (!=226)", "service-identity (>=18.1.0)", "service-identity (>=18.1.0)"]
-serial = ["pyserial (>=3.0)", "pywin32 (!=226)"]
+macos-platform = ["appdirs (>=1.4.0)", "appdirs (>=1.4.0)", "bcrypt (>=3.1.3)", "bcrypt (>=3.1.3)", "cryptography (>=3.3)", "cryptography (>=3.3)", "cython-test-exception-raiser (>=1.0.2,<2)", "cython-test-exception-raiser (>=1.0.2,<2)", "h2 (>=3.2,<5.0)", "h2 (>=3.2,<5.0)", "httpx[http2] (>=0.27)", "httpx[http2] (>=0.27)", "hypothesis (>=6.56)", "hypothesis (>=6.56)", "idna (>=2.4)", "idna (>=2.4)", "priority (>=1.1.0,<2.0)", "priority (>=1.1.0,<2.0)", "pyhamcrest (>=2)", "pyhamcrest (>=2)", "pyobjc-core", "pyobjc-core", "pyobjc-framework-cfnetwork", "pyobjc-framework-cfnetwork", "pyobjc-framework-cocoa", "pyobjc-framework-cocoa", "pyopenssl (>=21.0.0)", "pyopenssl (>=21.0.0)", "pyserial (>=3.0)", "pyserial (>=3.0)", "pywin32 (!=226) ; platform_system == \"Windows\"", "pywin32 (!=226) ; platform_system == \"Windows\"", "service-identity (>=18.1.0)", "service-identity (>=18.1.0)"]
+mypy = ["appdirs (>=1.4.0)", "bcrypt (>=3.1.3)", "coverage (>=7.5,<8.0)", "cryptography (>=3.3)", "cython-test-exception-raiser (>=1.0.2,<2)", "h2 (>=3.2,<5.0)", "httpx[http2] (>=0.27)", "hypothesis (>=6.56)", "idna (>=2.4)", "mypy (==1.10.1)", "mypy-zope (==1.0.6)", "priority (>=1.1.0,<2.0)", "pydoctor (>=23.9.0,<23.10.0)", "pyflakes (>=2.2,<3.0)", "pyhamcrest (>=2)", "pyopenssl (>=21.0.0)", "pyserial (>=3.0)", "python-subunit (>=1.4,<2.0)", "pywin32 (!=226) ; platform_system == \"Windows\"", "service-identity (>=18.1.0)", "sphinx (>=6,<7)", "sphinx-rtd-theme (>=1.3,<2.0)", "towncrier (>=23.6,<24.0)", "twistedchecker (>=0.7,<1.0)", "types-pyopenssl", "types-setuptools"]
+osx-platform = ["appdirs (>=1.4.0)", "appdirs (>=1.4.0)", "bcrypt (>=3.1.3)", "bcrypt (>=3.1.3)", "cryptography (>=3.3)", "cryptography (>=3.3)", "cython-test-exception-raiser (>=1.0.2,<2)", "cython-test-exception-raiser (>=1.0.2,<2)", "h2 (>=3.2,<5.0)", "h2 (>=3.2,<5.0)", "httpx[http2] (>=0.27)", "httpx[http2] (>=0.27)", "hypothesis (>=6.56)", "hypothesis (>=6.56)", "idna (>=2.4)", "idna (>=2.4)", "priority (>=1.1.0,<2.0)", "priority (>=1.1.0,<2.0)", "pyhamcrest (>=2)", "pyhamcrest (>=2)", "pyobjc-core", "pyobjc-core", "pyobjc-framework-cfnetwork", "pyobjc-framework-cfnetwork", "pyobjc-framework-cocoa", "pyobjc-framework-cocoa", "pyopenssl (>=21.0.0)", "pyopenssl (>=21.0.0)", "pyserial (>=3.0)", "pyserial (>=3.0)", "pywin32 (!=226) ; platform_system == \"Windows\"", "pywin32 (!=226) ; platform_system == \"Windows\"", "service-identity (>=18.1.0)", "service-identity (>=18.1.0)"]
+serial = ["pyserial (>=3.0)", "pywin32 (!=226) ; platform_system == \"Windows\""]
 test = ["cython-test-exception-raiser (>=1.0.2,<2)", "httpx[http2] (>=0.27)", "hypothesis (>=6.56)", "pyhamcrest (>=2)"]
 tls = ["idna (>=2.4)", "pyopenssl (>=21.0.0)", "service-identity (>=18.1.0)"]
-windows-platform = ["appdirs (>=1.4.0)", "appdirs (>=1.4.0)", "bcrypt (>=3.1.3)", "bcrypt (>=3.1.3)", "cryptography (>=3.3)", "cryptography (>=3.3)", "cython-test-exception-raiser (>=1.0.2,<2)", "cython-test-exception-raiser (>=1.0.2,<2)", "h2 (>=3.2,<5.0)", "h2 (>=3.2,<5.0)", "httpx[http2] (>=0.27)", "httpx[http2] (>=0.27)", "hypothesis (>=6.56)", "hypothesis (>=6.56)", "idna (>=2.4)", "idna (>=2.4)", "priority (>=1.1.0,<2.0)", "priority (>=1.1.0,<2.0)", "pyhamcrest (>=2)", "pyhamcrest (>=2)", "pyopenssl (>=21.0.0)", "pyopenssl (>=21.0.0)", "pyserial (>=3.0)", "pyserial (>=3.0)", "pywin32 (!=226)", "pywin32 (!=226)", "pywin32 (!=226)", "pywin32 (!=226)", "service-identity (>=18.1.0)", "service-identity (>=18.1.0)", "twisted-iocpsupport (>=1.0.2)", "twisted-iocpsupport (>=1.0.2)"]
+windows-platform = ["appdirs (>=1.4.0)", "appdirs (>=1.4.0)", "bcrypt (>=3.1.3)", "bcrypt (>=3.1.3)", "cryptography (>=3.3)", "cryptography (>=3.3)", "cython-test-exception-raiser (>=1.0.2,<2)", "cython-test-exception-raiser (>=1.0.2,<2)", "h2 (>=3.2,<5.0)", "h2 (>=3.2,<5.0)", "httpx[http2] (>=0.27)", "httpx[http2] (>=0.27)", "hypothesis (>=6.56)", "hypothesis (>=6.56)", "idna (>=2.4)", "idna (>=2.4)", "priority (>=1.1.0,<2.0)", "priority (>=1.1.0,<2.0)", "pyhamcrest (>=2)", "pyhamcrest (>=2)", "pyopenssl (>=21.0.0)", "pyopenssl (>=21.0.0)", "pyserial (>=3.0)", "pyserial (>=3.0)", "pywin32 (!=226)", "pywin32 (!=226)", "pywin32 (!=226) ; platform_system == \"Windows\"", "pywin32 (!=226) ; platform_system == \"Windows\"", "service-identity (>=18.1.0)", "service-identity (>=18.1.0)", "twisted-iocpsupport (>=1.0.2)", "twisted-iocpsupport (>=1.0.2)"]
 
 [[package]]
 name = "txaio"
@@ -1466,6 +1549,7 @@ version = "23.1.1"
 description = "Compatibility API between asyncio/Twisted/Trollius"
 optional = false
 python-versions = ">=3.7"
+groups = ["main"]
 files = [
     {file = "txaio-23.1.1-py2.py3-none-any.whl", hash = "sha256:aaea42f8aad50e0ecfb976130ada140797e9dcb85fad2cf72b0f37f8cefcb490"},
     {file = "txaio-23.1.1.tar.gz", hash = "sha256:f9a9216e976e5e3246dfd112ad7ad55ca915606b60b84a757ac769bd404ff704"},
@@ -1482,10 +1566,12 @@ version = "4.12.2"
 description = "Backported and Experimental Type Hints for Python 3.8+"
 optional = false
 python-versions = ">=3.8"
+groups = ["main", "dev"]
 files = [
     {file = "typing_extensions-4.12.2-py3-none-any.whl", hash = "sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d"},
     {file = "typing_extensions-4.12.2.tar.gz", hash = "sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8"},
 ]
+markers = {dev = "python_version < \"3.11\""}
 
 [[package]]
 name = "tzdata"
@@ -1493,6 +1579,7 @@ version = "2022.7"
 description = "Provider of IANA time zone data"
 optional = false
 python-versions = ">=2"
+groups = ["main"]
 files = [
     {file = "tzdata-2022.7-py2.py3-none-any.whl", hash = "sha256:2b88858b0e3120792a3c0635c23daf36a7d7eeeca657c323da299d2094402a0d"},
     {file = "tzdata-2022.7.tar.gz", hash = "sha256:fe5f866eddd8b96e9fcba978f8e503c909b19ea7efda11e52e39494bad3a7bfa"},
@@ -1504,6 +1591,7 @@ version = "4.1.1"
 description = "Implementation of RFC 6570 URI Templates"
 optional = false
 python-versions = ">=3.6"
+groups = ["main"]
 files = [
     {file = "uritemplate-4.1.1-py2.py3-none-any.whl", hash = "sha256:830c08b8d99bdd312ea4ead05994a38e8936266f84b9a7878232db50b044e02e"},
     {file = "uritemplate-4.1.1.tar.gz", hash = "sha256:4346edfc5c3b79f694bccd6d6099a322bbeb628dbf2cd86eea55a456ce5124f0"},
@@ -1515,6 +1603,7 @@ version = "5.1.0"
 description = "Python promises."
 optional = false
 python-versions = ">=3.6"
+groups = ["main"]
 files = [
     {file = "vine-5.1.0-py3-none-any.whl", hash = "sha256:40fdf3c48b2cfe1c38a49e9ae2da6fda88e4794c810050a728bd7413811fb1dc"},
     {file = "vine-5.1.0.tar.gz", hash = "sha256:8b62e981d35c41049211cf62a0a1242d8c1ee9bd15bb196ce38aefd6799e61e0"},
@@ -1526,6 +1615,7 @@ version = "0.2.13"
 description = "Measures the displayed width of unicode strings in a terminal"
 optional = false
 python-versions = "*"
+groups = ["main"]
 files = [
     {file = "wcwidth-0.2.13-py2.py3-none-any.whl", hash = "sha256:3da69048e4540d84af32131829ff948f1e022c1c6bdb8d6102117aac784f6859"},
     {file = "wcwidth-0.2.13.tar.gz", hash = "sha256:72ea0c06399eb286d978fdedb6923a9eb47e1c486ce63e9b4e64fc18303972b5"},
@@ -1537,6 +1627,7 @@ version = "6.7.0"
 description = "Radically simplified static file serving for WSGI applications"
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "whitenoise-6.7.0-py3-none-any.whl", hash = "sha256:a1ae85e01fdc9815d12fa33f17765bc132ed2c54fa76daf9e39e879dd93566f6"},
     {file = "whitenoise-6.7.0.tar.gz", hash = "sha256:58c7a6cd811e275a6c91af22e96e87da0b1109e9a53bb7464116ef4c963bf636"},
@@ -1551,6 +1642,7 @@ version = "7.1.1"
 description = "Interfaces for Python"
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "zope.interface-7.1.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:6650bd56ef350d37c8baccfd3ee8a0483ed6f8666e641e4b9ae1a1827b79f9e5"},
     {file = "zope.interface-7.1.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:84e87eba6b77a3af187bae82d8de1a7c208c2a04ec9f6bd444fd091b811ad92e"},
@@ -1600,6 +1692,6 @@ test = ["coverage[toml]", "zope.event", "zope.testing"]
 testing = ["coverage[toml]", "zope.event", "zope.testing"]
 
 [metadata]
-lock-version = "2.0"
+lock-version = "2.1"
 python-versions = ">=3.8.1,<4.0"
-content-hash = "6f9199cf967dbe793bc1cf32644ce5d0f0905fdc684585f5245103995922ef5d"
+content-hash = "5c5a4cffdba178eae27556eadc931de4a5c6626a22b11076dd1d8d6f73dda4de"
diff --git a/server/pyproject.toml b/server/pyproject.toml
index 5ebc774b5..90d4f5c7e 100644
--- a/server/pyproject.toml
+++ b/server/pyproject.toml
@@ -23,6 +23,7 @@ whitenoise = "^6.2.0"
 psycopg2-binary = "^2.9.9"
 channels = {extras = ["daphne"], version = "^4.1.0"}
 channels-redis = "^4.2.0"
+filetype = "^1.2.0"
 
 [tool.poetry.dev-dependencies]
 black = "^24.3.0"
diff --git a/server/settings.py b/server/settings.py
index e6a77759b..439603c76 100644
--- a/server/settings.py
+++ b/server/settings.py
@@ -4,20 +4,20 @@
 import os
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = config("DJANGO_SECRET_KEY")
+SECRET_KEY = config("CSHR_DJANGO_SECRET_KEY")
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = config("DJANGO_DEBUG") == "ON"
+DEBUG = config("CSHR_DJANGO_DEBUG") == "ON"
 
 CELERY_IMPORTS = ("cshr.celery.notifications",)
 
 ALLOWED_HOSTS = [
     "127.0.0.1",
     "0.0.0.0",
-    config("SERVER_DOMAIN_NAME"),  # Server domain
-    # f'https://{config("SERVER_DOMAIN_NAME")}',  # Server domain
-    config("CLIENT_DOMAIN_NAME"),  # Client domain
-    # f'https://{config("CLIENT_DOMAIN_NAME")}',  # Client domain
+    config("CSHR_SERVER_DOMAIN_NAME"),  # Server domain
+    # f'https://{config("CSHR_SERVER_DOMAIN_NAME")}',  # Server domain
+    config("CSHR_CLIENT_DOMAIN_NAME"),  # Client domain
+    # f'https://{config("CSHR_CLIENT_DOMAIN_NAME")}',  # Client domain
 ]
 
 # Application definition
@@ -76,16 +76,16 @@
 # Database
 # https://docs.djangoproject.com/en/4.1/ref/settings/#databases
 
-if config("ENV") == "production":
+if config("CSHR_ENV") == "production":
     # use the postgres db for production process.
     DATABASES = {
         "default": {
             "ENGINE": "django.db.backends.postgresql",
-            "NAME": config("DATABASE_NAME"),
-            "USER": config("DATABASE_USER"),
-            "PASSWORD": config("DATABASE_PASSWORD"),
-            "HOST": config("DATABASE_HOST"),
-            "PORT": config("DATABASE_PORT"),
+            "NAME": config("CSHR_DATABASE_NAME"),
+            "USER": config("CSHR_DATABASE_USER"),
+            "PASSWORD": config("CSHR_DATABASE_PASSWORD"),
+            "HOST": config("CSHR_DATABASE_HOST"),
+            "PORT": config("CSHR_DATABASE_PORT"),
         }
     }
 else:
@@ -167,9 +167,9 @@
 ASGI_APPLICATION = "asgi.application"
 
 try:
-    _, R_HOST, R_PORT = config("REDIS_HOST").replace("//", "").split(":")
+    _, R_HOST, R_PORT = config("CSHR_REDIS_HOST").replace("//", "").split(":")
 except Exception:
-    raise ImproperlyConfigured("REDIS_HOST is not defined")
+    raise ImproperlyConfigured("CSHR_REDIS_HOST is not defined")
 
 CHANNEL_LAYERS = {
     "default": {
@@ -204,20 +204,20 @@
 CORS_ALLOWED_ORIGINS = [
     "http://localhost:8080",
     "http://127.0.0.1:8080",
-    f'https://{config("SERVER_DOMAIN_NAME")}',
-    f'https://{config("CLIENT_DOMAIN_NAME")}',
+    f'https://{config("CSHR_SERVER_DOMAIN_NAME")}',
+    f'https://{config("CSHR_CLIENT_DOMAIN_NAME")}',
 ]
 
-CSRF_TRUSTED_ORIGINS = [f'https://{config("SERVER_DOMAIN_NAME")}']
+CSRF_TRUSTED_ORIGINS = [f'https://{config("CSHR_SERVER_DOMAIN_NAME")}']
 
 # email config
 
 EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"
-EMAIL_HOST = config("EMAIL_HOST")
+EMAIL_HOST = config("CSHR_EMAIL_HOST")
 EMAIL_PORT = 587
 EMAIL_USE_TLS = True
-EMAIL_HOST_USER = config("EMAIL")
-EMAIL_HOST_PASSWORD = config("EMAIL_PASSWORD")
+EMAIL_HOST_USER = config("CSHR_EMAIL")
+EMAIL_HOST_PASSWORD = config("CSHR_EMAIL_PASSWORD")
 
 
 # import dj_database_url
diff --git a/server/views.py b/server/views.py
index a6dc9346f..72cf66125 100644
--- a/server/views.py
+++ b/server/views.py
@@ -47,7 +47,7 @@ def get(self, request):
             status_code=200,
             data={
                 "healthy": overall_health,
-                "environment": config("ENV", default="development"),
+                "environment": config("CSHR_ENV", default="development"),
                 "services": services_status
             }
         )
@@ -168,10 +168,10 @@ def _check_email(self):
         try:
             # Check if email settings are configured
             if not all([
-                settings.EMAIL_HOST,
-                settings.EMAIL_PORT,
-                settings.EMAIL_HOST_USER,
-                settings.EMAIL_HOST_PASSWORD
+                settings.CSHR_EMAIL_HOST,
+                settings.CSHR_EMAIL_PORT,
+                settings.CSHR_EMAIL_HOST_USER,
+                settings.CSHR_EMAIL_HOST_PASSWORD
             ]):
                 return {
                     "status": False,
@@ -191,7 +191,7 @@ def _check_email(self):
                 "info": {
                     "service": "Email",
                     "configured": True,
-                    "provider": settings.EMAIL_HOST.split('.')[0] if '.' in settings.EMAIL_HOST else settings.EMAIL_HOST
+                    "provider": settings.CSHR_EMAIL_HOST.split('.')[0] if '.' in settings.CSHR_EMAIL_HOST else settings.CSHR_EMAIL_HOST
                 }
             }
         except Exception as e:
diff --git a/terraform/main.tf b/terraform/main.tf
index 7e0348351..01d4da7e0 100644
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -42,16 +42,16 @@ resource "grid_deployment" "d1" {
         planetary = true
         entrypoint = ""
         env_vars = {
-            ENV=""
-            DJANGO_DEBUG=""
-            EMAIL=""
-            EMAIL_PASSWORD=""
-            EMAIL_HOST=""
-            REDIS_HOST=""
-            DJANGO_SUPERUSER_EMAIL=""
-            DJANGO_SUPERUSER_PASSWORD=""
-            SERVER_DOMAIN_NAME=format(data.grid_gateway_domain.server_domain.fqdn)
-            CLIENT_DOMAIN_NAME=format(data.grid_gateway_domain.client_domain.fqdn)
+            CSHR_ENV=""
+            CSHR_DJANGO_DEBUG=""
+            CSHR_EMAIL=""
+            CSHR_EMAIL_PASSWORD=""
+            CSHR_EMAIL_HOST=""
+            CSHR_REDIS_HOST=""
+            CSHR_DJANGO_SUPERUSER_EMAIL=""
+            CSHR_DJANGO_SUPERUSER_PASSWORD=""
+            CSHR_SERVER_DOMAIN_NAME=format(data.grid_gateway_domain.server_domain.fqdn)
+            CSHR_CLIENT_DOMAIN_NAME=format(data.grid_gateway_domain.client_domain.fqdn)
         }
     }
 }
diff --git a/terraform/main.tf.template b/terraform/main.tf.template
index 913ae9da7..2ff5bf421 100644
--- a/terraform/main.tf.template
+++ b/terraform/main.tf.template
@@ -42,15 +42,15 @@ resource "grid_deployment" "d1" {
         planetary = true
         entrypoint = "/sbin/zinit init"
         env_vars = {
-            DJANGO_DEBUG="ON"
-            EMAIL="codescalersinternship@gmail.com"
-            EMAIL_PASSWORD="ubunyyzgxeoxhnze"
-            EMAIL_HOST="smtp.gmail.com"
-            REDIS_HOST="redis://localhost:6379"
-            DJANGO_SUPERUSER_EMAIL="admin@gmail.com"
-            DJANGO_SUPERUSER_PASSWORD="0000"
-            SERVER_DOMAIN_NAME=format(data.grid_gateway_domain.server_domain.fqdn)
-            CLIENT_DOMAIN_NAME=format(data.grid_gateway_domain.client_domain.fqdn)
+            CSHR_DJANGO_DEBUG="ON"
+            CSHR_EMAIL="codescalersinternship@gmail.com"
+            CSHR_EMAIL_PASSWORD="ubunyyzgxeoxhnze"
+            CSHR_EMAIL_HOST="smtp.gmail.com"
+            CSHR_REDIS_HOST="redis://localhost:6379"
+            CSHR_DJANGO_SUPERUSER_EMAIL="admin@gmail.com"
+            CSHR_DJANGO_SUPERUSER_PASSWORD="0000"
+            CSHR_SERVER_DOMAIN_NAME=format(data.grid_gateway_domain.server_domain.fqdn)
+            CSHR_CLIENT_DOMAIN_NAME=format(data.grid_gateway_domain.client_domain.fqdn)
         }
     }
 }