From 9c8ed5b6ffc3cef65f0331be6b13f195a16bd3e5 Mon Sep 17 00:00:00 2001 From: Adeoye Adefemi Date: Tue, 19 Sep 2023 23:36:06 +0100 Subject: [PATCH 1/4] hot fixes: --- core/src/database.rs | 6 +- src/components/nav/index.tsx | 16 ++--- src/pages/history.tsx | 114 +---------------------------------- 3 files changed, 15 insertions(+), 121 deletions(-) diff --git a/core/src/database.rs b/core/src/database.rs index cfe3b666..7efe401a 100644 --- a/core/src/database.rs +++ b/core/src/database.rs @@ -28,7 +28,6 @@ impl Database { let file_history_table = "CREATE TABLE IF NOT EXISTS transfer_history ( id VARCHAR PRIMARY KEY, file_name VARCHAR, file_size VARCHAR, transaction_type VARCHAR, date TEXT, recipient VARCHAR)"; - /* create the settings table, the table will contain user preference and settings */ //TODO: add device name , device_name VARCHAR let settings_table = @@ -125,7 +124,10 @@ impl Default for TransferHistory { id: Uuid::new_v4().to_string(), file_name: "".to_string(), file_size: "".to_string(), - date: Local::now().to_rfc2822().to_string(), + date: Local::now() + .date_naive() + .format("%a, %-d %b, %C%y") + .to_string(), transaction_type: "".to_string(), recipient: "".to_string(), } diff --git a/src/components/nav/index.tsx b/src/components/nav/index.tsx index 821d5663..ac9adb8f 100644 --- a/src/components/nav/index.tsx +++ b/src/components/nav/index.tsx @@ -88,14 +88,14 @@ export default function Navigation() { alternateIcon: , action: () => gotoPage({ routePath: "history" }), }, - { - //TODO: open saved files directory - path: "/files", - icon: , - action: openFileManager, - alternateIcon: , - name: "File Manager", - }, + // { + // //TODO: open saved files directory + // path: "/files", + // icon: , + // action: openFileManager, + // alternateIcon: , + // name: "File Manager", + // }, { path: "/settings", diff --git a/src/pages/history.tsx b/src/pages/history.tsx index 75e9f898..675d386f 100644 --- a/src/pages/history.tsx +++ b/src/pages/history.tsx @@ -2,123 +2,15 @@ import PageLayout from "@/components/layout/PageLayout"; import { useState } from "react"; import { Tab } from "@headlessui/react"; -function classNames(...classes: string[]) { - return classes.filter(Boolean).join(" "); -} + export default function HistoryPage() { - let [categories] = useState({ - Sent: [ - { - id: 1, - title: "Does drinking coffee make you smarter?", - date: "5h ago", - commentCount: 5, - shareCount: 2, - }, - { - id: 1, - title: "Does drinking coffee make you smarter?", - date: "5h ago", - commentCount: 5, - shareCount: 2, - }, - { - id: 1, - title: "Does drinking coffee make you smarter?", - date: "5h ago", - commentCount: 5, - shareCount: 2, - }, - { - id: 2, - title: "So you've bought coffee... now what?", - date: "2h ago", - commentCount: 3, - shareCount: 2, - }, - ], - Received: [ - { - id: 1, - title: "Is tech making coffee better or worse?", - date: "Jan 7", - commentCount: 29, - shareCount: 16, - }, - { - id: 2, - title: "The most innovative things happening in coffee", - date: "Mar 19", - commentCount: 24, - shareCount: 12, - }, - ], - }); + return ( <>
- - - {Object.keys(categories).map((category) => ( - - classNames( - "w-full rounded-lg py-2.5 text-sm font-medium leading-5 ", - "ring-white ring-opacity-60 ring-offset-2 ring-offset-blue-400 focus:outline-none focus:ring-2", - selected - ? "bg-white shadow" - : "text-blue-100 hover:bg-white/[0.12] hover:text-white" - ) - } - > - {category} - - ))} - - - {Object.values(categories).map((posts, idx) => ( - -
    - {posts.map((post) => ( -
  • -

    - {post.title} -

    - -
      -
    • {post.date}
      • -
    • ·
      • -
    • {post.commentCount} comments
      • -
    • ·
      • -
    • {post.shareCount} shares
      • -
    - - -
    • - ))} -
- - ))} - - +
From 41b862cd56aee42dac66383f4895b13a4f90e218 Mon Sep 17 00:00:00 2001 From: Adeoye Adefemi Date: Wed, 20 Sep 2023 18:11:33 +0100 Subject: [PATCH 2/4] feat: implemented history page --- core/bindings/TransferHistory.ts | 9 +- core/src/main.rs | 1 + package.json | 3 + react-identicons.d.ts | 1 + src/components/app/AppAside.tsx | 2 +- .../FileTransferCard.tsx | 4 +- src/components/history/TransferHistory.tsx | 53 ++++++++++++ src/components/nav/index.tsx | 16 ++-- src/pages/history.tsx | 69 ++++++++++++++-- src/pages/index.tsx | 4 +- src/pages/quick-access/documents.tsx | 2 +- src/pages/quick-access/images.tsx | 4 +- yarn.lock | 82 +++++++++++++++++++ 13 files changed, 229 insertions(+), 21 deletions(-) create mode 100644 react-identicons.d.ts rename src/components/{thumbnail => history}/FileTransferCard.tsx (96%) create mode 100644 src/components/history/TransferHistory.tsx diff --git a/core/bindings/TransferHistory.ts b/core/bindings/TransferHistory.ts index 79a3f2ca..7a8b4530 100644 --- a/core/bindings/TransferHistory.ts +++ b/core/bindings/TransferHistory.ts @@ -1,3 +1,10 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -export interface TransferHistory { id: string, fileName: string, fileSize: string, date: string, transactionType: string, recipient: string, } \ No newline at end of file +export interface TransferHistory { + id: string; + fileName: string; + fileSize: string; + date: string; + transactionType: string; + recipient: string; +} diff --git a/core/src/main.rs b/core/src/main.rs index c8d7e441..6e4b9d8f 100644 --- a/core/src/main.rs +++ b/core/src/main.rs @@ -48,6 +48,7 @@ fn main() -> Result<(), tauri::Error> { let state = app_state::State { ..Default::default() }; + // run core the server in a separate thread from tauri tauri::async_runtime::spawn(http_server::core_server()); diff --git a/package.json b/package.json index cdabf823..5bd041c0 100644 --- a/package.json +++ b/package.json @@ -18,9 +18,12 @@ "@heroicons/react": "^2.0.16", "@tauri-apps/api": "^1.3.0", "antd": "^5.6.2", + "iqons": "^1.0.4", "next": "^13.2.4", "react": "^18.2.0", "react-dom": "^18.2.0", + "react-identicon": "^1.0.2", + "react-identicons": "^1.2.5", "react-qr-code": "^2.0.11", "react-router-dom": "^6.9.0", "tauri-plugin-sqlite-api": "github:lzdyes/tauri-plugin-sqlite#v0.1.1", diff --git a/react-identicons.d.ts b/react-identicons.d.ts new file mode 100644 index 00000000..6a3a8dea --- /dev/null +++ b/react-identicons.d.ts @@ -0,0 +1 @@ +declare module "react-identicons"; diff --git a/src/components/app/AppAside.tsx b/src/components/app/AppAside.tsx index 4fef8059..0cb1a868 100644 --- a/src/components/app/AppAside.tsx +++ b/src/components/app/AppAside.tsx @@ -1,5 +1,5 @@ import { useContext } from "react"; -import { FileTransferCard } from "../thumbnail/FileTransferCard"; +import { FileTransferCard } from "../history/FileTransferCard"; import Image from "next/image"; import { FileContext } from "@/store/context"; import { Battery50Icon, BellAlertIcon } from "@heroicons/react/24/outline"; diff --git a/src/components/thumbnail/FileTransferCard.tsx b/src/components/history/FileTransferCard.tsx similarity index 96% rename from src/components/thumbnail/FileTransferCard.tsx rename to src/components/history/FileTransferCard.tsx index c938bf72..2e5c1117 100644 --- a/src/components/thumbnail/FileTransferCard.tsx +++ b/src/components/history/FileTransferCard.tsx @@ -10,7 +10,7 @@ import { PlayCircleIcon, } from "@heroicons/react/24/outline"; import Image from "next/image"; -import { getFileIcon } from "."; +import { getFileIcon } from "../thumbnail"; // the required data to render the file card component // the data will be passed dynamically @@ -24,7 +24,7 @@ type TFileType = { }; // the component -export function FileTransferCard({ +export function FileTransferCard({ fileName, fileSize, fileType, diff --git a/src/components/history/TransferHistory.tsx b/src/components/history/TransferHistory.tsx new file mode 100644 index 00000000..7ea178b3 --- /dev/null +++ b/src/components/history/TransferHistory.tsx @@ -0,0 +1,53 @@ +import { computeFileSize } from "@/utils"; + +import { + ArrowDownCircleIcon, + ArrowUpCircleIcon, +} from "@heroicons/react/24/outline"; +import Identicon from "react-identicons"; +import { TransferHistory } from "../../../core/bindings/TransferHistory"; + +// the required data to render the file card component +// the data will be passed dynamically + +enum FileTransferType { + SENT = "sent", + RECEIVED = "received", +} + +interface Props extends TransferHistory { +} +// the component +export function FileHistory({ + fileName, + fileSize, + transactionType, + date, + recipient, + id, +}: Props) { + return ( +
+ +
+
+ {fileName} +
+
+ {computeFileSize(Number(fileSize))}{" "} + {` transfer ${recipient}`} +
+
+ +
+ {transactionType == FileTransferType.SENT + ? + : } +
+
+ ); +} diff --git a/src/components/nav/index.tsx b/src/components/nav/index.tsx index ac9adb8f..821d5663 100644 --- a/src/components/nav/index.tsx +++ b/src/components/nav/index.tsx @@ -88,14 +88,14 @@ export default function Navigation() { alternateIcon: , action: () => gotoPage({ routePath: "history" }), }, - // { - // //TODO: open saved files directory - // path: "/files", - // icon: , - // action: openFileManager, - // alternateIcon: , - // name: "File Manager", - // }, + { + //TODO: open saved files directory + path: "/files", + icon: , + action: openFileManager, + alternateIcon: , + name: "File Manager", + }, { path: "/settings", diff --git a/src/pages/history.tsx b/src/pages/history.tsx index 675d386f..9f967a5f 100644 --- a/src/pages/history.tsx +++ b/src/pages/history.tsx @@ -1,16 +1,75 @@ import PageLayout from "@/components/layout/PageLayout"; -import { useState } from "react"; -import { Tab } from "@headlessui/react"; +import { useEffect, useState } from "react"; +import LoaderCircle from "@/components/loaders/LoaderCircle"; +import { CommandData } from "../../core/bindings/CommandData"; +import { TransferHistory } from "../../core/bindings/TransferHistory"; +import { invoke } from "@tauri-apps/api/tauri"; +import Image from "next/image"; +import { FileHistory } from "@/components/history/TransferHistory"; +export default function HistoryPage() { + // get the file transfer history data from the application backend + const [data, setData] = useState(null); + const [isLoading, setLoading] = useState(false); + // get the data from the application core + useEffect(() => { + setLoading(true); + invoke("get_transfer_history").then((res) => { + setData(res as any); + setLoading(false); + }); + }, []); + + // typecast the response into AppData type + const fetchedData = data as unknown as CommandData< + Array + >; + if (isLoading) { + return ( + <> + +

