Merge pull request #188 from AOSSIE-Org/revert-157-setup-and-albumLoa…

…der-fix

Revert "Fixed setup page responsiveness and album page loader"

frontend/.eslintignore

@@ -1,4 +1,3 @@
 node_modules/
 dist/
-env.d.ts
-src-tauri/target/
+env.d.ts

frontend/package.json

@@ -31,7 +31,6 @@
     "lucide-react": "^0.400.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-query": "^3.39.3",
     "react-router-dom": "^6.24.1",
     "tailwind-merge": "^2.3.0",
     "tailwindcss-animate": "^1.0.7"

frontend/src-tauri/tauri.conf.json

@@ -23,7 +23,9 @@
   "plugins": {
     "updater": {
       "active": true,
-      "endpoints": ["https://server.com//api/v1/tauri/update"],
+      "endpoints": [
+        "https://server.com//api/v1/tauri/update"
+      ],
       "dialog": true,
       "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEI3ODc5QjNDMERGMzlCMUEKUldRYW0vTU5QSnVIdHplYktOV3hKKzdmSGd6ZVN3eTg4Q2ExbmVTbk4yN0pMWjZLYXl1M1ZzN3AK"
     }
@@ -41,10 +43,12 @@
     ],
     "security": {
       "assetProtocol": {
-        "scope": ["**"],
+        "scope": [
+          "**"
+        ],
         "enable": true
       },
       "csp": null
     }
   }
-}
+}

frontend/src/components/Album/Album.tsx

@@ -12,7 +12,6 @@ import {
   deleteAlbums,
   fetchAllAlbums,
 } from '../../../api/api-functions/albums';
-import { LoadingScreen } from '../LoadingScreen/LoadingScreen';
 const AlbumsView: React.FC = () => {
   const { successData: albums, isLoading } = usePictoQuery({
     queryFn: fetchAllAlbums,
@@ -30,14 +29,8 @@ const AlbumsView: React.FC = () => {
     description: string;
   } | null>(null);
 
-  if (isLoading){
-    return (
-      <div className="container flex w-full items-center justify-center">
-       <LoadingScreen/>
-      </div>
-    );
-  }
-
+  if (isLoading) return <div>Loading albums...</div>;
+
   const showErrorDialog = (title: string, err: unknown) => {
     setErrorDialogContent({
       title,

frontend/src/components/FolderPicker/FolderPicker.tsx

@@ -56,7 +56,7 @@ const FolderPicker: React.FC<FolderPickerProps> = ({
       <Button
         onClick={pickFolder}
         variant="outline"
-        className={`flex items-center justify-center border-gray-400 text-gray-100 hover:bg-accent dark:text-gray-50 dark:hover:bg-white/10 ${className} `}
+        className={`flex items-center justify-center border-gray-500 text-gray-700 hover:bg-accent dark:text-gray-50 dark:hover:bg-white/10 ${className} `}
       >
         <FolderPlus className="h-[18px] w-[18px]" />
         <p className={`ml-2 ${!settingsPage && 'hidden lg:inline'}`}>