From 70b6fe99a00ae7a7e199c86dd6d84bde883d1d4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mois=C3=A9s=20de=20Jes=C3=BAs=20Cort=C3=A9s=20Castellanos?=
 <96152034+notsoweb@users.noreply.github.com>
Date: Mon, 16 Dec 2024 15:55:10 -0600
Subject: [PATCH] =?UTF-8?q?UPDATE:=20Logo=20y=20versi=C3=B3n=20(#2)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/images/.gitignore                       |  2 --
 src/auth.js                                    | 13 +++++++++----
 src/components/Holos/Layout/App.vue            |  2 --
 src/components/Holos/Layout/Auth.vue           |  2 +-
 src/components/Holos/Logo.vue                  |  4 ++--
 src/components/Holos/Skeleton/Sidebar/Left.vue |  2 +-
 src/index.js                                   |  8 +++++---
 src/pages/Admin/Users/Roles.vue                |  1 -
 .../Partials/TwoFactorAuthenticationForm.vue   |  2 --
 .../Profile/Partials/UpdatePasswordForm.vue    |  1 -
 src/services/Page.js                           | 18 +++++++++++++++---
 11 files changed, 33 insertions(+), 22 deletions(-)
 delete mode 100644 public/images/.gitignore

diff --git a/public/images/.gitignore b/public/images/.gitignore
deleted file mode 100644
index c96a04f..0000000
--- a/public/images/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
\ No newline at end of file
diff --git a/src/auth.js b/src/auth.js
index e898f09..f170525 100644
--- a/src/auth.js
+++ b/src/auth.js
@@ -8,7 +8,7 @@ import { i18n, lang } from '@/lang/i18n.js';
 import router from '@Router/Auth'
 import Notify from '@Plugins/Notify'
 import TailwindScreen from '@Plugins/TailwindScreen'
-import { pagePlugin } from '@Services/Page';
+import { defineApp, pagePlugin, reloadApp } from '@Services/Page';
 
 import Auth from '@Holos/Layout/Auth.vue'
 
@@ -22,16 +22,21 @@ window.TwScreen = new TailwindScreen();
 
 async function boot() {
     try {
-        const { data } = await axios.get(import.meta.env.VITE_API_URL + '/api/routes');
-
+        const routes = await axios.get(import.meta.env.VITE_API_URL + '/api/resources/routes');
+        const app = await axios.get(import.meta.env.VITE_API_URL + '/api/resources/app');
+        
         // Iniciar rutas
-        window.Ziggy = data;
+        window.Ziggy = routes.data;
         window.route = useRoute();
+
+        defineApp(app.data);
     } catch (error) {
         console.error(error);
         alert('Failed to load routes');
     }
 
+    reloadApp();
+
     createApp(Auth)
         .use(createPinia())
         .use(i18n)
diff --git a/src/components/Holos/Layout/App.vue b/src/components/Holos/Layout/App.vue
index ea81eec..8aa64dc 100644
--- a/src/components/Holos/Layout/App.vue
+++ b/src/components/Holos/Layout/App.vue
@@ -1,7 +1,6 @@
 <script setup>
 import { onBeforeMount, onMounted } from 'vue';
 import { bootPermissions } from '@Plugins/RolePermission.js';
-import { reloadApp } from '@Services/Page';
 import useDarkMode from '@Stores/DarkMode'
 import useLeftSidebar from '@Stores/LeftSidebar'
 import useNotificationSidebar from '@Stores/NotificationSidebar'
@@ -23,7 +22,6 @@ defineProps({
 /** Ciclos */
 onBeforeMount(() => {
     bootPermissions()
-    reloadApp();
 })
 
 onMounted(()=> {
diff --git a/src/components/Holos/Layout/Auth.vue b/src/components/Holos/Layout/Auth.vue
index 5c9e21a..284a7ec 100644
--- a/src/components/Holos/Layout/Auth.vue
+++ b/src/components/Holos/Layout/Auth.vue
@@ -59,7 +59,7 @@ onMounted(() => {
           </div>
           <div>
               <span>
-                  Versión {{ APP_VERSION }}
+                APP {{ APP_VERSION }} API {{ $page.app.version }}
               </span>
           </div>
         </footer>
diff --git a/src/components/Holos/Logo.vue b/src/components/Holos/Logo.vue
index 0bf9290..82dd7bc 100644
--- a/src/components/Holos/Logo.vue
+++ b/src/components/Holos/Logo.vue
@@ -13,6 +13,6 @@ const home = () => router.push(view({ name: 'index' }));
         class="flex w-full justify-center items-center space-x-2 cursor-pointer"
         @click="home"
     >
-        <img src="/images/logo.png" class="h-20" />
+        <img :src="$page.app.logo" class="h-20" />
     </div>
-</template>
+</template>
\ No newline at end of file
diff --git a/src/components/Holos/Skeleton/Sidebar/Left.vue b/src/components/Holos/Skeleton/Sidebar/Left.vue
index bf52244..b635c4c 100644
--- a/src/components/Holos/Skeleton/Sidebar/Left.vue
+++ b/src/components/Holos/Skeleton/Sidebar/Left.vue
@@ -45,7 +45,7 @@ const year = (new Date).getFullYear();
               &copy {{year}} {{ APP_COPYRIGHT }}
             </p>
             <p class="text-center text-xs text-yellow-500 cursor-pointer">
-                V{{ APP_VERSION }}
+              APP {{ APP_VERSION }} API {{ $page.app.version }}
             </p>
           </div>
         </div>
diff --git a/src/index.js b/src/index.js
index ba88d39..64e78fc 100644
--- a/src/index.js
+++ b/src/index.js
@@ -9,9 +9,9 @@ import router from '@Router/Index'
 import Notify from '@Plugins/Notify'
 import TailwindScreen from '@Plugins/TailwindScreen'
 import { pagePlugin } from '@Services/Page';
+import { reloadApp,view } from '@Services/Page';
 
 import App from '@Layouts/AppLayout.vue'
-import { view } from '@Services/Page';
 
 // Configurar axios
 axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
@@ -24,10 +24,10 @@ window.TwScreen = new TailwindScreen();
 
 async function boot() {
     try {
-        const { data } = await axios.get(import.meta.env.VITE_API_URL + '/api/routes');
+        const routes = await axios.get(import.meta.env.VITE_API_URL + '/api/resources/routes');
 
         // Iniciar rutas
-        window.Ziggy = data;
+        window.Ziggy = routes.data;
         window.route = useRoute();
         window.view = view;
     } catch (error) {
@@ -39,6 +39,8 @@ async function boot() {
         await import('@Services/Broadcast')
     }
 
+    reloadApp();
+
     createApp(App)
         .use(createPinia())
         .use(i18n)
diff --git a/src/pages/Admin/Users/Roles.vue b/src/pages/Admin/Users/Roles.vue
index 93ca8a8..3fc9da4 100644
--- a/src/pages/Admin/Users/Roles.vue
+++ b/src/pages/Admin/Users/Roles.vue
@@ -36,7 +36,6 @@ onMounted(() => {
 
     api.get(apiTo('roles', { user: props.userId }), {
         onSuccess: (r) => {
-            console.log(r);
             form.roles = r.roles
         }
     });
diff --git a/src/pages/Profile/Partials/TwoFactorAuthenticationForm.vue b/src/pages/Profile/Partials/TwoFactorAuthenticationForm.vue
index efddfa8..6eeedeb 100644
--- a/src/pages/Profile/Partials/TwoFactorAuthenticationForm.vue
+++ b/src/pages/Profile/Partials/TwoFactorAuthenticationForm.vue
@@ -41,8 +41,6 @@ watch(twoFactorEnabled, () => {
 const enableTwoFactorAuthentication = () => {
     enabling.value = true;
 
-    console.log('enabling ...');
-
     api.post(route('two-factor.enable'), {
         onSuccess: () => Promise.all([
             showQrCode(),
diff --git a/src/pages/Profile/Partials/UpdatePasswordForm.vue b/src/pages/Profile/Partials/UpdatePasswordForm.vue
index 7885725..f763818 100644
--- a/src/pages/Profile/Partials/UpdatePasswordForm.vue
+++ b/src/pages/Profile/Partials/UpdatePasswordForm.vue
@@ -22,7 +22,6 @@ const updatePassword = () => {
             Notify.success(Lang('account.password.updated'));
         },
         onError: (e) => {
-            console.log(e);
             if (form.errors.password) {
                 form.reset('password', 'password_confirmation');
                 passwordInput.value.focus();
diff --git a/src/services/Page.js b/src/services/Page.js
index b738cab..0097752 100644
--- a/src/services/Page.js
+++ b/src/services/Page.js
@@ -10,6 +10,7 @@ import { resetPermissions } from '@Plugins/RolePermission';
  */
 const page = reactive({
     lang: 'es',
+    app: {},
     user: {
         id: 0,
         name: 'public'
@@ -21,10 +22,15 @@ const page = reactive({
  */
 const reloadApp = () => {
     const user = localStorage.user
+    const app = localStorage.app
 
     if(user) {
         page.user = JSON.parse(user);
     }
+
+    if(app) {
+        page.app = JSON.parse(app);
+    }
 }
 
 /**
@@ -62,6 +68,13 @@ const defineUser = (user) => {
     });
 }
 
+/**
+ * Definir datos de la aplicación
+ */
+const defineApp = (app) => {
+    localStorage.app = JSON.stringify(app);
+}
+
 /**
  * Instalar el componente de forma nativa
  */
@@ -76,8 +89,6 @@ const pagePlugin = {
  * Reload user
  */
 const reloadUser = () => {
-    console.log('reloadUser')
-
     return api.get(route('user.show'), {
         onSuccess: (r) => {
             defineUser(r.user)
@@ -107,10 +118,11 @@ const logout = () => {
 export {
     pagePlugin,
     page,
+    defineApp,
+    defineUser,
     reloadApp,
     reloadUser,
     resetPage,
-    defineUser,
     logout,
     view
 }
\ No newline at end of file