Merge pull request #395 from opeolluwa/master

update build script

.github/workflows/bundle.yml

@@ -1,5 +1,7 @@
 name: 'publish'
+
 on:
+  workflow_dispatch:
   push:
     branches:
       - release
@@ -11,34 +13,54 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [macos-latest, ubuntu-20.04, windows-latest]
+        include:
+          - platform: 'macos-latest' # for Arm based macs (M1 and above).
+            args: '--target aarch64-apple-darwin'
+          - platform: 'macos-latest' # for Intel based macs.
+            args: '--target x86_64-apple-darwin'
+          - platform: 'ubuntu-22.04'
+            args: ''
+          - platform: 'windows-latest'
+            args: ''
 
     runs-on: ${{ matrix.platform }}
     steps:
-      - uses: actions/checkout@v3
-      - name: setup node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 18
-      - name: install Rust stable
-        uses: dtolnay/rust-toolchain@stable
+      - uses: actions/checkout@v4
+
       - name: install dependencies (ubuntu only)
-        if: matrix.platform == 'ubuntu-20.04'
+        if: matrix.platform == 'ubuntu-22.04' # This must match the platform value defined above.
         run: |
           sudo apt-get update
-          sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf
+          sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
+
+      - name: setup node
+        uses: actions/setup-node@v4
+        with:
+          node-version: lts/*
+          cache: 'yarn' # Set this to npm, yarn or pnpm.
+
+      - name: install Rust stable
+        uses: dtolnay/rust-toolchain@stable # Set this to dtolnay/rust-toolchain@nightly
+        with:
+          # Those targets are only used on macos runners so it's in an `if` to slightly speed up windows and linux builds.
+          targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
+
+      - name: Rust cache
+        uses: swatinem/rust-cache@v2
+        with:
+          workspaces: './tauri -> target'
+
       - name: install frontend dependencies
-        run: npm install # change this to npm or pnpm depending on which one you use
+        # If you don't have `beforeBuildCommand` configured you may want to build your frontend here too.
+        run: yarn install # change this to npm or pnpm depending on which one you use.
 
       - uses: tauri-apps/tauri-action@v0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          tagName: app-v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version
+          tagName: app-v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version.
           releaseName: 'App v__VERSION__'
           releaseBody: 'See the assets to download this version and install.'
           releaseDraft: true
           prerelease: false
-          # owner: opeolluwa
-          # repo: wishare-release
-          # releaseCommit: 'new release'
+          args: ${{ matrix.args }}

src/pages/history/index.tsx

@@ -1,5 +1,5 @@
 import PageLayout from "@/components/layout/desktop/DesktopViewLayout";
-import LoaderCircle from "@/components/Progress/LoaderCircle";
+import LoaderCircle from "@/components/Loaders/LoaderCircle";
 import type { TabsProps } from "antd";
 import { Tabs } from "antd";
 import React, { useState } from "react";

src/pages/home/index.tsx

@@ -4,7 +4,7 @@ import PageTitle from "@/components/PageTitle";
 import SearchBar from "@/components/Search";
 import Text from "@/components/Text";
 
-import LoaderCircle from "@/components/Progress/LoaderCircle";
+import LoaderCircle from "@/components/Loaders/LoaderCircle";
 import { WifiStatusContext } from "@/store/network";
 import { computeFileSize } from "@/utils";
 import { LoadingOutlined } from "@ant-design/icons";

src/pages/index.tsx

@@ -3,7 +3,7 @@
 import Button from "@/components/Button";
 import Card from "@/components/Card";
 import Heading from "@/components/Heading";
-import Loader from "@/components/Progress/LoaderWifi";
+import Loader from "@/components/Loaders/LoaderWifi";
 import Text from "@/components/Text";
 import View from "@/components/View";
 import { DeviceInformationContext } from "@/store/device";

src/pages/quick-access/audio.tsx

@@ -1,4 +1,4 @@
-import LoaderCircle from "@/components/Progress/LoaderCircle";
+import LoaderCircle from "@/components/Loaders/LoaderCircle";
 import FileCard, { FileInterface } from "@/components/Thumbnail";
 import QuickAccessLayout from "@/components/layout/desktop/DesktopViewLayout";
 import { AppData } from "@/types";

src/pages/quick-access/documents.tsx

@@ -3,7 +3,7 @@ import QuickAccessLayout from "@/components/layout/desktop/DesktopViewLayout";
 import { AppData } from "@/types";
 import { invoke } from "@tauri-apps/api/core";
 import { useEffect, useState } from "react";
-import LoaderCircle from "@/components/Progress/LoaderCircle";
+import LoaderCircle from "@/components/Loaders/LoaderCircle";
 
 export default function Document() {
   const [data, setData] = useState(null);

src/pages/quick-access/downloads.tsx

@@ -5,7 +5,7 @@ import QuickAccessLayout from "@/components/layout/desktop/DesktopViewLayout";
 import { AppData } from "@/types";
 import { invoke } from "@tauri-apps/api/core";
 import { useEffect, useState } from "react";
-import LoaderCircle from "@/components/Progress/LoaderCircle";
+import LoaderCircle from "@/components/Loaders/LoaderCircle";
 
 export default function Document() {
   const [data, setData] = useState(null);

src/pages/quick-access/pictures.tsx

@@ -3,7 +3,7 @@ import QuickAccessLayout from "@/components/layout/desktop/DesktopViewLayout";
 import { AppData } from "@/types";
 import { invoke } from "@tauri-apps/api/core";
 import { useEffect, useState } from "react";
-import LoaderCircle from "@/components/Progress/LoaderCircle";
+import LoaderCircle from "@/components/Loaders/LoaderCircle";
 
 export default function Images() {
   const [data, setData] = useState(null);

src/pages/quick-access/videos.tsx

@@ -5,7 +5,7 @@ import QuickAccessLayout from "@/components/layout/desktop/DesktopViewLayout";
 import { AppData } from "@/types";
 import { invoke } from "@tauri-apps/api/core";
 import { useEffect, useState } from "react";
-import LoaderCircle from "@/components/Progress/LoaderCircle";
+import LoaderCircle from "@/components/Loaders/LoaderCircle";
 
 export default function Video() {
   const [data, setData] = useState(null);

src/pages/received.tsx

@@ -5,7 +5,7 @@ import QuickAccessLayout from "@/components/layout/desktop/DesktopViewLayout";
 import { AppData } from "@/types";
 import { invoke } from "@tauri-apps/api/core";
 import { useEffect, useState } from "react";
-import LoaderCircle from "@/components/Progress/LoaderCircle";
+import LoaderCircle from "@/components/Loaders/LoaderCircle";
 import React from "react";
 
 export default function Document() {

src/pages/settings.tsx

@@ -20,7 +20,7 @@ import {
 
 import Card from "@/components/Card";
 import Heading from "@/components/Heading";
-import { SettingsInterface, SettingsTab } from "@/components/AppSettings";
+import { SettingsInterface, SettingsTab } from "@/components/Settings";
 import { SystemInformation } from "@/store/system_information";
 import { invoke } from "@tauri-apps/api/core";
 import { hostname, locale } from "@tauri-apps/plugin-os";