resolve conflicts

frontend/src/components/Transactions/TransactionLinkSummary.spec.js

@@ -1,7 +1,7 @@
 import { mount } from '@vue/test-utils'
 import TransactionLinksSummary from './TransactionLinkSummary'
 import { listTransactionLinks } from '@/graphql/queries'
-import { toastErrorSpy } from '@test/testSetup'
+import { toastErrorSpy } from '../../../test/testSetup'
 
 const localVue = global.localVue
 

frontend/src/layouts/DashboardLayout.vue

@@ -11,15 +11,6 @@
         </b-col>
       </b-row>
       <mobile-sidebar @admin="admin" @logout="logout" />
-      <!-- <div ref="sideMenuRow" class="d-none d-lg-none d-md-none zindex1000">
-        <sidebar
-          class="main-sidebar"
-          @admin="admin"
-          @logout="logout"
-          @modeToggle="modeToggle"
-          @toogleMobilMenu="toogleMobilMenu"
-        />
-      </div> -->
 
       <!-- Breadcrumb -->
       <b-row>
@@ -228,38 +219,6 @@ export default {
     setTunneledEmail(email) {
       this.tunneledEmail = email
     },
-    // toogleMobilMenu() {
-    //   // console.log(this.$refs.sideMenuRow.classList.value)
-    //   this.$refs.sideMenuRow.classList.toggle('d-inline')
-    //   this.$refs.sideMenuRow.classList.toggle('position-absolute')
-
-    //   document.getElementById('side-menu').classList.toggle('bg-lightgrey')
-    //   this.hamburger ? (this.hamburger = false) : (this.hamburger = true)
-    // },
-    // dark() {
-    //   document.getElementById('app').classList.add('dark-mode')
-    //   document.querySelector('#app a').classList.add('dark-mode')
-    //   this.darkMode = true
-    // },
-
-    // light() {
-    //   document.getElementById('app').classList.remove('dark-mode')
-    //   document.querySelector('#app a').classList.remove('dark-mode')
-    //   this.darkMode = false
-    // },
-
-    // modeToggle() {
-    //   if (this.darkMode || document.getElementById('app').classList.contains('dark-mode')) {
-    //     this.light()
-    //   } else {
-    //     this.dark()
-    //   }
-    // },
-  },
-  computed: {
-    darkDark() {
-      return this.darkMode && 'darkmode-toggled'
-    },
   },
 }
 </script>