[beta] Fix window minimal resize bug in AccountsCard. Minor translate…

… improvements in Settings
DIDIRUS4 · Jan 9, 2024 · 823b9d0 · 823b9d0
1 parent 6b461eb
commit 823b9d0
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 21 deletions.
diff --git a/theseus_gui/package.json b/theseus_gui/package.json
@@ -2,7 +2,7 @@
   "name": "theseus_gui",
   "private": true,
   "version": "0.6.3",
-  "patch_version": "17 • Beta",
+  "patch_version": "18 • Beta",
   "type": "module",
   "scripts": {
     "dev": "vite",

diff --git a/theseus_gui/src-tauri/tauri.conf.json b/theseus_gui/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "AstralRinth App",
-    "version": "0.6.317"
+    "version": "0.6.318"
   },
   "tauri": {
     "allowlist": {

diff --git a/theseus_gui/src/components/ui/AccountsCard.vue b/theseus_gui/src/components/ui/AccountsCard.vue
@@ -35,9 +35,9 @@
           <TrashIcon/>
         </Button>
       </div>
-      <div v-else class="logged-out account">
+      <div v-else class="logged-out no-account">
         <h4>{{ t('AccountsCard.NoAccount') }}</h4>
-        <div class="trash-icon-selected-fix account-no-account-fix">
+        <div class="account-no-account-fix">
         <Button v-tooltip="t('AccountsCard.LoginLicense')" icon-only color="secondary" @click="login()">
           <Microsoft class="account-type-no-account"/>
         </Button>
@@ -343,6 +343,19 @@ onUnmounted(() => {
   }
 }
 
+.no-account {
+  width: 20rem;
+  display: flex;
+  align-items: center;
+  text-align: left;
+  padding: 0.5rem;
+
+  h4,
+  p {
+    margin: 0;
+  }
+}
+
 .account-type {
   display: inline-flex;
   margin-left: 0.3rem;
@@ -359,9 +372,10 @@ onUnmounted(() => {
 }
 
 .account-no-account-fix {
-  width: auto;
-  margin-left: auto;
+  width: max-content;
   gap: 0.5rem;
+  display: flex;
+  margin-left: 3rem;
 }
 
 .account-buttons-fix {
@@ -374,13 +388,8 @@ onUnmounted(() => {
   margin-left: auto;
 }
 
-.trash-icon-selected-fix {
-  display: flex;
-  margin-left: auto;
-}
-
 .account-card {
-  width: 32%; // Change this percent value for rescale AccountsCard.vue window
+  width: min-content; // Change this percent value for rescale AccountsCard.vue window
   position: absolute;
   display: flex;
   flex-direction: column;

diff --git a/theseus_gui/src/languages/en_us.json b/theseus_gui/src/languages/en_us.json
@@ -97,7 +97,12 @@
     "EnterWrapper": "Enter wrapper command...",
     "EnterEnvVars": "Enter environmental variables...",
     "EnterJavaArgs": "Enter java arguments...",
-    "Display": "Display"
+    "Display": "Display",
+    "LatestAvailable": "The latest releases are available on",
+    "OurGithub": "our Github",
+    "Remote": "Remote latest version is",
+    "Local": "Local installed version is",
+    "DownloadButton": "Download via github"
   },
   "RunningAppBar": {
     "GetSupport": "Support",
@@ -109,7 +114,7 @@
   "AccountsCard": {
     "MinecraftAccounts": "Minecraft accounts",
     "Active": "Active",
-    "NoAccount": "You don't have account, please authenticate",
+    "NoAccount": "You don't have account",
     "Logout": "Log out",
     "LoginLicense": "Log in Microsoft",
     "LoginOffline": "Log in Pirate",

diff --git a/theseus_gui/src/languages/ru_ru.json b/theseus_gui/src/languages/ru_ru.json
@@ -97,7 +97,12 @@
     "EnterWrapper": "Введите команду оболочки...",
     "EnterEnvVars": "Введите переменные среды...",
     "EnterJavaArgs": "Введите аргументы Java...",
-    "Display": "Изображение"
+    "Display": "Изображение",
+    "LatestAvailable": "Последние релизы доступны на",
+    "OurGithub": "нашем Github",
+    "Remote": "Последняя версия на удаленном репозитории",
+    "Local": "Локальная установленная версия",
+    "DownloadButton": "Скачать через Github"
   },
   "RunningAppBar": {
     "GetSupport": "Поддержка",

diff --git a/theseus_gui/src/pages/Settings.vue b/theseus_gui/src/pages/Settings.vue
@@ -621,18 +621,18 @@ await forceRefreshRemote() // Calling when Settings.vue opened
       </div>
       <div>
         <label>
-          <span class="label__title">AstralRinth <PirateShip class="icon-line-fix"/>Version</span>
-          <span class="label__subdescription">Theseus version: v{{ version }}. Our patch version: v{{ patch_version }} </span>
-          <span class="label__description">The latest releases are available on <a class="github" :href="astraliumHref" target="_blank" rel="noopener noreferrer">our Github</a></span>
+          <span class="label__title">AstralRinth <PirateShip class="icon-line-fix"/> Version</span>
+          <span class="label__subdescription">Modrinth/Theseus version: v{{ version }}. Patch version: v{{ patch_version }} </span>
+          <span class="label__description">{{ t('Settings.LatestAvailable') }} <a class="github" :href="astraliumHref" target="_blank" rel="noopener noreferrer">{{ t('Settings.OurGithub') }}</a></span>
 
           <span class="label__title">Update Checker</span>
 
-          <span class="label__subdescription">Remote latest version is <a class="github">
+          <span class="label__subdescription">{{ t('Settings.Remote') }} <a class="github">
             <span id="releaseData"></span></a>
           </span>
-          <span class="label__description">Local installed version is v{{ version }}{{ patch_version }}</span>
+          <span class="label__description">{{ t('Settings.Local') }} v{{ version }}{{ patch_version }}</span>
         </label>
-        <a :href="githubHref"><Button :disabled="blockdownload" class="remote-update-fix" color="primary"><DownloadIcon/>Download via github
+        <a :href="githubHref"><Button :disabled="blockdownload" class="remote-update-fix" color="primary"><DownloadIcon/>{{ t('Settings.DownloadButton') }}
         </Button></a>
         <Button class="icon-line-fix" icon-only @click="forceRefreshRemote">
           <UpdatedIcon/>