mirror of
https://github.com/kaythomas0/noisedash.git
synced 2025-11-11 19:06:20 +00:00
Compare commits
84 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d83639b5c6 | ||
|
|
5d3a6fb912 | ||
|
|
722e0600f1 | ||
|
|
cd65c0b714 | ||
|
|
d73afdb68c | ||
|
|
e72503e91e | ||
|
|
294a4e4dec | ||
|
|
21fda5ce04 | ||
|
|
17301b5b31 | ||
|
|
923f5bb52e | ||
|
|
0cac4f2d5a | ||
|
|
5b99b8cfc2 | ||
|
|
1ae403171e | ||
|
|
c329f4f70a | ||
|
|
f1654d39ca | ||
|
|
a698934823 | ||
|
|
0ec92bad85 | ||
|
|
0bb814e763 | ||
|
|
621576db14 | ||
|
|
80969ca029 | ||
|
|
26fc54054f | ||
|
|
8a1fc99fb5 | ||
|
|
e6cc5b36c5 | ||
|
|
6c4c24c166 | ||
|
|
9466ed692b | ||
|
|
5ace3d9996 | ||
|
|
c4642df353 | ||
|
|
aca7fbd1e0 | ||
|
|
90f4d50b7f | ||
|
|
66b23f39a6 | ||
|
|
4d22dab887 | ||
|
|
bc93b05c4e | ||
|
|
60a01908c2 | ||
|
|
5879e6d327 | ||
|
|
88cbfe0bf1 | ||
|
|
74c7d543c0 | ||
|
|
dc81a65c7a | ||
|
|
3358efce1d | ||
|
|
2d71af03d0 | ||
|
|
aae33a6121 | ||
|
|
cc3fe4608d | ||
|
|
38de3595c4 | ||
|
|
4330b04c1f | ||
|
|
70aa906110 | ||
|
|
55851a4cd0 | ||
|
|
3c738925bc | ||
|
|
3dbbf4c85d | ||
|
|
a3f7709adf | ||
|
|
496b71ee7b | ||
|
|
c2aad26e3f | ||
|
|
b84522847a | ||
|
|
231dea143a | ||
|
|
659d48548d | ||
|
|
7dc4524fa0 | ||
|
|
9b2bdaf159 | ||
|
|
d3cc1db2f9 | ||
|
|
34215b4126 | ||
|
|
5fc23030d4 | ||
|
|
4fc23521c1 | ||
|
|
cb3e39729a | ||
|
|
5219f53655 | ||
|
|
a2b6f1245c | ||
|
|
9400959852 | ||
|
|
72a7f99850 | ||
|
|
f40e6d47f4 | ||
|
|
4ab595f3a1 | ||
|
|
625ce328dd | ||
|
|
411270b850 | ||
|
|
2cc5051ab4 | ||
|
|
ff902fac16 | ||
|
|
8e1a8aeb05 | ||
|
|
fa59f8ebfe | ||
|
|
f8289ad4d1 | ||
|
|
5fb7066e59 | ||
|
|
6cc6493ee6 | ||
|
|
c97c87f58c | ||
|
|
4bc985d36e | ||
|
|
c6ff0b6def | ||
|
|
319be778b0 | ||
|
|
86141a124c | ||
|
|
8ad174b0af | ||
|
|
c485b0a786 | ||
|
|
e13a056706 | ||
|
|
232163064e |
@@ -8,7 +8,7 @@ module.exports = {
|
||||
'@vue/standard'
|
||||
],
|
||||
parserOptions: {
|
||||
parser: 'babel-eslint'
|
||||
parser: '@babel/eslint-parser'
|
||||
},
|
||||
rules: {
|
||||
'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
|
||||
|
||||
1
.github/FUNDING.yml
vendored
1
.github/FUNDING.yml
vendored
@@ -1,3 +1,4 @@
|
||||
# These are supported funding model platforms
|
||||
|
||||
github: kaythomas0
|
||||
custom: "https://kaythomas.dev/cryptocurrency.html"
|
||||
|
||||
8
.github/dependabot.yml
vendored
Normal file
8
.github/dependabot.yml
vendored
Normal file
@@ -0,0 +1,8 @@
|
||||
version: 2
|
||||
updates:
|
||||
- package-ecosystem: "npm"
|
||||
directory: "/"
|
||||
schedule:
|
||||
interval: "daily"
|
||||
# Disable version updates for npm dependencies
|
||||
open-pull-requests-limit: 0
|
||||
BIN
.github/noisedash-screenshot-1.jpg
vendored
BIN
.github/noisedash-screenshot-1.jpg
vendored
Binary file not shown.
|
Before Width: | Height: | Size: 63 KiB After Width: | Height: | Size: 78 KiB |
BIN
.github/noisedash-screenshot-4.png
vendored
Normal file
BIN
.github/noisedash-screenshot-4.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 49 KiB |
38
.github/workflows/docker-image.yml
vendored
Normal file
38
.github/workflows/docker-image.yml
vendored
Normal file
@@ -0,0 +1,38 @@
|
||||
name: Docker Image CI
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
types:
|
||||
- labeled
|
||||
branches:
|
||||
- 'main'
|
||||
|
||||
jobs:
|
||||
buildx:
|
||||
if: ${{ github.event.label.name == 'run-workflow' }}
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
-
|
||||
name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
-
|
||||
name: Set up QEMU
|
||||
uses: docker/setup-qemu-action@v1
|
||||
-
|
||||
name: Set up Docker Buildx
|
||||
id: buildx
|
||||
uses: docker/setup-buildx-action@v1
|
||||
-
|
||||
name: Login to DockerHub
|
||||
uses: docker/login-action@v1
|
||||
with:
|
||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||
-
|
||||
name: Build and push
|
||||
uses: docker/build-push-action@v2
|
||||
with:
|
||||
context: .
|
||||
platforms: linux/amd64,linux/arm/v7,linux/arm64
|
||||
push: true
|
||||
tags: noisedash/noisedash:latest,noisedash/noisedash:${{ github.head_ref }}
|
||||
@@ -1,4 +1,6 @@
|
||||
## Project setup
|
||||
Requires [Node](https://nodejs.org/en/download/) and [Vue CLI](https://cli.vuejs.org/guide/installation.html)
|
||||
|
||||
```
|
||||
npm install
|
||||
```
|
||||
@@ -23,5 +25,22 @@ npm run build
|
||||
npm run lint
|
||||
```
|
||||
|
||||
### Directory Summary
|
||||
|
||||
Here are some of the more important files and directories:
|
||||
|
||||
* `config/default.json`: Contains the default configuration file
|
||||
* `server/*`: Where all of the node server related code is
|
||||
* `server/app.js`: The main server file where server settings are set
|
||||
* `server/db.js`: Where the database is created
|
||||
* `server/logger.js`: Where the logger is created and configured
|
||||
* `server/bin/www.js`: The entry point of the server application (what you run to start the server)
|
||||
* `server/boot/*`: These are run on server startup
|
||||
* `server/routes/*`: Where all of the server routes and logic are defined
|
||||
* `src/*`: Contains all the frontend code
|
||||
* `src/components/*`: Where all of the Vue components are defined, split into vue and js files for each component
|
||||
* `src/router/index.js`: Where all the routing and route-protection logic is defined
|
||||
* `src/views/*`: Contains all the views
|
||||
|
||||
### Customize configuration
|
||||
See [Configuration Reference](https://cli.vuejs.org/config/).
|
||||
|
||||
24
README.md
24
README.md
@@ -2,16 +2,16 @@
|
||||
|
||||
Self-hostable web tool for generating ambient noises
|
||||
|
||||

|
||||

|
||||
|
||||
(More screenshots on the [wiki](https://github.com/kaythomas0/noisedash/wiki/Screenshots))
|
||||
|
||||
# Features
|
||||
|
||||
* Generate and customize ambient noises and user-uploadable samples (leveraging [Tone.js](https://github.com/Tonejs/Tone.js/))
|
||||
* Save "noise profiles" so you can easily switch between your created soundscapes
|
||||
* Save "noise profiles" so you can easily switch between your created soundscapes. Import and export them for easy sharing, record them for use elsewhere
|
||||
* Fine-tune your noises with audio processing tools like filters, LFOs, and effects
|
||||
* Upload audio samples (e.g rain, wind, thunder) to combine with your generated noises
|
||||
* Upload and edit audio samples (e.g rain, wind, thunder) to combine with your generated noises. Add effects to them and set playback modes
|
||||
* Use admin tools to manage multiple users
|
||||
* Mobile friendly
|
||||
|
||||
@@ -65,3 +65,21 @@ npm run server-prod
|
||||
# Contributing
|
||||
|
||||
See [CONTRIBUTING.md](https://github.com/kaythomas0/noisedash/blob/main/CONTRIBUTING.md)
|
||||
|
||||
# License
|
||||
|
||||
Noisedash, a self-hostable web tool for generating ambient noises
|
||||
Copyright (C) 2021 Kay Thomas <kaythomas@pm.me>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU Affero General Public License as published
|
||||
by the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU Affero General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Affero General Public License
|
||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
14671
package-lock.json
generated
14671
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
57
package.json
57
package.json
@@ -1,18 +1,14 @@
|
||||
{
|
||||
"name": "noisedash",
|
||||
"descriptions": "Self-hostable web tool for generating ambient noises",
|
||||
"homepage": "https://github.com/kaythomas0/noisedash",
|
||||
"bugs": "https://github.com/kaythomas0/noisedash/issues",
|
||||
"license": "AGPL-3.0-or-later",
|
||||
"author": "Kay Thomas <kaythomas@pm.me> (https://kaythomas.dev)",
|
||||
"version": "0.2.0",
|
||||
"version": "0.6.9",
|
||||
"private": true,
|
||||
"author": "Kay Thomas <kaythomas@pm.me> (https://kaythomas.dev)",
|
||||
"scripts": {
|
||||
"serve": "vue-cli-service serve",
|
||||
"server": "node server/bin/www.js",
|
||||
"server-prod": "NODE_ENV=production node server/bin/www.js",
|
||||
"build": "vue-cli-service build",
|
||||
"lint": "vue-cli-service lint"
|
||||
"lint": "vue-cli-service lint",
|
||||
"server": "node server/bin/www.js",
|
||||
"server-prod": "NODE_ENV=production node server/bin/www.js"
|
||||
},
|
||||
"dependencies": {
|
||||
"@vscode/sqlite3": "^5.0.8",
|
||||
@@ -20,38 +16,43 @@
|
||||
"config": "^3.3.6",
|
||||
"connect-history-api-fallback": "^1.6.0",
|
||||
"cookie-parser": "^1.4.5",
|
||||
"core-js": "^3.19.1",
|
||||
"express": "^4.17.1",
|
||||
"express-session": "^1.17.2",
|
||||
"multer": "^1.4.3",
|
||||
"passport": "^0.4.1",
|
||||
"core-js": "^3.22.7",
|
||||
"express": "^4.18.1",
|
||||
"express-session": "^1.17.3",
|
||||
"multer": "^1.4.5-lts.1",
|
||||
"passport": "^0.6.0",
|
||||
"passport-local": "^1.0.0",
|
||||
"path": "^0.12.7",
|
||||
"session-file-store": "^1.5.0",
|
||||
"tone": "^14.7.77",
|
||||
"vue": "^2.6.11",
|
||||
"vue-router": "^3.5.3",
|
||||
"vuetify": "^2.5.12",
|
||||
"vue-router": "^3.5.4",
|
||||
"vuetify": "^2.6.10",
|
||||
"winston": "^3.3.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@vue/cli-plugin-babel": "^4.5.15",
|
||||
"@vue/cli-plugin-eslint": "^4.5.15",
|
||||
"@vue/cli-plugin-router": "^4.5.15",
|
||||
"@vue/cli-service": "^4.5.15",
|
||||
"@vue/eslint-config-standard": "^5.1.2",
|
||||
"babel-eslint": "^10.1.0",
|
||||
"eslint": "^6.7.2",
|
||||
"@babel/core": "^7.12.16",
|
||||
"@babel/eslint-parser": "^7.12.16",
|
||||
"@vue/cli-plugin-babel": "^5.0.8",
|
||||
"@vue/cli-plugin-eslint": "^5.0.8",
|
||||
"@vue/cli-plugin-router": "^5.0.8",
|
||||
"@vue/cli-service": "^5.0.8",
|
||||
"@vue/eslint-config-standard": "^6.1.0",
|
||||
"eslint": "^7.32.0",
|
||||
"eslint-plugin-html": "^6.2.0",
|
||||
"eslint-plugin-import": "^2.25.2",
|
||||
"eslint-plugin-import": "^2.25.3",
|
||||
"eslint-plugin-node": "^11.1.0",
|
||||
"eslint-plugin-promise": "^4.2.1",
|
||||
"eslint-plugin-promise": "^5.1.0",
|
||||
"eslint-plugin-standard": "^4.0.0",
|
||||
"eslint-plugin-vue": "^6.2.2",
|
||||
"eslint-plugin-vue": "^8.0.3",
|
||||
"sass": "~1.32.0",
|
||||
"sass-loader": "^10.0.0",
|
||||
"vue-cli-plugin-vuetify": "^2.4.3",
|
||||
"vue-cli-plugin-vuetify": "^2.5.8",
|
||||
"vue-template-compiler": "^2.6.11",
|
||||
"vuetify-loader": "^1.7.3"
|
||||
}
|
||||
},
|
||||
"bugs": "https://github.com/kaythomas0/noisedash/issues",
|
||||
"descriptions": "Self-hostable web tool for generating ambient noises",
|
||||
"homepage": "https://github.com/kaythomas0/noisedash",
|
||||
"license": "AGPL-3.0-or-later"
|
||||
}
|
||||
|
||||
@@ -36,7 +36,8 @@ app.use(session({
|
||||
store: new FileStore(fileStoreOptions),
|
||||
secret: sessionSecret,
|
||||
resave: true,
|
||||
saveUninitialized: true
|
||||
saveUninitialized: true,
|
||||
cookie: { sameSite: 'strict' }
|
||||
}))
|
||||
app.use((req, res, next) => {
|
||||
const msgs = req.session.messages || []
|
||||
|
||||
@@ -59,7 +59,8 @@ module.exports = function () {
|
||||
} else {
|
||||
const userVersion = row.user_version
|
||||
|
||||
if (userVersion === 0) {
|
||||
db.serialize(() => {
|
||||
if (userVersion < 1) {
|
||||
db.run('ALTER TABLE samples ADD COLUMN fade_in REAL DEFAULT 0')
|
||||
db.run('ALTER TABLE samples ADD COLUMN loop_points_enabled INTEGER DEFAULT 0')
|
||||
db.run('ALTER TABLE samples ADD COLUMN loop_start REAL DEFAULT 0')
|
||||
@@ -67,6 +68,37 @@ module.exports = function () {
|
||||
|
||||
db.run('PRAGMA user_version = 1')
|
||||
}
|
||||
|
||||
if (userVersion < 2) {
|
||||
db.run('ALTER TABLE users ADD COLUMN preferences TEXT DEFAULT "{}"')
|
||||
|
||||
db.run('PRAGMA user_version = 2')
|
||||
}
|
||||
|
||||
if (userVersion < 3) {
|
||||
db.run('ALTER TABLE profiles_samples ADD COLUMN reverb_enabled INTEGER DEFAULT 0')
|
||||
db.run('ALTER TABLE profiles_samples ADD COLUMN reverb_pre_delay REAL DEFAULT 0')
|
||||
db.run('ALTER TABLE profiles_samples ADD COLUMN reverb_decay REAL DEFAULT 0')
|
||||
db.run('ALTER TABLE profiles_samples ADD COLUMN reverb_wet INTEGER DEFAULT 0')
|
||||
db.run('ALTER TABLE profiles_samples ADD COLUMN playback_mode TEXT DEFAULT "continuous"')
|
||||
db.run('ALTER TABLE profiles_samples ADD COLUMN sporadic_min INTEGER DEFAULT 30')
|
||||
db.run('ALTER TABLE profiles_samples ADD COLUMN sporadic_max INTEGER DEFAULT 300')
|
||||
|
||||
db.run('PRAGMA user_version = 3')
|
||||
}
|
||||
|
||||
if (userVersion < 4) {
|
||||
db.run('UPDATE users SET preferences = ? WHERE preferences = ?',
|
||||
['{"accentColor":{"alpha":1,"hex":"#607D8B","hexa":"#607D8BFF","hsla":{"h":200,"s":18,"l":46,"a":1},"hsva":{"h":200,"s":31,"v":55,"a":1},"hue":200,"rgba":{"r":96,"g":125,"b":139,"a":1}}}', '{}'],
|
||||
(err) => {
|
||||
if (err) {
|
||||
logger.error(err)
|
||||
} else {
|
||||
db.run('PRAGMA user_version = 4')
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
@@ -36,8 +36,14 @@ router.get('/admin', (req, res) => {
|
||||
})
|
||||
|
||||
router.get('/logout', (req, res) => {
|
||||
req.logout()
|
||||
req.logout((err) => {
|
||||
if (err) {
|
||||
logger.error(err)
|
||||
res.sendStatus(500)
|
||||
} else {
|
||||
res.sendStatus(200)
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
router.get('/setup', (req, res) => {
|
||||
|
||||
@@ -59,10 +59,28 @@ router.post('/profiles', (req, res) => {
|
||||
profileID = this.lastID
|
||||
|
||||
req.body.samples.forEach(s => {
|
||||
db.run('INSERT INTO profiles_samples (profile, sample, volume) VALUES (?, ?, ?)', [
|
||||
db.run(`INSERT INTO profiles_samples(
|
||||
profile,
|
||||
sample,
|
||||
volume,
|
||||
reverb_enabled,
|
||||
reverb_pre_delay,
|
||||
reverb_decay,
|
||||
reverb_wet,
|
||||
playback_mode,
|
||||
sporadic_min,
|
||||
sporadic_max)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [
|
||||
profileID,
|
||||
s.id,
|
||||
s.volume
|
||||
s.volume,
|
||||
s.reverbEnabled,
|
||||
s.reverbPreDelay,
|
||||
s.reverbDecay,
|
||||
s.reverbWet,
|
||||
s.playbackMode,
|
||||
s.sporadicMin,
|
||||
s.sporadicMax
|
||||
],
|
||||
(err) => {
|
||||
if (err) {
|
||||
@@ -204,10 +222,28 @@ router.put('/profiles/:profileId', (req, res) => {
|
||||
})
|
||||
|
||||
req.body.samples.forEach(s => {
|
||||
db.run('INSERT INTO profiles_samples (profile, sample, volume) VALUES (?, ?, ?)', [
|
||||
db.run(`INSERT INTO profiles_samples(
|
||||
profile,
|
||||
sample,
|
||||
volume,
|
||||
reverb_enabled,
|
||||
reverb_pre_delay,
|
||||
reverb_decay,
|
||||
reverb_wet,
|
||||
playback_mode,
|
||||
sporadic_min,
|
||||
sporadic_max)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [
|
||||
req.params.profileId,
|
||||
s.id,
|
||||
s.volume
|
||||
s.volume,
|
||||
s.reverbEnabled,
|
||||
s.reverbPreDelay,
|
||||
s.reverbDecay,
|
||||
s.reverbWet,
|
||||
s.playbackMode,
|
||||
s.sporadicMin,
|
||||
s.sporadicMax
|
||||
],
|
||||
(err) => {
|
||||
if (err) {
|
||||
@@ -355,6 +391,13 @@ router.get('/profiles/:profileId', (req, res) => {
|
||||
samples.id,
|
||||
name,
|
||||
profiles_samples.volume,
|
||||
profiles_samples.reverb_enabled as reverbEnabled,
|
||||
profiles_samples.reverb_pre_delay as reverbPreDelay,
|
||||
profiles_samples.reverb_decay as reverbDecay,
|
||||
profiles_samples.reverb_wet as reverbWet,
|
||||
profiles_samples.playback_mode as playbackMode,
|
||||
profiles_samples.sporadic_min as sporadicMin,
|
||||
profiles_samples.sporadic_max as sporadicMax,
|
||||
fade_in as fadeIn,
|
||||
loop_points_enabled as loopPointsEnabled,
|
||||
loop_start as loopStart,
|
||||
@@ -382,6 +425,13 @@ router.get('/profiles/:profileId', (req, res) => {
|
||||
sample.loopPointsEnabled = row.loopPointsEnabled === 1
|
||||
sample.loopStart = row.loopStart
|
||||
sample.loopEnd = row.loopEnd
|
||||
sample.reverbEnabled = row.reverbEnabled === 1
|
||||
sample.reverbPreDelay = row.reverbPreDelay
|
||||
sample.reverbDecay = row.reverbDecay
|
||||
sample.reverbWet = row.reverbWet
|
||||
sample.playbackMode = row.playbackMode
|
||||
sample.sporadicMin = row.sporadicMin
|
||||
sample.sporadicMax = row.sporadicMax
|
||||
|
||||
samples.push(sample)
|
||||
})
|
||||
|
||||
@@ -9,7 +9,11 @@ router.get('/users/current', (req, res) => {
|
||||
return res.sendStatus(401)
|
||||
}
|
||||
|
||||
db.get('SELECT is_admin as isAdmin, dark_mode as darkMode, can_upload as canUpload, * FROM users WHERE id = ?', [req.user.id], (err, row) => {
|
||||
db.get(`SELECT
|
||||
is_admin as isAdmin,
|
||||
dark_mode as darkMode,
|
||||
can_upload as canUpload,
|
||||
* FROM users WHERE id = ?`, [req.user.id], (err, row) => {
|
||||
if (err) {
|
||||
logger.error(err)
|
||||
return res.sendStatus(500)
|
||||
@@ -24,6 +28,7 @@ router.get('/users/current', (req, res) => {
|
||||
user.isAdmin = row.isAdmin === 1
|
||||
user.darkMode = row.darkMode === 1
|
||||
user.canUpload = row.canUpload === 1
|
||||
user.preferences = JSON.parse(row.preferences)
|
||||
}
|
||||
|
||||
res.json({ user: user })
|
||||
@@ -67,6 +72,8 @@ router.post('/users', (req, res) => {
|
||||
return res.sendStatus(500)
|
||||
}
|
||||
|
||||
const defaultPreferences = '{"accentColor":{"alpha":1,"hex":"#607D8B","hexa":"#607D8BFF","hsla":{"h":200,"s":18,"l":46,"a":1},"hsva":{"h":200,"s":31,"v":55,"a":1},"hue":200,"rgba":{"r":96,"g":125,"b":139,"a":1}}}'
|
||||
|
||||
if (row.count !== 0) {
|
||||
if (!req.user) {
|
||||
return res.sendStatus(401)
|
||||
@@ -89,15 +96,16 @@ router.post('/users', (req, res) => {
|
||||
return res.sendStatus(500)
|
||||
}
|
||||
|
||||
db.run(`INSERT INTO users (username, hashed_password, salt, name, is_admin, dark_mode, can_upload)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?)`, [
|
||||
db.run(`INSERT INTO users (username, hashed_password, salt, name, is_admin, dark_mode, can_upload, preferences)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?)`, [
|
||||
req.body.username,
|
||||
hashedPassword,
|
||||
salt,
|
||||
req.body.name,
|
||||
req.body.isAdmin,
|
||||
req.body.darkMode,
|
||||
req.body.canUpload
|
||||
req.body.canUpload,
|
||||
defaultPreferences
|
||||
], (err) => {
|
||||
if (err) {
|
||||
logger.error(err)
|
||||
@@ -120,15 +128,16 @@ router.post('/users', (req, res) => {
|
||||
return res.sendStatus(500)
|
||||
}
|
||||
|
||||
db.run(`INSERT INTO users (username, hashed_password, salt, name, is_admin, dark_mode, can_upload)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?)`, [
|
||||
db.run(`INSERT INTO users (username, hashed_password, salt, name, is_admin, dark_mode, can_upload, preferences)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?)`, [
|
||||
req.body.username,
|
||||
hashedPassword,
|
||||
salt,
|
||||
req.body.name,
|
||||
req.body.isAdmin,
|
||||
req.body.darkMode,
|
||||
req.body.canUpload
|
||||
req.body.canUpload,
|
||||
defaultPreferences
|
||||
], function (err) {
|
||||
if (err) {
|
||||
logger.error(err)
|
||||
@@ -287,4 +296,23 @@ router.delete('/users/:userId', (req, res) => {
|
||||
})
|
||||
})
|
||||
|
||||
router.patch('/users/preferences', (req, res) => {
|
||||
if (!req.user) {
|
||||
return res.sendStatus(401)
|
||||
}
|
||||
|
||||
const preferences = JSON.stringify(req.body.preferences)
|
||||
|
||||
db.serialize(() => {
|
||||
db.run('UPDATE users SET preferences = ? WHERE id = ?', [preferences, req.user.id], (err) => {
|
||||
if (err) {
|
||||
logger.error(err)
|
||||
return res.sendStatus(500)
|
||||
} else {
|
||||
return res.sendStatus(200)
|
||||
}
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
module.exports = router
|
||||
|
||||
@@ -8,6 +8,10 @@
|
||||
</v-col>
|
||||
</v-row>
|
||||
|
||||
<h2 class="headline font-weight-bold mb-3">
|
||||
User Management
|
||||
</h2>
|
||||
|
||||
<v-col cols="12">
|
||||
<v-row>
|
||||
ID: {{ currentUser.id }}
|
||||
@@ -24,9 +28,9 @@
|
||||
v-model="changePasswordDialog"
|
||||
max-width="600px"
|
||||
>
|
||||
<template v-slot:activator="{ on, attrs }">
|
||||
<template #activator="{ on, attrs }">
|
||||
<v-btn
|
||||
class="my-3"
|
||||
class="mt-5 mb-10"
|
||||
v-bind="attrs"
|
||||
v-on="on"
|
||||
@click="resetChangePasswordForm"
|
||||
@@ -77,19 +81,42 @@
|
||||
</v-form>
|
||||
</v-dialog>
|
||||
|
||||
<h2 class="headline font-weight-bold mb-3">
|
||||
Preferences
|
||||
</h2>
|
||||
|
||||
<h3 class="font-weight-bold">
|
||||
Dark Mode
|
||||
</h3>
|
||||
|
||||
<v-switch
|
||||
v-model="$vuetify.theme.dark"
|
||||
label="Dark Mode"
|
||||
:label="`${$vuetify.theme.dark ? 'On' : 'Off'}`"
|
||||
@change="toggleDarkMode"
|
||||
/>
|
||||
|
||||
<h3 class="mb-5 font-weight-bold">
|
||||
Accent Color
|
||||
</h3>
|
||||
|
||||
<v-color-picker
|
||||
v-model="accentColor"
|
||||
/>
|
||||
|
||||
<v-btn
|
||||
class="mt-5"
|
||||
@click="updateAccentColor"
|
||||
>
|
||||
Apply
|
||||
</v-btn>
|
||||
|
||||
<v-snackbar
|
||||
v-model="snackbar"
|
||||
timeout="3000"
|
||||
>
|
||||
{{ snackbarText }}
|
||||
|
||||
<template v-slot:action="{ attrs }">
|
||||
<template #action="{ attrs }">
|
||||
<v-btn
|
||||
text
|
||||
v-bind="attrs"
|
||||
@@ -12,7 +12,7 @@
|
||||
v-model="registerUserDialog"
|
||||
max-width="600px"
|
||||
>
|
||||
<template v-slot:activator="{ on, attrs }">
|
||||
<template #activator="{ on, attrs }">
|
||||
<v-btn
|
||||
v-bind="attrs"
|
||||
v-on="on"
|
||||
@@ -139,7 +139,7 @@
|
||||
>
|
||||
{{ snackbarText }}
|
||||
|
||||
<template v-slot:action="{ attrs }">
|
||||
<template #action="{ attrs }">
|
||||
<v-btn
|
||||
text
|
||||
v-bind="attrs"
|
||||
@@ -7,7 +7,7 @@
|
||||
dense
|
||||
>
|
||||
<v-app-bar-nav-icon
|
||||
@click="getCurrentUser"
|
||||
@click="checkForAdmin"
|
||||
/>
|
||||
</v-app-bar>
|
||||
<v-navigation-drawer
|
||||
@@ -63,7 +63,7 @@
|
||||
</v-list-item>
|
||||
</v-list-item-group>
|
||||
</v-list>
|
||||
<template v-slot:append>
|
||||
<template #append>
|
||||
<v-btn
|
||||
block
|
||||
href="https://github.com/kaythomas0/noisedash"
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
>
|
||||
{{ snackbarText }}
|
||||
|
||||
<template v-slot:action="{ attrs }">
|
||||
<template #action="{ attrs }">
|
||||
<v-btn
|
||||
text
|
||||
v-bind="attrs"
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
<v-row justify="center">
|
||||
<v-btn
|
||||
:disabled="playDisabled || !isTimerValid"
|
||||
:disabled="playDisabled || !isTimerValid || (loadedSamples.length != 0 && !isSporadicValid)"
|
||||
class="mx-3 mb-5"
|
||||
fab
|
||||
large
|
||||
@@ -50,7 +50,7 @@
|
||||
label="Profiles"
|
||||
class="mx-3 mb-5"
|
||||
:disabled="playDisabled"
|
||||
@change="loadProfile"
|
||||
@change="loadProfile(true)"
|
||||
/>
|
||||
</v-row>
|
||||
|
||||
@@ -66,14 +66,14 @@
|
||||
class="mx-3 my-3"
|
||||
@click="updateProfile"
|
||||
>
|
||||
Save Profile
|
||||
{{ unsavedWork ? 'Save Profile*' : 'Save Profile' }}
|
||||
</v-btn>
|
||||
|
||||
<v-dialog
|
||||
v-model="profileDialog"
|
||||
max-width="600px"
|
||||
>
|
||||
<template v-slot:activator="{ on, attrs }">
|
||||
<template #activator="{ on, attrs }">
|
||||
<v-btn
|
||||
v-bind="attrs"
|
||||
class="mx-3 my-3"
|
||||
@@ -90,18 +90,16 @@
|
||||
>
|
||||
<v-card>
|
||||
<v-card-title>
|
||||
<span class="text-h5">Profile Name</span>
|
||||
<span class="text-h5">Save Profile As...</span>
|
||||
</v-card-title>
|
||||
<v-card-text>
|
||||
<v-container>
|
||||
<v-row>
|
||||
<v-col cols="12">
|
||||
<v-text-field
|
||||
v-model="profileName"
|
||||
label="Profile Name"
|
||||
:rules="[rules.required()]"
|
||||
/>
|
||||
</v-col>
|
||||
</v-row>
|
||||
</v-container>
|
||||
</v-card-text>
|
||||
@@ -129,7 +127,7 @@
|
||||
v-model="profileMoreDialog"
|
||||
max-width="600px"
|
||||
>
|
||||
<template v-slot:activator="{ on, attrs }">
|
||||
<template #activator="{ on, attrs }">
|
||||
<v-btn
|
||||
v-bind="attrs"
|
||||
class="mx-3 my-3"
|
||||
@@ -168,6 +166,16 @@
|
||||
Export Profile
|
||||
</v-list-item-title>
|
||||
</v-list-item>
|
||||
<v-list-item
|
||||
@click="openStartRecordingDialog"
|
||||
>
|
||||
<v-list-item-icon>
|
||||
<v-icon>mdi-record</v-icon>
|
||||
</v-list-item-icon>
|
||||
<v-list-item-title>
|
||||
Record Profile Audio
|
||||
</v-list-item-title>
|
||||
</v-list-item>
|
||||
</v-list-item-group>
|
||||
</v-col>
|
||||
</v-row>
|
||||
@@ -252,7 +260,6 @@
|
||||
:items="profileItems"
|
||||
return-object
|
||||
label="Profiles"
|
||||
class="mx-3 mb-5"
|
||||
/>
|
||||
</v-row>
|
||||
</v-container>
|
||||
@@ -274,6 +281,120 @@
|
||||
</v-card-actions>
|
||||
</v-card>
|
||||
</v-dialog>
|
||||
|
||||
<v-dialog
|
||||
v-model="startRecordingDialog"
|
||||
max-width="600px"
|
||||
>
|
||||
<v-form
|
||||
ref="startRecordingForm"
|
||||
v-model="isRecordingValid"
|
||||
>
|
||||
<v-card>
|
||||
<v-card-title>
|
||||
<span class="text-h5">Start Recording</span>
|
||||
</v-card-title>
|
||||
<v-card-text>
|
||||
<v-container>
|
||||
<v-row>
|
||||
<p>Select profile to record audio for. This is only supported on Chrome and Firefox. Current profile will be saved before recording.</p>
|
||||
</v-row>
|
||||
<v-row>
|
||||
<v-select
|
||||
v-model="recordedProfile"
|
||||
:items="profileItems"
|
||||
return-object
|
||||
label="Profiles"
|
||||
/>
|
||||
</v-row>
|
||||
<v-row>
|
||||
<v-text-field
|
||||
v-model="recordingFileName"
|
||||
label="File Name"
|
||||
:rules="[rules.required()]"
|
||||
/>
|
||||
</v-row>
|
||||
</v-container>
|
||||
</v-card-text>
|
||||
<v-card-actions>
|
||||
<v-spacer />
|
||||
<v-btn
|
||||
text
|
||||
@click="startRecordingDialog = false"
|
||||
>
|
||||
Close
|
||||
</v-btn>
|
||||
<v-btn
|
||||
text
|
||||
:disabled="!isRecordingValid"
|
||||
@click="startRecording"
|
||||
>
|
||||
Record
|
||||
</v-btn>
|
||||
</v-card-actions>
|
||||
</v-card>
|
||||
</v-form>
|
||||
</v-dialog>
|
||||
|
||||
<v-dialog
|
||||
v-model="recordingDialog"
|
||||
max-width="600px"
|
||||
persistent
|
||||
>
|
||||
<v-card>
|
||||
<v-card-title>
|
||||
<span class="text-h5">Recording</span>
|
||||
</v-card-title>
|
||||
<v-card-text>
|
||||
Time Elapsed: {{ recordingTimeElapsed }} Seconds
|
||||
</v-card-text>
|
||||
<v-card-actions>
|
||||
<v-spacer />
|
||||
<v-btn
|
||||
text
|
||||
@click="cancelRecording"
|
||||
>
|
||||
Cancel
|
||||
</v-btn>
|
||||
<v-btn
|
||||
text
|
||||
@click="stopRecording"
|
||||
>
|
||||
Stop and Save
|
||||
</v-btn>
|
||||
</v-card-actions>
|
||||
</v-card>
|
||||
</v-dialog>
|
||||
|
||||
<v-dialog
|
||||
v-model="confirmSwitchProfileDialog"
|
||||
max-width="600px"
|
||||
persistent
|
||||
>
|
||||
<v-card>
|
||||
<v-card-title>
|
||||
<span class="text-h5">Save Profile?</span>
|
||||
</v-card-title>
|
||||
<v-card-text>
|
||||
You have unsaved work on your current profile. Would you like to save it before switching?
|
||||
</v-card-text>
|
||||
<v-card-actions>
|
||||
<v-spacer />
|
||||
<v-btn
|
||||
text
|
||||
@click="discardChanges"
|
||||
>
|
||||
Discard Changes
|
||||
</v-btn>
|
||||
<v-btn
|
||||
text
|
||||
@click="saveChanges"
|
||||
>
|
||||
Save Profile
|
||||
</v-btn>
|
||||
</v-card-actions>
|
||||
</v-card>
|
||||
</v-dialog>
|
||||
</v-col>
|
||||
|
||||
<v-col cols="12">
|
||||
@@ -345,7 +466,7 @@
|
||||
label="Volume"
|
||||
thumb-label
|
||||
max="0"
|
||||
min="-30"
|
||||
min="-60"
|
||||
class="mx-3"
|
||||
@input="updateVolume"
|
||||
/>
|
||||
@@ -531,10 +652,15 @@
|
||||
<v-row
|
||||
justify="center"
|
||||
>
|
||||
{{ sample.name }}
|
||||
</v-row>
|
||||
<v-col />
|
||||
|
||||
<v-row>
|
||||
<v-col>
|
||||
<h2 class="mb-5">
|
||||
{{ sample.name }}
|
||||
</h2>
|
||||
</v-col>
|
||||
|
||||
<v-col>
|
||||
<v-btn
|
||||
icon
|
||||
:disabled="playDisabled"
|
||||
@@ -542,13 +668,16 @@
|
||||
>
|
||||
<v-icon>mdi-delete</v-icon>
|
||||
</v-btn>
|
||||
</v-col>
|
||||
</v-row>
|
||||
|
||||
<v-row>
|
||||
<v-slider
|
||||
v-model="sample.volume"
|
||||
label="Volume"
|
||||
thumb-label
|
||||
max="0"
|
||||
min="-30"
|
||||
min="-60"
|
||||
class="mx-3"
|
||||
@input="updateSampleVolume(sample.id, index)"
|
||||
/>
|
||||
@@ -558,6 +687,142 @@
|
||||
<p>{{ loadedSamples[index].volume }}</p>
|
||||
</div>
|
||||
</v-row>
|
||||
|
||||
<v-row
|
||||
justify="center"
|
||||
>
|
||||
<h3 class="font-weight-regular mb-9">
|
||||
Effects
|
||||
</h3>
|
||||
</v-row>
|
||||
|
||||
<v-expansion-panels class="mb-9">
|
||||
<v-expansion-panel>
|
||||
<v-expansion-panel-header>
|
||||
Reverb
|
||||
</v-expansion-panel-header>
|
||||
<v-expansion-panel-content>
|
||||
<v-row justify="center">
|
||||
<v-checkbox
|
||||
v-model="sample.reverbEnabled"
|
||||
:disabled="playDisabled"
|
||||
label="Enabled"
|
||||
/>
|
||||
</v-row>
|
||||
|
||||
<v-row justify="center">
|
||||
<v-slider
|
||||
v-model="sample.reverbPreDelay"
|
||||
:disabled="playDisabled || !sample.reverbEnabled"
|
||||
label="Pre Delay"
|
||||
thumb-label
|
||||
max="16"
|
||||
min="0"
|
||||
step="0.5"
|
||||
class="mx-3"
|
||||
/>
|
||||
<div
|
||||
class="mx-3"
|
||||
>
|
||||
<p>{{ sample.reverbPreDelay }}</p>
|
||||
</div>
|
||||
</v-row>
|
||||
|
||||
<v-row justify="center">
|
||||
<v-slider
|
||||
v-model="sample.reverbDecay"
|
||||
:disabled="playDisabled || !sample.reverbEnabled"
|
||||
label="Decay"
|
||||
thumb-label
|
||||
max="16"
|
||||
min="0"
|
||||
step="0.5"
|
||||
class="mx-3"
|
||||
@input="updateVolume"
|
||||
/>
|
||||
<div
|
||||
class="mx-3"
|
||||
>
|
||||
<p> {{ sample.reverbDecay }}</p>
|
||||
</div>
|
||||
</v-row>
|
||||
|
||||
<v-row justify="center">
|
||||
<v-slider
|
||||
v-model="sample.reverbWet"
|
||||
:disabled="playDisabled || !sample.reverbEnabled"
|
||||
label="Wet"
|
||||
thumb-label
|
||||
max="1"
|
||||
min="0"
|
||||
step="0.01"
|
||||
class="mx-3"
|
||||
@input="updateVolume"
|
||||
/>
|
||||
<div
|
||||
class="mx-3"
|
||||
>
|
||||
<p>{{ sample.reverbWet }}%</p>
|
||||
</div>
|
||||
</v-row>
|
||||
</v-expansion-panel-content>
|
||||
</v-expansion-panel>
|
||||
</v-expansion-panels>
|
||||
|
||||
<v-row justify="center">
|
||||
<h3 class="font-weight-regular">
|
||||
Playback Mode
|
||||
</h3>
|
||||
</v-row>
|
||||
|
||||
<v-row
|
||||
class="mb-5"
|
||||
>
|
||||
<v-radio-group
|
||||
v-model="sample.playbackMode"
|
||||
:disabled="playDisabled"
|
||||
mandatory
|
||||
>
|
||||
<v-radio
|
||||
label="Continuous (Looped)"
|
||||
value="continuous"
|
||||
/>
|
||||
<v-radio
|
||||
label="Sporadic (Not Looped, Plays Randomly Within Interval)"
|
||||
value="sporadic"
|
||||
/>
|
||||
</v-radio-group>
|
||||
</v-row>
|
||||
|
||||
<v-form
|
||||
v-model="isSporadicValid"
|
||||
>
|
||||
<v-row
|
||||
justify="center"
|
||||
>
|
||||
<v-text-field
|
||||
v-model="sample.sporadicMin"
|
||||
type="number"
|
||||
label="Sporadic Min"
|
||||
class="mx-3"
|
||||
:disabled="sample.playbackMode != 'sporadic' || playDisabled"
|
||||
:rules="[rules.gt(-1)]"
|
||||
/>
|
||||
|
||||
<v-text-field
|
||||
v-model="sample.sporadicMax"
|
||||
type="number"
|
||||
label="Sporadic Max"
|
||||
class="mx-3"
|
||||
:disabled="sample.playbackMode != 'sporadic' || playDisabled"
|
||||
:rules="[rules.gt(0)]"
|
||||
/>
|
||||
</v-row>
|
||||
</v-form>
|
||||
|
||||
<v-divider
|
||||
class="mt-7"
|
||||
/>
|
||||
</v-container>
|
||||
</v-row>
|
||||
|
||||
@@ -565,7 +830,7 @@
|
||||
v-model="addSampleDialog"
|
||||
max-width="600px"
|
||||
>
|
||||
<template v-slot:activator="{ on, attrs }">
|
||||
<template #activator="{ on, attrs }">
|
||||
<v-btn
|
||||
v-bind="attrs"
|
||||
class="mx-3 my-3 mb-5"
|
||||
@@ -625,7 +890,7 @@
|
||||
v-model="uploadSampleDialog"
|
||||
max-width="600px"
|
||||
>
|
||||
<template v-slot:activator="{ on, attrs }">
|
||||
<template #activator="{ on, attrs }">
|
||||
<v-btn
|
||||
v-bind="attrs"
|
||||
class="mx-3 my-3 mb-5"
|
||||
@@ -646,9 +911,7 @@
|
||||
<v-card-text>
|
||||
<v-container>
|
||||
<v-row>
|
||||
<v-col cols="12">
|
||||
<p><strong>WARNING:</strong> Uploaded samples are publicly accessible.</p>
|
||||
</v-col>
|
||||
</v-row>
|
||||
<v-row>
|
||||
<v-file-input
|
||||
@@ -659,13 +922,11 @@
|
||||
/>
|
||||
</v-row>
|
||||
<v-row>
|
||||
<v-col cols="12">
|
||||
<v-text-field
|
||||
v-model="sampleName"
|
||||
label="Sample Name"
|
||||
:rules="[rules.required()]"
|
||||
/>
|
||||
</v-col>
|
||||
</v-row>
|
||||
</v-container>
|
||||
</v-card-text>
|
||||
@@ -693,7 +954,7 @@
|
||||
v-model="editSampleDialog"
|
||||
max-width="600px"
|
||||
>
|
||||
<template v-slot:activator="{ on, attrs }">
|
||||
<template #activator="{ on, attrs }">
|
||||
<v-btn
|
||||
v-bind="attrs"
|
||||
class="mx-3 my-3 mb-5"
|
||||
@@ -711,7 +972,7 @@
|
||||
>
|
||||
<v-card>
|
||||
<v-card-title>
|
||||
<span class="text-h5">Edit Sample</span>
|
||||
<span class="text-h5">Edit Samples</span>
|
||||
</v-card-title>
|
||||
<v-card-text>
|
||||
<v-container>
|
||||
@@ -722,7 +983,6 @@
|
||||
item-text="name"
|
||||
return-object
|
||||
label="Samples"
|
||||
class="mx-3"
|
||||
@change="loadPreviewSample"
|
||||
/>
|
||||
</v-row>
|
||||
@@ -735,8 +995,8 @@
|
||||
<v-checkbox
|
||||
v-model="previewSampleLoopPointsEnabled"
|
||||
:disabled="previewSamplePlaying"
|
||||
label="Use Loop Points"
|
||||
class="mx-3"
|
||||
label="Use Loop Points (Continuous Playback Mode Only)"
|
||||
@change="updatePreviewSampleLoopPoints"
|
||||
/>
|
||||
</v-row>
|
||||
|
||||
@@ -745,7 +1005,7 @@
|
||||
v-model="previewSampleLoopStart"
|
||||
type="number"
|
||||
label="Loop Start Time"
|
||||
class="mx-3"
|
||||
class="mr-3"
|
||||
:disabled="!previewSampleLoopPointsEnabled || previewSamplePlaying"
|
||||
:rules="[rules.gt(-1)]"
|
||||
@change="updatePreviewSamplePlayerLoopPoints"
|
||||
@@ -755,7 +1015,7 @@
|
||||
v-model="previewSampleLoopEnd"
|
||||
type="number"
|
||||
label="Loop End Time"
|
||||
class="mx-3"
|
||||
class="ml-3"
|
||||
:disabled="!previewSampleLoopPointsEnabled || previewSamplePlaying"
|
||||
:rules="[rules.gt(-1), rules.lt(previewSampleLength)]"
|
||||
@change="updatePreviewSamplePlayerLoopPoints"
|
||||
@@ -766,8 +1026,7 @@
|
||||
<v-text-field
|
||||
v-model="previewSampleFadeIn"
|
||||
type="number"
|
||||
label="Fade In Time"
|
||||
class="mx-3"
|
||||
label="Fade In Time (In continuous mode, this only effects first playback)"
|
||||
:disabled="previewSamplePlaying"
|
||||
:rules="[rules.gt(-1)]"
|
||||
@change="updatePreviewSamplePlayerFadeIn"
|
||||
@@ -812,7 +1071,7 @@
|
||||
>
|
||||
{{ infoSnackbarText }}
|
||||
|
||||
<template v-slot:action="{ attrs }">
|
||||
<template #action="{ attrs }">
|
||||
<v-btn
|
||||
text
|
||||
v-bind="attrs"
|
||||
@@ -830,7 +1089,7 @@
|
||||
>
|
||||
{{ errorSnackbarText }}
|
||||
|
||||
<template v-slot:action="{ attrs }">
|
||||
<template #action="{ attrs }">
|
||||
<v-btn
|
||||
text
|
||||
v-bind="attrs"
|
||||
@@ -1,11 +1,12 @@
|
||||
export default {
|
||||
name: 'Admin',
|
||||
name: 'Account',
|
||||
|
||||
data: () => ({
|
||||
currentUser: {},
|
||||
changePasswordDialog: false,
|
||||
isPasswordValid: false,
|
||||
password: '',
|
||||
accentColor: {},
|
||||
snackbar: false,
|
||||
snackbarText: '',
|
||||
rules: {
|
||||
@@ -21,6 +22,7 @@ export default {
|
||||
.then(response => {
|
||||
if (response.status === 200) {
|
||||
this.currentUser = response.data.user
|
||||
this.accentColor = this.currentUser.preferences.accentColor
|
||||
}
|
||||
})
|
||||
},
|
||||
@@ -45,6 +47,14 @@ export default {
|
||||
this.$http.patch('/users/dark-mode', {
|
||||
darkMode: this.$vuetify.theme.dark
|
||||
})
|
||||
},
|
||||
updateAccentColor () {
|
||||
const preferences = { accentColor: this.accentColor }
|
||||
this.$http.patch('/users/preferences', {
|
||||
preferences: preferences
|
||||
})
|
||||
this.$vuetify.theme.themes.dark.primary = this.accentColor.hex
|
||||
this.$vuetify.theme.themes.light.primary = this.accentColor.hex
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,6 +6,9 @@ export default {
|
||||
isAdmin: false,
|
||||
loggedIn: false
|
||||
}),
|
||||
created () {
|
||||
this.getUserPreferences()
|
||||
},
|
||||
methods: {
|
||||
home () {
|
||||
this.$router.push('/')
|
||||
@@ -24,7 +27,7 @@ export default {
|
||||
}
|
||||
})
|
||||
},
|
||||
getCurrentUser () {
|
||||
checkForAdmin () {
|
||||
this.loggedIn = false
|
||||
this.drawyer = true
|
||||
this.$http.get('/users/current')
|
||||
@@ -32,12 +35,21 @@ export default {
|
||||
if (response.status === 200) {
|
||||
this.loggedIn = true
|
||||
this.isAdmin = response.data.user.isAdmin
|
||||
this.$vuetify.theme.dark = response.data.user.darkMode
|
||||
}
|
||||
})
|
||||
.catch(() => {
|
||||
this.isAdmin = false
|
||||
})
|
||||
},
|
||||
getUserPreferences () {
|
||||
this.$http.get('/users/current')
|
||||
.then(response => {
|
||||
if (response.status === 200) {
|
||||
const preferences = response.data.user.preferences
|
||||
this.$vuetify.theme.themes.dark.primary = preferences.accentColor.hex
|
||||
this.$vuetify.theme.themes.light.primary = preferences.accentColor.hex
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
export default {
|
||||
name: 'Login',
|
||||
|
||||
data: () => ({
|
||||
valid: false,
|
||||
username: '',
|
||||
|
||||
@@ -64,6 +64,18 @@ export default {
|
||||
previewSampleButtonText: 'Preview Sample',
|
||||
previewSampleLoading: true,
|
||||
previewSampleLength: 0,
|
||||
startRecordingDialog: false,
|
||||
recordingDialog: false,
|
||||
recordingTimeElapsed: 0,
|
||||
recordedProfile: {},
|
||||
recordingFileName: '',
|
||||
isRecordingValid: false,
|
||||
unsavedWork: false,
|
||||
saveProfileText: 'Save Profile',
|
||||
unwatch: null,
|
||||
confirmSwitchProfileDialog: false,
|
||||
activeProfile: {},
|
||||
isSporadicValid: false,
|
||||
errorSnackbar: false,
|
||||
errorSnackbarText: '',
|
||||
rules: {
|
||||
@@ -88,6 +100,40 @@ export default {
|
||||
}
|
||||
})
|
||||
return samples
|
||||
},
|
||||
changeableSettings: function () {
|
||||
const settings = [
|
||||
this.isTimerEnabled,
|
||||
this.hours,
|
||||
this.minutes,
|
||||
this.seconds,
|
||||
this.volume,
|
||||
this.noiseColor,
|
||||
this.isFilterEnabled,
|
||||
this.filterType,
|
||||
this.filterCutoff,
|
||||
this.isLFOFilterCutoffEnabled,
|
||||
this.lfoFilterCutoffFrequency,
|
||||
this.lfoFilterCutoffRange,
|
||||
this.isTremoloEnabled,
|
||||
this.tremoloDepth,
|
||||
this.tremoloFrequency,
|
||||
this.isTimerEnabled,
|
||||
this.loadedSamples
|
||||
]
|
||||
|
||||
this.loadedSamples.forEach(s => {
|
||||
settings.push(s.volume)
|
||||
settings.push(s.reverbEnabled)
|
||||
settings.push(s.reverbPreDelay)
|
||||
settings.push(s.reverbDecay)
|
||||
settings.push(s.reverbWet)
|
||||
settings.push(s.playbackMode)
|
||||
settings.push(s.sporadicMin)
|
||||
settings.push(s.sporadicMax)
|
||||
})
|
||||
|
||||
return settings
|
||||
}
|
||||
},
|
||||
created () {
|
||||
@@ -98,6 +144,7 @@ export default {
|
||||
this.players = new Tone.Players()
|
||||
this.samplePreviewPlayer = new Tone.Player().toDestination()
|
||||
this.samplePreviewPlayer.loop = true
|
||||
this.recorder = new Tone.Recorder()
|
||||
|
||||
this.populateProfileItems(0)
|
||||
this.populatePreviewSampleItems()
|
||||
@@ -108,11 +155,13 @@ export default {
|
||||
this.stop()
|
||||
},
|
||||
methods: {
|
||||
play () {
|
||||
async play () {
|
||||
if (!this.players.loaded) {
|
||||
return
|
||||
}
|
||||
|
||||
await Tone.start()
|
||||
|
||||
this.playDisabled = true
|
||||
Tone.Transport.cancel()
|
||||
|
||||
@@ -139,35 +188,73 @@ export default {
|
||||
this.lfo.connect(this.filter.frequency).start()
|
||||
}
|
||||
|
||||
if (this.isTimerEnabled) {
|
||||
this.duration = parseInt((this.hours * 3600)) + parseInt((this.minutes * 60)) + parseInt(this.seconds)
|
||||
this.timeRemaining = this.duration
|
||||
this.transportInterval = setInterval(() => this.stop(), this.duration * 1000 + 100)
|
||||
this.timeRemainingInterval = setInterval(() => this.startTimer(), 1000)
|
||||
Tone.Transport.loopEnd = this.duration
|
||||
|
||||
this.noise.sync().start(0).stop(this.duration)
|
||||
} else {
|
||||
this.noise.sync().start(0)
|
||||
}
|
||||
|
||||
this.loadedSamples.forEach(s => {
|
||||
this.players.player(s.id).loop = true
|
||||
this.players.player(s.id).fadeIn = s.fadeIn
|
||||
if (s.loopPointsEnabled) {
|
||||
this.players.player(s.id).setLoopPoints(s.loopStart, s.loopEnd)
|
||||
} else {
|
||||
this.players.player(s.id).setLoopPoints(0, this.players.player(s.id).buffer.duration)
|
||||
}
|
||||
this.players.player(s.id).volume.value = s.volume
|
||||
})
|
||||
|
||||
if (this.isTimerEnabled) {
|
||||
this.duration = parseInt((this.hours * 3600)) + parseInt((this.minutes * 60)) + parseInt(this.seconds)
|
||||
this.noise.sync().start(0).stop(this.duration)
|
||||
Tone.Transport.loopEnd = this.duration
|
||||
this.timeRemaining = this.duration
|
||||
this.transportInterval = setInterval(() => this.stop(), this.duration * 1000 + 100)
|
||||
this.timeRemainingInterval = setInterval(() => this.startTimer(), 1000)
|
||||
|
||||
this.loadedSamples.forEach(s => {
|
||||
this.players.player(s.id).unsync().sync().start(0).stop(this.duration)
|
||||
})
|
||||
this.players.player(s.id).disconnect()
|
||||
if (s.reverbEnabled) {
|
||||
const reverb = new Tone.Reverb(s.reverbDecay).toDestination()
|
||||
reverb.set({ preDelay: s.reverbPreDelay, wet: s.reverbWet })
|
||||
this.players.player(s.id).connect(reverb)
|
||||
} else {
|
||||
this.noise.sync().start(0)
|
||||
|
||||
this.loadedSamples.forEach(s => {
|
||||
this.players.player(s.id).unsync().sync().start(0)
|
||||
})
|
||||
this.players.player(s.id).toDestination()
|
||||
}
|
||||
|
||||
Tone.Transport.start()
|
||||
if (s.playbackMode === 'sporadic') {
|
||||
this.players.player(s.id).loop = false
|
||||
|
||||
const maxInt = parseInt(s.sporadicMax, 10)
|
||||
const minInt = parseInt(s.sporadicMin, 10)
|
||||
|
||||
if (minInt <= maxInt) {
|
||||
const rand = Math.floor(Math.random() * (maxInt - minInt + 1) + minInt)
|
||||
s.initialSporadicPlayInterval = setInterval(() => this.playSporadicSample(s.id), rand * 1000)
|
||||
}
|
||||
} else {
|
||||
this.players.player(s.id).loop = true
|
||||
|
||||
if (this.isTimerEnabled) {
|
||||
this.players.player(s.id).unsync().sync().start(0).stop(this.duration)
|
||||
} else {
|
||||
this.players.player(s.id).unsync().sync().start(0)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
Tone.Transport.start('+0.1')
|
||||
},
|
||||
playSporadicSample (id) {
|
||||
const sample = this.loadedSamples.find(s => s.id === id)
|
||||
|
||||
clearInterval(sample.initialSporadicPlayInterval)
|
||||
clearInterval(sample.sporadicInterval)
|
||||
|
||||
this.players.player(id).unsync().sync().start()
|
||||
|
||||
const maxInt = parseInt(sample.sporadicMax, 10)
|
||||
const minInt = parseInt(sample.sporadicMin, 10)
|
||||
sample.playNextTime = Math.floor(Math.random() * (maxInt - minInt + 1) + minInt)
|
||||
|
||||
sample.sporadicInterval = setInterval(() => this.playSporadicSample(id), sample.playNextTime * 1000)
|
||||
},
|
||||
stop () {
|
||||
clearInterval(this.transportInterval)
|
||||
@@ -177,6 +264,13 @@ export default {
|
||||
clearInterval(this.timeRemainingInterval)
|
||||
this.timeRemaining = 0
|
||||
this.duration = 0
|
||||
|
||||
this.loadedSamples.forEach(s => {
|
||||
if (s.playbackMode === 'sporadic') {
|
||||
clearInterval(s.initialSporadicPlayInterval)
|
||||
clearInterval(s.sporadicInterval)
|
||||
}
|
||||
})
|
||||
},
|
||||
startTimer () {
|
||||
this.timeRemaining -= 1
|
||||
@@ -249,7 +343,8 @@ export default {
|
||||
this.selectedProfile = this.profileItems.find(p => p.id === profileId)
|
||||
}
|
||||
this.exportedProfile = this.profileItems[0]
|
||||
this.loadProfile()
|
||||
this.recordedProfile = this.profileItems[0]
|
||||
this.loadProfile(true)
|
||||
}
|
||||
}
|
||||
})
|
||||
@@ -286,6 +381,7 @@ export default {
|
||||
if (response.status === 200) {
|
||||
this.profileDialog = false
|
||||
this.populateProfileItems(response.data.id)
|
||||
this.unsavedWork = false
|
||||
this.infoSnackbarText = 'Profile Saved'
|
||||
this.infoSnackbar = true
|
||||
}
|
||||
@@ -314,6 +410,7 @@ export default {
|
||||
samples: this.loadedSamples
|
||||
}).then(response => {
|
||||
if (response.status === 200) {
|
||||
this.unsavedWork = false
|
||||
this.infoSnackbarText = 'Profile Saved'
|
||||
this.infoSnackbar = true
|
||||
}
|
||||
@@ -323,7 +420,10 @@ export default {
|
||||
this.errorSnackbar = true
|
||||
})
|
||||
},
|
||||
loadProfile () {
|
||||
loadProfile (checkForUnsavedWork) {
|
||||
if (checkForUnsavedWork && this.unsavedWork) {
|
||||
this.confirmSwitchProfileDialog = true
|
||||
} else {
|
||||
this.$http.get('/profiles/'.concat(this.selectedProfile.id))
|
||||
.then(response => {
|
||||
if (response.status === 200) {
|
||||
@@ -345,12 +445,23 @@ export default {
|
||||
this.tremoloDepth = profile.tremoloDepth
|
||||
|
||||
this.loadedSamples = profile.samples
|
||||
|
||||
this.activeProfile = profile
|
||||
|
||||
if (this.unwatch) {
|
||||
this.unwatch()
|
||||
}
|
||||
|
||||
this.unwatch = this.$watch('changeableSettings', function () {
|
||||
this.unsavedWork = true
|
||||
})
|
||||
}
|
||||
})
|
||||
.catch(() => {
|
||||
this.errorSnackbarText = 'Error Loading Profile'
|
||||
this.errorSnackbar = true
|
||||
})
|
||||
}
|
||||
},
|
||||
deleteProfile () {
|
||||
this.$http.delete('/profiles/'.concat(this.selectedProfile.id))
|
||||
@@ -414,6 +525,8 @@ export default {
|
||||
this.checkedSamples.forEach(i => {
|
||||
const load = this.allSamples.find(e => e.id === i)
|
||||
load.volume = -10
|
||||
load.sporadicMin = 30
|
||||
load.sporadicMax = 300
|
||||
this.loadedSamples.push(load)
|
||||
})
|
||||
|
||||
@@ -433,6 +546,9 @@ export default {
|
||||
if (response.status === 200) {
|
||||
this.canUpload = response.data.user.canUpload
|
||||
this.$vuetify.theme.dark = response.data.user.darkMode
|
||||
const preferences = response.data.user.preferences
|
||||
this.$vuetify.theme.themes.dark.primary = preferences.accentColor.hex
|
||||
this.$vuetify.theme.themes.light.primary = preferences.accentColor.hex
|
||||
}
|
||||
})
|
||||
},
|
||||
@@ -483,7 +599,7 @@ export default {
|
||||
}
|
||||
})
|
||||
.catch(() => {
|
||||
this.errorSnackbarText = 'Error Saving Profile'
|
||||
this.errorSnackbarText = 'Error Importing Profile'
|
||||
this.errorSnackbar = true
|
||||
})
|
||||
|
||||
@@ -536,7 +652,7 @@ export default {
|
||||
}
|
||||
})
|
||||
.catch(() => {
|
||||
this.errorSnackbarText = 'Error Loading Profile'
|
||||
this.errorSnackbarText = 'Error Exporting Profile'
|
||||
this.errorSnackbar = true
|
||||
})
|
||||
|
||||
@@ -593,6 +709,13 @@ export default {
|
||||
}
|
||||
})
|
||||
},
|
||||
updatePreviewSampleLoopPoints () {
|
||||
if (this.previewSampleLoopPointsEnabled) {
|
||||
this.samplePreviewPlayer.setLoopPoints(this.previewSampleLoopStart, this.previewSampleLoopEnd)
|
||||
} else {
|
||||
this.samplePreviewPlayer.setLoopPoints(0, this.samplePreviewPlayer.buffer.duration)
|
||||
}
|
||||
},
|
||||
previewSample () {
|
||||
if (this.previewSamplePlaying) {
|
||||
this.previewSamplePlaying = false
|
||||
@@ -613,7 +736,16 @@ export default {
|
||||
}).then(response => {
|
||||
if (response.status === 200) {
|
||||
this.getSamples()
|
||||
this.loadProfile()
|
||||
|
||||
// Update sample if it's already loaded in current profile
|
||||
const sample = this.loadedSamples.find(s => s.id === this.selectedPreviewSample.id)
|
||||
if (sample) {
|
||||
sample.fadeIn = this.previewSampleFadeIn
|
||||
sample.loopPointsEnabled = this.previewSampleLoopPointsEnabled
|
||||
sample.loopStart = this.previewSampleLoopStart
|
||||
sample.loopEnd = this.previewSampleLoopEnd
|
||||
}
|
||||
|
||||
this.closeEditSampleForm()
|
||||
this.infoSnackbarText = 'Sample Saved'
|
||||
this.infoSnackbar = true
|
||||
@@ -631,6 +763,161 @@ export default {
|
||||
if (this.previewSampleLoopStart >= 0 && this.previewSampleLoopEnd <= this.previewSampleLength) {
|
||||
this.samplePreviewPlayer.setLoopPoints(this.previewSampleLoopStart, this.previewSampleLoopEnd)
|
||||
}
|
||||
},
|
||||
openStartRecordingDialog () {
|
||||
this.startRecordingDialog = true
|
||||
this.profileMoreDialog = false
|
||||
},
|
||||
startRecording () {
|
||||
// Save current profile before recording
|
||||
this.updateProfile()
|
||||
|
||||
this.$http.get('/profiles/'.concat(this.recordedProfile.id))
|
||||
.then(async response => {
|
||||
if (response.status === 200) {
|
||||
const profile = response.data.profile
|
||||
|
||||
this.isTimerEnabled = profile.isTimerEnabled
|
||||
this.duration = profile.duration
|
||||
this.volume = profile.volume
|
||||
this.noiseColor = profile.noiseColor
|
||||
this.isFilterEnabled = profile.isFilterEnabled
|
||||
this.filterType = profile.filterType
|
||||
this.filterCutoff = profile.filterCutoff
|
||||
this.isLFOFilterCutoffEnabled = profile.isLFOFilterCutoffEnabled
|
||||
this.lfoFilterCutoffFrequency = profile.lfoFilterCutoffFrequency
|
||||
this.lfoFilterCutoffRange[0] = profile.lfoFilterCutoffLow
|
||||
this.lfoFilterCutoffRange[1] = profile.lfoFilterCutoffHigh
|
||||
this.isTremoloEnabled = profile.isTremoloEnabled
|
||||
this.tremoloFrequency = profile.tremoloFrequency
|
||||
this.tremoloDepth = profile.tremoloDepth
|
||||
|
||||
this.loadedSamples = profile.samples
|
||||
|
||||
this.startRecordingDialog = false
|
||||
this.recordingDialog = true
|
||||
this.recordingTimeElapsed = 0
|
||||
|
||||
await this.recorder.start()
|
||||
this.recordingInterval = setInterval(() => this.recordingTimeElapsed++, 1000)
|
||||
this.playProfileForRecording()
|
||||
}
|
||||
})
|
||||
.catch(() => {
|
||||
this.errorSnackbarText = 'Error Recording Profile'
|
||||
this.errorSnackbar = true
|
||||
})
|
||||
},
|
||||
playProfileForRecording () {
|
||||
this.playDisabled = true
|
||||
Tone.Transport.cancel()
|
||||
|
||||
if (!this.isFilterEnabled && !this.isTremoloEnabled) {
|
||||
this.noise = new Tone.Noise({ volume: this.volume, type: this.noiseColor }).connect(this.recorder).toDestination()
|
||||
} else if (!this.isFilterEnabled && this.isTremoloEnabled) {
|
||||
this.tremolo = new Tone.Tremolo({ frequency: this.tremoloFrequency, depth: this.tremoloDepth }).connect(this.recorder).toDestination().start()
|
||||
this.noise = new Tone.Noise({ volume: this.volume, type: this.noiseColor }).connect(this.tremolo)
|
||||
} else if (this.isFilterEnabled && !this.isTremoloEnabled) {
|
||||
this.filter = new Tone.Filter(this.filterCutoff, this.filterType).connect(this.recorder).toDestination()
|
||||
this.noise = new Tone.Noise({ volume: this.volume, type: this.noiseColor }).connect(this.filter)
|
||||
} else if (this.isFilterEnabled && this.isTremoloEnabled) {
|
||||
this.tremolo = new Tone.Tremolo({ frequency: this.tremoloFrequency, depth: this.tremoloDepth }).connect(this.recorder).toDestination().start()
|
||||
this.filter = new Tone.Filter(this.filterCutoff, this.filterType).connect(this.tremolo)
|
||||
this.noise = new Tone.Noise({ volume: this.volume, type: this.noiseColor }).connect(this.filter)
|
||||
} else {
|
||||
this.tremolo = new Tone.Tremolo({ frequency: this.tremoloFrequency, depth: this.tremoloDepth }).connect(this.recorder).toDestination().start()
|
||||
this.filter = new Tone.Filter(this.filterCutoff, this.filterType).connect(this.tremolo)
|
||||
this.noise = new Tone.Noise({ volume: this.volume, type: this.noiseColor }).connect(this.filter)
|
||||
}
|
||||
|
||||
if (this.isLFOFilterCutoffEnabled) {
|
||||
this.lfo = new Tone.LFO({ frequency: this.lfoFilterCutoffFrequency, min: this.lfoFilterCutoffRange[0], max: this.lfoFilterCutoffRange[1] })
|
||||
this.lfo.connect(this.filter.frequency).start()
|
||||
}
|
||||
|
||||
this.loadedSamples.forEach(s => {
|
||||
this.players.player(s.id).loop = true
|
||||
this.players.player(s.id).fadeIn = s.fadeIn
|
||||
if (s.loopPointsEnabled) {
|
||||
this.players.player(s.id).setLoopPoints(s.loopStart, s.loopEnd)
|
||||
} else {
|
||||
this.players.player(s.id).setLoopPoints(0, this.players.player(s.id).buffer.duration)
|
||||
}
|
||||
this.players.player(s.id).volume.value = s.volume
|
||||
|
||||
this.players.player(s.id).disconnect()
|
||||
if (s.reverbEnabled) {
|
||||
const reverb = new Tone.Reverb(s.reverbDecay).connect(this.recorder).toDestination()
|
||||
reverb.set({ preDelay: s.reverbPreDelay, wet: s.reverbWet })
|
||||
this.players.player(s.id).connect(reverb)
|
||||
} else {
|
||||
this.players.player(s.id).connect(this.recorder).toDestination()
|
||||
}
|
||||
})
|
||||
|
||||
this.noise.sync().start(0)
|
||||
|
||||
this.loadedSamples.forEach(s => {
|
||||
if (s.playbackMode === 'sporadic') {
|
||||
this.players.player(s.id).loop = false
|
||||
|
||||
const maxInt = parseInt(s.sporadicMax, 10)
|
||||
const minInt = parseInt(s.sporadicMin, 10)
|
||||
const rand = Math.floor(Math.random() * (maxInt - minInt + 1) + minInt)
|
||||
|
||||
s.initialSporadicPlayInterval = setInterval(() => this.playSporadicSample(s.id), rand * 1000)
|
||||
} else {
|
||||
this.players.player(s.id).loop = true
|
||||
this.players.player(s.id).unsync().sync().start(0)
|
||||
}
|
||||
})
|
||||
|
||||
Tone.Transport.start('+0.1')
|
||||
},
|
||||
async stopRecording () {
|
||||
const recording = await this.recorder.stop()
|
||||
|
||||
// Set active profile back to the selected one
|
||||
this.loadProfile(false)
|
||||
|
||||
const url = URL.createObjectURL(recording)
|
||||
const anchor = document.createElement('a')
|
||||
anchor.download = this.recordingFileName + '.webm'
|
||||
anchor.href = url
|
||||
anchor.click()
|
||||
|
||||
clearInterval(this.recordingInterval)
|
||||
|
||||
this.loadedSamples.forEach(s => {
|
||||
if (s.playbackMode === 'sporadic') {
|
||||
clearInterval(s.initialSporadicPlayInterval)
|
||||
clearInterval(s.sporadicInterval)
|
||||
}
|
||||
})
|
||||
|
||||
this.recordingDialog = false
|
||||
this.stop()
|
||||
},
|
||||
async cancelRecording () {
|
||||
await this.recorder.stop()
|
||||
|
||||
// Set active profile back to the selected one
|
||||
this.loadProfile(false)
|
||||
|
||||
clearInterval(this.recordingInterval)
|
||||
this.recordingDialog = false
|
||||
this.stop()
|
||||
},
|
||||
discardChanges () {
|
||||
this.unsavedWork = false
|
||||
this.loadProfile(true)
|
||||
this.confirmSwitchProfileDialog = false
|
||||
},
|
||||
saveChanges () {
|
||||
// Set active profile back to previously selected one before saving
|
||||
this.selectedProfile = this.profileItems.find(p => p.text === this.activeProfile.name)
|
||||
this.updateProfile()
|
||||
this.confirmSwitchProfileDialog = false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
export default {
|
||||
name: 'Register',
|
||||
|
||||
data: () => ({
|
||||
valid: false,
|
||||
name: '',
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import Vue from 'vue'
|
||||
import Vuetify from 'vuetify/lib/framework'
|
||||
import Vuetify from 'vuetify/lib'
|
||||
|
||||
import colors from 'vuetify/lib/util/colors'
|
||||
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
<template>
|
||||
<Account />
|
||||
<AccountPage />
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import Account from '../components/Account'
|
||||
import AccountPage from '../components/AccountPage'
|
||||
|
||||
export default {
|
||||
name: 'AccountView',
|
||||
|
||||
components: {
|
||||
Account
|
||||
AccountPage
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
<template>
|
||||
<Admin />
|
||||
<AdminPage />
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import Admin from '../components/Admin'
|
||||
import AdminPage from '../components/AdminPage'
|
||||
|
||||
export default {
|
||||
name: 'AdminView',
|
||||
|
||||
components: {
|
||||
Admin
|
||||
AdminPage
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
<template>
|
||||
<Noise />
|
||||
<NoisePage />
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import Noise from '../components/Noise'
|
||||
import NoisePage from '../components/NoisePage'
|
||||
|
||||
export default {
|
||||
name: 'HomeView',
|
||||
|
||||
components: {
|
||||
Noise
|
||||
NoisePage
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
<template>
|
||||
<Login />
|
||||
<LoginPage />
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import Login from '../components/Login'
|
||||
import LoginPage from '../components/LoginPage'
|
||||
|
||||
export default {
|
||||
name: 'LoginView',
|
||||
|
||||
components: {
|
||||
Login
|
||||
LoginPage
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
<template>
|
||||
<Register />
|
||||
<RegisterPage />
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import Register from '../components/Register'
|
||||
import RegisterPage from '../components/RegisterPage'
|
||||
|
||||
export default {
|
||||
name: 'RegisterView',
|
||||
|
||||
components: {
|
||||
Register
|
||||
RegisterPage
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
Reference in New Issue
Block a user