From 9312a8797e378922087d2d681b27f40cbfb44cf8 Mon Sep 17 00:00:00 2001 From: jb-alvarado Date: Tue, 24 Sep 2024 11:23:57 +0200 Subject: [PATCH] merge frontend repo/dev settings, update folder names --- .gitignore | 28 +++++++++++++ .vscode/extensions.json | 6 +++ .vscode/settings.json | 30 ++++++++++++++ Cargo.toml | 3 +- frontend/.github/ISSUE_TEMPLATE/bug_report.md | 37 ------------------ frontend/.gitignore | 39 ------------------- frontend/.vscode/extensions.json | 10 ----- frontend/.vscode/settings.json | 34 ---------------- tests/Cargo.toml | 2 +- 9 files changed, 66 insertions(+), 123 deletions(-) delete mode 100644 frontend/.github/ISSUE_TEMPLATE/bug_report.md delete mode 100644 frontend/.gitignore delete mode 100644 frontend/.vscode/extensions.json delete mode 100644 frontend/.vscode/settings.json diff --git a/.gitignore b/.gitignore index 5dd690c4..d3eddeb4 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,31 @@ assets/playlist_template.json advanced*.toml ffplayout*.toml template.json + +# frontend stuff +node_modules +.nuxt +.nitro +.cache +.output +.env +dist +.eslintcache +*.tgz +.yarn-integrity +sw.* +.DS_Store +*.swp +master.m3u8 +tv-media +tv-media/ +Videos +Videos/ +*.tar* +home +home/ +live1 +live1/ +Musik +Musik/ +test.vue diff --git a/.vscode/extensions.json b/.vscode/extensions.json index f4fb1d4f..03623c4f 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,7 +1,13 @@ { "recommendations": [ + "bradlc.vscode-tailwindcss", + "dbaeumer.vscode-eslint", + "esbenp.prettier-vscode", + "hollowtree.vue-snippets", "rust-lang.rust-analyzer", "statiolake.vscode-rustfmt", "tamasfe.even-better-toml", + "vue.volar", + "wscats.vue", ] } diff --git a/.vscode/settings.json b/.vscode/settings.json index 84fcfd01..b05144c0 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,15 @@ { + "eslint.useFlatConfig": true, + "prettier.tabWidth": 4, + "prettier.printWidth": 120, + "vue3snippets.semi": false, + "vue3snippets.singleQuote": true, + "vue3snippets.jsxSingleQuote": true, + "vue3snippets.printWidth": 120, + "vue3snippets.tabWidth": 4, + "prettier.jsxSingleQuote": true, + "prettier.semi": false, + "prettier.singleQuote": true, "rust-analyzer.cargo.target": null, "rust-analyzer.checkOnSave": true, "rust-analyzer.cargo.buildScripts.overrideCommand": null, @@ -10,6 +21,24 @@ "[dockercompose]": { "editor.defaultFormatter": "esbenp.prettier-vscode" }, + "[css]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[html]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[javascript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[scss]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[vue]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[typescript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, "[rust]": { "editor.formatOnSave": true, "editor.defaultFormatter": "statiolake.vscode-rustfmt" @@ -23,6 +52,7 @@ "flexi", "lettre", "libc", + "nuxt", "neli", "paris", "reqwest", diff --git a/Cargo.toml b/Cargo.toml index 08244c9e..723fff30 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,5 @@ [workspace] -members = ["ffplayout", "tests"] -default-members = ["ffplayout", "tests"] +members = ["engine", "tests"] resolver = "2" [workspace.package] diff --git a/frontend/.github/ISSUE_TEMPLATE/bug_report.md b/frontend/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index 92f92992..00000000 --- a/frontend/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,37 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve -title: '' -labels: '' -assignees: '' - ---- - -**Describe the bug** -A clear and concise description of what the bug is. - -**To Reproduce** -Steps to reproduce the behavior: -1. Go to '...' -2. Click on '....' -3. Scroll down to '....' -4. See error - -**Expected behavior** -A clear and concise description of what you expected to happen. - -**Screenshots** -If applicable, add screenshots to help explain your problem. - -**Logging** -If applicable, add logs to help explain your problem. - -**Server (please complete the following information):** - - OS: [e.g. debian] - - Version [e.g. 10] - -**Repo Version (please complete the following information):** - - Version [e.g. v3.0.0] - -**Additional context** -Add any other context about the problem here. diff --git a/frontend/.gitignore b/frontend/.gitignore deleted file mode 100644 index af03af5c..00000000 --- a/frontend/.gitignore +++ /dev/null @@ -1,39 +0,0 @@ -node_modules -*.log* -.nuxt -.nitro -.cache -.output -.env -dist -.eslintcache - -# Output of 'npm pack' -*.tgz - -# Yarn Integrity file -.yarn-integrity - -# Service worker -sw.* - -# Mac OSX -.DS_Store - -# Vim swap files -*.swp - -master.m3u8 -tv-media -tv-media/ -Videos -Videos/ -*.tar* -home -home/ -live1 -live1/ -Musik -Musik/ - -test.vue diff --git a/frontend/.vscode/extensions.json b/frontend/.vscode/extensions.json deleted file mode 100644 index 8d18dfe8..00000000 --- a/frontend/.vscode/extensions.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "recommendations": [ - "bradlc.vscode-tailwindcss", - "dbaeumer.vscode-eslint", - "esbenp.prettier-vscode", - "hollowtree.vue-snippets", - "vue.volar", - "wscats.vue", - ] -} diff --git a/frontend/.vscode/settings.json b/frontend/.vscode/settings.json deleted file mode 100644 index 57395ca4..00000000 --- a/frontend/.vscode/settings.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "eslint.experimental.useFlatConfig": true, - "prettier.tabWidth": 4, - "prettier.printWidth": 120, - "vue3snippets.semi": false, - "vue3snippets.singleQuote": true, - "vue3snippets.jsxSingleQuote": true, - "vue3snippets.printWidth": 120, - "vue3snippets.tabWidth": 4, - "prettier.jsxSingleQuote": true, - "prettier.semi": false, - "prettier.singleQuote": true, - "[css]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[html]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[javascript]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[scss]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[vue]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[typescript]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "cSpell.words": [ - "nuxt" - ], -} diff --git a/tests/Cargo.toml b/tests/Cargo.toml index 3b428929..70d39160 100644 --- a/tests/Cargo.toml +++ b/tests/Cargo.toml @@ -8,7 +8,7 @@ edition.workspace = true publish = false [dev-dependencies] -ffplayout= { path = "../ffplayout" } +ffplayout = { path = "../engine" } actix-web = "4" actix-web-grants = "4"