diff --git a/.env.dev b/.env.dev index 5702020..eb6bd0f 100644 --- a/.env.dev +++ b/.env.dev @@ -1,6 +1,6 @@ VITE_DOMAIN = https://192.168.0.251:5173/ # VITE_LOGIN_URL = http://localhost:10325/ms/ -# VITE_FILE_URL = http://localhost:10325/ms/ +VITE_SERVER = httpS://192.168.0.251:10325/ VITE_API_URL = https://192.168.0.251:10325/api/ VITE_TEST_URL = https://192.168.0.251:10325/test/ VITE_KAKAO_MAP_KEY=6f092e8f45ee81186bb6d8408f66a492 \ No newline at end of file diff --git a/.env.mine b/.env.mine index 6f5a98c..07aa984 100644 --- a/.env.mine +++ b/.env.mine @@ -1,6 +1,6 @@ VITE_DOMAIN = http://localhost:5173/ # VITE_LOGIN_URL = http://localhost:10325/ms/ -# VITE_FILE_URL = http://localhost:10325/ms/ +VITE_SERVER = http://localhost:10325/ VITE_API_URL = http://localhost:10325/api/ VITE_TEST_URL = http://localhost:10325/test/ VITE_KAKAO_MAP_KEY=6f092e8f45ee81186bb6d8408f66a492 \ No newline at end of file diff --git a/public/js/main.js b/public/js/main.js index c118e86..047566f 100644 --- a/public/js/main.js +++ b/public/js/main.js @@ -7,12 +7,6 @@ //----------------- let menu, animate; -<<<<<<< HEAD -var menu, animate; -(function () { - // Initialize menu - //----------------- -======= let layoutMenuEl = document.querySelectorAll('#layout-menu'); layoutMenuEl.forEach(function (element) { menu = new Menu(element, { @@ -23,7 +17,6 @@ var menu, animate; window.Helpers.scrollToActive((animate = false)); window.Helpers.mainMenu = menu; }); ->>>>>>> board-comment // Initialize menu togglers and bind click on each let menuToggler = document.querySelectorAll('.layout-menu-toggle'); diff --git a/src/layouts/NormalLayout.vue b/src/layouts/NormalLayout.vue index 0277f84..08cef90 100644 --- a/src/layouts/NormalLayout.vue +++ b/src/layouts/NormalLayout.vue @@ -32,17 +32,17 @@ window.isDarkStyle = window.Helpers.isDarkStyle(); -const loadScript = src => { - const script = document.createElement('script'); - script.src = src; - script.type = 'text/javascript'; - script.async = true; - document.body.appendChild(script); -}; -nextTick(async () => { - await wait(200); - loadScript('/vendor/js/menu.js'); - // loadScript('/js/main.js'); -}); + const loadScript = src => { + const script = document.createElement('script'); + script.src = src; + script.type = 'text/javascript'; + script.async = true; + document.body.appendChild(script); + }; + nextTick(async () => { + await wait(200); + loadScript('/vendor/js/menu.js'); + loadScript('/js/main.js'); + }); diff --git a/src/layouts/TheTop.vue b/src/layouts/TheTop.vue index 9bd7296..ada3701 100644 --- a/src/layouts/TheTop.vue +++ b/src/layouts/TheTop.vue @@ -241,7 +241,7 @@ const user = ref(null); //const baseUrl = $api.defaults.baseURL.replace(/api\/$/, ''); - const baseUrl = import.meta.env.BASE_URL; + const baseUrl = import.meta.env.VITE_SERVER; const authStore = useAuthStore(); const userStore = useUserInfoStore();