Merge remote-tracking branch 'origin/main'

inikoo · Oct 6, 2023 · 383af5a · 383af5a
2 parents 2968f23 + ae771ca
commit 383af5a
Show file tree

Hide file tree

Showing 17 changed files with 20 additions and 585 deletions.
diff --git a/database/seeders/uploads/production/customers.xlsx:Zone.Identifier b/database/seeders/uploads/production/customers.xlsx:Zone.Identifier
@@ -0,0 +1,3 @@
+[ZoneTransfer]
+ZoneId=3
+HostUrl=https://files.slack.com/files-pri/TDQRD1S4Q-F05V8PWUSTV/download/customers.xlsx?origin_team=T052U0J3CHL
diff --git a/database/seeders/uploads/production/employees.xlsx:Zone.Identifier b/database/seeders/uploads/production/employees.xlsx:Zone.Identifier
@@ -0,0 +1,3 @@
+[ZoneTransfer]
+ZoneId=3
+HostUrl=https://files.slack.com/files-pri/TDQRD1S4Q-F05V8SSP2KU/download/employees.xlsx?origin_team=T052U0J3CHL
diff --git a/database/seeders/uploads/production/products.xlsx:Zone.Identifier b/database/seeders/uploads/production/products.xlsx:Zone.Identifier
@@ -0,0 +1,3 @@
+[ZoneTransfer]
+ZoneId=3
+HostUrl=https://files.slack.com/files-pri/TDQRD1S4Q-F05V27WRPHU/download/products.xlsx?origin_team=T052U0J3CHL
diff --git a/resources/js/Layouts/GuestLayout.vue b/resources/js/Layouts/GuestLayout.vue
@@ -8,7 +8,6 @@
 import { useLayoutStore } from '@/Stores/layout'
 import { usePage } from '@inertiajs/vue3'
 import { loadLanguageAsync } from 'laravel-vue-i18n'
-import { watchEffect } from 'vue'
 import Image from '@/Components/Image.vue'
 
 const layout = useLayoutStore()

diff --git a/resources/js/Layouts/Public.vue b/resources/js/Layouts/Public.vue
@@ -5,52 +5,18 @@
   -->
 
 <script setup>
-import { usePage } from '@inertiajs/vue3'
-import { ref, computed } from 'vue'
 
 
 
-import HeaderThemeOne from '@/Components/Header/Public/HeaderThemeOne.vue'
-import MenuOne from '@/Components/Menu/Public/MenuOne.vue'
-import MenuTwo from '@/Components/Menu/Public/MenuTwo.vue'
-import FooterOne from '@/Components/Public/Footer/FooterOne.vue'
-import FooterThemeTwo from '@/Components/Footer/Public/FooterThemeTwo.vue'
 
-const isTabActive = ref(false)
+
+
 
 const props = defineProps([
     'layout',
     'structure'
 ])
-console.log(props.structure.footer)
-
-// const footerLogo = usePage().props.art.footer_logo
-
-const getHeaderComponent = computed(() => {
-    const componentList = {
-        'simpleSticky': HeaderThemeOne
-    }
-
-    return componentList[props.structure.header.type]
-})
 
-// const getMenuComponent = computed(() => {
-//     const componentList = {
-//         'simple': MenuOne,
-//         'MenuTwo': MenuTwo
-//     }
-
-//     return componentList[props.layout?.menu?.component ?? 'MenuTwo']
-// })
-
-const getFooterComponent = computed(() => {
-    const componentList = {
-        'simple': FooterOne,
-        'FooterThemeTwo': FooterThemeTwo,
-    }
-
-    return componentList[props.structure?.footer?.type ?? 'simple']
-})
 
 
 </script>
@@ -60,17 +26,12 @@ const getFooterComponent = computed(() => {
         <section class="relative isolate overflow-hidden bg-gray-100"
             :class="[structure.layout.layout !== 'center' ? 'mx-auto max-w-5xl' : '']"
         >
-            <!-- Header -->
-            <!-- <pre>{{ structure }}</pre> -->
-            <component :is="getHeaderComponent" :data="structure.header"></component>
-
-            <!-- Menu -->
-            <!-- <component :is="getMenuComponent" :data="structure.header.menu"></component> -->
-
+
+
             <slot />
 
-            <!-- Footer -->
-            <component :is="getFooterComponent" :dataFooter="structure.footer" :dataLayout="structure.layout" />
+
+
         </section>
     </div>
 

diff --git a/resources/js/Pages/Public/CreateModel.vue b/resources/js/Pages/Public/CreateModel.vue
diff --git a/resources/js/Pages/Public/Dashboard.vue b/resources/js/Pages/Public/Dashboard.vue
diff --git a/resources/js/Pages/Public/EditModel.vue b/resources/js/Pages/Public/EditModel.vue
diff --git a/resources/js/Pages/Public/Home.vue b/resources/js/Pages/Public/Home.vue
@@ -6,13 +6,14 @@
 <script setup lang="ts">
 
 const props = defineProps<{
-    blocks: []
+    content: object
 }>()
 
-
+console.log(props.content)
 </script>
 
 <template layout="Public">
-     <Head title="Home"/>
-    hi
+     <div v-html="content.pagesHtml[0].html"></div>
+     <div v-html="content.pagesHtml[0].html"></div>
+     <div v-html="content.pagesHtml[0].html"></div>
 </template>
diff --git a/resources/js/Pages/Public/PageComponents/Accordeon.vue b/resources/js/Pages/Public/PageComponents/Accordeon.vue
diff --git a/resources/js/Pages/Public/PageComponents/Banner.vue b/resources/js/Pages/Public/PageComponents/Banner.vue
diff --git a/resources/js/Pages/Public/PageComponents/Collection.vue b/resources/js/Pages/Public/PageComponents/Collection.vue