fixins

im-aeo · Dec 3, 2023 · 2e6ec64 · 2e6ec64
1 parent f194459
commit 2e6ec64
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 1,074 deletions.
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
@@ -78,6 +78,5 @@ class Kernel extends AeosKernel
         'abilities' => \Laravel\Sanctum\Http\Middleware\CheckAbilities::class,
         'ability' => \Laravel\Sanctum\Http\Middleware\CheckForAnyAbility::class,
         'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
-     	'abilities' => \Laravel\Sanctum\Http\Middleware\CheckAbilities::class,
     ];
 }
diff --git a/resources/js/Components/ChatForm.vue b/resources/js/Components/ChatForm.vue
@@ -1,19 +1,7 @@
 <template>
   <div class="input-group">
-<<<<<<< HEAD
     <input id="btn-input" type="text" name="message" class="form input-sm" placeholder="Type your message here..."
       v-model="newMessage" @keyup.enter="sendMessage" />
-=======
-    <input
-      id="btn-input"
-      type="text"
-      name="message"
-      class="form input-sm"
-      placeholder="Type your message here..."
-      v-model="newMessage"
-      @keyup.enter="sendMessage"
-    />
->>>>>>> 39a8b60fc9187ffe8bbc9f31cd7ca7b112b96018
     //Button
     <span class="input-group-btn">
       <button class="btn btn-primary btn-sm" id="btn-chat" @click="sendMessage">

diff --git a/resources/js/Components/MacMini.vue b/resources/js/Components/MacMini.vue
@@ -1,60 +1,9 @@
 <template>
-<<<<<<< HEAD
-  <div v-if="links.length > 3">
-    <div class="flex flex-wrap -mb-1">
-      <template v-for="(link, key) in links">
-        <div v-if="link.url === null" :key="key"
-          class="px-4 py-3 mb-1 mr-1 text-sm leading-4 text-gray-400 border rounded" v-html="link.label"></div>
-        <Link v-else :key="k3y"
-          class="px-4 py-3 mb-1 mr-1 text-sm leading-4 border rounded hover:bg-white focus:border-indigo-500 focus:text-indigo-500"
-          :class="{ 'bg-white': link.active }" :href="link.url" v-html="link.label">
-        </Link>
-      </template>
-    </div>
-  </div>
-</template>
-
-<script lang="ts">
-import { ref, defineProps } from 'vue';
-import { Inertia } from '@inertiajs/inertia';
-import { Link } from '@inertiajs/inertia-vue3';
-
-interface Link {
-  isActive: boolean;
-  url: string | null;
-  label: string;
-  index: number;
-}
-
-export default {
-  props: {
-    links: Array as () => Link[],
-  },
-  components: {
-    Link,
-  },
-  setup(props) {
-    const links = ref(props.links);
-
-    const gotoPage = (page: Link) => {
-      if (page.url) {
-        Inertia.visit(page.url, { replace: true });
-      }
-    };
-
-    return {
-      links,
-      gotoPage,
-    };
-  },
-};
-</script>
-=======
     <div v-if="links.length > 3">
       <div class="flex flex-wrap -mb-1">
         <template v-for="(link, key) in links">
           <div v-if="link.url === null" :key="key" class="px-4 py-3 mb-1 mr-1 text-sm leading-4 text-gray-400 border rounded" v-html="link.label"></div>
-          <Link v-else :key="k3y" class="px-4 py-3 mb-1 mr-1 text-sm leading-4 border rounded hover:bg-white focus:border-indigo-500 focus:text-indigo-500" :class="{ 'bg-white': link.active }" :href="link.url" v-html="link.label"></Link>
+          <Link v-else :key="key" class="px-4 py-3 mb-1 mr-1 text-sm leading-4 border rounded hover:bg-white focus:border-indigo-500 focus:text-indigo-500" :class="{ 'bg-white': link.active }" :href="link.url" v-html="link.label"></Link>
         </template>
       </div>
     </div>
