Merge pull request #857 from alpheios-project/i856-home-link

Add to Home link
alpheios-project · Jul 11, 2022 · 66d038e · 66d038e
2 parents 737f180 + 6d623e7
commit 66d038e
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 9 deletions.
diff --git a/public/css/style.css b/public/css/style.css
@@ -23,6 +23,11 @@ body, html {
     /* padding: 0 10px 0 35px;*/
 }
 
+.header-logo {
+    cursor: pointer;
+}
+
+
 .header-logo img {
     display: block;
     height: 100%;

diff --git a/public/index.html b/public/index.html
@@ -65,7 +65,7 @@
     </script>
     <div class="container">
       <div class="header alpheios-header">
-        <div class="header-logo">
+        <div class="header-logo" onclick="location.reload(true)" title="to Home">
           <img src="images/alpheios-logo-only.png" class="logo-1">
           <img src="images/alpheios-logo-black.png" class="logo-2">
         </div>

diff --git a/src/lib/controllers/texts-controller.js b/src/lib/controllers/texts-controller.js
@@ -602,7 +602,7 @@ export default class TextsController {
     const result = await StorageController.deleteMany(alData.alignmentID, 'fullAlignmentByID')
 
     if (result) {
-      this.store.commit('incremetReloadAlignmentsList')
+      this.store.commit('incrementReloadAlignmentsList')
     }
     return result
   }
@@ -643,7 +643,7 @@ export default class TextsController {
     const result = await StorageController.clear()
 
     if (result) {
-      this.store.commit('incremetReloadAlignmentsList')
+      this.store.commit('incrementReloadAlignmentsList')
     }
     return result
   }

diff --git a/src/lib/store/store-definition.js b/src/lib/store/store-definition.js
@@ -116,7 +116,7 @@ export default class StoreDefinition {
         incrementUploadPartNum (state) {
           state.uploadPartNum++
         },
-        incremetReloadAlignmentsList (state) {
+        incrementReloadAlignmentsList (state) {
           state.reloadAlignmentsList++
         },
         incrementUpdateAnnotations (state) {

diff --git a/src/locales/en-us/messages-initial-screen.json b/src/locales/en-us/messages-initial-screen.json
@@ -1,4 +1,9 @@
 {
+    "TO_HOME": {
+      "message": "Home",
+      "description": "Button in Main Menu",
+      "component": "Main Menu"
+    },
     "INITIAL_NEW_ALIGNMENT": {
       "message": "Begin new alignment",
       "description": "Button on initial screen",

diff --git a/src/vue/app.vue b/src/vue/app.vue
@@ -10,7 +10,7 @@
         @redo-action = "redoAction"
         @undo-action = "undoAction"
         @add-target = "addTarget"
-        @clear-all = "startOver"
+        @clear-all = "clearAll"
         @new-initial-alignment = "startNewInitialAlignment"
         @upload-data-from-db = "uploadDataFromDB"
 
@@ -26,7 +26,8 @@
       <initial-screen v-show="showInitialScreenBlock"
         @upload-data-from-file = "uploadDataFromFile" @upload-data-from-db = "uploadDataFromDB" @delete-data-from-db = "deleteDataFromDB"
         @new-initial-alignment="startNewInitialAlignment" @clear-all-alignments="clearAllAlignmentsFromDB"/>
-      <text-editor v-show="showSourceTextEditorBlock" @add-translation="addTarget" @align-text="showSummaryPopup" @showAlignmentGroupsEditor = "showAlignmentGroupsEditor" @showTokensEditor = "showTokensEditor"
+      <text-editor v-show="showSourceTextEditorBlock" @add-translation="addTarget" @align-text="showSummaryPopup" 
+        @showAlignmentGroupsEditor = "showAlignmentGroupsEditor" @showTokensEditor = "showTokensEditor"
       />
       <align-editor v-show="showAlignmentGroupsEditorBlock" @showSourceTextEditor = "showSourceTextEditor" @showTokensEditor = "showTokensEditor"
       />
@@ -246,6 +247,7 @@ export default {
     createANewAlignment (alTitle) {
       this.$textC.createAlignment(alTitle)
       this.$historyAGC.startTracking(this.$textC.alignment)
+      this.$textC.store.commit('incrementAlignmentRestarted')
       this.showSourceTextEditor()
     },
 
@@ -337,6 +339,12 @@ export default {
       } else {
         this.showSourceTextEditor()
       }
+    },
+
+    clearAll () {
+      NotificationSingleton.clearNotifications()
+      this.$textC.store.commit('incrementReloadAlignmentsList')
+      this.showInitialScreen()
     }
   }
 }

diff --git a/src/vue/initial-screen.vue b/src/vue/initial-screen.vue
@@ -101,6 +101,8 @@ export default {
   methods: {
     startNewAlignment () {
       this.$emit("new-initial-alignment")
+      this.showUploadBlock = false
+      this.showUploadFromDB = false
     },
     resumePrevAlignment () {
       this.showUploadBlock = true
@@ -129,6 +131,7 @@ export default {
     uploadDataFromDB (alData) {
       this.$emit('upload-data-from-db', alData)
       this.showUploadBlock = false
+      this.showUploadFromDB = false
     },
 
     deleteDataFromDB (alData) {

diff --git a/src/vue/main-menu.vue b/src/vue/main-menu.vue
@@ -6,9 +6,12 @@
       </span>
       <div class="alpheios-alignment-app-menu__buttons">
         <div class="alpheios-alignment-app-menu__buttons-actions">
-
           <button class="alpheios-app-menu-link" id ="alpheios-main-menu-clear-all" 
-                  @click="clearAll">
+                  @click="reloadPage">
+                  {{ l10n.getMsgS('TO_HOME') }}
+          </button>
+          <button class="alpheios-app-menu-link" id ="alpheios-main-menu-clear-all" 
+                  @click="newInitialAlignment">
                   {{ l10n.getMsgS('INITIAL_NEW_ALIGNMENT') }}
           </button>
 
@@ -174,6 +177,11 @@ export default {
       return `alpheios-main-menu-download-block__radio_${dTypeName}`
     },
 
+    newInitialAlignment () {
+      this.clearAll()
+      this.$emit("new-initial-alignment")
+    },
+
     clearAll () {
       this.$refs.alpheiosfileupload.value = ''
       this.showUploadBlock = false
@@ -182,9 +190,12 @@ export default {
 
       this.currentPage = 'initial-page'
       this.closeMenu()
-      this.$emit("new-initial-alignment")
+      
     },
     
+    reloadPage () {
+      location.reload(true)
+    },
     closeMenu () {
       this.menuShown = false
     },