Merge pull request #48 from kaythomas0/v0.6.7

v0.6.7

.eslintrc.js

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

.github/FUNDING.yml

@@ -1,3 +1,4 @@
 # These are supported funding model platforms
 
 github:  kaythomas0
+custom:  "https://kaythomas.dev/cryptocurrency.html"

.github/dependabot.yml

@@ -0,0 +1,11 @@
+version: 2
+updates:
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    target-branch: "dev"
+    labels:
+      - "dependencies"
+    # Disable version updates for npm dependencies
+    open-pull-requests-limit: 0

.github/workflows/docker-image.yml

@@ -1,11 +1,15 @@
 name: Docker Image CI
 
 on:
-  push:
-    branches: [ main ]
+  pull_request:
+    types:
+      - labeled
+    branches:    
+      - 'main'
 
 jobs:
   buildx:
+    if: ${{ github.event.label.name == 'run-workflow' }}
     runs-on: ubuntu-latest
     steps:
       -
@@ -25,18 +29,10 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
-        name: Build and push linux/amd64
+        name: Build and push
         uses: docker/build-push-action@v2
         with:
           context: .
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm/v7,linux/arm64
           push: true
-          tags: noisedash/noisedash:latest
-      -
-        name: Build and push linux/arm/v7
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          platforms: linux/arm/v7
-          push: true
-          tags: noisedash/noisedash:latest-armv7
+          tags: noisedash/noisedash:latest,noisedash/noisedash:${{ github.head_ref }}

CONTRIBUTING.md

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

README.md

@@ -2,7 +2,7 @@
 
 Self-hostable web tool for generating ambient noises
 
-![Noisedash](./.github/noisedash-screenshot-1.jpg)
+![Noisedash](https://raw.githubusercontent.com/kaythomas0/noisedash/dev/.github/noisedash-screenshot-1.jpg)
 
 (More screenshots on the [wiki](https://github.com/kaythomas0/noisedash/wiki/Screenshots))
 
@@ -11,7 +11,7 @@ Self-hostable web tool for generating ambient noises
 * 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. 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 and edit 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/>.

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.7",
   "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"
 }

server/app.js

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

server/boot/db.js

@@ -59,14 +59,46 @@ module.exports = function () {
       } else {
         const userVersion = row.user_version
 
-        if (userVersion === 0) {
-          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')
-          db.run('ALTER TABLE samples ADD COLUMN loop_end REAL DEFAULT 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')
+            db.run('ALTER TABLE samples ADD COLUMN loop_end REAL DEFAULT 0')
 
-          db.run('PRAGMA user_version = 1')
-        }
+            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')
+                }
+              })
+          }
+        })
       }
     })
   })

server/routes/auth.js

@@ -36,8 +36,14 @@ router.get('/admin', (req, res) => {
 })
 
 router.get('/logout', (req, res) => {
-  req.logout()
-  res.sendStatus(200)
+  req.logout((err) => {
+    if (err) {
+      logger.error(err)
+      res.sendStatus(500)
+    } else {
+      res.sendStatus(200)
+    }
+  })
 })
 
 router.get('/setup', (req, res) => {

server/routes/profiles.js

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

server/routes/users.js

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

src/components/AccountPage.vue

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

src/components/AdminPage.vue

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

src/components/AppBar.vue

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

src/components/LoginPage.vue

@@ -50,7 +50,7 @@
       >
         {{ snackbarText }}
 
-        <template v-slot:action="{ attrs }">
+        <template #action="{ attrs }">
           <v-btn
             text
             v-bind="attrs"

src/components/NoisePage.vue

@@ -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"
@@ -127,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"
@@ -297,7 +297,7 @@
               <v-card-text>
                 <v-container>
                   <v-row>
-                    <p>Select profile to record audio for. This is only supported on Chrome and Firefox.</p>
+                    <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
@@ -339,7 +339,7 @@
         <v-dialog
           v-model="recordingDialog"
           max-width="600px"
-          persistent="true"
+          persistent
         >
           <v-card>
             <v-card-title>
@@ -365,6 +365,36 @@
             </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">
@@ -622,18 +652,26 @@
             <v-row
               justify="center"
             >
-              {{ sample.name }}
+              <v-col />
+
+              <v-col>
+                <h2 class="mb-5">
+                  {{ sample.name }}
+                </h2>
+              </v-col>
+
+              <v-col>
+                <v-btn
+                  icon
+                  :disabled="playDisabled"
+                  @click="removeSample(index)"
+                >
+                  <v-icon>mdi-delete</v-icon>
+                </v-btn>
+              </v-col>
             </v-row>
 
             <v-row>
-              <v-btn
-                icon
-                :disabled="playDisabled"
-                @click="removeSample(index)"
-              >
-                <v-icon>mdi-delete</v-icon>
-              </v-btn>
-
               <v-slider
                 v-model="sample.volume"
                 label="Volume"
@@ -649,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>
 
@@ -656,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"
@@ -716,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"
@@ -780,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"
@@ -821,7 +995,8 @@
                     <v-checkbox
                       v-model="previewSampleLoopPointsEnabled"
                       :disabled="previewSamplePlaying"
-                      label="Use Loop Points"
+                      label="Use Loop Points (Continuous Playback Mode Only)"
+                      @change="updatePreviewSampleLoopPoints"
                     />
                   </v-row>
 
@@ -851,7 +1026,7 @@
                     <v-text-field
                       v-model="previewSampleFadeIn"
                       type="number"
-                      label="Fade In Time"
+                      label="Fade In Time (In continuous mode, this only effects first playback)"
                       :disabled="previewSamplePlaying"
                       :rules="[rules.gt(-1)]"
                       @change="updatePreviewSamplePlayerFadeIn"
@@ -896,7 +1071,7 @@
       >
         {{ infoSnackbarText }}
 
-        <template v-slot:action="{ attrs }">
+        <template #action="{ attrs }">
           <v-btn
             text
             v-bind="attrs"
@@ -914,7 +1089,7 @@
       >
         {{ errorSnackbarText }}
 
-        <template v-slot:action="{ attrs }">
+        <template #action="{ attrs }">
           <v-btn
             text
             v-bind="attrs"

src/components/account.js

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

src/components/appbar.js

@@ -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
+          }
+        })
     }
   }
 }

