Added Matomo code and respective setting, added background image for …

…dmg build

README.md

@@ -1,20 +1,18 @@
 # sleek
-[![Code scan and test cases](https://github.com/ransome1/sleek/actions/workflows/code-scan.yml/badge.svg?branch=develop)](https://github.com/ransome1/sleek/actions/workflows/code-scan.yml)
-[![sleek](https://snapcraft.io/sleek/badge.svg)](https://snapcraft.io/sleek)
 
-## ❤️ Become a contributer
-[sleek is currently being rewritten.](https://github.com/ransome1/sleek/discussions/501) Now is a good time to join us in our mission to provide a user-friendly, free, and open-source todo.txt client. We're actively inviting passionate contributors skilled in `React`, `TypeScript`, `Electron`, and `Jest/Playwright` to join our collaborative effort. The `develop` branch reflects the most recent progress. Here you'll find our roadmap: https://github.com/users/ransome1/projects/3. For those interested, [we've updated our contribution guidelines](https://github.com/ransome1/sleek/wiki/Contributing-Guidelines).
-
-## sleek is an open-source (FOSS) todo manager based on the todo.txt syntax. It's available for Windows, macOS and Linux
+### sleek is an open-source (FOSS) todo manager based on the todo.txt syntax. It's available for Windows, macOS and Linux
 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.
 
 All classic todo.txt attributes are supported and enhanced by additional features. Creating todos is straightforward, and tag-based filtering in tandem with highly customisable grouping and smart full-text search allows for rapid information retrieval. Completed todos can be hidden or archived into separate done.txt files. Easy integration with other todo.txt apps is facilitated by continuously scanning todo.txt files for changes.
 
-sleek is available for Windows, macOS and Linux, and in several languages.
+sleek is available for Windows, macOS and Linux, and in several languages. [For more detailed information, please refer to the sleek wiki](https://github.com/ransome1/sleek/wiki).
 
-### Sponsor sleek
+### ❤️ Sponsor sleek
 Pushing sleek to the Apple and Microsoft app stores creates annual costs. You can help covering these by [sponsoring the project](https://github.com/sponsors/ransome1).
 
+### 👩🏾‍💻 Become a contributer
+We're actively inviting passionate contributors skilled in `React`, `TypeScript`, `Electron`, and `Jest/Playwright` to join our collaborative effort. The `develop` branch reflects the most recent progress. Here you'll find our roadmap: https://github.com/users/ransome1/projects/3. For those interested, [we've updated our contribution guidelines](https://github.com/ransome1/sleek/wiki/Contributing-Guidelines).
+
 ### Get sleek from Apple Mac App Store
 <a href="https://apps.apple.com/us/app/sleek-todo-manager/id1614704209" target="blank"><img src='assets/store_badges/Download_on_the_Mac_App_Store.png' alt='Get sleek from Apple Mac App Store' width='180'/></a>
 

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.0-dev20" date="2023-10-30"/>
+    <release version="2.0.0" date="2023-10-30"/>
   </releases>
   <url type="homepage">https://github.com/ransome1/sleek</url>
   <url type="contact">https://github.com/ransome1/sleek/issues</url>

flatpak/com.github.ransome1.sleek.desktop

@@ -1,5 +1,5 @@
 [Desktop Entry]
-Version=2.0.0-dev20
+Version=2.0.0
 Name=sleek
 Exec=sleek
 Type=Application

package.json

@@ -9,6 +9,7 @@
     "lint": "cross-env NODE_ENV=development eslint . --ext .js,.jsx,.ts,.tsx",
     "package": "ts-node ./.erb/scripts/clean.js dist && yarn run build && electron-builder build --publish never",
     "dir": "ts-node ./.erb/scripts/clean.js dist && yarn run build && electron-builder --dir",
+    "mac": "ts-node ./.erb/scripts/clean.js dist && yarn run build && electron-builder build -m --arm64 --publish never",
     "mas": "ts-node ./.erb/scripts/clean.js dist && yarn run build && electron-builder build -m mas --universal --publish never",
     "masDev": "ts-node ./.erb/scripts/clean.js dist && yarn run build && electron-builder build -m 'mas-dev' --arm64 --publish never",
     "appimage": "ts-node ./.erb/scripts/clean.js dist && yarn run build && electron-builder build -l appimage --universal --publish never",
@@ -168,11 +169,7 @@
     "mac": {
       "appId": "com.todotxt.sleek",
       "target": {
-        "target": "default",
-        "arch": [
-          "arm64",
-          "x64"
-        ]
+        "target": "default"
       },
       "icon": "assets/icons/icon.icns",
       "type": "distribution",
@@ -185,6 +182,7 @@
       "darkModeSupport": true
     },
     "dmg": {
+      "background": "assets/background.tiff",
       "contents": [
         {
           "x": 130,

release/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sleek",
-  "version": "2.0.0-dev20",
+  "version": "2.0.0",
   "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": [

snap/snapcraft.yaml

@@ -1,6 +1,6 @@
 name: sleek
 base: core20
-version: "2.0.0-dev20"
+version: "2.0.0"
 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.

src/__tests__/__mock__/recurrence.txt

@@ -1,11 +1,11 @@
 
-2023-10-29 Line 1 rec:1d due:2023-10-30
-2023-10-29 Line 1 rec:w due:2023-11-05
-2023-10-29 Line 1 rec:2m due:2023-12-29
-2023-10-29 Line 1 rec:+1d due:2023-10-31
-2023-10-29 Line 1 rec:7w due:2023-12-17
+2023-10-30 Line 1 rec:1d due:2023-10-31
+2023-10-30 Line 1 rec:w due:2023-11-06
+2023-10-30 Line 1 rec:2m due:2023-12-30
+2023-10-30 Line 1 rec:+1d due:2023-11-01
+2023-10-30 Line 1 rec:7w due:2023-12-18
 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-10-29 Water plants @home +quick due:2023-11-05 t:2023-10-26 rec:1w
-2023-10-29 Line 1 rec:+1d t:2023-09-20 due:2023-10-30
-(A) 2023-10-29 Line 1 rec:1d pri:A due:2023-10-30
+2023-10-30 Water plants @home +quick due:2023-11-06 t:2023-10-27 rec:1w
+2023-10-30 Line 1 rec:+1d t:2023-09-20 due:2023-10-31
+(A) 2023-10-30 Line 1 rec:1d pri:A due:2023-10-31

src/locales/cs.json

@@ -20,6 +20,7 @@
   "settings.language": "Jazyk",
   "settings.notificationThreshold": "Hranice oznámení",
   "settings.useMultilineForBulkTodoCreation": "Každý řádek v textovém poli vytvoří samostatnou položku úkolu",
+  "settings.matomo": "Povolit analýzu Matomo",
   "drawer.tabs.attributes": "Atributy",
   "drawer.tabs.filters": "Filtry",
   "drawer.tabs.sorting": "Řazení",

src/locales/de.json

@@ -20,6 +20,7 @@
   "settings.language": "Sprache",
   "settings.notificationThreshold": "Benachrichtigungsschwelle",
   "settings.useMultilineForBulkTodoCreation": "Jede Zeile im Textfeld erstellt eine separate Todo",
+  "settings.matomo": "Matomo-Analyse erlauben",
   "drawer.tabs.attributes": "Attribute",
   "drawer.tabs.filters": "Filter",
   "drawer.tabs.sorting": "Sortierung",

src/locales/en-gb.json

@@ -20,6 +20,7 @@
   "settings.language": "Language",
   "settings.notificationThreshold": "Notification threshold",
   "settings.useMultilineForBulkTodoCreation": "Each row in the text field creates a separate to-do item",
+  "settings.matomo": "Allow Matomo Analysis",
   "drawer.tabs.attributes": "Attributes",
   "drawer.tabs.filters": "Filters",
   "drawer.tabs.sorting": "Sorting",

src/locales/en.json

@@ -20,6 +20,7 @@
   "settings.language": "Language",
   "settings.notificationThreshold": "Notification threshold",
   "settings.useMultilineForBulkTodoCreation": "Each row in the text field creates a separate to-do item",
+  "settings.matomo": "Allow Matomo Analysis",
   "drawer.tabs.attributes": "Attributes",
   "drawer.tabs.filters": "Filters",
   "drawer.tabs.sorting": "Sorting",

src/locales/es.json

@@ -20,6 +20,7 @@
   "settings.language": "Idioma",
   "settings.notificationThreshold": "Umbral de notificación",
   "settings.useMultilineForBulkTodoCreation": "Cada línea en el campo de texto crea un elemento de tarea separado",
+  "settings.matomo": "Permitir análisis de Matomo",
   "drawer.tabs.attributes": "Atributos",
   "drawer.tabs.filters": "Filtros",
   "drawer.tabs.sorting": "Ordenación",

src/locales/fr.json

@@ -20,6 +20,7 @@
   "settings.language": "Langue",
   "settings.notificationThreshold": "Umbral de notificación",
   "settings.useMultilineForBulkTodoCreation": "Chaque ligne dans le champ de texte crée un élément de tâche séparé",
+  "settings.matomo": "Autoriser l'analyse Matomo",
   "drawer.tabs.attributes": "Attributs",
   "drawer.tabs.filters": "Filtres",
   "drawer.tabs.sorting": "Tri",

src/locales/hi.json

@@ -19,7 +19,8 @@
   "settings.dark": "डार्क",
   "settings.language": "भाषा",
   "settings.notificationThreshold": "सूचना सीमा",
-  "settings.useMultilineForBulkTodoCreation": "पाठ क्षेत्र में प्रत्येक पंक्ति स्वतंत्र टूडू आइटम बनाती है",  
+  "settings.useMultilineForBulkTodoCreation": "पाठ क्षेत्र में प्रत्येक पंक्ति स्वतंत्र टूडू आइटम बनाती है",
+  "settings.matomo": "मैटोमो विश्लेषण की अनुमति दें",
   "drawer.tabs.attributes": "गुण",
   "drawer.tabs.filters": "फ़िल्टर",
   "drawer.tabs.sorting": "क्रमबद्ध करना",

src/locales/hu.json

@@ -20,6 +20,7 @@
   "settings.language": "Nyelv",
   "settings.notificationThreshold": "Értesítés küszöbérték",
   "settings.useMultilineForBulkTodoCreation": "Minden sor külön teendőelemet hoz létre a szövegmezőben",
+  "settings.matomo": "Matomo elemzés engedélyezése",
   "drawer.tabs.attributes": "Tulajdonságok",
   "drawer.tabs.filters": "Szűrők",
   "drawer.tabs.sorting": "Rendezés",

src/locales/it.json

@@ -20,6 +20,7 @@
   "settings.language": "Lingua",
   "settings.notificationThreshold": "Soglia di notifica",
   "settings.useMultilineForBulkTodoCreation": "Ogni riga nel campo di testo crea un'attività separata",
+  "settings.matomo": "Consenti l'analisi di Matomo",
   "drawer.tabs.attributes": "Attributi",
   "drawer.tabs.filters": "Filtri",
   "drawer.tabs.sorting": "Ordinamento",

src/locales/jp.json

@@ -19,7 +19,8 @@
   "settings.dark": "ダーク",
   "settings.language": "言語",
   "settings.notificationThreshold": "通知しきい値",
-  "settings.useMultilineForBulkTodoCreation": "テキストフィールド内の各行は別々のタスクを作成します",  
+  "settings.useMultilineForBulkTodoCreation": "テキストフィールド内の各行は別々のタスクを作成します",
+  "settings.matomo": "Matomoの分析を許可",
   "drawer.tabs.attributes": "属性",
   "drawer.tabs.filters": "フィルター",
   "drawer.tabs.sorting": "ソート",

src/locales/ko.json

@@ -19,7 +19,8 @@
   "settings.dark": "다크",
   "settings.language": "언어",
   "settings.notificationThreshold": "알림 임계값",
-  "settings.useMultilineForBulkTodoCreation": "텍스트 필드의 각 줄은 별도의 할 일 항목을 생성합니다",  
+  "settings.useMultilineForBulkTodoCreation": "텍스트 필드의 각 줄은 별도의 할 일 항목을 생성합니다",
+  "settings.matomo": "Matomo 분석 허용",
   "drawer.tabs.attributes": "속성",
   "drawer.tabs.filters": "필터",
   "drawer.tabs.sorting": "정렬",

src/locales/pl.json

@@ -20,6 +20,7 @@
   "settings.language": "Język",
   "settings.notificationThreshold": "Prog powiadomień",
   "settings.useMultilineForBulkTodoCreation": "Każdy wiersz w polu tekstowym tworzy oddzielną pozycję na liście zadań",
+  "settings.matomo": "Zezwalaj na analizę Matomo",
   "drawer.tabs.attributes": "Atrybuty",
   "drawer.tabs.filters": "Filtry",
   "drawer.tabs.sorting": "Sortowanie",

src/locales/pt.json

@@ -20,6 +20,7 @@
   "settings.language": "Idioma",
   "settings.notificationThreshold": "Prog powiadomień",
   "settings.useMultilineForBulkTodoCreation": "Cada linha no campo de texto cria um item de tarefa separado",
+  "settings.matomo": "Permitir Análise do Matomo",
   "drawer.tabs.attributes": "Atributos",
   "drawer.tabs.filters": "Filtros",
   "drawer.tabs.sorting": "Ordenação",

src/locales/ru.json

@@ -20,6 +20,7 @@
   "settings.language": "Язык",
   "settings.notificationThreshold": "Порог уведомлений",
   "settings.useMultilineForBulkTodoCreation": "Каждая строка в текстовом поле создает отдельную задачу",
+  "settings.matomo": "Разрешить анализ Matomo",
   "drawer.tabs.attributes": "Атрибуты",
   "drawer.tabs.filters": "Фильтры",
   "drawer.tabs.sorting": "Сортировка",

src/locales/tr.json

@@ -20,6 +20,7 @@
   "settings.language": "Dil",
   "settings.notificationThreshold": "Bildirim Eşik Değeri",
   "settings.useMultilineForBulkTodoCreation": "Metin alanındaki her satır ayrı bir görev oluşturur",
+  "settings.matomo": "Matomo Analizine İzin Ver",
   "drawer.tabs.attributes": "Özellikler",
   "drawer.tabs.filters": "Filtreler",
   "drawer.tabs.sorting": "Sıralama",

src/locales/zh.json

@@ -20,6 +20,7 @@
   "settings.language": "语言",
   "settings.notificationThreshold": "通知阈值",
   "settings.useMultilineForBulkTodoCreation": "文本字段中的每一行都创建一个单独的待办事项",
+  "settings.matomo": "允许Matomo分析",
   "drawer.tabs.attributes": "属性",
   "drawer.tabs.filters": "过滤器",
   "drawer.tabs.sorting": "排序",

src/main/config.tsx

@@ -9,7 +9,7 @@ import { File, ConfigData } from './util';
 import processDataRequest from './modules/ProcessDataRequest';
 import handleTheme from './modules/Theme';
 
-const userDataDirectory = path.join(app.getPath('userData'), 'userData' + app.getVersion());
+const userDataDirectory = path.join(app.getPath('userData'), 'userData');
 if (!fs.existsSync(userDataDirectory)) fs.mkdirSync(userDataDirectory)
 console.log('config.ts: sleek userdata is located at: ' + userDataDirectory);
 
@@ -58,6 +58,7 @@ const defaultConfigData = {
   zoom: 100,
   multilineTextField: false,
   useMultilineForBulkTodoCreation: false,
+  matomo: true,
 };
 
 const configPath = path.join(userDataDirectory, 'config.json');

src/renderer/App.tsx

@@ -48,6 +48,7 @@ const App = () => {
   const [attributeMapping, setAttributeMapping] = useState<TranslatedAttributes>(translatedAttributes(i18n.t) || {});
   const [textFieldValue, setTextFieldValue] = useState<string | null>(null);
   const [promptItem, setPromptItem] = useState<PromptItem | null>(null);
+  const [matomo, setMatomo] = useState<boolean>(store.get('matomo') || false);
 
   const searchFieldRef = useRef(null);
 
@@ -194,6 +195,17 @@ const App = () => {
     document.body.style.fontSize = `${adjustedFontSize}px`;
   }, [zoom]);
 
+  useEffect(() => {
+    if (matomo) {
+      var _mtm = window._mtm = window._mtm || [];
+      _mtm.push({'mtm.startTime': (new Date().getTime()), 'event': 'mtm.Start'});
+      var d = document, g = d.createElement('script'), s = d.getElementsByTagName('script')[0];
+      g.async = true;
+      g.src = 'https://www.datenkrake.eu/matomo/js/container_WVsEueTV.js';
+      s.parentNode.insertBefore(g, s);
+    }
+  }, [matomo]);
+
   useEffect(() => {
     ipcRenderer.on('requestData', handleRequestedData);
     ipcRenderer.on('updateFiles', handleUpdateFiles);

src/renderer/Settings.tsx

@@ -42,6 +42,7 @@ const Settings: React.FC<Props> = ({
     showFileTabs: store.get('showFileTabs'),
     colorTheme: store.get('colorTheme'),
     useMultilineForBulkTodoCreation: store.get('useMultilineForBulkTodoCreation'),
+    matomo: store.get('matomo'),
     notificationsAllowed: store.get('notificationsAllowed'),
     notificationThreshold: store.get('notificationThreshold'),
   });

yarn.lock

@@ -3947,21 +3947,21 @@ [email protected]:
   integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
 
 core-js-compat@^3.31.0, core-js-compat@^3.33.1:
-  version "3.33.1"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.33.1.tgz#debe80464107d75419e00c2ee29f35982118ff84"
-  integrity sha512-6pYKNOgD/j/bkC5xS5IIg6bncid3rfrI42oBH1SQJbsmYPKF7rhzcFzYCcxYMmNQQ0rCEB8WqpW7QHndOggaeQ==
+  version "3.33.2"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.33.2.tgz#3ea4563bfd015ad4e4b52442865b02c62aba5085"
+  integrity sha512-axfo+wxFVxnqf8RvxTzoAlzW4gRoacrHeoFlc9n0x50+7BEyZL/Rt3hicaED1/CEd7I6tPCPVUYcJwCMO5XUYw==
   dependencies:
     browserslist "^4.22.1"
 
 core-js-pure@^3.23.3:
-  version "3.33.1"
-  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.33.1.tgz#7f27dd239da8eb97dbea30120071be8e5565cb0e"
-  integrity sha512-wCXGbLjnsP10PlK/thHSQlOLlLKNEkaWbTzVvHHZ79fZNeN1gUmw2gBlpItxPv/pvqldevEXFh/d5stdNvl6EQ==
+  version "3.33.2"
+  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.33.2.tgz#644830db2507ef84d068a70980ccd99c275f5fa6"
+  integrity sha512-a8zeCdyVk7uF2elKIGz67AjcXOxjRbwOLz8SbklEso1V+2DoW4OkAMZN9S9GBgvZIaqQi/OemFX4OiSoQEmg1Q==
 
 core-js@^3.30.2:
-  version "3.33.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.33.1.tgz#ef3766cfa382482d0a2c2bc5cb52c6d88805da52"
-  integrity sha512-qVSq3s+d4+GsqN0teRCJtM6tdEEXyWxjzbhVrCHmBS5ZTM0FS2MOS0D13dUXAWDUN6a+lHI/N1hF9Ytz6iLl9Q==
+  version "3.33.2"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.33.2.tgz#312bbf6996a3a517c04c99b9909cdd27138d1ceb"
+  integrity sha512-XeBzWI6QL3nJQiHmdzbAOiMYqjrb7hwU7A39Qhvd/POSa/t9E1AeZyEZx3fNvp/vtM8zXwhoL0FsiS0hD0pruQ==
 
 [email protected]:
   version "1.0.2"
@@ -4699,9 +4699,9 @@ electron-store@^8.1.0:
     type-fest "^2.17.0"
 
 electron-to-chromium@^1.4.535:
-  version "1.4.569"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.569.tgz#1298b67727187ffbaac005a7425490d157f3ad03"
-  integrity sha512-LsrJjZ0IbVy12ApW3gpYpcmHS3iRxH4bkKOW98y1/D+3cvDUWGcbzbsFinfUS8knpcZk/PG/2p/RnkMCYN7PVg==
+  version "1.4.570"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.570.tgz#5fb79061ead248a411bc8532da34d1dbf6ae23c1"
+  integrity sha512-5GxH0PLSIfXKOUMMHMCT4M0olwj1WwAxsQHzVW5Vh3kbsvGw8b4k7LHQmTLC2aRhsgFzrF57XJomca4XLc/WHA==
 
 electron@^25.8.1:
   version "25.9.3"
@@ -8580,9 +8580,9 @@ pump@^3.0.0:
     once "^1.3.1"
 
 punycode@^2.1.0, punycode@^2.1.1:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f"
-  integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
+  integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
 
 pure-rand@^6.0.0:
   version "6.0.4"
@@ -9783,9 +9783,9 @@ terser-webpack-plugin@*, terser-webpack-plugin@^5.3.7, terser-webpack-plugin@^5.
     terser "^5.16.8"
 
 terser@^5.10.0, terser@^5.16.8:
-  version "5.22.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.22.0.tgz#4f18103f84c5c9437aafb7a14918273310a8a49d"
-  integrity sha512-hHZVLgRA2z4NWcN6aS5rQDc+7Dcy58HOf2zbYwmFcQ+ua3h6eEFf5lIDKTzbWwlazPyOZsFQO8V80/IjVNExEw==
+  version "5.23.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.23.0.tgz#a9c02bc3087d0f5b1cc63bbfb4fe0f7e5dbbde82"
+  integrity sha512-Iyy83LN0uX9ZZLCX4Qbu5JiHiWjOCTwrmM9InWOzVeM++KNWEsqV4YgN9U9E8AlohQ6Gs42ztczlWOG/lwDAMA==
   dependencies:
     "@jridgewell/source-map" "^0.3.3"
     acorn "^8.8.2"