diff --git a/front/.eslintrc.json b/front/.eslintrc.js
similarity index 75%
rename from front/.eslintrc.json
rename to front/.eslintrc.js
index 45b44456..33466012 100644
--- a/front/.eslintrc.json
+++ b/front/.eslintrc.js
@@ -1,4 +1,4 @@
-{
+module.exports = {
"root": true,
"env": {
"browser": true,
@@ -18,10 +18,18 @@
"parserOptions": {
"ecmaVersion": 2018,
"sourceType": "module",
- "project": "./tsconfig.json"
+ "project": "./tsconfig.json",
+ "extraFileExtensions": [".svelte"]
},
"plugins": [
- "@typescript-eslint"
+ "@typescript-eslint",
+ "svelte3"
+ ],
+ "overrides": [
+ {
+ "files": ["*.svelte"],
+ "processor": "svelte3/svelte3"
+ }
],
"rules": {
"no-unused-vars": "off",
@@ -34,5 +42,9 @@
"@typescript-eslint/no-unsafe-return": "off",
"@typescript-eslint/no-unsafe-member-access": "off",
"@typescript-eslint/restrict-template-expressions": "off"
+ },
+ "settings": {
+ "svelte3/typescript": true,
+ "svelte3/ignore-styles": () => true
}
}
diff --git a/front/.prettierrc.json b/front/.prettierrc.json
index e8980d15..057ed062 100644
--- a/front/.prettierrc.json
+++ b/front/.prettierrc.json
@@ -1,4 +1,5 @@
{
"printWidth": 120,
- "tabWidth": 4
+ "tabWidth": 4,
+ "plugins": ["prettier-plugin-svelte"]
}
diff --git a/front/package.json b/front/package.json
index 6a9db0ba..5b11c6ed 100644
--- a/front/package.json
+++ b/front/package.json
@@ -16,6 +16,7 @@
"@typescript-eslint/parser": "^4.23.0",
"css-loader": "^5.2.4",
"eslint": "^7.26.0",
+ "eslint-plugin-svelte3": "^3.2.1",
"fork-ts-checker-webpack-plugin": "^6.2.9",
"html-webpack-plugin": "^5.3.1",
"jasmine": "^3.5.0",
@@ -24,6 +25,7 @@
"node-polyfill-webpack-plugin": "^1.1.2",
"npm-run-all": "^4.1.5",
"prettier": "^2.3.1",
+ "prettier-plugin-svelte": "^2.5.0",
"sass": "^1.32.12",
"sass-loader": "^11.1.0",
"svelte": "^3.38.2",
@@ -68,17 +70,19 @@
"build": "cross-env TS_NODE_PROJECT=\"tsconfig-for-webpack.json\" NODE_ENV=production webpack",
"build-typings": "cross-env TS_NODE_PROJECT=\"tsconfig-for-webpack.json\" NODE_ENV=production BUILD_TYPINGS=1 webpack",
"test": "cross-env TS_NODE_PROJECT=\"tsconfig-for-jasmine.json\" ts-node node_modules/jasmine/bin/jasmine --config=jasmine.json",
- "lint": "node_modules/.bin/eslint src/ . --ext .ts",
- "fix": "node_modules/.bin/eslint --fix src/ . --ext .ts",
+ "lint": "node_modules/.bin/eslint src/ tests/ --ext .ts,.svelte",
+ "fix": "node_modules/.bin/eslint --fix src/ tests/ --ext .ts,.svelte",
"precommit": "lint-staged",
"svelte-check-watch": "svelte-check --fail-on-warnings --fail-on-hints --compiler-warnings \"a11y-no-onchange:ignore,a11y-autofocus:ignore,a11y-media-has-caption:ignore\" --watch",
"svelte-check": "svelte-check --fail-on-warnings --fail-on-hints --compiler-warnings \"a11y-no-onchange:ignore,a11y-autofocus:ignore,a11y-media-has-caption:ignore\"",
- "pretty": "yarn prettier --write 'src/**/*.{ts,tsx}'",
- "pretty-check": "yarn prettier --check 'src/**/*.{ts,tsx}'"
+ "pretty": "yarn prettier --write 'src/**/*.{ts,svelte}'",
+ "pretty-check": "yarn prettier --check 'src/**/*.{ts,svelte}'"
},
"lint-staged": {
- "*.ts": [
- "prettier --write"
+ "*.{ts,svelte}": [
+ "yarn run svelte-check",
+ "yarn run fix",
+ "yarn run pretty"
]
}
}
diff --git a/front/src/Components/App.svelte b/front/src/Components/App.svelte
index ab8b6d3f..4886cc4e 100644
--- a/front/src/Components/App.svelte
+++ b/front/src/Components/App.svelte
@@ -1,147 +1,146 @@
{#if $loginSceneVisibleStore}
-
+
{/if}
{#if $selectCharacterSceneVisibleStore}
-
+
{/if}
{#if $customCharacterSceneVisibleStore}
-
+
{/if}
{#if $selectCompanionSceneVisibleStore}
-
+
{/if}
{#if $enableCameraSceneVisibilityStore}
-
+
{/if}
{#if $banMessageVisibleStore}
{/if}
{#if $textMessageVisibleStore}
-
+
{/if}
{#if $soundPlayingStore}
-
+
{/if}
{#if $audioManagerVisibilityStore}
-
+
{/if}
{#if $layoutManagerVisibilityStore}
-
+
{/if}
{#if $showReportScreenStore !== userReportEmpty}
-
+
{/if}
{#if $menuIconVisiblilityStore}
-
+
{/if}
{#if $menuVisiblilityStore}
-
+
{/if}
{#if $emoteMenuStore}
-
+
{/if}
{#if $gameOverlayVisibilityStore}
-
-
-
+
+
+
{/if}
{#if $helpCameraSettingsVisibleStore}
-
+
{/if}
{#if $requestVisitCardsStore}
-
+
{/if}
{#if $errorStore.length > 0}
-
-
-
+
+
+
{/if}
{#if $chatVisibilityStore}
-
+
{/if}
{#if $warningContainerStore}
-
+
{/if}
diff --git a/front/src/Components/AudioManager/AudioManager.svelte b/front/src/Components/AudioManager/AudioManager.svelte
index e201254c..3253699e 100644
--- a/front/src/Components/AudioManager/AudioManager.svelte
+++ b/front/src/Components/AudioManager/AudioManager.svelte
@@ -1,10 +1,7 @@
-
-
\ No newline at end of file
+
diff --git a/front/src/Components/CameraControls.svelte b/front/src/Components/CameraControls.svelte
index 728c84e9..232d42da 100644
--- a/front/src/Components/CameraControls.svelte
+++ b/front/src/Components/CameraControls.svelte
@@ -1,6 +1,6 @@
-
+
-
-