@@ -95,4 +44,3 @@ export default {
     },
   };
   </script>
->>>>>>> 39a8b60fc9187ffe8bbc9f31cd7ca7b112b96018
diff --git a/resources/js/Pages/App/Error.vue b/resources/js/Pages/App/Error.vue
@@ -1,63 +1,36 @@
 <script setup lang="ts">
-<<<<<<< HEAD
-import { defineProps, computed } from 'vue'
-=======
 import { defineProps,computed } from 'vue'
->>>>>>> 39a8b60fc9187ffe8bbc9f31cd7ca7b112b96018
 import Navbar from '@/Components/LayoutParts/Navbar.vue';
 import Sidebar from '@/Components/LayoutParts/Sidebar.vue';
 import Footer from '@/Components/LayoutParts/Footer.vue';
 import { route, current } from 'momentum-trail';
 
 defineProps<{
-<<<<<<< HEAD
-    status: number
-    adonis_error: string
-    message: string
-    icon: string
-=======
   status: number
   adonis_error: string
   message: string
   icon: string
->>>>>>> 39a8b60fc9187ffe8bbc9f31cd7ca7b112b96018
 }>()
 
 </script>
 
 <template>
-<<<<<<< HEAD
-    <Navbar />
-=======
   <Navbar/>
->>>>>>> 39a8b60fc9187ffe8bbc9f31cd7ca7b112b96018
     <Sidebar>
         <div class="cell medium-7">
-            <div class="card text-center">
+            <div class="text-center card">
                 <div class="card-body">
-<<<<<<< HEAD
-                    <i class="mb-3" :class="icon" style="font-size:80px;"></i>
-                    <h3>{{ status }}</h3>
-                    <p>{{ message }}</p>
-=======
 		<i class="mb-3" :class="icon" style="font-size:80px;"></i>
                     <h3>{{ status }}</h3>
 		    <p>{{ message }}</p>
->>>>>>> 39a8b60fc9187ffe8bbc9f31cd7ca7b112b96018
                 </div>
             </div>
             <p class="mt-2 text-muted">
                 <i>
                     {{ adonis_error }}
                 </i>
             </p>
-<<<<<<< HEAD
-        </div>
-    </Sidebar>
-    <Footer />
-=======
 	</div>
     </Sidebar>
 <Footer/>
->>>>>>> 39a8b60fc9187ffe8bbc9f31cd7ca7b112b96018
 </template>
diff --git a/resources/js/Pages/App/FeatureDisabled.vue b/resources/js/Pages/App/FeatureDisabled.vue
@@ -1,33 +1,17 @@
 <template>
-<<<<<<< HEAD
-  <Navbar />
-  <Sidebar>
-    <div class="cell medium-7">
-      <div class="card text-center">
-        <div class="card-body">
-          <i class="fas fa-exclamation-triangle text-warning mb-3" style="font-size:80px;"></i>
-          <h3>{{ props.title }}</h3>
-          <p>This feature is currently disabled.</p>
-        </div>
-      </div>
-    </div>
-  </Sidebar>
-  <Footer />
-=======
 <Navbar/>
 <Sidebar>
 <div class="cell medium-7">
-            <div class="card text-center">
+            <div class="text-center card">
                 <div class="card-body">
-                    <i class="fas fa-exclamation-triangle text-warning mb-3" style="font-size:80px;"></i>
+                    <i class="mb-3 fas fa-exclamation-triangle text-warning" style="font-size:80px;"></i>
                     <h3>{{ props.title }}</h3>
                     <p>This feature is currently disabled.</p>
                 </div>
             </div>
 </div>
 </Sidebar>
 <Footer/>
->>>>>>> 39a8b60fc9187ffe8bbc9f31cd7ca7b112b96018
 </template>
 <script setup lang="ts">
 import Navbar from '@/Components/LayoutParts/Navbar.vue';