src/components/login.js

@@ -1,4 +1,6 @@
 export default {
+  name: 'Login',
+
   data: () => ({
     valid: false,
     username: '',

src/components/noise.js

@@ -70,6 +70,12 @@ export default {
     recordedProfile: {},
     recordingFileName: '',
     isRecordingValid: false,
+    unsavedWork: false,
+    saveProfileText: 'Save Profile',
+    unwatch: null,
+    confirmSwitchProfileDialog: false,
+    activeProfile: {},
+    isSporadicValid: false,
     errorSnackbar: false,
     errorSnackbarText: '',
     rules: {
@@ -94,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 () {
@@ -115,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()
 
@@ -146,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
+
+        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.players.player(s.id).toDestination()
+        }
+
+        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)
+          }
+        }
       })
 
-      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)
+      Tone.Transport.start('+0.1')
+    },
+    playSporadicSample (id) {
+      const sample = this.loadedSamples.find(s => s.id === id)
 
-        this.loadedSamples.forEach(s => {
-          this.players.player(s.id).unsync().sync().start(0).stop(this.duration)
-        })
-      } else {
-        this.noise.sync().start(0)
+      clearInterval(sample.initialSporadicPlayInterval)
+      clearInterval(sample.sporadicInterval)
 
-        this.loadedSamples.forEach(s => {
-          this.players.player(s.id).unsync().sync().start(0)
-        })
-      }
+      this.players.player(id).unsync().sync().start()
 
-      Tone.Transport.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)
@@ -184,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
@@ -257,7 +344,7 @@ export default {
               }
               this.exportedProfile = this.profileItems[0]
               this.recordedProfile = this.profileItems[0]
-              this.loadProfile()
+              this.loadProfile(true)
             }
           }
         })
@@ -294,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
         }
@@ -322,6 +410,7 @@ export default {
         samples: this.loadedSamples
       }).then(response => {
         if (response.status === 200) {
+          this.unsavedWork = false
           this.infoSnackbarText = 'Profile Saved'
           this.infoSnackbar = true
         }
@@ -331,34 +420,48 @@ export default {
           this.errorSnackbar = true
         })
     },
-    loadProfile () {
-      this.$http.get('/profiles/'.concat(this.selectedProfile.id))
-        .then(response => {
-          if (response.status === 200) {
-            const profile = response.data.profile
+    loadProfile (checkForUnsavedWork) {
+      if (checkForUnsavedWork && this.unsavedWork) {
+        this.confirmSwitchProfileDialog = true
+      } else {
+        this.$http.get('/profiles/'.concat(this.selectedProfile.id))
+          .then(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.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
-          }
-        })
-        .catch(() => {
-          this.errorSnackbarText = 'Error Loading Profile'
-          this.errorSnackbar = true
-        })
+              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))
@@ -422,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)
       })
 
@@ -441,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
           }
         })
     },
@@ -601,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
@@ -621,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
@@ -645,6 +769,9 @@ export default {
       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) {
@@ -713,22 +840,45 @@ export default {
         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).connect(this.recorder)
-        this.players.player(s.id).unsync().sync().start(0)
+        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)
 
-      Tone.Transport.start()
+      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()
+      this.loadProfile(false)
 
       const url = URL.createObjectURL(recording)
       const anchor = document.createElement('a')
@@ -737,6 +887,14 @@ export default {
       anchor.click()
 
       clearInterval(this.recordingInterval)
+
+      this.loadedSamples.forEach(s => {
+        if (s.playbackMode === 'sporadic') {
+          clearInterval(s.initialSporadicPlayInterval)
+          clearInterval(s.sporadicInterval)
+        }
+      })
+
       this.recordingDialog = false
       this.stop()
     },
@@ -744,11 +902,22 @@ export default {
       await this.recorder.stop()
 
       // Set active profile back to the selected one
-      this.loadProfile()
+      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
     }
   }
 }

src/components/register.js

@@ -1,4 +1,6 @@
 export default {
+  name: 'Register',
+
   data: () => ({
     valid: false,
     name: '',

src/plugins/vuetify.js

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

src/views/AccountView.vue

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

src/views/AdminView.vue

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

src/views/HomeView.vue

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

src/views/LoginView.vue

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

src/views/RegisterView.vue

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