diff --git a/packages/common/helpers/routes.ts b/packages/common/helpers/routes.ts
index e544678..25a1143 100644
--- a/packages/common/helpers/routes.ts
+++ b/packages/common/helpers/routes.ts
@@ -1,10 +1,12 @@
-enum Routes {
- convos = "/s#conversations",
- later = "/s#later",
- done = "/s#done",
- drawer = "/s#drawer",
- createConvo = "/s#createConversation",
- search = "/s#search",
+export enum QueryRoutes {
+ convos = "conversations",
+ later = "later",
+ done = "done",
+ drawer = "drawer",
+ createConvo = "createConversation",
+ search = "search",
}
-export default Routes;
+export enum Routes {
+ home = "/s",
+}
diff --git a/packages/common/models/usersConverations.ts b/packages/common/models/usersConverations.ts
index 2a8483f..3cdccfc 100644
--- a/packages/common/models/usersConverations.ts
+++ b/packages/common/models/usersConverations.ts
@@ -23,6 +23,7 @@ export default class UserConversation {
}
export enum UserConversationState {
+ inbox = "inbox",
default = "default",
priority = "priority",
later = "later",
diff --git a/packages/web/components/v2/CreateConversation.tsx b/packages/web/components/v2/CreateConversation.tsx
index 0ad8ac6..7dc8f23 100644
--- a/packages/web/components/v2/CreateConversation.tsx
+++ b/packages/web/components/v2/CreateConversation.tsx
@@ -109,8 +109,8 @@ export default function CreateConversation() {
diff --git a/packages/web/components/v2/Header.tsx b/packages/web/components/v2/Header.tsx
index 5931c3e..d5678c3 100644
--- a/packages/web/components/v2/Header.tsx
+++ b/packages/web/components/v2/Header.tsx
@@ -1,5 +1,4 @@
-// import Routes from "@nirvana/common/helpers/routes";
-import Routes from "@nirvana/common/helpers/routes";
+import { QueryRoutes, Routes } from "@nirvana/common/helpers/routes";
import { Menu, Dropdown, Avatar } from "antd";
import { useRouter } from "next/router";
import { useRef, useState } from "react";
@@ -50,6 +49,10 @@ export default function Header() {
const selectSearch = () => {
inputRef.current?.focus();
+ router.push({
+ pathname: Routes.home,
+ query: { page: QueryRoutes.search },
+ });
};
const updateInput = (e) => {
@@ -64,7 +67,7 @@ export default function Header() {
}
router.push({
- query: { q: encodeURI(newSearchInput) },
+ query: { q: encodeURI(newSearchInput), page: QueryRoutes.search },
});
};
diff --git a/packages/web/components/v2/KeyboardShortcutHandler.tsx b/packages/web/components/v2/KeyboardShortcutHandler.tsx
index 95a7ad5..2bfa2d1 100644
--- a/packages/web/components/v2/KeyboardShortcutHandler.tsx
+++ b/packages/web/components/v2/KeyboardShortcutHandler.tsx
@@ -1,4 +1,4 @@
-import Routes from "@nirvana/common/helpers/routes";
+import { QueryRoutes } from "@nirvana/common/helpers/routes";
import { useRouter } from "next/router";
import { GlobalHotKeys, KeyMap, configure } from "react-hotkeys";
@@ -11,7 +11,7 @@ export default function KeyboardShortcutHandler() {
const handleEscape = () => {
console.log("woah");
- router.push(Routes.convos);
+ router.push({ query: { page: QueryRoutes.convos } });
};
const keyMap: KeyMap = {
diff --git a/packages/web/components/v2/Sidebar.tsx b/packages/web/components/v2/Sidebar.tsx
index a97a43a..b4235ea 100644
--- a/packages/web/components/v2/Sidebar.tsx
+++ b/packages/web/components/v2/Sidebar.tsx
@@ -1,3 +1,4 @@
+import { QueryRoutes, Routes } from "@nirvana/common/helpers/routes";
import { Divider, Avatar, Tooltip, Badge } from "antd";
import { useRouter } from "next/router";
import {
@@ -14,24 +15,23 @@ import {
FaCircle,
} from "react-icons/fa";
import { HiSpeakerphone } from "react-icons/hi";
-import Routes from "@nirvana/common/helpers/routes";
-import { useRecoilValue } from "recoil";
-import { currPagePath } from "../../recoil/main";
function Sidebar() {
const router = useRouter();
+ const currPage = router.query.page;
- const currPage = useRecoilValue(currPagePath);
-
- const handleRoute = (route: Routes) => {
- router.push(route);
+ const handleRoute = (queryRoute: QueryRoutes) => {
+ router.push({
+ pathname: Routes.home,
+ query: { page: queryRoute },
+ });
};
return (
{/* new button */}