Added option to reveal configuration folder in file manager, changed …

…label for "Minimize to tray option", archiving is now only possible when completed todos are available, if archiving fails error is handled properly and forwarded to interface, exchanged close icon of files in files tabs with "more icon"
ransome1 · Dec 10, 2023 · 5880ba9 · 5880ba9
1 parent df65948
commit 5880ba9
Show file tree

Hide file tree

Showing 48 changed files with 789 additions and 705 deletions.
diff --git a/.erb/scripts/notarize.js b/.erb/scripts/notarize.js
diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
@@ -34,12 +34,14 @@ jobs:
           yarn --network-timeout 100000
           yarn run build
       - name: Run Electron Builder
-        uses: coparse-inc/action-electron-builder@v1.0.0
+        uses: samuelmeuli/action-electron-builder@v1
         env:
           CSC_LINK: ${{ secrets.CSC_LINK }}
           CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
           APPLE_ID: ${{ secrets.APPLE_ID }}
-          APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASS }}
+          APPLE_ID_PASS: ${{ secrets.APPLE_ID_PASS }}
+          TEAM_ID: ${{ secrets.TEAM_ID }}
+          APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
         with:
           max_attempts: 5
           github_token: ${{ secrets.github_token }}

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.3-rc.3" date="2023-11-26"/>
+    <release version="2.0.3-rc.5" date="2023-12-10"/>
   </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.3-rc.3