Loading...

+

+ Please wait while we load your documents. This might take a while. +

+ + ); + } -export default function HistoryPage() { - return ( <>
- + <> + {fetchedData?.data?.length == 0 + ? ( +
+ file card icon +

no recent files

+
+ ) + : ( + fetchedData?.data?.map((history, index) => { + ; + }) + )} + + {JSON.stringify(fetchedData.data)}
diff --git a/src/pages/index.tsx b/src/pages/index.tsx index 8370d01d..ffcae43f 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -139,7 +139,9 @@ export default function Main() { - {transferHistory?.data?.map((file, index) => ( + {isLoading? + "Loading...": + transferHistory?.data?.slice(0, 5).map((file, index) => ( {file.fileName} diff --git a/src/pages/quick-access/documents.tsx b/src/pages/quick-access/documents.tsx index 9bba2a1a..95671538 100644 --- a/src/pages/quick-access/documents.tsx +++ b/src/pages/quick-access/documents.tsx @@ -36,7 +36,7 @@ export default function Document() { } return ( diff --git a/src/pages/quick-access/images.tsx b/src/pages/quick-access/images.tsx index 7bc2329a..56638b48 100644 --- a/src/pages/quick-access/images.tsx +++ b/src/pages/quick-access/images.tsx @@ -36,9 +36,9 @@ export default function Images() { } return (
diff --git a/yarn.lock b/yarn.lock index 820becd6..aaa1366a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -844,6 +844,14 @@ magic-string "^0.27.0" react-refresh "^0.14.0" +MD5@^1.2.2: + version "1.3.0" + resolved "https://registry.yarnpkg.com/MD5/-/MD5-1.3.0.tgz#3cc266f0e89abb6b43a50f39a459df5bfde0b240" + integrity sha512-kDyDOgf7CECKouVCQ8tcbASPTyLMxrHxlvKBTBaXbF4eff5VYdfy4GCkCIIbAice4JGxBK+ExRD/4LdxDNXvLg== + dependencies: + charenc ">= 0.0.1" + crypt ">= 0.0.1" + acorn-jsx@^5.3.2: version "5.3.2" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" @@ -1081,6 +1089,11 @@ binary-extensions@^2.0.0: resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== +bluebird@^2.9.30: + version "2.11.0" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1" + integrity sha512-UfFSr22dmHPQqPP9XWHRhq+gWnHCYguQGkXQlbyPtW5qTnhFWA8/iXg765tH0cAjy7l/zPJ1aBTO0g5XgA7kvQ== + bplist-parser@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/bplist-parser/-/bplist-parser-0.2.0.tgz#43a9d183e5bf9d545200ceac3e712f79ebbe8d0e" @@ -1167,6 +1180,11 @@ chalk@^4.0.0: ansi-styles "^4.1.0" supports-color "^7.1.0" +"charenc@>= 0.0.1": + version "0.0.2" + resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667" + integrity sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA== + chokidar@^3.5.3: version "3.5.3" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" @@ -1252,6 +1270,11 @@ cross-spawn@^7.0.2, cross-spawn@^7.0.3: shebang-command "^2.0.0" which "^2.0.1" +"crypt@>= 0.0.1": + version "0.0.2" + resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b" + integrity sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow== + cssesc@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" @@ -2080,6 +2103,11 @@ internal-slot@^1.0.3, internal-slot@^1.0.5: has "^1.0.3" side-channel "^1.0.4" +iqons@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/iqons/-/iqons-1.0.4.tgz#016b14ab519030ed15f00f2b3b57f79c67a308f5" + integrity sha512-6fQFndagM51D5C0uxOX15xjYIWt45kLoI2R5FaK9QbTSymGgYhf99l6RM3szzPOI1lMSSGnX1ylmZ9VweTw1UQ== + is-array-buffer@^3.0.1, is-array-buffer@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.2.tgz#f2653ced8412081638ecb0ebbd0c41c6e0aecbbe" @@ -2356,6 +2384,11 @@ lodash.merge@^4.6.2: resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== +lodash@^3.9.3: + version "3.10.1" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" + integrity sha512-9mDDwqVIma6OZX79ZlDACZl8sBm0TEnkf99zV3iMA4GzkIT/9hiqP5mY0HoT1iNLCrKc/R1HByV+yJfRWVJryQ== + loose-envify@^1.1.0, loose-envify@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" @@ -2771,6 +2804,11 @@ punycode@^2.1.0: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f" integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA== +pure-render-decorator@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/pure-render-decorator/-/pure-render-decorator-0.1.0.tgz#3cb2e29f282138e833667252117fd9ae0390b859" + integrity sha512-WAKH5gWwWRcQ9HUrXJRgz9HuY/vI7gragJmhKd8wKlvj+ae7DZG46IYcTqcYLpM1OyWuzqjrQzyS6YO6SRNeMw== + qr.js@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/qr.js/-/qr.js-0.0.0.tgz#cace86386f59a0db8050fa90d9b6b0e88a1e364f" @@ -3152,6 +3190,22 @@ react-dom@^18.2.0: loose-envify "^1.1.0" scheduler "^0.23.0" +react-identicon@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/react-identicon/-/react-identicon-1.0.2.tgz#79ee46541e3665c873733b113496e71ea6a87264" + integrity sha512-aiJivs6CD5u1yUEzYsZMphAZYAwAbO+u5XGj1V8tb1ayQa/Rfl0yKGhEj81i19yCzKgJh0hKvd7Hu8dpXImEYQ== + dependencies: + MD5 "^1.2.2" + bluebird "^2.9.30" + lodash "^3.9.3" + pure-render-decorator "^0.1.0" + should "^6.0.3" + +react-identicons@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/react-identicons/-/react-identicons-1.2.5.tgz#3502249e49d88f4e3500092694410a984bb102fa" + integrity sha512-x7prkDoc2pD7wSl2C1pGxS+XAoSdq1ABWJWTBUimVTDVJArKOLd0B4wRUJpDm4r+9y7pgf8ylyPGsmlWSV5n2g== + react-is@^16.12.0, react-is@^16.13.1: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" @@ -3333,6 +3387,34 @@ shebang-regex@^3.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== +should-equal@0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/should-equal/-/should-equal-0.3.1.tgz#bd8ea97a6748e39fad476a3be6fd72ebc2e72bf0" + integrity sha512-/Q/o9EL9CJlCsy817ZkcQVlyUzyeWUxS9HkXUrqv4tTg+aOXEwvOpR1odT0K9DwcMA0gCy452K71YJA1E6K1mQ== + dependencies: + should-type "0.0.4" + +should-format@0.0.7: + version "0.0.7" + resolved "https://registry.yarnpkg.com/should-format/-/should-format-0.0.7.tgz#1e2ef86bd91da9c2e0412335b56ababd9a2fde12" + integrity sha512-8oNurKotJEQy+HboLxAHkgKQ+dRfV9TmVAvcY3He1RdnE994M39JTmkCt67cWaygVLKUfBcLRITkpHy2Hsgwcg== + dependencies: + should-type "0.0.4" + +should-type@0.0.4: + version "0.0.4" + resolved "https://registry.yarnpkg.com/should-type/-/should-type-0.0.4.tgz#0132a05417a6126866426acf116f1ed5623a5cd0" + integrity sha512-ve9tkv/i29COtupPlu2g4SXGefgSTjDTBI8d5UgSmT52T9T5VBpZY9/Ygn5Pb3dcCaiMyEzBAxBkpUGxEbbMDw== + +should@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/should/-/should-6.0.3.tgz#daee30786a557662fbc774c008d7c58791edb1d9" + integrity sha512-ksCle9zSaEu6dgeWRf63+l7yQ+4VdUdXju/5LIJmYL8ehc3Ssfjvs3pmSFbgOCPPzmFWblouyaUxyYgJKtM1TQ== + dependencies: + should-equal "0.3.1" + should-format "0.0.7" + should-type "0.0.4" + side-channel@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" From 735dea443a01844775f90bce1b3f3f60b46102c4 Mon Sep 17 00:00:00 2001 From: Adeoye Adefemi Date: Wed, 20 Sep 2023 18:40:46 +0100 Subject: [PATCH 3/4] feat: implemented history page --- src/components/history/TransferHistory.tsx | 12 +++++-- src/pages/history.tsx | 42 +++++++--------------- src/pages/quick-access/documents.tsx | 1 + 3 files changed, 22 insertions(+), 33 deletions(-) diff --git a/src/components/history/TransferHistory.tsx b/src/components/history/TransferHistory.tsx index 7ea178b3..197121ae 100644 --- a/src/components/history/TransferHistory.tsx +++ b/src/components/history/TransferHistory.tsx @@ -28,7 +28,13 @@ export function FileHistory({ }: Props) { return (
- +
+ +
{computeFileSize(Number(fileSize))}{" "} - {` transfer ${recipient}`} + {` ${recipient}`}
-
+
{transactionType == FileTransferType.SENT ? : } diff --git a/src/pages/history.tsx b/src/pages/history.tsx index 9f967a5f..1ae4cde7 100644 --- a/src/pages/history.tsx +++ b/src/pages/history.tsx @@ -40,36 +40,18 @@ export default function HistoryPage() { return ( <> -
- <> - {fetchedData?.data?.length == 0 - ? ( -
- file card icon -

no recent files

-
- ) - : ( - fetchedData?.data?.map((history, index) => { - ; - }) - )} - - {JSON.stringify(fetchedData.data)} +
+ {fetchedData?.data?.map((history, index) => ( + + ))}
diff --git a/src/pages/quick-access/documents.tsx b/src/pages/quick-access/documents.tsx index 95671538..e0ba5eaf 100644 --- a/src/pages/quick-access/documents.tsx +++ b/src/pages/quick-access/documents.tsx @@ -34,6 +34,7 @@ export default function Document() { ); } + return ( Date: Wed, 20 Sep 2023 18:42:32 +0100 Subject: [PATCH 4/4] app-v 0.6.20 --- core/tauri.conf.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/tauri.conf.json b/core/tauri.conf.json index b5dedb30..38cf6c82 100644 --- a/core/tauri.conf.json +++ b/core/tauri.conf.json @@ -8,7 +8,7 @@ }, "package": { "productName": "filesync", - "version": "0.6.19" + "version": "0.6.20" }, "tauri": { "allowlist": {