pingo doce; ir para o home

luckspt · Dec 5, 2021 · b66a099 · b66a099
1 parent 347e5ee
commit b66a099
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 12 deletions.
diff --git a/src/assets/audio/jorgejesus.mp3 b/src/assets/audio/jorgejesus.mp3
diff --git a/src/assets/audio/pingo_doce.mp3 b/src/assets/audio/pingo_doce.mp3
diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
@@ -79,6 +79,7 @@ export default Vue.extend({
     },
     goHome() {
       if (this.$route.name !== 'Chat') this.$router.push({ name: 'Chat' });
+      this.$emit('goHome');
     },
     goHelp() {
       if (this.$route.name !== 'Help') this.$router.push({ name: 'Help', params: { p: this.$route.name as string } });

diff --git a/src/components/dialogs/Soundboard.vue b/src/components/dialogs/Soundboard.vue
@@ -149,7 +149,6 @@ export default Vue.extend({
     lastVol: 75,
     selected: null as Som | null,
     songs: [
-      { nome: 'Amanha hablamos ok?', path: 'jorgejesus.mp3', duracao: 2000 },
       { nome: 'Amogus', path: 'amogus.mp3', duracao: 4000 },
       { nome: 'Anúncio LOL', path: 'anuncio_lol.mp3', duracao: 103000 },
       { nome: 'Astronaut in the Ocean', path: 'astronaut_ocean.mp3', duracao: 13000 },
@@ -168,6 +167,7 @@ export default Vue.extend({
       { nome: 'Não é não', path: 'nao_e_nao.mp3', duracao: 1000 },
       { nome: 'Olha tanta luz', path: 'olha_tanta_luz.mp3', duracao: 2000 },
       { nome: 'Polozhenie - Zedline', path: 'polozhenie.mp3', duracao: 67000 },
+      { nome: 'Pingo doce', path: 'pingo_doce.mp3', duracao: 60000 },
       { nome: 'Shape of you', path: 'shape_of_you.mp3', duracao: 235000 },
       { nome: 'Shooting Stars', path: 'shooting_stars.mp3', duracao: 6000 },
       { nome: 'Super idol', path: 'super_idol.mp3', duracao: 14000 },

diff --git a/src/containers/ChatContainer.vue b/src/containers/ChatContainer.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <NavBar style="height:66px;" class="mb-2"/>
+    <NavBar style="height:66px;" class="mb-2" @goHome="recenteSeleccionado = null"/>
 
     <div class="grid px-3" style="height:100%;">
       <vs-row justify="center" align="center" >
@@ -249,16 +249,12 @@
               </vs-row>
             </div>
 
-            <transition
-              name="fade"
-              mode="out-in">
-              <router-view
-                :chat="recenteSeleccionado"
-                :search="pesquisaMensagem"
-                @cameraUpdate="forceRerenderTable"
-                @messageSent="forceRerenderTable"
-                @callEnd="forceRerenderTable"/>
-            </transition>
+            <router-view
+              :chat="recenteSeleccionado"
+              :search="pesquisaMensagem"
+              @cameraUpdate="forceRerenderTable"
+              @messageSent="forceRerenderTable"
+              @callEnd="forceRerenderTable"/>
           </div>
         </vs-col>