scss formatting

api/src/policies/users-policy.ts

@@ -58,6 +58,10 @@ export class UsersPolicy extends PolicyFactory(User) {
       "displayName",
     ]
 
+    if (this.user.isSystemAdmin) {
+      attributes.push("roles")
+    }
+
     return attributes
   }
 

web/package-lock.json

@@ -26,10 +26,10 @@
         "qs": "^6.14.0",
         "validator": "^13.15.26",
         "vue": "^3.4.21",
-        "vue-draggable-next": "^2.3.0",
         "vue-i18n": "^11.3.0",
         "vue-router": "^4.6.4",
         "vue-scrollto": "^2.20.0",
+        "vuedraggable": "^4.1.0",
         "vuetify": "^3.11.4"
       },
       "devDependencies": {
@@ -5171,11 +5171,10 @@
       "license": "ISC"
     },
     "node_modules/sortablejs": {
-      "version": "1.15.7",
+      "version": "1.14.0",
-      "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.7.tgz",
+      "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.14.0.tgz",
-      "integrity": "sha512-Kk8wLQPlS+yi1ZEf48a4+fzHa4yxjC30M/Sr2AnQu+f/MPwvvX9XjZ6OWejiz8crBsLwSq8GHqaxaET7u6ux0A==",
+      "integrity": "sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w==",
-      "license": "MIT",
+      "license": "MIT"
-      "peer": true
     },
     "node_modules/source-map-js": {
       "version": "1.2.1",
@@ -5739,16 +5738,6 @@
         }
       }
     },
-    "node_modules/vue-draggable-next": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/vue-draggable-next/-/vue-draggable-next-2.3.0.tgz",
-      "integrity": "sha512-ymbY0UIwfSdg0iDN/iyNNwUrTqZ/6KbPryzsvTNXBLuDCuOBdNijSK8yynNtmiSj6RapTPQfjLGQdJrZkzBd2w==",
-      "license": "MIT",
-      "peerDependencies": {
-        "sortablejs": "^1.14.0",
-        "vue": "^3.5.17"
-      }
-    },
     "node_modules/vue-eslint-parser": {
       "version": "9.4.3",
       "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.4.3.tgz",
@@ -5836,6 +5825,18 @@
         "typescript": ">=5.0.0"
       }
     },
