Fixed desktop file for Flathub build, fixed minor CSS bug

ransome1 · Jan 22, 2024 · 9f5de73 · 9f5de73
1 parent 1070d3e
commit 9f5de73
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 17 deletions.
diff --git a/.erb/scripts/update-version-numbers.js b/.erb/scripts/update-version-numbers.js
@@ -2,12 +2,6 @@ const fs = require('fs');
 const packageJson = require('../../release/app/package.json');
 const dayjs = require('dayjs');
 
-let desktopFileContent = fs.readFileSync('../../flatpak/com.github.ransome1.sleek.desktop', 'utf8');
-desktopFileContent = desktopFileContent.replace(/Version=.*\n/, `Version=${packageJson.version}\n`);
-fs.writeFileSync('../../flatpak/com.github.ransome1.sleek.desktop', desktopFileContent);
-
-console.log('Updated com.github.ransome1.sleek.desktop with version', packageJson.version);
-
 let appdataContent = fs.readFileSync('../../flatpak/com.github.ransome1.sleek.appdata.xml', 'utf8');
 const formattedDate = dayjs(new Date()).format('YYYY-MM-DD');
 appdataContent = appdataContent.replace(/<release version=".*?" date=".*?"\/>/, `<release version="${packageJson.version}" date="${formattedDate}"/>`);

diff --git a/flatpak/com.github.ransome1.sleek.appdata.xml b/flatpak/com.github.ransome1.sleek.appdata.xml
@@ -9,7 +9,7 @@
   <developer_name>Robin Ahle</developer_name>
   <content_rating type="oars-1.1"/>
   <releases>
-    <release version="2.0.7" date="2024-01-21"/>
+    <release version="2.0.8" date="2024-01-22"/>
   </releases>
   <url type="homepage">https://github.com/ransome1/sleek</url>
   <url type="contact">https://github.com/ransome1/sleek/issues</url>

diff --git a/flatpak/com.github.ransome1.sleek.desktop b/flatpak/com.github.ransome1.sleek.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Version=2.0.7
+Version=1.5
 Name=sleek
 Exec=sleek
 Type=Application

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sleek",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "main": "./src/main/main.tsx",
   "scripts": {
     "build": "concurrently \"yarn run peggy\" \"yarn run build:main\" \"yarn run build:renderer\"",
@@ -142,7 +142,7 @@
     "webpack-merge": "^5.9.0"
   },
   "build": {
-    "buildVersion": "37",
+    "buildVersion": "38",
     "asar": true,
     "asarUnpack": "**\\*.{node,dll}",
     "files": [

diff --git a/release/app/package.json b/release/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sleek",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "description": "todo.txt manager for Linux, Windows and MacOS, free and open-source (FOSS)",
   "synopsis": "todo.txt manager for Linux, Windows and MacOS, free and open-source (FOSS)",
   "keywords": [

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -1,6 +1,6 @@
 name: sleek
 base: core20
-version: "2.0.7"
+version: "2.0.8"
 summary: todo.txt manager for Linux, free and open-source (FOSS)
 description: |
   sleek is an open-source (FOSS) todo manager based on the todo.txt syntax. Stripped down to only the most necessary features, and with a clean and simple interface, sleek aims to help you focus on getting things done.

diff --git a/src/renderer/Header/FileTabs.scss b/src/renderer/Header/FileTabs.scss
@@ -1,6 +1,8 @@
 @import "../Variables.scss";
 
 #fileTabs {
+	height: 2.5em;
+	min-height: 2.5em;
 	.MuiTabs-scroller {
 		button[role=tab] {
 			min-width: 8.5em;

diff --git a/src/renderer/Header/Header.tsx b/src/renderer/Header/Header.tsx
@@ -37,7 +37,7 @@ const HeaderComponent: React.FC<Props> = memo(({
     };
   }, [handleKeyDown]);
 
-  return (
+  return (settings.showFileTabs &&
     <div id='ToolBar' onClick={handleOnClick}>
       <SearchIcon 
         className={settings.isSearchOpen ? 'active' : ''}

diff --git a/src/renderer/Header/Search/Search.scss b/src/renderer/Header/Search/Search.scss
@@ -3,9 +3,9 @@
 #search {
 	display: flex;
 	position: relative;
+	padding: 0.5em 1em;
 	.MuiAutocomplete-root {
 		flex-direction: row;
 		flex: 1;
-		margin: 1em 1em 0.25em 1em;
 	}
 }
diff --git a/yarn.lock b/yarn.lock
@@ -8802,9 +8802,9 @@ truncate-utf8-bytes@^1.0.0:
     utf8-byte-length "^1.0.1"
 
 ts-jest@^29.1.0:
-  version "29.1.1"
-  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.1.1.tgz#f58fe62c63caf7bfcc5cc6472082f79180f0815b"
-  integrity sha512-D6xjnnbP17cC85nliwGiL+tpoKN0StpgE0TeOjXQTU6MVCfsB4v7aW05CgQ/1OywGb0x/oy9hHFnN+sczTiRaA==
+  version "29.1.2"
+  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.1.2.tgz#7613d8c81c43c8cb312c6904027257e814c40e09"
+  integrity sha512-br6GJoH/WUX4pu7FbZXuWGKGNDuU7b8Uj77g/Sp7puZV6EXzuByl6JrECvm0MzVzSTkSHWTihsXt+5XYER5b+g==
   dependencies:
     bs-logger "0.x"
     fast-json-stable-stringify "2.x"