Update button

ospic · Sep 11, 2024 · 43dfcd3 · 43dfcd3
1 parent 344b018
commit 43dfcd3
Show file tree

Hide file tree

Showing 8 changed files with 71 additions and 60 deletions.
diff --git a/assets/css/_btn.scss b/assets/css/_btn.scss
@@ -1,34 +1,32 @@
-button {
-  &.button {
-    background-color: $button_color;
+.button {
+  background-color: $button_color;
+  span {
+    color: $color_white;
+    font-weight: normal;
+    font-size: small;
+  }
+  &.cancel {
     span {
-      color: $color_white;
-      font-weight: normal;
-      font-size: small;
-    }
-    &.cancel {
-      span {
-        color: white;
-      }
-      background-color: $color_cream !important;
-    }
-    &.upload {
-      background-color: $color_teal !important;
-    }
-    &.warning {
-      background-color: $color_warning !important;
-      span.v-btn__content {
-        color: $color_white !important;
-      }
-    }
-    &.delete {
-      background-color: red !important;
-    }
-    &.error {
-      background-color: $color_error !important;
+      color: white;
     }
-    i {
-      font-weight: bold;
+    background-color: $color_cream !important;
+  }
+  &.upload {
+    background-color: $color_teal !important;
+  }
+  &.warning {
+    background-color: $color_warning !important;
+    span.v-btn__content {
+      color: $color_white !important;
     }
   }
+  &.delete {
+    background-color: red !important;
+  }
+  &.error {
+    background-color: $color_error !important;
+  }
+  i {
+    font-weight: bold;
+  }
 }
diff --git a/assets/css/_colors.scss b/assets/css/_colors.scss
@@ -1,4 +1,4 @@
-$color_primary: #2f4454 !global;
+$color_primary: #2f4454;
 $color_accent: #000000;
 $color_secondary: #ffffff;
 $color_success: #4caf50;
@@ -10,10 +10,11 @@ $color_milky: #fdfff5;
 $color_teal: #00897b;
 $color_whitish: #f5f5f5;
 $color_dlue: #303edb;
-$color_white: #ffffff !global;
+$color_white: #ffffff;
 $button_color: #2cb673;
 $color_cream: #c67f43;
 
+$button_color: #24a0ed;
 $color_drygreen: #2cb673;
 
 @mixin whitecolor {

diff --git a/assets/css/styles.css b/assets/css/styles.css
@@ -1839,36 +1839,36 @@ th span {
   overflow: hidden;
 }
 
-button.button {
-  background-color: #2cb673;
+.button {
+  background-color: #24a0ed;
 }
-button.button span {
+.button span {
   color: #ffffff;
   font-weight: normal;
   font-size: small;
 }
-button.button.cancel {
+.button.cancel {
   background-color: #c67f43 !important;
 }
-button.button.cancel span {
+.button.cancel span {
   color: white;
 }
-button.button.upload {
+.button.upload {
   background-color: #00897b !important;
 }
-button.button.warning {
+.button.warning {
   background-color: #fb8c00 !important;
 }
-button.button.warning span.v-btn__content {
+.button.warning span.v-btn__content {
   color: #ffffff !important;
 }
-button.button.delete {
+.button.delete {
   background-color: red !important;
 }
-button.button.error {
+.button.error {
   background-color: #ff0000 !important;
 }
-button.button i {
+.button i {
   font-weight: bold;
 }
 

diff --git a/assets/css/styles.css.map b/assets/css/styles.css.map
diff --git a/assets/css/styles.scss b/assets/css/styles.scss
@@ -1,7 +1,7 @@
+@import "_colors";
 @import "_fonts";
 @import "_mixin";
 @import "_body";
-@import "_colors";
 @import "_breadcrumb";
 @import "_cards";
 @import "_theme";

diff --git a/components/patients/PatientListing.vue b/components/patients/PatientListing.vue
@@ -15,23 +15,35 @@
       @update:page="updatePagination"
     >
       <template v-slot:top>
-        <v-toolbar flat class="primary" dark>
+        <v-toolbar flat color="primary">
           <v-spacer></v-spacer>
-          <v-text-field
-            v-model="search"
-            append-icon="search"
-            label="Enter search text ..."
-            single-line
-            hide-details
-            rounded
-            filled
-            height="40"
-          ></v-text-field
-          >&nbsp;&nbsp;
+          <v-col cols="12" md="3">
+            <v-text-field
+              v-model="search"
+              prepend-inner-icon="mdi-magnify"
+              label="Search group by name, id"
+              single-line
+              hide-details
+              outlined
+              filled
+              rounded
+              height="40"
+              dense
+              class="search mr-2"
+              clearable
+              autocomplete="off"
+              light
+            ></v-text-field>
+          </v-col>
 
           <div v-if="hasPermission('ALL_FUNCTIONS', 'CREATE_PATIENT')">
-            <v-btn x-large v-if="isMdAndUp" class="button" to="/patients/add"
-              ><v-icon>mdi-plus</v-icon
+            <v-btn
+              rounded
+              v-if="isMdAndUp"
+              class="button"
+              color="button"
+              to="/patients/add"
+              ><v-icon left>mdi-plus</v-icon
               >{{ $t("label.button.btnnewpatient") }}</v-btn
             >
             <v-btn fab v-else class="button" to="/patients/add"

diff --git a/nuxt.config.js b/nuxt.config.js
@@ -21,7 +21,7 @@ export default {
 
   env: {
     baseUrl: 'http://159.203.183.129:8080/api/',
-    localUrl: 'http://localhost:8080/api/'
+    localUrl: 'http://192.168.1.45:8080/api/'
   },
 
   // Global page headers (https://go.nuxtjs.dev/config-head)

diff --git a/plugins/vuetify.js b/plugins/vuetify.js
@@ -35,7 +35,7 @@ export default (ctx) => {
           teal: "#00897B",
           whitish: "F5F5F5",
           dlue: "#1520A6",
-          button: "#02532b"
+          button: "#24a0ed"
         }
 
       },