From a4e0a345d6ac821cfcad1e6a0c805ebeb7207aa5 Mon Sep 17 00:00:00 2001
From: Franzz <francois@lutran.fr>
Date: Sun, 3 May 2026 18:31:53 +0200
Subject: [PATCH] Use resolves

---
 build/webpack.config.js                |  8 +++++---
 src/Spot.vue                           |  6 +++---
 src/{scripts => }/app.js               | 12 ++++++------
 src/components/admin.vue               |  6 +++---
 src/components/project.vue             | 14 +++++++-------
 src/components/projectMediaLink.vue    |  4 ++--
 src/components/projectPopup.vue        | 10 +++++-----
 src/components/projectPost.vue         | 14 +++++++-------
 src/components/projectRelTime.vue      |  2 +-
 src/components/spotButton.vue          |  2 +-
 src/components/spotIcon.vue            | 16 +++++++++++++++-
 src/components/spotIconStack.vue       |  2 +-
 src/components/upload.vue              |  4 ++--
 src/scripts/jquery.helpers.js          |  2 +-
 src/scripts/lightbox.js                |  2 +-
 src/styles/_common.scss                |  2 +-
 src/styles/_fa.scss                    | 11 -----------
 src/styles/_lightbox.scss              |  6 +++---
 src/styles/_mobile.scss                |  2 +-
 src/styles/_page.admin.scss            |  4 ++--
 src/styles/_page.project.feed.scss     |  6 +++---
 src/styles/_page.project.map.scss      |  8 ++++----
 src/styles/_page.project.panel.scss    |  6 +++---
 src/styles/_page.project.scss          | 14 +++++++-------
 src/styles/_page.project.settings.scss |  8 ++++----
 src/styles/_page.upload.scss           |  4 ++--
 src/styles/spot.scss                   | 17 ++++++++---------
 27 files changed, 98 insertions(+), 94 deletions(-)
 rename src/{scripts => }/app.js (80%)
 delete mode 100644 src/styles/_fa.scss

