merge frontend repo/dev settings, update folder names

This commit is contained in:
jb-alvarado 2024-09-24 11:23:57 +02:00
parent 2ffae59043
commit 9312a8797e
9 changed files with 66 additions and 123 deletions

28
.gitignore vendored
View File

@ -29,3 +29,31 @@ assets/playlist_template.json
advanced*.toml advanced*.toml
ffplayout*.toml ffplayout*.toml
template.json 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

View File

@ -1,7 +1,13 @@
{ {
"recommendations": [ "recommendations": [
"bradlc.vscode-tailwindcss",
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode",
"hollowtree.vue-snippets",
"rust-lang.rust-analyzer", "rust-lang.rust-analyzer",
"statiolake.vscode-rustfmt", "statiolake.vscode-rustfmt",
"tamasfe.even-better-toml", "tamasfe.even-better-toml",
"vue.volar",
"wscats.vue",
] ]
} }

30
.vscode/settings.json vendored
View File

@ -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.cargo.target": null,
"rust-analyzer.checkOnSave": true, "rust-analyzer.checkOnSave": true,
"rust-analyzer.cargo.buildScripts.overrideCommand": null, "rust-analyzer.cargo.buildScripts.overrideCommand": null,
@ -10,6 +21,24 @@
"[dockercompose]": { "[dockercompose]": {
"editor.defaultFormatter": "esbenp.prettier-vscode" "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]": { "[rust]": {
"editor.formatOnSave": true, "editor.formatOnSave": true,
"editor.defaultFormatter": "statiolake.vscode-rustfmt" "editor.defaultFormatter": "statiolake.vscode-rustfmt"
@ -23,6 +52,7 @@
"flexi", "flexi",
"lettre", "lettre",
"libc", "libc",
"nuxt",
"neli", "neli",
"paris", "paris",
"reqwest", "reqwest",

View File

@ -1,6 +1,5 @@
[workspace] [workspace]
members = ["ffplayout", "tests"] members = ["engine", "tests"]
default-members = ["ffplayout", "tests"]
resolver = "2" resolver = "2"
[workspace.package] [workspace.package]

View File

@ -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.

39
frontend/.gitignore vendored
View File

@ -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

View File

@ -1,10 +0,0 @@
{
"recommendations": [
"bradlc.vscode-tailwindcss",
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode",
"hollowtree.vue-snippets",
"vue.volar",
"wscats.vue",
]
}

View File

@ -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"
],
}

View File

@ -8,7 +8,7 @@ edition.workspace = true
publish = false publish = false
[dev-dependencies] [dev-dependencies]
ffplayout= { path = "../ffplayout" } ffplayout = { path = "../engine" }
actix-web = "4" actix-web = "4"
actix-web-grants = "4" actix-web-grants = "4"