From eaec1b3449539f249d608dbc10cf0bd013340876 Mon Sep 17 00:00:00 2001
From: Dominik George <dominik.george@teckids.org>
Date: Mon, 18 Jul 2022 12:08:13 +0200
Subject: [PATCH] Restructure Vue app directory
---
assets/{js/vue => }/app.js | 8 ++++----
.../components/core => components}/CacheNotification.js | 0
.../vue/components/core => components}/LanguageForm.js | 0
.../{js/vue/components/core => components}/MessageBox.js | 0
.../vue/components/core => components}/SidenavSearch.js | 0
assets/index.js | 4 ++++
assets/js/index.js | 4 ----
assets/{js/vue/main_vue.js => util.js} | 0
webpack.config.js | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
rename assets/{js/vue => }/app.js (91%)
rename assets/{js/vue/components/core => components}/CacheNotification.js (100%)
rename assets/{js/vue/components/core => components}/LanguageForm.js (100%)
rename assets/{js/vue/components/core => components}/MessageBox.js (100%)
rename assets/{js/vue/components/core => components}/SidenavSearch.js (100%)
create mode 100644 assets/index.js
delete mode 100644 assets/js/index.js
rename assets/{js/vue/main_vue.js => util.js} (100%)
diff --git a/assets/js/vue/app.js b/assets/app.js
similarity index 91%
rename from assets/js/vue/app.js
rename to assets/app.js
index ca27cd1cc..d2cf5224d 100644
--- a/assets/js/vue/app.js
+++ b/assets/app.js
@@ -52,10 +52,10 @@ const apolloClient = new ApolloClient({
})
-import CacheNotification from "./components/core/CacheNotification.js";
-import LanguageForm from "./components/core/LanguageForm.js";
-import MessageBox from "./components/core/MessageBox.js";
-import SidenavSearch from "./components/core/SidenavSearch.js";
+import CacheNotification from "./components/CacheNotification";
+import LanguageForm from "./components/LanguageForm";
+import MessageBox from "./components/MessageBox";
+import SidenavSearch from "./components/SidenavSearch";
Vue.component(MessageBox.name, MessageBox); // Load MessageBox globally as other components depend on it
diff --git a/assets/js/vue/components/core/CacheNotification.js b/assets/components/CacheNotification.js
similarity index 100%
rename from assets/js/vue/components/core/CacheNotification.js
rename to assets/components/CacheNotification.js
diff --git a/assets/js/vue/components/core/LanguageForm.js b/assets/components/LanguageForm.js
similarity index 100%
rename from assets/js/vue/components/core/LanguageForm.js
rename to assets/components/LanguageForm.js
diff --git a/assets/js/vue/components/core/MessageBox.js b/assets/components/MessageBox.js
similarity index 100%
rename from assets/js/vue/components/core/MessageBox.js
rename to assets/components/MessageBox.js
diff --git a/assets/js/vue/components/core/SidenavSearch.js b/assets/components/SidenavSearch.js
similarity index 100%
rename from assets/js/vue/components/core/SidenavSearch.js
rename to assets/components/SidenavSearch.js
diff --git a/assets/index.js b/assets/index.js
new file mode 100644
index 000000000..94f4131ba
--- /dev/null
+++ b/assets/index.js
@@ -0,0 +1,4 @@
+import '@mdi/font/css/materialdesignicons.css'
+
+import "./util"
+import "./app"
diff --git a/assets/js/index.js b/assets/js/index.js
deleted file mode 100644
index d7a36ccd9..000000000
--- a/assets/js/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import '@mdi/font/css/materialdesignicons.css'
-
-import "./vue/main_vue.js"
-import "./vue/app.js"
diff --git a/assets/js/vue/main_vue.js b/assets/util.js
similarity index 100%
rename from assets/js/vue/main_vue.js
rename to assets/util.js
diff --git a/webpack.config.js b/webpack.config.js
index 5069e905a..406d3e3e2 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -6,7 +6,7 @@ const BundleTracker = require('webpack-bundle-tracker')
module.exports = {
context: __dirname,
entry: {
- core: './assets/js/index',
+ core: './assets/index',
alsijil: {
dependOn: 'core',
import: '../AlekSIS-App-Alsijil/assets/js/vue/alsijil/LoadComponents',
--
GitLab