diff --git a/build/webpack.config.js b/build/webpack.config.js
index aae4d37..b14b175 100644
--- a/build/webpack.config.js
+++ b/build/webpack.config.js
@@ -19,7 +19,7 @@ module.exports = (env, argv) => {
 		devtool: isDev ? 'inline-source-map' : false,
 		watch: isDev,
 		entry: {
-			app: path.resolve(SRC, 'scripts', 'app.js')
+			app: path.resolve(SRC, 'app.js')
 		},
 		output: {
 			path: DIST,
@@ -93,9 +93,11 @@ module.exports = (env, argv) => {
 			new VueLoaderPlugin()
 		],
 		resolve: {
-			extensions: ['.js', '.vue', '...'],
+			extensions: ['.vue', '.scss', '...'],
 			alias: {
-				'@scripts': path.resolve(SRC, 'scripts')
+				'@components': path.resolve(SRC, 'components'),
+				'@scripts': path.resolve(SRC, 'scripts'),
+				'@styles': path.resolve(SRC, 'styles')
 			}
 		}
 	};
diff --git a/src/Spot.vue b/src/Spot.vue
index 6e20722..75ac31b 100644
--- a/src/Spot.vue
+++ b/src/Spot.vue
@@ -1,7 +1,7 @@
 <script>
-import Project from './components/project.vue';
-import Admin from './components/admin.vue';
-import Upload from './components/upload.vue';
+import Project from '@components/project';
+import Admin from '@components/admin';
+import Upload from '@components/upload';
 
 const aoRoutes = {
 	'project': Project,
diff --git a/src/scripts/app.js b/src/app.js
similarity index 80%
rename from src/scripts/app.js
rename to src/app.js
index a411674..c0321a1 100644
--- a/src/scripts/app.js
+++ b/src/app.js
@@ -1,15 +1,15 @@
 //Librairies
-import Api from './api.js';
-import Lang from './lang.js';
-import Projects from './projects.js';
-import User from './user.js';
+import Api from '@scripts/api';
+import Lang from '@scripts/lang';
+import Projects from '@scripts/projects';
+import User from '@scripts/user';
 import { createApp } from 'vue';
 
 //Main template
-import Spot from '../Spot.vue';
+import Spot from './Spot';
 
 //Style
-import Css from './../styles/spot.scss';
+import Css from '@styles/spot';
 
 //App Configuration from PHP
 const appConfig = JSON.parse(document.getElementById('app-config').textContent);
diff --git a/src/components/admin.vue b/src/components/admin.vue
index 8fd305d..5ae6a0e 100644
--- a/src/components/admin.vue
+++ b/src/components/admin.vue
@@ -1,7 +1,7 @@
 <script>
-import SpotIcon from './spotIcon.vue';
-import SpotButton from './spotButton.vue';
-import AdminInput from './adminInput.vue';
+import SpotIcon from '@components/spotIcon';
+import SpotButton from '@components/spotButton';
+import AdminInput from '@components/adminInput';
 
 export default {
 	components: {
diff --git a/src/components/project.vue b/src/components/project.vue
index 310a43d..0be0330 100644
--- a/src/components/project.vue
+++ b/src/components/project.vue
@@ -4,14 +4,14 @@ import { Map, NavigationControl, Marker, LngLatBounds, LngLat, Popup } from 'map
 import { createApp, ref, provide, inject } from 'vue';
 import Simplebar from 'simplebar-vue';
 
-import lightbox from '../scripts/lightbox.js';
-import { getOuterWidth } from '../scripts/common.js';
+import lightbox from '@scripts/lightbox';
+import { getOuterWidth } from '@scripts/common';
 
-import SpotIcon from './spotIcon.vue';
-import SpotIconStack from './spotIconStack.vue';
-import SpotButton from './spotButton.vue';
-import ProjectPost from './projectPost.vue';
-import ProjectPopup from './projectPopup.vue';
+import SpotIcon from '@components/spotIcon';
+import SpotIconStack from '@components/spotIconStack';
+import SpotButton from '@components/spotButton';
+import ProjectPost from '@components/projectPost';
+import ProjectPopup from '@components/projectPopup';
 
 export default {
 	components: {
diff --git a/src/components/projectMediaLink.vue b/src/components/projectMediaLink.vue
index 04dee25..c99a385 100644
--- a/src/components/projectMediaLink.vue
+++ b/src/components/projectMediaLink.vue
@@ -1,6 +1,6 @@
 <script>
-import spotIcon from './spotIcon.vue';
-import projectRelTime from './projectRelTime.vue';
+import spotIcon from '@components/spotIcon';
+import projectRelTime from '@components/projectRelTime';
 
 export default {
 	components: {
diff --git a/src/components/projectPopup.vue b/src/components/projectPopup.vue
index c57699d..03af693 100644
--- a/src/components/projectPopup.vue
+++ b/src/components/projectPopup.vue
@@ -1,9 +1,9 @@
 <script>
-import projectMapLink from './projectMapLink.vue';
-import spotIcon from './spotIcon.vue';
-import projectRelTime from './projectRelTime.vue';
-import projectMediaLink from './projectMediaLink.vue';
-import { options } from '../scripts/lightbox';
+import projectMapLink from '@components/projectMapLink';
+import spotIcon from '@components/spotIcon';
+import projectRelTime from '@components/projectRelTime';
+import projectMediaLink from '@components/projectMediaLink';
+import { options } from '@scripts/lightbox';
 
 export default {
 	components: {
diff --git a/src/components/projectPost.vue b/src/components/projectPost.vue
index ced141c..6520ba4 100644
--- a/src/components/projectPost.vue
+++ b/src/components/projectPost.vue
@@ -1,12 +1,12 @@
 <script>
-	import spotIcon from './spotIcon.vue';
-	import spotIconStack from './spotIconStack.vue';
-	import spotButton from './spotButton.vue';
-	import projectMediaLink from './projectMediaLink.vue';
-	import projectMapLink from './projectMapLink.vue';
-	import projectRelTime from './projectRelTime.vue';
+	import spotIcon from '@components/spotIcon';
+	import spotIconStack from '@components/spotIconStack';
+	import spotButton from '@components/spotButton';
+	import projectMediaLink from '@components/projectMediaLink';
+	import projectMapLink from '@components/projectMapLink';
+	import projectRelTime from '@components/projectRelTime';
 	import { LngLat } from 'maplibre-gl';
-	import { copyTextToClipboard } from '../scripts/common.js';
+	import { copyTextToClipboard } from '@scripts/common';
 
 	import autosize from 'autosize';
 
diff --git a/src/components/projectRelTime.vue b/src/components/projectRelTime.vue
index d209a07..7e4ab07 100644
--- a/src/components/projectRelTime.vue
+++ b/src/components/projectRelTime.vue
@@ -1,5 +1,5 @@
 <script>
-import spotIcon from './spotIcon.vue';
+import spotIcon from '@components/spotIcon';
 
 export default {
 	components: {
diff --git a/src/components/spotButton.vue b/src/components/spotButton.vue
index 3931da7..c4a2b5f 100644
--- a/src/components/spotButton.vue
+++ b/src/components/spotButton.vue
@@ -1,5 +1,5 @@
 <script>
-import SpotIcon from './spotIcon.vue';
+import SpotIcon from '@components/spotIcon';
 
 export default {
 	components: {
diff --git a/src/components/spotIcon.vue b/src/components/spotIcon.vue
index c25f059..5d05e5f 100644
--- a/src/components/spotIcon.vue
+++ b/src/components/spotIcon.vue
@@ -1,6 +1,6 @@
 <script>
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
-import { getIcon } from '../scripts/icons.js';
+import { getIcon } from '@scripts/icons';
 
 export default {
 	components: {
@@ -55,3 +55,17 @@ export default {
 	</span>
 	<FontAwesomeIcon v-else :icon="iconDefinition" :class="classNames" :fixed-width="resolvedFixedWidth" :width-auto="resolvedAutoWidth" :size="resolvedSize" :transform="resolvedTransform" />
 </template>
+
+<style lang="scss" scoped>
+@use "@styles/var";
+
+.spot-icon {
+	&.margin-right {
+		margin-right: var.$elem-spacing;
+	}
+
+	&.margin-left {
+		margin-left: var.$elem-spacing;
+	}
+}
+</style>
diff --git a/src/components/spotIconStack.vue b/src/components/spotIconStack.vue
index 7302edd..7f96eb9 100644
--- a/src/components/spotIconStack.vue
+++ b/src/components/spotIconStack.vue
@@ -1,6 +1,6 @@
 <script>
 import { FontAwesomeLayers } from '@fortawesome/vue-fontawesome';
-import spotIcon from './spotIcon.vue';
+import spotIcon from '@components/spotIcon';
 
 export default {
 	components: {
diff --git a/src/components/upload.vue b/src/components/upload.vue
index 9f36e36..43e6fd8 100644
--- a/src/components/upload.vue
+++ b/src/components/upload.vue
@@ -4,8 +4,8 @@ import Uppy from '@uppy/core';
 import XHRUpload from '@uppy/xhr-upload';
 import '@uppy/core/css/style.min.css';
 
-import SpotIcon from './spotIcon.vue';
-import SpotButton from './spotButton.vue';
+import SpotIcon from '@components/spotIcon';
+import SpotButton from '@components/spotButton';
 
 export default {
 	name: 'upload',
diff --git a/src/scripts/jquery.helpers.js b/src/scripts/jquery.helpers.js
index fa49b2f..201163e 100644
--- a/src/scripts/jquery.helpers.js
+++ b/src/scripts/jquery.helpers.js
@@ -1,4 +1,4 @@
-import { getDragPosition } from './common.js';
+import { getDragPosition } from '@scripts/common';
 
 $.prototype.defaultVal = function(sDefaultValue)
 {
diff --git a/src/scripts/lightbox.js b/src/scripts/lightbox.js
index 1d8ae47..1c5857a 100644
--- a/src/scripts/lightbox.js
+++ b/src/scripts/lightbox.js
@@ -1,5 +1,5 @@
 import { icon } from '@fortawesome/fontawesome-svg-core';
-import { getIcon } from './icons.js';
+import { getIcon } from '@scripts/icons';
 
 const defaults = {
 	albumLabel: 'Image %1 of %2',
diff --git a/src/styles/_common.scss b/src/styles/_common.scss
index 5fe4c7b..9ee0338 100644
--- a/src/styles/_common.scss
+++ b/src/styles/_common.scss
@@ -1,4 +1,4 @@
-@use "color";
+@use "@styles/color";
 
 /* Animations */
 
diff --git a/src/styles/_fa.scss b/src/styles/_fa.scss
deleted file mode 100644
index 9d54a49..0000000
--- a/src/styles/_fa.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-@use "var";
-
-.spot-icon {
-	&.margin-right {
-		margin-right: var.$elem-spacing;
-	}
-
-	&.margin-left {
-		margin-left: var.$elem-spacing;
-	}
-}
\ No newline at end of file
diff --git a/src/styles/_lightbox.scss b/src/styles/_lightbox.scss
index c2b4a42..70ed30f 100644
--- a/src/styles/_lightbox.scss
+++ b/src/styles/_lightbox.scss
@@ -1,6 +1,6 @@
-@use "common";
-@use "var";
-@use "color";
+@use "@styles/common";
+@use "@styles/var";
+@use "@styles/color";
 
 body.lb-disable-scrolling {
 	overflow: hidden;
diff --git a/src/styles/_mobile.scss b/src/styles/_mobile.scss
index 6e5c2d3..c7e6fcf 100644
--- a/src/styles/_mobile.scss
+++ b/src/styles/_mobile.scss
@@ -1,4 +1,4 @@
-@use "var";
+@use "@styles/var";
 
 @media only screen and (max-width: 800px) {
 
diff --git a/src/styles/_page.admin.scss b/src/styles/_page.admin.scss
index ccaf568..49dbbb4 100644
--- a/src/styles/_page.admin.scss
+++ b/src/styles/_page.admin.scss
@@ -1,5 +1,5 @@
-@use "var";
-@use "color";
+@use "@styles/var";
+@use "@styles/color";
 
 #admin {
 	margin: 1em;
diff --git a/src/styles/_page.project.feed.scss b/src/styles/_page.project.feed.scss
index 21f6593..5324b52 100644
--- a/src/styles/_page.project.feed.scss
+++ b/src/styles/_page.project.feed.scss
@@ -1,5 +1,5 @@
-@use "var";
-@use "color";
+@use "@styles/var";
+@use "@styles/color";
 
 #feed {
 	#feed-panel {
@@ -285,4 +285,4 @@
 			}
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/src/styles/_page.project.map.scss b/src/styles/_page.project.map.scss
index 28c8a3a..931482a 100644
--- a/src/styles/_page.project.map.scss
+++ b/src/styles/_page.project.map.scss
@@ -1,6 +1,6 @@
-@use "common";
-@use "var";
-@use "color";
+@use "@styles/common";
+@use "@styles/var";
+@use "@styles/color";
 
 $thumbnail-max-size: 60px;
 
@@ -117,4 +117,4 @@ $thumbnail-max-size: 60px;
 			}
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/src/styles/_page.project.panel.scss b/src/styles/_page.project.panel.scss
index 7b35c5a..980b945 100644
--- a/src/styles/_page.project.panel.scss
+++ b/src/styles/_page.project.panel.scss
@@ -1,6 +1,6 @@
-@use "common";
-@use "var";
-@use "color";
+@use "@styles/common";
+@use "@styles/var";
+@use "@styles/color";
 
 $panel-width: 30vw;
 $panel-width-max: "400px + 3 * #{var.$block-spacing}";
diff --git a/src/styles/_page.project.scss b/src/styles/_page.project.scss
index 3317e56..1c6ca83 100644
--- a/src/styles/_page.project.scss
+++ b/src/styles/_page.project.scss
@@ -1,10 +1,10 @@
-@use "var";
-@use "color";
+@use "@styles/var";
+@use "@styles/color";
 
-@use 'page.project.map' as map;
-@use 'page.project.panel' as panel;
-@use 'page.project.feed' as feed;
-@use 'page.project.settings' as settings;
+@use '@styles/page.project.map' as map;
+@use '@styles/page.project.panel' as panel;
+@use '@styles/page.project.feed' as feed;
+@use '@styles/page.project.settings' as settings;
 
 #projects {
 	overflow: hidden;
@@ -77,4 +77,4 @@
 			}
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/src/styles/_page.project.settings.scss b/src/styles/_page.project.settings.scss
index 22f7c44..5d83f64 100644
--- a/src/styles/_page.project.settings.scss
+++ b/src/styles/_page.project.settings.scss
@@ -1,6 +1,6 @@
-@use "common";
-@use "var";
-@use "color";
+@use "@styles/common";
+@use "@styles/var";
+@use "@styles/color";
 
 #settings {
 	#settings-panel {
@@ -158,4 +158,4 @@
 			}
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/src/styles/_page.upload.scss b/src/styles/_page.upload.scss
index f1d847f..bf40211 100644
--- a/src/styles/_page.upload.scss
+++ b/src/styles/_page.upload.scss
@@ -1,5 +1,5 @@
-@use "var";
-@use "color";
+@use "@styles/var";
+@use "@styles/color";
 
 #upload {
 	padding: 1em;
diff --git a/src/styles/spot.scss b/src/styles/spot.scss
index c34ecda..e3d33b0 100755
--- a/src/styles/spot.scss
+++ b/src/styles/spot.scss
@@ -1,16 +1,15 @@
 /* Site Global CSS */
 @use "sass:meta";
-@use 'common';
+@use '@styles/common';
 
 /* Modules */
-@use 'fa';
-@use 'lightbox';
-@import '../../node_modules/simplebar-vue/dist/simplebar.min.css';
-@include meta.load-css('vue');
+@use '@styles/lightbox';
+@import 'simplebar-vue/dist/simplebar.min.css';
+@include meta.load-css('@styles/vue');
 
 /* Pages Specific CSS */
-@include meta.load-css('page.project');
-@include meta.load-css('page.upload');
-@include meta.load-css('page.admin');
+@include meta.load-css('@styles/page.project');
+@include meta.load-css('@styles/page.upload');
+@include meta.load-css('@styles/page.admin');
 
-@include meta.load-css('mobile');
+@include meta.load-css('@styles/mobile');
\ No newline at end of file