Merge pull request #34 from kaythomas0/v0.6.3

v0.6.3

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "noisedash",
-  "version": "0.6.0",
+  "version": "0.6.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "noisedash",
-  "version": "0.6.0",
+  "version": "0.6.3",
   "private": true,
   "author": "Kay Thomas <kaythomas@pm.me> (https://kaythomas.dev)",
   "scripts": {

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

src/components/NoisePage.vue

@@ -50,7 +50,7 @@
             label="Profiles"
             class="mx-3 mb-5"
             :disabled="playDisabled"
-            @change="loadProfile"
+            @change="loadProfile(true)"
           />
         </v-row>
 
@@ -788,7 +788,7 @@
                   value="continuous"
                 />
                 <v-radio
-                  label="Sporadic (Not Looped, Plays Randomly Within Interval"
+                  label="Sporadic (Not Looped, Plays Randomly Within Interval)"
                   value="sporadic"
                 />
               </v-radio-group>

src/components/noise.js

@@ -188,6 +188,18 @@ 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
@@ -206,39 +218,27 @@ export default {
         } else {
           this.players.player(s.id).toDestination()
         }
-      })
 
-      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)
+        if (s.playbackMode === 'sporadic') {
+          this.players.player(s.id).loop = false
 
-        this.loadedSamples.forEach(s => {
-          this.players.player(s.id).unsync().sync().start(0).stop(this.duration)
-        })
-      } else {
-        this.noise.sync().start(0)
+          const maxInt = parseInt(s.sporadicMax, 10)
+          const minInt = parseInt(s.sporadicMin, 10)
 
-        this.loadedSamples.forEach(s => {
-          if (s.playbackMode === 'sporadic') {
-            this.players.player(s.id).loop = false
+          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
 
-            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)
-            }
+          if (this.isTimerEnabled) {
+            this.players.player(s.id).unsync().sync().start(0).stop(this.duration)
           } else {
-            this.players.player(s.id).loop = true
             this.players.player(s.id).unsync().sync().start(0)
           }
-        })
-      }
+        }
+      })
 
       Tone.Transport.start('+0.1')
     },
@@ -344,7 +344,7 @@ export default {
               }
               this.exportedProfile = this.profileItems[0]
               this.recordedProfile = this.profileItems[0]
-              this.loadProfile()
+              this.loadProfile(true)
             }
           }
         })
@@ -420,8 +420,8 @@ export default {
           this.errorSnackbar = true
         })
     },
-    loadProfile () {
-      if (this.unsavedWork) {
+    loadProfile (checkForUnsavedWork) {
+      if (checkForUnsavedWork && this.unsavedWork) {
         this.confirmSwitchProfileDialog = true
       } else {
         this.$http.get('/profiles/'.concat(this.selectedProfile.id))
@@ -736,7 +736,7 @@ export default {
       }).then(response => {
         if (response.status === 200) {
           this.getSamples()
-          this.loadProfile()
+          this.loadProfile(false)
           this.closeEditSampleForm()
           this.infoSnackbarText = 'Sample Saved'
           this.infoSnackbar = true
@@ -866,7 +866,7 @@ export default {
       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')
@@ -890,7 +890,7 @@ 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
@@ -898,7 +898,7 @@ export default {
     },
     discardChanges () {
       this.unsavedWork = false
-      this.loadProfile()
+      this.loadProfile(true)
       this.confirmSwitchProfileDialog = false
     },
     saveChanges () {