feat(tauri): updater window

zidoro · Nov 11, 2023 · 186d28c · 186d28c
1 parent dd1bf65
commit 186d28c
Show file tree

Hide file tree

Showing 42 changed files with 734 additions and 181 deletions.
diff --git a/.github/workflows/build-tauri.yml b/.github/workflows/build-tauri.yml
@@ -34,7 +34,11 @@ jobs:
             # The only real added benefit of NSIS is that the installer can have a custom logo.
             # Also, nsis is the only one that currently works on arm64
             # Another note is embedBootstrapper is enabled to improve support on window 7. Though windows 7 doesn't support arm64.
-            tauri_target: ["'aarch64-pc-windows-msvc --bundles nsis,updater'", "'x86_64-pc-windows-msvc --bundles msi,updater'"]
+            tauri_target:
+              [
+                "'aarch64-pc-windows-msvc --bundles nsis,updater'",
+                "'x86_64-pc-windows-msvc --bundles msi,updater'",
+              ]
 
     steps:
       - uses: actions/checkout@v4
@@ -50,7 +54,7 @@ jobs:
       - name: Rust cache
         uses: swatinem/rust-cache@v2
         with:
-          workspaces: './app/tauri -> target'
+          workspaces: "./app/tauri -> target"
       - name: install dependencies (ubuntu only)
         if: matrix.os == 'ubuntu-22.04'
         run: |
@@ -88,13 +92,23 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-      - name: Download all artifacts
+        # Download-artifact cannot do a wildcard and if all are downloaded it can download the results from the electron stage
+        # We could filter that but this is faster to avoid unneeded downloads.
+      - name: Download Win
         uses: actions/download-artifact@v3
         with:
-          path: artifacts
-      - name: Display structure of downloaded files
-        shell: bash
-        run: ls -R
+          name: tauri-win
+          path: artifacts/tauri-win
+      - name: Download Mac
+        uses: actions/download-artifact@v3
+        with:
+          name: tauri-mac
+          path: artifacts/tauri-mac
+      - name: Download Linux
+        uses: actions/download-artifact@v3
+        with:
+          name: tauri-linux
+          path: artifacts/tauri-linux
       - name: Use Node.js 18.x
         uses: actions/setup-node@v3
         with:
@@ -106,4 +120,4 @@ jobs:
         with:
           name: tauri-release
           path: |
-            release/*
+            release/*
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
@@ -30,6 +30,7 @@ jobs:
     needs: release-please
     if: needs.release-please.outputs.release_created
     uses: ./.github/workflows/build-tauri.yml
+    secrets: inherit
   publish:
     name: Publish
     needs:
@@ -57,28 +58,31 @@ jobs:
             built-*/*.exe
             built-*/*.snap
             built-*/*.blockmap
