Merge pull request #69 from pvdthings/dev

v0.13.1 - Take 2
pvdthings · Oct 5, 2023 · 23f7a51 · 23f7a51
2 parents f9de518 + 45a3363
commit 23f7a51
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 31 deletions.
diff --git a/src/app.html b/src/app.html
@@ -4,7 +4,7 @@
 		<meta charset="utf-8" />
 		<link rel="manifest" href="%sveltekit.assets%/manifest.json" crossorigin="use-credentials">
 		<link rel="icon" href="%sveltekit.assets%/favicon.ico" />
-		<meta name="viewport" content="width=device-width" />
+		<meta name="viewport" content="width=device-width; initial-scale=1; viewport-fit=cover">
 		%sveltekit.head%
 	</head>
 	<body data-sveltekit-preload-data="hover">

diff --git a/src/lib/language/translations.ts b/src/lib/language/translations.ts
@@ -32,8 +32,8 @@ export default {
         "Wednesday": "Wednesday",
         "Saturday": "Saturday",
         "Catalog": "Catalog",
-        "My List": "My List",
-        "Info": "Info",
+        "Bookmarks": "Bookmarks",
+        "Learn": "Learn",
         "Bookmarked": "Bookmarked",
         "No Bookmarks": "No Bookmarks",
         "It's not loading!": "It's not loading!"
@@ -72,8 +72,8 @@ export default {
         "Automotive": "Automotor",
         "Health": "Salud",
         "Catalog": "Catálago",
-        "My List": "Mi lista",
-        "Info": "Información",
+        "Bookmarks": "Marcadores",
+        "Learn": "Aprende",
         "Bookmarked": "Marcado",
         "No Bookmarks": "No hay marcadores",
         "It's not loading!": "¡No se está cargando!"

diff --git a/src/lib/views/BottomNavigationView.svelte b/src/lib/views/BottomNavigationView.svelte
@@ -11,11 +11,11 @@
 	import { thingsLength } from '$lib/stores/myList';
 
 	$: catalogText = $t('Catalog');
-	$: myListText = $t('My List');
-	$: infoText = $t('Info');
+	$: bookmarksText = $t('Bookmarks');
+	$: learnText = $t('Learn');
 </script>
 
-<div class="btm-nav bg-indigo-50 upward-shadow lg:hidden">
+<div class="btm-nav bg-indigo-50 upward-shadow box-content lg:hidden">
 	<button
 		class="bg-transparent"
 		class:active={$activeScreen === Screen.catalog}
@@ -24,9 +24,9 @@
 		<img
 			src={$activeScreen === Screen.catalog ? SolidBookOpenIcon : BookOpenIcon}
 			alt={catalogText}
-			width={28}
-			height={28}
+			class="w-5 h-5"
 		/>
+		<span class="text-xs font-display font-semibold">{catalogText}</span>
 	</button>
 	<button
 		class="bg-transparent"
@@ -37,15 +37,15 @@
 			{#if $thingsLength}
 				<span class="indicator-item badge bg-indigo-500 border-indigo-600 text-white">
 					{$thingsLength}
-				</span> 
+				</span>
 			{/if}
 			<img
 				src={$activeScreen === Screen.myList ? SolidBookmarkIcon : BookmarkIcon}
-				alt={myListText}
-				width={28}
-				height={28}
+				alt={bookmarksText}
+				class="w-5 h-5"
 			/>
 		</div>
+		<div class="text-xs font-display font-semibold">{bookmarksText}</div>
 	</button>
 	<button
 		class="bg-transparent"
@@ -54,10 +54,10 @@
 	>
 		<img
 			src={$activeScreen === Screen.info ? SolidLightbulbIcon : LightbulbIcon}
-			alt={infoText}
-			width={28}
-			height={28}
+			alt={learnText}
+			class="w-5 h-5"
 		/>
+		<span class="text-xs font-display font-semibold">{learnText}</span>
 	</button>
 </div>
 

diff --git a/src/lib/views/CatalogView.svelte b/src/lib/views/CatalogView.svelte
@@ -1,6 +1,6 @@
 <script>
 	import BorrowModal from '$lib/components/BorrowModal/BorrowModal.svelte';
-import { t } from '$lib/language/translate';
+	import { t } from '$lib/language/translate';
 	import { filteredThings } from '$lib/stores/catalog';
 	import CategoryChooserView from './CategoryChooserView.svelte';
 	import SearchInputView from './SearchInputView.svelte';

diff --git a/src/lib/views/MyListView/MyListTableRow.svelte b/src/lib/views/MyListView/MyListTableRow.svelte
@@ -14,7 +14,7 @@
 
 <tr>
   <td>
-    <div class="flex items-center space-x-3">
+    <div class="flex space-x-3">
       <div class="avatar">
         <div class="mask rounded-md border border-gray-300 bg-white w-14 h-14">
           <img src={imgSrc ?? BoxIcon} alt={thingName} />
@@ -23,14 +23,12 @@
       <div>
         <div class="text-base font-bold">{thingName}</div>
         <div class="text-sm">{available} {$t('Available')}</div>
+        <span class="badge badge-ghost mt-2 bg-yellow-300 border-yellow-400">{$t(category)}</span>
       </div>
     </div>
   </td>
-  <td>
-    <span class="badge badge-ghost bg-yellow-300 border-yellow-400">{$t(category)}</span>
-  </td>
-  <th class="float-right">
-    <button class="btn btn-ghost btn-circle" on:click={() => dispatch('remove')}>
+  <th>
+    <button class="btn btn-ghost btn-circle float-right" on:click={() => dispatch('remove')}>
       <img src={MinusCircleIcon} alt="Remove" class="h-6 w-6" />
     </button>
   </th>

diff --git a/src/lib/views/MyListView/MyListView.svelte b/src/lib/views/MyListView/MyListView.svelte
@@ -12,13 +12,6 @@
 
 {#if $things.length > 0}
   <table class="table">
-    <thead>
-      <tr>
-        <th>{$t('Name')}</th>
-        <th>{$t('Category')}</th>
-        <th></th>
-      </tr>
-    </thead>
     <tbody>
       {#each $things as thing}
         {@const thingName = isSpanish ? thing.spanishName : thing.name}