Merge pull request #35 from kaythomas0/v0.6.4

v0.6.4

package-lock.json

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "noisedash",
-  "version": "0.6.0",
+  "version": "0.6.4",
   "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>
 
@@ -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
@@ -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>
@@ -1026,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"

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,23 +218,7 @@ 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)
-
-        this.loadedSamples.forEach(s => {
-          this.players.player(s.id).unsync().sync().start(0).stop(this.duration)
-        })
-      } else {
-        this.noise.sync().start(0)
-
-        this.loadedSamples.forEach(s => {
         if (s.playbackMode === 'sporadic') {
           this.players.player(s.id).loop = false
 
@@ -235,10 +231,14 @@ export default {
           }
         } 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')
     },
@@ -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 () {
+    loadProfile (checkForUnsavedWork) {
-      if (this.unsavedWork) {
+      if (checkForUnsavedWork && this.unsavedWork) {
         this.confirmSwitchProfileDialog = true
       } else {
         this.$http.get('/profiles/'.concat(this.selectedProfile.id))
@@ -736,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
@@ -760,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) {
@@ -866,7 +878,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 +902,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 +910,7 @@ export default {
     },
     discardChanges () {
       this.unsavedWork = false
-      this.loadProfile()
+      this.loadProfile(true)
       this.confirmSwitchProfileDialog = false
     },
     saveChanges () {