diff --git a/index.html b/index.html
index 1ac23fa..db50e56 100644
--- a/index.html
+++ b/index.html
@@ -4,7 +4,7 @@
-
+
diff --git a/src/components/animations/PageTransition.jsx b/src/components/animations/PageTransition.jsx
index 5fb011a..cf7c580 100644
--- a/src/components/animations/PageTransition.jsx
+++ b/src/components/animations/PageTransition.jsx
@@ -57,7 +57,7 @@ const PageTransition = ({ children }) => {
const previousLevel = getRouteLevel(prevLocation.current.pathname)
// Determine if we're navigating back (to a higher level in hierarchy)
- isNavigatingBack.current = currentLevel < previousLevel
+ // isNavigatingBack.current = currentLevel < previousLevel
window.scrollTo({ top: 0, left: 0, behavior: 'instant' })
prevLocation.current = location
diff --git a/src/contexts/RouterContext.jsx b/src/contexts/RouterContext.jsx
index 654750f..da38c15 100644
--- a/src/contexts/RouterContext.jsx
+++ b/src/contexts/RouterContext.jsx
@@ -1,6 +1,5 @@
import App from '@/App'
import ChoreEdit from '@/views/ChoreEdit/ChoreEdit'
-import ChoresOverview from '@/views/ChoresOverview'
import Error from '@/views/Error'
import Settings from '@/views/Settings/Settings'
import { Capacitor } from '@capacitor/core'
@@ -12,6 +11,7 @@ import LoginView from '../views/Authorization/LoginView'
import SignupView from '../views/Authorization/Signup'
import UpdatePasswordView from '../views/Authorization/UpdatePasswordView'
import ChoreView from '../views/ChoreEdit/ChoreView'
+import ArchivedTasks from '../views/Chores/ArchivedTasks'
import MyChores from '../views/Chores/MyChores'
import JoinCircleView from '../views/Circles/JoinCircle'
import ChoreHistory from '../views/History/ChoreHistory'
@@ -53,7 +53,11 @@ const Router = createBrowserRouter([
},
{
path: '/chores',
- element: ,
+ element: ,
+ },
+ {
+ path: '/archived',
+ element: ,
},
{
path: '/chores/:choreId/edit',
@@ -99,6 +103,7 @@ const Router = createBrowserRouter([
path: '/signup',
element: ,
},
+
{
path: '/auth/:provider',
element: ,
@@ -151,6 +156,7 @@ const Router = createBrowserRouter([
path: 'labels/',
element: ,
},
+
{
path: '*',
element: ,
diff --git a/src/utils/TokenManager.jsx b/src/utils/TokenManager.jsx
index 2109364..665a265 100644
--- a/src/utils/TokenManager.jsx
+++ b/src/utils/TokenManager.jsx
@@ -93,7 +93,9 @@ export async function Fetch(url, options) {
if (response.ok) {
const data = await response.clone().json()
- const optionsHash = murmurhash.v3(JSON.stringify(options))
+ const optionWithoutToken = { ...options }
+ delete optionWithoutToken.headers.Authorization
+ const optionsHash = murmurhash.v3(JSON.stringify(optionWithoutToken))
await localStore.saveToCache(fullURL + optionsHash, data)
networkManager.setOnline()
} else if (response.status === 401) {
diff --git a/src/views/ChoreEdit/ChoreView.jsx b/src/views/ChoreEdit/ChoreView.jsx
index 07f5bd8..a58f043 100644
--- a/src/views/ChoreEdit/ChoreView.jsx
+++ b/src/views/ChoreEdit/ChoreView.jsx
@@ -137,7 +137,8 @@ const ChoreView = () => {
}`,
subtext: ` Last: ${
chore.lastCompletedDate
- ? performers.find(p => p.id === chore.lastCompletedBy)?.displayName
+ ? performers.find(p => p.userId === chore.lastCompletedBy)
+ ?.displayName
: '--'
}`,
},
@@ -165,7 +166,8 @@ const ChoreView = () => {
icon: ,
title: 'Details',
subtext: `Created By: ${
- performers.find(p => p.id === chore.createdBy)?.displayName || 'N/A'
+ performers.find(p => p.userId === chore.createdBy)?.displayName ||
+ 'N/A'
}`,
},
]
diff --git a/src/views/Modals/EditHistoryModal.jsx b/src/views/Modals/EditHistoryModal.jsx
index c53d160..4995753 100644
--- a/src/views/Modals/EditHistoryModal.jsx
+++ b/src/views/Modals/EditHistoryModal.jsx
@@ -68,6 +68,7 @@ function EditHistoryModal({ config, historyRecord }) {
{/* 3 button save , cancel and delete */}
-