Merge branch 'release/v0.7.2'

dreiekk · Jun 2, 2022 · c3a7b5b · c3a7b5b
2 parents c7118d5 971be85
commit c3a7b5b
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 18 deletions.
diff --git a/package.json b/package.json
@@ -1,6  1,6 @@
 {
   "name": "calcdav",
-  "version": "0.7.1",
   "version": "0.7.2",
   "private": true,
   "description": "Simple caldav-client to sum up project hours from a calendar.",
   "author": {

diff --git a/src/background.js b/src/background.js
@@ -117,6  117,7 @@ ipcMain.on('requestVersion', (event) => {
 
 ipcMain.on('checkForUpdate', () => {
   if (!isDevelopment) {
     autoUpdater.autoInstallOnAppQuit = false;
     autoUpdater.checkForUpdates();
   } else {
     console.log('We are in dev-environment. Skipping update check...');

diff --git a/src/components/StatusBar.vue b/src/components/StatusBar.vue
@@ -9,7  9,7 @@
           <i v-if="updateLoading" class="fas fa-fw fa-spin fa-circle-notch mr-2"></i>
           <span>{{ updateStatus }}</span>
         </div>
-        <a href="#" @click="restartForUpdate" v-if="updateReady">
         <a href="#" style="color: lightgray" @click="restartForUpdate" v-if="updateReady">
           <i class="fas fa-fw fa-box-open mr-2"></i>
           Update ready. Click here to install.
         </a>

diff --git a/src/views/DashboardView.vue b/src/views/DashboardView.vue
@@ -2,22  2,22 @@
   <div class="text-white">
 
     <div v-if="statusbar == 'error'" class="alert alert-danger text-center mb-0">
-      <i class="fas fa-fw fa-exclamation-triangle"></i>
       <span><i class="fas fa-fw fa-exclamation-triangle"></i></span>
       {{ $t('status_error') }}
     </div>
 
     <div v-if="statusbar == 'updating_calendar'" class="alert alert-info text-center mb-0">
-      <i class="fas fa-fw fa-spin fa-circle-notch"></i>
       <span><i class="fas fa-fw fa-spin fa-circle-notch"></i></span>
       {{ $t('status_calendar_download') }}
     </div>
 
     <div v-if="statusbar == 'calendar_uptodate'" class="alert alert-success text-center mb-0">
-      <i class="fas fa-fw fa-check"></i>
       <span><i class="fas fa-fw fa-check"></i></span>
       {{ $t('status_calendar_uptodate') }}
     </div>
 
     <div v-if="statusbar == 'calendar_changed'" class="alert alert-info text-center mb-0">
-      <i class="fas fa-fw fa-exchange-alt"></i>
       <span><i class="fas fa-fw fa-exchange-alt"></i></span>
       {{ $t('status_calendar_changed') }}
       <a class="ml-2" href="#">{{ $t('status_calendar_changed_button') }}</a>
     </div>
@@ -70,23  70,23 @@
               <th></th>
               <th @click="sort('title')">
                 {{ $t('title') }}
-                <i v-if="sorting.column == 'title' && sorting.direction == 'desc'" class="fas fa-fw fa-caret-down"></i>
-                <i v-if="sorting.column == 'title' && sorting.direction == 'asc'" class="fas fa-fw fa-caret-up"></i>
                 <span v-if="sorting.column == 'title' && sorting.direction == 'desc'"><i class="fas fa-fw fa-caret-down"></i></span>
                 <span v-if="sorting.column == 'title' && sorting.direction == 'asc'"><i class="fas fa-fw fa-caret-up"></i></span>
               </th>
               <th @click="sort('start_raw')">
                 {{ $t('from') }}
-                <i v-if="sorting.column == 'start_raw' && sorting.direction == 'desc'" class="fas fa-fw fa-caret-down"></i>
-                <i v-if="sorting.column == 'start_raw' && sorting.direction == 'asc'" class="fas fa-fw fa-caret-up"></i>
                 <span v-if="sorting.column == 'start_raw' && sorting.direction == 'desc'"><i class="fas fa-fw fa-caret-down"></i></span>
                 <span v-if="sorting.column == 'start_raw' && sorting.direction == 'asc'"><i class="fas fa-fw fa-caret-up"></i></span>
               </th>
               <th @click="sort('end_raw')">
                 {{ $t('to') }}
-                <i v-if="sorting.column == 'end_raw' && sorting.direction == 'desc'" class="fas fa-fw fa-caret-down"></i>
-                <i v-if="sorting.column == 'end_raw' && sorting.direction == 'asc'" class="fas fa-fw fa-caret-up"></i>
                 <span v-if="sorting.column == 'end_raw' && sorting.direction == 'desc'"><i class="fas fa-fw fa-caret-down"></i></span>
                 <span v-if="sorting.column == 'end_raw' && sorting.direction == 'asc'"><i class="fas fa-fw fa-caret-up"></i></span>
               </th>
               <th @click="sort('hours')" class="text-center">
                 {{ $t('hours_title') }}
-                <i v-if="sorting.column == 'hours' && sorting.direction == 'desc'" class="fas fa-fw fa-caret-down"></i>
-                <i v-if="sorting.column == 'hours' && sorting.direction == 'asc'" class="fas fa-fw fa-caret-up"></i>
                 <span v-if="sorting.column == 'hours' && sorting.direction == 'desc'"><i class="fas fa-fw fa-caret-down"></i></span>
                 <span v-if="sorting.column == 'hours' && sorting.direction == 'asc'"><i class="fas fa-fw fa-caret-up"></i></span>
               </th>
             </tr>
           </thead>

diff --git a/src/views/LoginView.vue b/src/views/LoginView.vue
@@ -22,10  22,14 @@
             <input type="password" class="form-control" id="inputPassword" v-model="inputPassword" :placeholder="$t('password')">
           </div>
           <button type="submit" class="btn btn-sm btn-primary" :disabled="loading">
-            <i v-if="!loading" class="fas fa-fw fa-key mr-1"></i>
-            <i v-if="loading" class="fas fa-fw fa-spin fa-circle-notch mr-1"></i>
-            <span v-if="!loading">{{ $t('login') }}</span>
-            <span v-if="loading">{{ $t('logging_in') }}</span>
             <div v-if="loading">
               <span><i class="fas fa-fw fa-spin fa-circle-notch mr-1"></i></span>
               <span>{{ $t('logging_in') }}</span>
             </div>
             <div v-else>
               <span><i class="fas fa-fw fa-key mr-1"></i></span>
               <span>{{ $t('login') }}</span>
             </div>
           </button>
         </form>
       </div>