+Version=2.0.3-rc.5
 Name=sleek
 Exec=sleek
 Type=Application

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sleek",
-  "version": "2.0.3-rc.3",
+  "version": "2.0.3-rc.5",
   "main": "./src/main/main.ts",
   "scripts": {
     "build": "concurrently \"yarn run peggy\" \"yarn run build:main\" \"yarn run build:renderer\"",
@@ -18,7 +18,7 @@
     "test": "jest",
     "mac": "cross-env NODE_ENV=production yarn run build && electron-builder build -m --publish never",
     "mas": "cross-env NODE_ENV=production yarn run build && electron-builder build -m mas --universal --publish never",
-    "masDev": "cross-env NODE_ENV=production yarn run build && electron-builder build -m mas-dev --universal --publish never",
+    "masdev": "cross-env NODE_ENV=production yarn run build && electron-builder build -m mas-dev --universal --publish never",
     "dir": "cross-env NODE_ENV=production yarn run build && electron-builder --dir --publish never",
     "peggy": "peggy --format es --output ./src/main/modules/FilterLang/FilterLang.js ./src/main/modules/FilterLang/FilterLang.pegjs",
     "depcheck": "depcheck"
@@ -104,7 +104,6 @@
     "@types/react": "^18.2.8",
     "@types/react-dom": "^18.2.4",
     "@types/react-test-renderer": "^18.0.0",
-    "@types/terser-webpack-plugin": "^5.0.4",
     "@types/webpack-bundle-analyzer": "^4.6.0",
     "@typescript-eslint/eslint-plugin": "^5.59.8",
     "@typescript-eslint/parser": "^5.59.8",
@@ -158,15 +157,14 @@
     "webpack-merge": "^5.9.0"
   },
   "build": {
-    "buildVersion": "30",
+    "buildVersion": "31",
     "asar": true,
     "asarUnpack": "**\\*.{node,dll}",
     "files": [
       "dist",
       "node_modules",
       "package.json"
     ],
-    "afterSign": ".erb/scripts/notarize.js",
     "mac": {
       "appId": "com.todotxt.sleek",
       "target": {
@@ -183,7 +181,10 @@
       "gatekeeperAssess": false,
       "category": "public.app-category.productivity",
       "artifactName": "${productName}-${version}-mac.${ext}",
-      "darkModeSupport": true
+      "darkModeSupport": true,
+      "notarize": {
+        "teamId": "8QSR3UZXP8"
+      }
     },
     "dmg": {
       "background": "assets/background.tiff",

diff --git a/release/app/package.json b/release/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sleek",
-  "version": "2.0.3-rc.4",
+  "version": "2.0.3-rc.5",
   "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.3-rc.3"
+version: "2.0.3-rc.5"
 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/__tests__/__mock__/recurrence.txt b/src/__tests__/__mock__/recurrence.txt
@@ -1,12 +1,12 @@
 
-2023-11-28 Line 1 rec:1d due:2023-11-29
-2023-11-28 Line 1 rec:w due:2023-12-05
-2023-11-28 Line 1 rec:2m due:2024-01-28
-2023-11-28 Line 1 rec:+1d due:2023-11-30
-2023-11-28 Line 1 rec:7w due:2024-01-16
+2023-12-10 Line 1 rec:1d due:2023-12-11
+2023-12-10 Line 1 rec:w due:2023-12-17
+2023-12-10 Line 1 rec:2m due:2024-02-10
+2023-12-10 Line 1 rec:+1d due:2023-12-12
+2023-12-10 Line 1 rec:7w due:2024-01-28
 2023-07-21 Line 1 due:2023-07-24 rec:+1b
 2021-01-01 taxes are due in one year t:2022-03-30 due:2022-04-30 rec:+1y
-2023-11-28 Water plants @home +quick due:2023-12-05 t:2023-11-25 rec:1w
-2023-11-28 Line 1 rec:+1d t:2023-09-20
-2023-11-28 Line 1 rec:1d pri:A due:2023-11-29
-2023-11-28 (A) Do something rec:d t:2023-11-29 @SomeContext
+2023-12-10 Water plants @home +quick due:2023-12-17 t:2023-12-07 rec:1w
+2023-12-10 Line 1 rec:+1d t:2023-09-20
+2023-12-10 Line 1 rec:1d pri:A due:2023-12-11
+2023-12-10 (A) Do something rec:d t:2023-12-11 @SomeContext
diff --git a/src/__tests__/main/Archive.tsx b/src/__tests__/main/Archive.tsx
@@ -20,9 +20,9 @@ jest.mock('../../main/config', () => ({
     get: jest.fn((key) => {
       if (key === 'files') {
         return [
-          { active: false, todoFilePath: './src/__tests__/__mock__/test1.txt', todoFileName: 'test1.txt', doneFilePath: './src/__tests__/__mock__/done.txt' },
-          { active: true, todoFilePath: './src/__tests__/__mock__/archiving.txt', todoFileName: 'archiving.txt', doneFilePath: './src/__tests__/__mock__/done.txt' },
-          { active: false, todoFilePath: './src/__tests__/__mock__/test3.txt', todoFileName: 'test3.txt', doneFilePath: './src/__tests__/__mock__/done.txt' },
+          { active: false, todoFilePath: './src/__tests__/__mock__/test1.txt', todoFileName: 'test1.txt', todoFileBookmark: null, doneFilePath: './src/__tests__/__mock__/done.txt', doneFileBookmark: null },
+          { active: true, todoFilePath: './src/__tests__/__mock__/archiving.txt', todoFileName: 'archiving.txt', todoFileBookmark: null, doneFilePath: './src/__tests__/__mock__/done.txt', doneFileBookmark: null },
+          { active: false, todoFilePath: './src/__tests__/__mock__/test3.txt', todoFileName: 'test3.txt', todoFileBookmark: null, doneFilePath: './src/__tests__/__mock__/done.txt', doneFileBookmark: null },
         ];
       }
     }),
@@ -43,7 +43,7 @@ describe('Archiving', () => {
 	});
 
 	test('Should collect data from todo and done file and merge it properly', async () => {
-		await archiveTodos();
+		await archiveTodos(undefined);
 		const fileContent = await fs.readFile('./src/__tests__/__mock__/done.txt', 'utf8');
 		const expectedContent = `x 2022-02-02 todo from done.txt 1\nx 2022-02-03 todo from done.txt 2\nx 2022-02-04 todo from done.txt 3\nx 2022-02-05 todo from done.txt 4\nx 2022-02-01 Finished todo 3\nx 2022-02-08 Finished todo 1\nx 2022-02-17 Finished todo 2`;
 		await new Promise((resolve) => setTimeout(resolve, 1000));

diff --git a/src/__tests__/main/CreateRecurringTodo.tsx b/src/__tests__/main/CreateRecurringTodo.tsx
@@ -16,7 +16,9 @@ jest.mock('../../main/config', () => ({
         active: true,
         todoFileName: 'recurrence.txt',
         todoFilePath: './src/__tests__/__mock__/recurrence.txt',
+        todoFileBookmark: null,
         doneFilePath: './src/__tests__/__mock__/done.txt',
+        doneFileBookmark: null
       },
     ]),
   },

diff --git a/src/__tests__/main/File.tsx b/src/__tests__/main/File.tsx
@@ -10,6 +10,18 @@ jest.mock('../../main/main', () => ({
   },
 }));
 
+jest.mock('../../main/modules/File/Watcher', () => ({
+  createFileWatcher: jest.fn(),
+}));
+
+jest.mock('../../main/modules/Tray', () => ({
+  createTray: jest.fn(),
+}));
+
+jest.mock('../../main/modules/Menu', () => ({
+  createMenu: jest.fn(),
+}));
+
 jest.mock('../../main/config', () => ({
   configStorage: {
     get: jest.fn().mockReturnValue([
@@ -21,8 +33,6 @@ jest.mock('../../main/config', () => ({
   },
 }));
 
-jest.mock('../../main/modules/File/Watcher', () => jest.fn());
-
 describe('File functions', () => {
   beforeEach(() => {
     jest.clearAllMocks();

diff --git a/src/__tests__/main/ProcessTodoObjects.tsx b/src/__tests__/main/ProcessTodoObjects.tsx
@@ -6,8 +6,10 @@ jest.mock('../../main/config', () => ({
       {
         active: true,
         path: './src/__tests__/__mock__',
-        todoFile: 'recurrence.txt',
-        doneFile: 'done.txt',
+        todoFilePath: 'recurrence.txt',
+        todoFileBookmark: null,
+        doneFilePath: 'done.txt',
+        doneFileBookmark: null,
       },
     ]),
   },

diff --git a/src/__tests__/main/Write.tsx b/src/__tests__/main/Write.tsx
@@ -15,9 +15,9 @@ jest.mock('../../main/config', () => ({
     get: jest.fn((key) => {
       if (key === 'files') {
         return [
-          { active: false, todoFileName: 'test1.txt', todoFilePath: './src/__tests__/__mock__/test1.txt', doneFile: 'done.txt' },
-          { active: true, todoFileName: 'test.txt', todoFilePath: './src/__tests__/__mock__/test.txt', doneFile: 'done.txt' },
-          { active: false, todoFileName: 'test3.txt', todoFilePath: './src/__tests__/__mock__/test3.txt', doneFile: 'done.txt' },
+          { active: false, todoFileName: 'test1.txt', todoFilePath: './src/__tests__/__mock__/test1.txt', todoFileBookmark: null, doneFile: 'done.txt', doneFileBookmark: null },
+          { active: true, todoFileName: 'test.txt', todoFilePath: './src/__tests__/__mock__/test.txt', todoFileBookmark: null, doneFile: 'done.txt', doneFileBookmark: null },
+          { active: false, todoFileName: 'test3.txt', todoFilePath: './src/__tests__/__mock__/test3.txt', todoFileBookmark: null, doneFile: 'done.txt', doneFileBookmark: null },
         ];
       } else if (key === 'appendCreationDate') {
         return false;

diff --git a/src/locales/cs.json b/src/locales/cs.json
@@ -14,7 +14,7 @@
   "settings.convertRelativeToAbsoluteDates": "Převést relativní data na absolutní data",
   "settings.notificationsAllowed": "Odeslat oznámení",
   "settings.showFileTabs": "Zobrazit záložky souborů",
-  "settings.tray": "Minimalizovat do oznamovací oblasti",
+  "settings.tray": "Minimalizovat do oznamovací oblasti místo ukončení aplikace",
   "settings.colorTheme": "Téma",
   "settings.system": "Sledovat systém",
   "settings.light": "Světlé",

diff --git a/src/locales/de.json b/src/locales/de.json
@@ -14,7 +14,7 @@
   "settings.convertRelativeToAbsoluteDates": "Relative Daten in absolute Daten umwandeln",
   "settings.notificationsAllowed": "Benachrichtigungen senden",
   "settings.showFileTabs": "Datei-Tabs anzeigen",
-  "settings.tray": "In die Taskleiste minimieren",
+  "settings.tray": "In Tray-Leiste minimieren anstatt die Anwendung zu beenden",
   "settings.colorTheme": "Design",
   "settings.system": "System folgen",
   "settings.light": "Hell",

diff --git a/src/locales/en-gb.json b/src/locales/en-gb.json
@@ -14,7 +14,7 @@
   "settings.convertRelativeToAbsoluteDates": "Convert relative dates to absolute dates",
   "settings.notificationsAllowed": "Send notifications",
   "settings.showFileTabs": "Show file tabs",
-  "settings.tray": "Minimize to tray",
+  "settings.tray": "Minimize to tray instead of quitting application",
   "settings.colorTheme": "Theme",
   "settings.system": "Follow system",
   "settings.light": "Light",

diff --git a/src/locales/en.json b/src/locales/en.json
@@ -14,7 +14,7 @@
   "settings.convertRelativeToAbsoluteDates": "Convert relative dates to absolute dates",
   "settings.notificationsAllowed": "Send notifications",
   "settings.showFileTabs": "Show file tabs",
-  "settings.tray": "Minimize to tray",
+  "settings.tray": "Minimize to tray instead of quitting application",
   "settings.colorTheme": "Theme",
   "settings.system": "Follow system",
   "settings.light": "Light",

diff --git a/src/locales/es.json b/src/locales/es.json
@@ -14,7 +14,7 @@
   "settings.convertRelativeToAbsoluteDates": "Convertir fechas relativas a fechas absolutas",
   "settings.notificationsAllowed": "Enviar notificaciones",
   "settings.showFileTabs": "Mostrar pestañas de archivo",
-  "settings.tray": "Minimizar a la bandeja",
+  "settings.tray": "Minimizar a la bandeja en lugar de cerrar la aplicación",
   "settings.colorTheme": "Tema",
   "settings.system": "Seguir el sistema",
   "settings.light": "Claro",

diff --git a/src/locales/fr.json b/src/locales/fr.json
@@ -14,7 +14,7 @@
   "settings.convertRelativeToAbsoluteDates": "Convertir les dates relatives en dates absolues",
   "settings.notificationsAllowed": "Envoyer des notifications",
   "settings.showFileTabs": "Afficher les onglets de fichier",
-  "settings.tray": "Réduire dans la zone de notification",
+  "settings.tray": "Minimiser dans la zone de notification au lieu de quitter l'application",
   "settings.colorTheme": "Thème",
   "settings.system": "Suivre le système",
   "settings.light": "Clair",

diff --git a/src/locales/hi.json b/src/locales/hi.json
@@ -14,7 +14,7 @@
   "settings.convertRelativeToAbsoluteDates": "सांख्यिक तिथियों को पूर्ण तिथियों में परिवर्तित करें",
   "settings.notificationsAllowed": "सूचनाएँ भेजें",
   "settings.showFileTabs": "फ़ाइल टैब दिखाएं",
-  "settings.tray": "सिस्टम ट्रे में मिनिमाइज़ करें",
+  "settings.tray": "एप्लिकेशन को बंद करने के बजाय ट्रे में कम करें",
   "settings.colorTheme": "थीम",
   "settings.system": "सिस्टम का पालन करें",
   "settings.light": "रोशनी",

diff --git a/src/locales/hu.json b/src/locales/hu.json
@@ -14,7 +14,7 @@
   "settings.convertRelativeToAbsoluteDates": "Relatív dátumok konvertálása abszolút dátumokká",
   "settings.notificationsAllowed": "Értesítések küldése",
   "settings.showFileTabs": "Fájl lapok megjelenítése",
-  "settings.tray": "Minimálás a tálcára",
+  "settings.tray": "Kisiklik az értesítési területre az alkalmazás bezárása helyett",
   "settings.colorTheme": "Téma",
   "settings.system": "Kövesse a rendszert",
   "settings.light": "Világos",

diff --git a/src/locales/it.json b/src/locales/it.json
@@ -14,7 +14,7 @@
   "settings.convertRelativeToAbsoluteDates": "Converti date relative in date assolute",
   "settings.notificationsAllowed": "Invia notifiche",
   "settings.showFileTabs": "Mostra le schede dei file",
-  "settings.tray": "Minimizza nella barra delle applicazioni",
+  "settings.tray": "Minimizza nella barra delle applicazioni anziché chiudere l'applicazione",
   "settings.colorTheme": "Tema",
   "settings.system": "Segui il sistema",
   "settings.light": "Chiaro",

diff --git a/src/locales/jp.json b/src/locales/jp.json
@@ -14,7 +14,7 @@
   "settings.convertRelativeToAbsoluteDates": "相対日付を絶対日付に変換",
   "settings.notificationsAllowed": "通知を送信",
   "settings.showFileTabs": "ファイルタブを表示",
-  "settings.tray": "トレイに最小化",
+  "settings.tray": "アプリケーションを終了する代わりにトレイに最小化",
   "settings.colorTheme": "テーマ",
   "settings.system": "システムに従う",
   "settings.light": "ライト",

diff --git a/src/locales/ko.json b/src/locales/ko.json
@@ -14,7 +14,7 @@
   "settings.convertRelativeToAbsoluteDates": "상대적 날짜를 절대 날짜로 변환",
   "settings.notificationsAllowed": "알림 보내기",
   "settings.showFileTabs": "파일 탭 표시",
-  "settings.tray": "트레이로 최소화",
+  "settings.tray": "애플리케이션 종료 대신 트레이로 최소화",
   "settings.colorTheme": "테마",
   "settings.system": "시스템 따르기",
   "settings.light": "라이트",

diff --git a/src/locales/pl.json b/src/locales/pl.json
@@ -14,7 +14,7 @@
   "settings.convertRelativeToAbsoluteDates": "Konwertuj daty względne na daty bezwzględne",
   "settings.notificationsAllowed": "Wysyłaj powiadomienia",
   "settings.showFileTabs": "Pokaż karty plików",
-  "settings.tray": "Minimalizuj do zasobnika",
+  "settings.tray": "Minimalizuj do zasobnika zamiast zamykania aplikacji",
   "settings.colorTheme": "Motyw kolorystyczny",
   "settings.system": "Zastosuj motyw systemowy",
   "settings.light": "Jasny",

diff --git a/src/locales/pt.json b/src/locales/pt.json
@@ -14,7 +14,7 @@
   "settings.convertRelativeToAbsoluteDates": "Converter datas relativas em datas absolutas",
   "settings.notificationsAllowed": "Enviar notificações",
   "settings.showFileTabs": "Mostrar separadores de ficheiro",
-  "settings.tray": "Minimizar para a bandeja do sistema",
+  "settings.tray": "Minimizar para a bandeja em vez de fechar a aplicação",
   "settings.colorTheme": "Tema",
   "settings.system": "Seguir o sistema",
   "settings.light": "Claro",

diff --git a/src/locales/ru.json b/src/locales/ru.json
@@ -14,7 +14,7 @@
   "settings.convertRelativeToAbsoluteDates": "Преобразовать относительные даты в абсолютные",
   "settings.notificationsAllowed": "Отправлять уведомления",
   "settings.showFileTabs": "Показать вкладки файлов",
-  "settings.tray": "Свернуть в лоток",
+  "settings.tray": "Свернуть в трей вместо закрытия приложения",
   "settings.colorTheme": "Тема",
   "settings.system": "Следовать системе",
   "settings.light": "Светлая",

diff --git a/src/locales/tr.json b/src/locales/tr.json
@@ -14,7 +14,7 @@
   "settings.convertRelativeToAbsoluteDates": "İlgili tarihleri mutlak tarihlere dönüştür",
   "settings.notificationsAllowed": "Bildirimleri Gönder",
   "settings.showFileTabs": "Dosya sekmesini göster",
-  "settings.tray": "Tepsiye Küçült",
+  "settings.tray": "Uygulamayı kapatmak yerine taya küçült",
   "settings.colorTheme": "Tema",
   "settings.system": "Sistemi Takip Et",
   "settings.light": "Açık",

diff --git a/src/locales/zh.json b/src/locales/zh.json
@@ -14,7 +14,7 @@
   "settings.convertRelativeToAbsoluteDates": "将相对日期转换为绝对日期",
   "settings.notificationsAllowed": "发送通知",
   "settings.showFileTabs": "显示文件选项卡",
-  "settings.tray": "最小化到系统托盘",
+  "settings.tray": "最小化到托盘而不是退出应用程序",
   "settings.colorTheme": "主题",
   "settings.system": "跟随系统",
   "settings.light": "明亮",