Merge pull request #392 from opeolluwa/master

fixes

src/pages/history/index.tsx

@@ -1,5 +1,5 @@
 import PageLayout from "@/components/layout/desktop/DesktopViewLayout";
-import LoaderCircle from "@/components/Loaders/LoaderCircle";
+import LoaderCircle from "@/components/Progress/LoaderCircle";
 import type { TabsProps } from "antd";
 import { Tabs } from "antd";
 import React, { useState } from "react";
@@ -13,7 +13,6 @@ const items: TabsProps["items"] = [
  { key: "2", label: "Received files", children: "received files" },
 ];
 
-
 export default function HistoryPage() {
  // get the file transfer history data from the application backend
  const [data, setData] = useState(null);

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/Loaders/LoaderCircle";
+import LoaderCircle from "@/components/Progress/LoaderCircle";
 import { WifiStatusContext } from "@/store/network";
 import { computeFileSize } from "@/utils";
 import { LoadingOutlined } from "@ant-design/icons";
@@ -74,8 +74,6 @@ export default function Main() {
  const [isLoading, setLoading] = useState(false);
  const { data: isConnectedToWifi } = useContext(WifiStatusContext);
 
-
-
  // typecast the response into AppData type
  const transferHistory = data as unknown as CommandData<
  Array<TransferHistory>
@@ -107,14 +105,10 @@ export default function Main() {
  WiFi network
  </p>
  <div className="flex gap-5">
- <button
- className=" bg-app text-white px-4 py-1 rounded w-24 "
- >
+ <button className=" bg-app text-white px-4 py-1 rounded w-24 ">
  Refresh
  </button>
- <button
- className=" px-4 py-1 border-2 text-gray-400 border-gray-400 rounded w-24"
- >
+ <button className=" px-4 py-1 border-2 text-gray-400 border-gray-400 rounded w-24">
  Exit
  </button>
  </div>

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/Loaders/LoaderWifi";
+import Loader from "@/components/Progress/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/Loaders/LoaderCircle";
+import LoaderCircle from "@/components/Progress/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/Loaders/LoaderCircle";
+import LoaderCircle from "@/components/Progress/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/Loaders/LoaderCircle";
+import LoaderCircle from "@/components/Progress/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/Loaders/LoaderCircle";
+import LoaderCircle from "@/components/Progress/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/Loaders/LoaderCircle";
+import LoaderCircle from "@/components/Progress/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/Loaders/LoaderCircle";
+import LoaderCircle from "@/components/Progress/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/Settings";
+import { SettingsInterface, SettingsTab } from "@/components/AppSettings";
 import { SystemInformation } from "@/store/system_information";
 import { invoke } from "@tauri-apps/api/core";
 import { hostname, locale } from "@tauri-apps/plugin-os";