Remove react-toastify in favour of react-hot-toast

marcus-crane · Jun 2, 2022 · 3a78a56 · 3a78a56
1 parent 3dcbe93
commit 3a78a56
Show file tree

Hide file tree

Showing 21 changed files with 338 additions and 447 deletions.
diff --git a/backend/device.go b/backend/device.go
@@ -149,27 +149,29 @@ func (Bookmark) TableName() string {
 
 func GetKoboMetadata(detectedPaths []string) []Kobo {
 	var kobos []Kobo
-	log.Debug().Int("path_count", len(detectedPaths)).Msg("Found the location of possible Kobo(s)")
 	for _, path := range detectedPaths {
 		_, _, deviceId, err := kobo.ParseKoboVersion(path)
 		if err != nil {
-			log.Error().Err(err).Msg("Failed to parse Kobo version")
+			log.Error().Msg(fmt.Sprintf("Failed to parse version for Kobo at %s", path))
 		}
-		log.Debug().Str("device_id", deviceId).Msg("Found Kobo")
+		log.Debug().Msg(fmt.Sprintf("Found device with ID %s", deviceId))
 		device, found := kobo.DeviceByID(deviceId)
 		if !found {
+			log.Warn().Msg("Found a device that isn't officially supported but may still work anyway")
 			// We can handle unsupported Kobos in future but at present, there are none
-			log.Debug().Str("device_id", deviceId).Msg("Found an unrecognised Kobo")
-			continue
+			kobos = append(kobos, Kobo{
+				MntPath: path,
+				DbPath:  fmt.Sprintf("%s/.kobo/KoboReader.sqlite", path),
+			})
+		} else {
+			kobos = append(kobos, Kobo{
+				Name:       device.Name(),
+				Storage:    device.StorageGB(),
+				DisplayPPI: device.DisplayPPI(),
+				MntPath:    path,
+				DbPath:     fmt.Sprintf("%s/.kobo/KoboReader.sqlite", path),
+			})
 		}
-		log.Info().Str("device_name", device.Name()).Msg("Identified Kobo")
-		kobos = append(kobos, Kobo{
-			Name:       device.Name(),
-			Storage:    device.StorageGB(),
-			DisplayPPI: device.DisplayPPI(),
-			MntPath:    path,
-			DbPath:     fmt.Sprintf("%s/.kobo/KoboReader.sqlite", path),
-		})
 	}
 	return kobos
 }

diff --git a/backend/device_test.go b/backend/device_test.go
@@ -38,15 +38,6 @@ func TestGetKoboMetadata_HandleNoDevices(t *testing.T) {
 	assert.Equal(t, expected, actual)
 }
 
-// If you were to disconnect a device at the precise time between getting the connected paths
-// and checking the version at those paths, it would look the same as trying to access a file
-// that doesn't exist
-func TestGetKoboMetadata_HandleDisconnectedDevice(t *testing.T) {
-	var expected []Kobo
-	actual := GetKoboMetadata([]string{os.TempDir()})
-	assert.Equal(t, expected, actual)
-}
-
 func TestGetKoboMetadata_HandleConnectedDevices(t *testing.T) {
 	libraTempDir := t.TempDir()
 	fakeLibraVolume := setupTmpKobo(libraTempDir, libraTwoDeviceId)

diff --git a/frontend/dist/assets/index.0b1a9ab5.css b/frontend/dist/assets/index.0b1a9ab5.css
diff --git a/frontend/dist/assets/index.9fa72c53.js b/frontend/dist/assets/index.9fa72c53.js
diff --git a/frontend/dist/assets/index.bc6cfc65.js b/frontend/dist/assets/index.bc6cfc65.js
diff --git a/frontend/dist/assets/index.c7d5b2c6.css b/frontend/dist/assets/index.c7d5b2c6.css
diff --git a/frontend/dist/index.html b/frontend/dist/index.html
@@ -4,8 +4,8 @@
     <meta charset="UTF-8" />
     <meta content="width=device-width, initial-scale=1.0" name="viewport" />
     <title>October</title>
-    <script type="module" crossorigin src="/assets/index.bc6cfc65.js"></script>
-    <link rel="stylesheet" href="/assets/index.0b1a9ab5.css">
+    <script type="module" crossorigin src="/assets/index.9fa72c53.js"></script>
+    <link rel="stylesheet" href="/assets/index.c7d5b2c6.css">
   </head>
   <body class="max-h-screen bg-gray-100 dark:bg-gray-800">
     <div id="root"></div>

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -9,8 +9,7 @@
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
     "react-hot-toast": "^2.2.0",
-    "react-router-dom": "^6.3.0",
-    "react-toastify": "^9.0.3"
+    "react-router-dom": "^6.3.0"
   },
   "scripts": {
     "dev": "vite",

diff --git a/frontend/src/main.jsx b/frontend/src/main.jsx
@@ -1,15 +1,23 @@
 import React from 'react';
 import { createRoot } from 'react-dom/client'
+import { HashRouter, Route, Routes } from "react-router-dom"
 import { Toaster } from 'react-hot-toast'
 
-import 'react-toastify/dist/ReactToastify.css';
-import './style.css';
+import DeviceSelector from './pages/DeviceSelector';
+import Overview from './pages/Overview';
+import Settings from './pages/Settings';
 
-import Router from './router';
+import './style.css';
 
 const routes = (
   <React.StrictMode>
-    <Router />
+    <HashRouter>
+      <Routes>
+        <Route path="/" element={<DeviceSelector />} />
+        <Route path="/overview" element={<Overview />} />
+        <Route path="/settings" element={<Settings />} />
+      </Routes>
+    </HashRouter>
     <Toaster />
   </React.StrictMode>
 )