From 5cd8c5a8ea4950d853187d87f30a19abd7c91e42 Mon Sep 17 00:00:00 2001 From: Oleg Lobanov Date: Sat, 26 Aug 2023 13:40:14 +0200 Subject: [PATCH] fix --- .gitignore | 3 + frontend/.eslintrc.json | 2 +- frontend/.gitignore | 130 --------------------------------------- frontend/dist/.gitkeep | 0 frontend/index.html | 2 +- frontend/package.json | 7 ++- frontend/public/.gitkeep | 0 frontend/vite.config.js | 5 ++ 8 files changed, 14 insertions(+), 135 deletions(-) delete mode 100644 frontend/.gitignore create mode 100644 frontend/dist/.gitkeep create mode 100644 frontend/public/.gitkeep diff --git a/.gitignore b/.gitignore index 830774b6..5180999f 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,6 @@ yarn-error.log* *.sw* bin/ build/ + +/frontend/dist/* +!/frontend/dist/.gitkeep diff --git a/frontend/.eslintrc.json b/frontend/.eslintrc.json index e51997b8..743f1a01 100644 --- a/frontend/.eslintrc.json +++ b/frontend/.eslintrc.json @@ -9,7 +9,7 @@ "@vue/eslint-config-prettier" ], "rules": { - "vue/multi-word-component-names": "warn", + "vue/multi-word-component-names": "off", "vue/no-reserved-component-names": "warn", "vue/no-mutating-props": "warn" }, diff --git a/frontend/.gitignore b/frontend/.gitignore deleted file mode 100644 index 9770f7e8..00000000 --- a/frontend/.gitignore +++ /dev/null @@ -1,130 +0,0 @@ -# Logs -logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* -lerna-debug.log* -.pnpm-debug.log* - -# Diagnostic reports (https://nodejs.org/api/report.html) -report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json - -# Runtime data -pids -*.pid -*.seed -*.pid.lock - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage -*.lcov - -# nyc test coverage -.nyc_output - -# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -# Bower dependency directory (https://bower.io/) -bower_components - -# node-waf configuration -.lock-wscript - -# Compiled binary addons (https://nodejs.org/api/addons.html) -build/Release - -# Dependency directories -node_modules/ -jspm_packages/ - -# Snowpack dependency directory (https://snowpack.dev/) -web_modules/ - -# TypeScript cache -*.tsbuildinfo - -# Optional npm cache directory -.npm - -# Optional eslint cache -.eslintcache - -# Optional stylelint cache -.stylelintcache - -# Microbundle cache -.rpt2_cache/ -.rts2_cache_cjs/ -.rts2_cache_es/ -.rts2_cache_umd/ - -# Optional REPL history -.node_repl_history - -# Output of 'npm pack' -*.tgz - -# Yarn Integrity file -.yarn-integrity - -# dotenv environment variable files -.env -.env.development.local -.env.test.local -.env.production.local -.env.local - -# parcel-bundler cache (https://parceljs.org/) -.cache -.parcel-cache - -# Next.js build output -.next -out - -# Nuxt.js build / generate output -.nuxt -dist/* - -# Gatsby files -.cache/ -# Comment in the public line in if your project uses Gatsby and not Next.js -# https://nextjs.org/blog/next-9-1#public-directory-support -# public - -# vuepress build output -.vuepress/dist - -# vuepress v2.x temp and cache directory -.temp -.cache - -# Docusaurus cache and generated files -.docusaurus - -# Serverless directories -.serverless/ - -# FuseBox cache -.fusebox/ - -# DynamoDB Local files -.dynamodb/ - -# TernJS port file -.tern-port - -# Stores VSCode versions used for testing VSCode extensions -.vscode-test - -# yarn v2 -.yarn/cache -.yarn/unplugged -.yarn/build-state.yml -.yarn/install-state.gz -.pnp.* diff --git a/frontend/dist/.gitkeep b/frontend/dist/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/frontend/index.html b/frontend/index.html index c82cfcf7..7d0b8bc9 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -49,7 +49,7 @@ // We can assign JSON directly window.FileBrowser = { AuthMethod: "json", - BaseURL: "http://localhost:8080", + BaseURL: "", CSS: false, Color: "", DisableExternal: false, diff --git a/frontend/package.json b/frontend/package.json index d8510c11..18282c40 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -8,9 +8,10 @@ "serve": "vite serve", "build": "vite build", "watch": "vite build --watch", - "lint": "eslint --ext .vue,.js --ignore-path .gitignore src/", - "lint:fix": "eslint --ext .vue,.js --ignore-path .gitignore --fix src/", - "format": "prettier --write --ignore-path .gitignore ." + "clean": "find ./dist -maxdepth 1 -mindepth 1 ! -name '.gitkeep' -exec rm -r {} +", + "lint": "eslint --ext .vue,.js src/", + "lint:fix": "eslint --ext .vue,.js --fix src/", + "format": "prettier --write ." }, "dependencies": { "ace-builds": "^1.23.4", diff --git a/frontend/public/.gitkeep b/frontend/public/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/frontend/vite.config.js b/frontend/vite.config.js index 301e293c..1a906cb8 100644 --- a/frontend/vite.config.js +++ b/frontend/vite.config.js @@ -27,6 +27,11 @@ export default defineConfig(({ command }) => { return { plugins, resolve, + server: { + proxy: { + "/api": "http://localhost:8080", + }, + }, }; } else { // command === 'build'