+    "node_modules/vuedraggable": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-4.1.0.tgz",
+      "integrity": "sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==",
+      "license": "MIT",
+      "dependencies": {
+        "sortablejs": "1.14.0"
+      },
+      "peerDependencies": {
+        "vue": "^3.0.1"
+      }
+    },
     "node_modules/vuetify": {
       "version": "3.12.8",
       "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-3.12.8.tgz",

web/package.json

@@ -30,10 +30,10 @@
     "qs": "^6.14.0",
     "validator": "^13.15.26",
     "vue": "^3.4.21",
-    "vue-draggable-next": "^2.3.0",
     "vue-i18n": "^11.3.0",
     "vue-router": "^4.6.4",
     "vue-scrollto": "^2.20.0",
+    "vuedraggable": "^4.1.0",
     "vuetify": "^3.11.4"
   },
   "devDependencies": {

web/src/components/common/AppLogo.vue

@@ -13,7 +13,6 @@
       <div
         v-else
         class="d-flex"
-        style="width: 200px"
       >
         <h1
           class="mt-1 ml-3"

web/src/scss/_override.scss

@@ -18,13 +18,10 @@ html {
   }
 
   .bg-secondary-gradient {
-        background: linear-gradient(287deg, rgb(var(--v-theme-primary)) .54%, #1bcaff 100.84%);
+    background: linear-gradient(287deg, rgb(var(--v-theme-primary)) 0.54%, #1bcaff 100.84%);
   }
 }
 
-
-
-
 .border,
 .v-divider {
   border-color: rgba(var(--v-border-color)) !important;
@@ -69,7 +66,6 @@ html {
   line-height: 0 !important;
 }
 
-
 .lh-28 {
   line-height: 28px !important;
 }
@@ -80,7 +76,6 @@ html {
 
 .space-p-96 {
   padding: 96px 0 !important;
-
 }
 
 .ps-96 {
@@ -107,22 +102,21 @@ html {
   height: calc(-500px + 100vh);
 }
 
-@media screen and (max-width:991px) {
+@media screen and (max-width: 991px) {
   .overflow-x-reposive {
     overflow-x: scroll;
     overflow-y: hidden;
   }
 
   .border-m-none {
-        border: 0 !important
+    border: 0 !important;
   }
 }
 
-@media screen and (max-height:767px) {
+@media screen and (max-height: 767px) {
   .msg-chat-height {
     height: calc(-315px + 100vh);
   }
-
 }
 
 .max-h-600 {
@@ -130,13 +124,12 @@ html {
   height: calc(100vh - 100px);
 }
 
-
 .custom-hover-primary {
   .iconify {
     color: rgb(255, 255, 255) !important;
 
-        @media screen and (max-width:991px) {
+    @media screen and (max-width: 991px) {
-            color: rgba(var(--v-theme-textPrimary), 0.8) !important
+      color: rgba(var(--v-theme-textPrimary), 0.8) !important;
     }
   }
 
@@ -144,8 +137,8 @@ html {
     background-color: rgba(var(--v-theme-lightprimary), 0.1);
 
     .iconify {
-            @media screen and (max-width:991px) {
+      @media screen and (max-width: 991px) {
-                color: rgb(var(--v-theme-primary)) !important
+        color: rgb(var(--v-theme-primary)) !important;
       }
     }
   }
@@ -153,18 +146,14 @@ html {
 .custom-hover-primary-white {
   .iconify {
     color: rgb(255, 255, 255) !important;
-
-       
   }
 
   &:hover {
     background-color: rgba(var(--v-theme-lightprimary), 0.1);
-
   }
 }
 
 .no-icon {
-
   .v-input__prepend,
   .v-input__append {
     display: none !important;
@@ -181,7 +170,6 @@ html {
       height: 6px !important;
       width: 6px !important;
     }
-
   }
 }
 

web/src/scss/layout/_dark.scss

@@ -1,40 +1,41 @@
 // theme : dark
-div[class*='v-theme--DARK_'] {
+div[class*="v-theme--DARK_"] {
   .smallCap {
     color: rgb(var(--v-theme-textSecondary));
   }
 
   .elevation-10 {
-        box-shadow: rgb(145 158 171 / 30%) 0px 0px 2px 0px, rgb(145 158 171 / 2%) 0px 12px 24px -4px !important;
+    box-shadow:
+      rgb(145 158 171 / 30%) 0px 0px 2px 0px,
+      rgb(145 158 171 / 2%) 0px 12px 24px -4px !important;
   }
-    .v-field__outline{
+  .v-field__outline {
     --v-field-border-opacity: 0.38 !important;
   }
 
-    .front-wraper{
+  .front-wraper {
-        .bg-background{
+    .bg-background {
       background-color: rgb(var(--v-theme-hoverColor)) !important;
     }
 
-        .front-dark{
+    .front-dark {
-            &.bg-textPrimary{
+      &.bg-textPrimary {
         background-color: rgb(var(--v-theme-surface)) !important;
       }
     }
-        .bg-textPrimary{
+    .bg-textPrimary {
       background-color: rgb(var(--v-theme-textSecondary)) !important;
     }
   }
 
-
   #vector-map .dxm-layers path {
-        fill: #7C8FAC !important;
+    fill: #7c8fac !important;
   }
 
   .svgMap-map-wrapper {
     .svgMap-country {
       stroke: #878585;
-            fill: #1A2537 !important;
+      fill: #1a2537 !important;
 
       &#svgMap-map-country-IN {
         fill: rgb(var(--v-theme-secondary)) !important;
@@ -52,30 +53,29 @@ div[class*='v-theme--DARK_'] {
     .svgMap-map-controls-zoom {
       background: #c9d6de !important;
     }
-        .svgMap-control-button{
+    .svgMap-control-button {
       background-color: rgb(var(--v-theme-textSecondary)) !important;
     }
-
   }
-    .dark-card-title{
+  .dark-card-title {
-        color:rgb(var(--v-theme-surface));
+    color: rgb(var(--v-theme-surface));
   }
 
-    .fc{
+  .fc {
     .fc-button-primary:not(:disabled).fc-button-active {
       background-color: rgb(var(--v-theme-grey100));
     }
     .fc-button-group {
-            >.fc-button {
+      > .fc-button {
-                &:hover,&:focus{
+        &:hover,
+        &:focus {
           background-color: rgba(var(--v-theme-grey100));
           color: #fff;
-                    .fc-icon{
+          .fc-icon {
             color: #fff;
           }
         }
       }
     }
   }
-
 }

web/src/scss/layout/_horizontal.scss

@@ -22,7 +22,6 @@
       padding: 0 8px !important;
     }
   }
-
 }
 
 .ddMenu {
@@ -67,7 +66,6 @@
   }
 }
 
-
 .horizontalMenu {
   .v-toolbar__content {
     max-width: 1270px;
@@ -82,7 +80,6 @@
       color: rgba(255, 255, 255);
     }
   }
-
 }
 
 .mobile-menu {
@@ -153,9 +150,7 @@
           .dot {
             background-color: rgb(var(--v-theme-secondary)) !important;
           }
-
         }
-
       }
     }
 
@@ -168,7 +163,6 @@
         }
       }
 
-
       .ddMenu {
         .navItem {
           .navcollapse {
@@ -178,8 +172,6 @@
           }
         }
       }
-
-
     }
 
     .ddMenu {
@@ -205,17 +197,16 @@
     }
 
     .navItem:hover {
-
+      > .ddMenu {
-            >.ddMenu {
         display: block;
       }
     }
 
-        >li:hover {
+    > li:hover {
       background-color: rgb(var(--v-theme-lightprimary));
       border-radius: 9999px;
 
-            >.navItemLink {
+      > .navItemLink {
         color: rgb(var(--v-theme-secondary));
         opacity: 1;
       }

web/src/scss/layout/_sidebar.scss

@@ -2,7 +2,9 @@
 
 /*This is for the logo*/
 .leftSidebar {
-    box-shadow: 0 3px 4px 0 rgba(0, 0, 0, .03), 0 0 1px 0 rgba(0, 0, 0, .1);
+  box-shadow:
+    0 3px 4px 0 rgba(0, 0, 0, 0.03),
+    0 0 1px 0 rgba(0, 0, 0, 0.1);
 
   .logo {
     padding-left: 7px;
@@ -41,7 +43,7 @@
   .logo {
     width: 250px;
 
-        @media screen and (max-width:1024px) {
+    @media screen and (max-width: 1024px) {
       width: auto;
     }
   }
@@ -69,8 +71,6 @@
     }
   }
 
-
-
   /*General Menu css*/
   .v-list-group__items .v-list-item,
   .v-list-item {
@@ -79,15 +79,10 @@
 
     margin: 0 0 2px;
 
-
-
     &:hover {
       color: rgb(var(--v-theme-secondary));
-
     }
 
-
-
     .v-list-item__prepend {
       margin-inline-end: 13px;
     }
@@ -136,7 +131,6 @@
           background-color: rgb(var(--v-theme-secondary));
         }
       }
-
     }
   }
 
@@ -144,23 +138,23 @@
   .v-list {
     color: rgb(var(--v-theme-textPrimary));
 
-        >.v-list-item.v-list-item--active,
+    > .v-list-item.v-list-item--active,
-        .v-list-item--active>.v-list-item__overlay {
+    .v-list-item--active > .v-list-item__overlay {
       background: rgb(var(--v-theme-secondary));
       color: white;
     }
 
-        >.v-list-group {
+    > .v-list-group {
       position: relative;
 
-            >.v-list-item--active,
+      > .v-list-item--active,
-            >.v-list-item--active:hover {
+      > .v-list-item--active:hover {
         background: rgb(var(--v-theme-secondary));
         color: white;
       }
 
       .v-list-group__items .v-list-item.v-list-item--active,
-            .v-list-group__items .v-list-item.v-list-item--active>.v-list-item__overlay {
+      .v-list-group__items .v-list-item.v-list-item--active > .v-list-item__overlay {
         background: transparent;
         color: rgb(var(--v-theme-secondary));
       }
@@ -169,7 +163,6 @@
 }
 
 .v-navigation-drawer--rail {
-
   .scrollnavbar .v-list .v-list-group__items,
   .hide-menu {
     opacity: 1;
@@ -265,7 +258,7 @@
       .v-list-group__items {
         .v-list-item {
           .v-list-item__prepend .dot {
-                        opacity:0;
+            opacity: 0;
           }
         }
       }
@@ -301,7 +294,6 @@
         }
       }
     }
-
   }
 }
 

web/src/scss/pages/_apps.scss

@@ -12,7 +12,7 @@
 //Full Calendar
 .fc {
   .fc-button-group {
-		>.fc-button {
+    > .fc-button {
       display: flex;
       align-items: center;
       padding: 7px 10px;
@@ -20,38 +20,39 @@
       font-size: 14px;
       background-color: rgba(var(--v-theme-grey200));
       color: rgba(var(--v-theme-textPrimary));
-			.fc-icon{
+      .fc-icon {
         color: rgba(var(--v-theme-textPrimary));
         font-size: 20px;
       }
-			&:hover,&:focus{
+      &:hover,
+      &:focus {
         background-color: rgba(var(--v-theme-textPrimary));
         color: #fff;
-				.fc-icon{
+        .fc-icon {
           color: #fff;
         }
       }
     }
-		.fc-button-primary:not(:disabled):active{
+    .fc-button-primary:not(:disabled):active {
       background-color: rgba(var(--v-theme-textPrimary));
     }
     .fc-button-primary:not(:disabled).fc-button-active {
       background-color: rgb(var(--v-theme-textPrimary));
     }
   }
-	.fc-today-button{
+  .fc-today-button {
     padding: 7px 20px;
     border: 0;
     background-color: rgba(var(--v-theme-primary));
   }
 
-	.fc-prev-button{
+  .fc-prev-button {
     border-radius: 30px 0 0 30px;
   }
-	.fc-toolbar-title{
+  .fc-toolbar-title {
     font-weight: 600;
   }
-	.fc-event-title{
+  .fc-event-title {
     font-size: 14px;
     padding: 3px 6px;
   }
@@ -66,7 +67,7 @@
       vertical-align: unset;
     }
   }
-	.fc-daygrid-day-number{
+  .fc-daygrid-day-number {
     color: rgba(var(--v-theme-textSecondary));
     font-size: 15px;
   }
@@ -115,7 +116,7 @@
     font-size: 14px;
     font-weight: 600;
   }
-	.fc-button-primary:not(:disabled).fc-button-active{
+  .fc-button-primary:not(:disabled).fc-button-active {
     background-color: rgb(var(--v-theme-textPrimary));
   }
 }
@@ -147,7 +148,7 @@
 
 .fc-direction-ltr {
   .fc-button-group {
-		>.fc-button {
+    > .fc-button {
       &:not(:last-child) {
         border-bottom-left-radius: 30px;
         border-top-left-radius: 30px;
@@ -186,7 +187,7 @@
   font-size: 14px;
 }
 
-@media screen and (max-width:600px) {
+@media screen and (max-width: 600px) {
   .fc {
     .fc-toolbar {
       display: block;
@@ -229,7 +230,6 @@
     .email-title {
       color: rgb(var(--v-theme-primary)) !important;
     }
-
   }
 }
 

web/src/scss/theme/_themeColors.scss

@@ -34,7 +34,7 @@
   --v-theme-lightsecondary: 239, 249, 255;
 }
 
-.v-theme--DARK_AQUA_THEME{
+.v-theme--DARK_AQUA_THEME {
   --v-theme-primary: 0, 116, 186;
   --v-theme-secondary: 71, 215, 188;
 }