More bug fixes

modrinth · Jul 21, 2023 · 0bd6a0a · 0bd6a0a
1 parent 30181cc
commit 0bd6a0a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 40 deletions.
diff --git a/theseus_gui/src/App.vue b/theseus_gui/src/App.vue
@@ -153,23 +153,18 @@ const accounts = ref(null)
     <suspense>
       <OnboardingModal ref="testModal" :accounts="accounts" />
     </suspense>
-    <div class="nav-container" :class="{ expanded: !themeStore.collapsedNavigation }">
+    <div class="nav-container">
       <div class="nav-section">
         <suspense>
           <AccountsCard
             ref="accounts"
-            :mode="themeStore.collapsedNavigation ? 'small' : 'expanded'"
+            mode="small"
           />
         </suspense>
         <div class="pages-list">
           <RouterLink
             to="/"
-            class="btn"
-            :class="{
-              'icon-only': themeStore.collapsedNavigation,
-              'collapsed-button': themeStore.collapsedNavigation,
-              'expanded-button': !themeStore.collapsedNavigation,
-            }"
+            class="btn icon-only collapsed-button"
           >
             <HomeIcon />
             <span v-if="!themeStore.collapsedNavigation">Home</span>

diff --git a/theseus_gui/src/components/ui/RunningAppBar.vue b/theseus_gui/src/components/ui/RunningAppBar.vue
@@ -44,7 +44,7 @@
     </div>
   </div>
   <transition name="download">
-    <Card v-if="showCard === true" ref="card" class="info-card">
+    <Card v-if="showCard === true && currentLoadingBars.length > 0" ref="card" class="info-card">
       <div v-for="loadingBar in currentLoadingBars" :key="loadingBar.id" class="info-text">
         <h3 class="info-title">
           {{ loadingBar.title }}
@@ -57,7 +57,7 @@
     </Card>
   </transition>
   <transition name="download">
-    <Card v-if="showProfiles === true" ref="profiles" class="profile-card">
+    <Card v-if="showProfiles === true && currentProcesses.length > 0" ref="profiles" class="profile-card">
       <Button
         v-for="profile in currentProcesses"
         :key="profile.id"

diff --git a/theseus_gui/src/pages/Settings.vue b/theseus_gui/src/pages/Settings.vue
@@ -106,25 +106,6 @@ watch(
           "
         />
       </div>
-      <div class="adjacent-input">
-        <label for="collapsed-nav">
-          <span class="label__title">Collapsed navigation mode</span>
-          <span class="label__description"
-            >Change the style of the side navigation bar to a compact version.</span
-          >
-        </label>
-        <Toggle
-          id="collapsed-nav"
-          :model-value="themeStore.collapsedNavigation"
-          :checked="themeStore.collapsedNavigation"
-          @update:model-value="
-            (e) => {
-              themeStore.collapsedNavigation = e
-              settings.collapsed_navigation = themeStore.collapsedNavigation
-            }
-          "
-        />
-      </div>
       <div class="adjacent-input">
         <label for="advanced-rendering">
           <span class="label__title">Advanced rendering</span>

diff --git a/theseus_gui/src/pages/instance/Mods.vue b/theseus_gui/src/pages/instance/Mods.vue
@@ -61,12 +61,6 @@
               <DropdownIcon v-if="sortColumn === 'Version'" :class="{ down: ascending }" />
             </Button>
           </div>
-          <div v-if="selected.length === 0" class="table-cell table-text">
-            <Button class="transparent" @click="sortProjects('Author')">
-              Author
-              <DropdownIcon v-if="sortColumn === 'Author'" :class="{ down: ascending }" />
-            </Button>
-          </div>
           <div v-if="selected.length === 0" class="table-cell table-text actions-cell">
             <Button class="transparent" @click="sortProjects('Enabled')">
               Actions
@@ -199,9 +193,6 @@
               <Avatar :src="mod.icon" />
               <span v-tooltip="`${mod.name}`" class="title">{{ mod.name }}</span>
             </div>
-            <Button v-tooltip="`Show ${mod.file_name}`" class="transparent" icon-only @click="showInFolder(mod.path)">
-              <FolderOpenIcon />
-            </Button>
           </div>
           <div class="table-cell table-text">
             <span v-tooltip="`${mod.version}`">{{ mod.version }}</span>
@@ -232,6 +223,9 @@
               :checked="!mod.disabled"
               @change="toggleDisableMod(mod)"
             />
+            <Button v-tooltip="`Show ${mod.file_name}`" icon-only @click="showInFolder(mod.path)">
+              <FolderOpenIcon />
+            </Button>
           </div>
         </div>
       </div>
@@ -773,7 +767,7 @@ listen('tauri://file-drop', async (event) => {
 }
 
 .table-row {
-  grid-template-columns: min-content 2fr 1fr 11rem;
+  grid-template-columns: min-content 2fr 1fr 13.25rem;
 
   &.show-options {
     grid-template-columns: min-content auto;

diff --git a/theseus_gui/src/store/theme.js b/theseus_gui/src/store/theme.js
@@ -3,7 +3,6 @@ import { defineStore } from 'pinia'
 export const useTheming = defineStore('themeStore', {
   state: () => ({
     themeOptions: ['dark'],
-    collapsedNavigation: false,
     advancedRendering: true,
     selectedTheme: 'dark',
     darkTheme: true,