-  publish-to-homebrew-cask:
-    name: Publish to Homebrew Cask
-    needs:
-      - publish
-      - release-please
-    runs-on: macos-latest
-    steps:
-      - uses: Homebrew/actions/bump-packages@master
-        with:
-          casks: pomatez
-          token: ${{ secrets.GITHUB_TOKEN }}
-  publish-to-winget:
-    name: Publish to WinGet
-    needs:
-      - publish
-      - release-please
-    runs-on: windows-latest
-    steps:
-      - uses: vedantmgoyal2009/winget-releaser@v2
-        with:
-          identifier: Zidoro.Pomatez
-          installers-regex: 'setup\.exe$'
-          max-versions-to-keep: 5 # keep only latest 5 versions
-          release-tag: ${{ needs.release-please.outputs.tag }}
-          token: ${{ secrets.GITHUB_TOKEN }}
+            tauri-release/*
+
+# Commented out just for test releases
+#  publish-to-homebrew-cask:
+#    name: Publish to Homebrew Cask
+#    needs:
+#      - publish
+#      - release-please
+#    runs-on: macos-latest
+#    steps:
+#      - uses: Homebrew/actions/bump-packages@master
+#        with:
+#          casks: pomatez
+#          token: ${{ secrets.GITHUB_TOKEN }}
+#  publish-to-winget:
+#    name: Publish to WinGet
+#    needs:
+#      - publish
+#      - release-please
+#    runs-on: windows-latest
+#    steps:
+#      - uses: vedantmgoyal2009/winget-releaser@v2
+#        with:
+#          identifier: Zidoro.Pomatez
+#          installers-regex: 'setup\.exe$'
+#          max-versions-to-keep: 5 # keep only latest 5 versions
+#          release-tag: ${{ needs.release-please.outputs.tag }}
+#          token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/test-build-thingy.yml b/.github/workflows/test-build-thingy.yml
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "1.3.1"
+  ".": "1.5.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,12 +2,11 @@
 
 ## [1.3.1](https://github.com/zidoro/pomatez/compare/v1.3.0...v1.3.1) (2023-10-19)
 
-
 ### Bug Fixes 🐛
 
-* javascript error on launch ([#414](https://github.com/zidoro/pomatez/issues/414)) ([c6c18fb](https://github.com/zidoro/pomatez/commit/c6c18fb47b424be62a9b91ed64c7c95e8eaa41a3))
-* **lang:** Switch "released notes" with "release notes" ([#439](https://github.com/zidoro/pomatez/issues/439)) ([d9a3afa](https://github.com/zidoro/pomatez/commit/d9a3afa11f828084483c1d1e3693ff9b0dc1c8e1))
-* toast notification ([#382](https://github.com/zidoro/pomatez/issues/382)) ([25403d7](https://github.com/zidoro/pomatez/commit/25403d742d83d0d3654418a43bc5efe8316dc019))
+- javascript error on launch ([#414](https://github.com/zidoro/pomatez/issues/414)) ([c6c18fb](https://github.com/zidoro/pomatez/commit/c6c18fb47b424be62a9b91ed64c7c95e8eaa41a3))
+- **lang:** Switch "released notes" with "release notes" ([#439](https://github.com/zidoro/pomatez/issues/439)) ([d9a3afa](https://github.com/zidoro/pomatez/commit/d9a3afa11f828084483c1d1e3693ff9b0dc1c8e1))
+- toast notification ([#382](https://github.com/zidoro/pomatez/issues/382)) ([25403d7](https://github.com/zidoro/pomatez/commit/25403d742d83d0d3654418a43bc5efe8316dc019))
 
 ## [1.3.0](https://github.com/zidoro/pomatez/compare/v1.2.3...v1.3.0) (2023-09-26)
 

diff --git a/app/electron/package.json b/app/electron/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pomatez",
-  "version": "1.3.1",
+  "version": "1.5.0",
   "private": true,
   "license": "MIT",
   "main": "./build/main.js",

diff --git a/app/renderer/package.json b/app/renderer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pomatez/renderer",
-  "version": "1.3.1",
+  "version": "1.5.0",
   "private": true,
   "license": "MIT",
   "author": {

diff --git a/app/renderer/src/App.tsx b/app/renderer/src/App.tsx
@@ -35,6 +35,16 @@ export default function App() {
       document.removeEventListener("contextmenu", contextEvent);
   }, []);
 
+  useEffect(() => {
+    const middleMouseEvent = (event: MouseEvent) => {
+      if (event.button === 1) event.preventDefault();
+    };
+    window.addEventListener("auxclick", middleMouseEvent);
+
+    return () =>
+      window.removeEventListener("auxclick", middleMouseEvent);
+  }, []);
+
   return (
     <ThemeProvider>
       <CounterProvider>
@@ -54,7 +64,7 @@ export default function App() {
                           />
                         )
                       )
-                    : routes.map(
+                    : routes().map(
                         ({ exact, path, component }, index) => (
                           <Route
                             exact={exact}

diff --git a/app/renderer/src/components/NavNotify.tsx b/app/renderer/src/components/NavNotify.tsx
@@ -0,0 +1,18 @@
+import React from "react";
+import styled from "styled-components/macro";
+
+/**
+ * This is very roughly positioned atm though adding divs around the nav items breaks the layout
+ */
+const NavNotify: React.FC = styled.div`
+  background: var(--color-primary);
+  width: 8px;
+  height: 8px;
+  top: 0;
+  right: 0;
+  position: absolute;
+  transform: translate(50%, -50%);
+  border-radius: 50%;
+`;
+
+export default NavNotify;
diff --git a/app/renderer/src/components/Navigation.tsx b/app/renderer/src/components/Navigation.tsx
@@ -6,7 +6,9 @@ import {
   StyledNavList,
   StyledNavListItem,
   StyledNavLink,
+  StyledNavIconWrapper,
 } from "styles";
+import { NavNotify } from "components";
 import { routes } from "config";
 import SVG from "./SVG";
 
@@ -19,23 +21,32 @@ const Navigation: React.FC<Props> = ({ timerType }) => {
     (state: AppStateTypes) => state.settings
   );
 
+  const state = useSelector((state: AppStateTypes) => state);
+
   return (
     <StyledNav useNativeTitlebar={settings.useNativeTitlebar}>
       <StyledNavList>
-        {routes.map(({ name, icon, exact, path }, index) => (
-          <StyledNavListItem key={index}>
-            <StyledNavLink
-              exact={exact}
-              to={path}
-              type={timerType}
-              draggable="false"
-              replace
-            >
-              <SVG name={icon} />
-              {name}
-            </StyledNavLink>
-          </StyledNavListItem>
-        ))}
+        {routes(state).map(
+          ({ name, icon, exact, path, notify }, index) => {
+            return (
+              <StyledNavListItem key={index}>
+                <StyledNavLink
+                  exact={exact}
+                  to={path}
+                  type={timerType}
+                  draggable="false"
+                  replace
+                >
+                  <StyledNavIconWrapper>
+                    <SVG name={icon} />
+                    {notify && <NavNotify />}
+                  </StyledNavIconWrapper>
+                  {name}
+                </StyledNavLink>
+              </StyledNavListItem>
+            );
+          }
+        )}
       </StyledNavList>
     </StyledNav>
   );

diff --git a/app/renderer/src/components/Titlebar.tsx b/app/renderer/src/components/Titlebar.tsx
@@ -27,9 +27,8 @@ type Props = {
 };
 
 const Titlebar: React.FC<Props> = ({ darkMode, timerType }) => {
-  const { onMinimizeCallback, onExitCallback } = useContext(
-    ConnnectorContext
-  );
+  const { onMinimizeCallback, onExitCallback } =
+    useContext(ConnnectorContext);
 
   const getAppIcon = useCallback(() => {
     switch (timerType) {