Fix conflicts

Author: samaradel

client/src/components/Alerts.vue

@@ -0,0 +1,34 @@
+<template>
+  <v-alert
+    :density="density"
+    :text="text"
+    :title="title"
+    :type="type"
+    class="my-5 font-weight-bold"
+    :variant="variant"
+    v-bind="$attrs"
+  ></v-alert>
+</template>
+
+<script setup>
+defineProps({
+  density: {
+    type: String,
+    default: "compact",
+  },
+  text: {
+    type: String,
+    default: "Lorem ipsum dolor sit amet consectetur adipisicing elit.",
+  },
+  title: {
+    type: String,
+  },
+  type: {
+    type: String,
+  },
+  variant: {
+    type: String,
+    default: "flat",
+  },
+});
+</script>

client/src/components/Confirm.vue

@@ -1,57 +1,44 @@
 <template>
-  <v-dialog
-    v-model="dialog"
-    :max-width="options.width"
-    :style="{ zIndex: options.zIndex }"
-    @keydown.esc="cancel"
-  >
-    <v-card>
-      <v-toolbar dark :color="options.color" dense flat>
-        <v-toolbar-title class="white--text">{{ title }}</v-toolbar-title>
-      </v-toolbar>
-      <v-card-text v-show="!!message" class="pa-4">{{ message }}</v-card-text>
-      <v-card-actions class="pt-0">
-        <v-spacer></v-spacer>
-        <v-btn color="danger darken-1" text @click="agree">Yes</v-btn>
-        <v-btn color="grey" text @click="cancel">Cancel</v-btn>
-      </v-card-actions>
-    </v-card>
-  </v-dialog>
+  <v-card class="pa-2">
+    <v-card-title>{{ title }}</v-card-title>
+    <v-divider />
+    <v-card-text> {{ text }} </v-card-text>
+
+    <v-card-actions>
+      <v-spacer></v-spacer>
+
+      <BaseButton text="Cancel" @click="$emit('onClose')" variant="outlined" />
+
+      <BaseButton
+        :text="confirmText"
+        :color="color"
+        @click="$emit('confirm')"
+        :loading="loading"
+      />
+    </v-card-actions>
+  </v-card>
 </template>
 
-<script>
-export default {
-  data: () => ({
-    dialog: false,
-    resolve: null,
-    reject: null,
-    message: null,
-    title: null,
-    options: {
-      color: "primary",
-      width: 290,
-      zIndex: 999,
-    },
-  }),
-  methods: {
-    open(title, message, options) {
-      this.dialog = true;
-      this.title = title;
-      this.message = message;
-      this.options = Object.assign(this.options, options);
-      return new Promise((resolve, reject) => {
-        this.resolve = resolve;
-        this.reject = reject;
-      });
-    },
-    agree() {
-      this.resolve(true);
-      this.dialog = false;
-    },
-    cancel() {
-      this.resolve(false);
-      this.dialog = false;
-    },
+<script setup>
+import BaseButton from "@/components/Form/BaseButton.vue";
+
+defineProps({
+  title: { type: String, default: "Title here.." },
+  text: {
+    type: String,
+    default: "Text here..",
+  },
+  confirmText: {
+    type: String,
+    default: "Confirm",
+  },
+  color: {
+    type: String,
+    default: "secondary",
+  },
+  loading: {
+    type: Boolean,
+    default: false,
   },
-};
+});
 </script>

client/src/plugins/vuetify.js

@@ -40,5 +40,8 @@ export default createVuetify({
       fixedHeader: true,
       noDataText: "Results not found",
     },
+    // VContainer: {
+    //   maxWidth: "1200px",
+    // },
   },
 });

client/src/services/userService.js

@@ -79,9 +79,9 @@ export default {
     return await authClient().get(`/vm/validate/${name}`);
   },
 
-  async deployVm(name, resources, checked) {
+  async deployVm(name, resources) {
     await this.refresh_token();
-    return await authClient().post("/vm", { name, resources, public: checked });
+    return await authClient().post("/vm", { name, resources, public: true }); // FIXME
   },
 
   async deleteVm(id) {
@@ -222,7 +222,7 @@ export default {
   },
 
   // handler function of nextlaunch
-  async handleNextLaunch(){
+  async handleNextLaunch() {
     await this.getUser()
       .then((response) => {
         const { user } = response.data.data;
@@ -231,7 +231,7 @@ export default {
           localStorage.setItem("nextlaunch", "true");
         }
       })
-			.catch((response) => {
+      .catch((response) => {
         const { err } = response.response.data;
         console.log(err);
       });