refactor: use nav again

Roshanjossey · Roshanjossey · commit 853933a6647b · 2023-01-05T01:39:05.000+01:00
diff --git a/app/layout.tsx b/app/layout.tsx
@@ -6,7 +6,7 @@ export default function RootLayout({
   children: React.ReactNode
 }) {
   return (
-    <html>
+    <html lang="en">
       <head />
       <body>{children}</body>
     </html>
diff --git a/app/story/page.tsx b/app/story/page.tsx
@@ -14,7 +14,7 @@ export default function Story() {
         sidebarContentRight={<div>Promoted</div>}
         sidebarContentLeft={<div>Reactions</div>}
       >
-        <Editor editable={true} requestCookie={requestCookie} />
+        <Editor editable requestCookie={requestCookie} />
       </Layout>
     </div>
   )
diff --git a/src/components/Layout.tsx b/src/components/Layout.tsx
@@ -17,7 +17,7 @@ export default function Layout({
   const [isDrawerOpen, setIsDrawerOpen] = useState(false)
   return (
     <div className="mx-auto bg-gray-200 dark:bg-dark-800 min-h-screen">
-      {/* <Navbar isDrawerOpen={isDrawerOpen} setIsDrawerOpen={setIsDrawerOpen} /> */}
+      <Navbar isDrawerOpen={isDrawerOpen} setIsDrawerOpen={setIsDrawerOpen} />
       {sidebarContentLeft && (
         <aside
           className={`col-span-2 md:hidden mt-16 ${
diff --git a/src/components/UserDetails/Bio.tsx b/src/components/UserDetails/Bio.tsx
@@ -40,7 +40,7 @@ const Bio = ({ user }: BioProps) => {
     setEditMode(false)
     commitMutation({
       variables: {
-        input: { id: data.id, bio: bio },
+        input: { id: data.id, bio },
       },
     })
   }
diff --git a/src/components/navbar/Navbar.tsx b/src/components/navbar/Navbar.tsx
@@ -1,6 +1,6 @@
 import dynamic from 'next/dynamic'
 import Link from 'next/link'
-import { useRouter } from 'next/router'
+import { usePathname } from 'next/navigation'
 import React from 'react'
 import Button from '../Button'
 import HamburgerMenu from './HamburgerButton'
@@ -14,8 +14,7 @@ type NavbarProps = {
 }
 
 export default function Navbar({ isDrawerOpen, setIsDrawerOpen }: NavbarProps) {
-  const router = useRouter()
-  const { pathname } = router
+  const pathname = usePathname()
   return (
     <nav className="fixed top-0 left-0 right-0 z-10 w-full h-16 bg-white dark:bg-dark-700 p-3 shadow-sm">
       <div className="container m-auto flex justify-between">
diff --git a/src/components/story/StoryEditor.tsx b/src/components/story/StoryEditor.tsx
@@ -31,7 +31,7 @@ const DEFAULT_INITIAL_DATA = (): OutputData => {
 
 const getTitle = (content: OutputData) => {
   for (let i = 0; i < content.blocks.length; i++) {
-    if (content.blocks[i].type == 'header' && content.blocks[i].data.text) {
+    if (content.blocks[i].type === 'header' && content.blocks[i].data.text) {
       return content.blocks[i].data.text
     }
   }
@@ -42,14 +42,14 @@ const getAbstract = (content: OutputData) => {
   let headerTaken = false
   for (let i = 0; i < content.blocks.length; i++) {
     if (
-      content.blocks[i].type == 'header' &&
+      content.blocks[i].type === 'header' &&
       content.blocks[i].data.text &&
       !headerTaken
     ) {
       headerTaken = true
     } else if (
-      content.blocks[i].type == 'header' ||
-      content.blocks[i].type == 'paragraph'
+      content.blocks[i].type === 'header' ||
+      content.blocks[i].type === 'paragraph'
     ) {
       abstract += stripHtml(content.blocks[i].data.text).result + ' '
     }
@@ -60,7 +60,7 @@ const getAbstract = (content: OutputData) => {
 
 const getThubnail = (content: OutputData) => {
   for (let i = 0; i < content.blocks.length; i++) {
-    if (content.blocks[i].type == 'image' && content.blocks[i].data.file.url) {
+    if (content.blocks[i].type === 'image' && content.blocks[i].data.file.url) {
       return content.blocks[i].data.file.url
     }
   }
@@ -183,7 +183,7 @@ function Editor({ editable, body }: EditorProps) {
           }
         `}
       </style>
-      {editable && <Button onClick={() => handleStorySubmit()}>Submit </Button>}
+      {editable && <Button onClick={handleStorySubmit}>Submit </Button>}
     </Card>
   )
 }
diff --git a/src/relay/environment.ts b/src/relay/environment.ts
@@ -58,17 +58,17 @@ export const responseCache: QueryResponseCache | null = IS_SERVER
     })
 
 function createNetwork(cookie?: string) {
-  async function fetchResponse(
+  function fetchResponse(
     params: RequestParameters,
     variables: Variables,
     cacheConfig: CacheConfig
   ) {
     const isQuery = params.operationKind === 'query'
     const cacheKey = params.id ?? params.cacheID
     const forceFetch = cacheConfig && cacheConfig.force
-    if (responseCache != null && isQuery && !forceFetch) {
+    if (responseCache !== null && isQuery && !forceFetch) {
       const fromCache = responseCache.get(cacheKey, variables)
-      if (fromCache != null) {
+      if (fromCache !== null) {
         return Promise.resolve(fromCache)
       }
     }
diff --git a/src/relay/loadSerializableQuery.ts b/src/relay/loadSerializableQuery.ts
@@ -1,4 +1,3 @@
-import { cookies } from 'next/headers'
 import {
   GraphQLResponse,
   OperationType,

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ export default function Story() {`
`14`	`14`	`sidebarContentRight={<div>Promoted</div>}`
`15`	`15`	`sidebarContentLeft={<div>Reactions</div>}`
`16`	`16`	`>`
`17`		`- <Editor editable={true} requestCookie={requestCookie} />`
	`17`	`+ <Editor editable requestCookie={requestCookie} />`
`18`	`18`	`</Layout>`
`19`	`19`	`</div>`
`20`	`20`	`)`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ const Bio = ({ user }: BioProps) => {`
`40`	`40`	`setEditMode(false)`
`41`	`41`	`commitMutation({`
`42`	`42`	`variables: {`
`43`		`- input: { id: data.id, bio: bio },`
	`43`	`+ input: { id: data.id, bio },`
`44`	`44`	`},`
`45`	`45`	`})`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ const DEFAULT_INITIAL_DATA = (): OutputData => {`
`31`	`31`
`32`	`32`	`const getTitle = (content: OutputData) => {`
`33`	`33`	`for (let i = 0; i < content.blocks.length; i++) {`
`34`		`- if (content.blocks[i].type == 'header' && content.blocks[i].data.text) {`
	`34`	`+ if (content.blocks[i].type === 'header' && content.blocks[i].data.text) {`
`35`	`35`	`return content.blocks[i].data.text`
`36`	`36`	`}`
`37`	`37`	`}`
`@@ -42,14 +42,14 @@ const getAbstract = (content: OutputData) => {`
`42`	`42`	`let headerTaken = false`
`43`	`43`	`for (let i = 0; i < content.blocks.length; i++) {`
`44`	`44`	`if (`
`45`		`- content.blocks[i].type == 'header' &&`
	`45`	`+ content.blocks[i].type === 'header' &&`
`46`	`46`	`content.blocks[i].data.text &&`
`47`	`47`	`!headerTaken`
`48`	`48`	`) {`
`49`	`49`	`headerTaken = true`
`50`	`50`	`} else if (`
`51`		`- content.blocks[i].type == 'header' \|\|`
`52`		`- content.blocks[i].type == 'paragraph'`
	`51`	`+ content.blocks[i].type === 'header' \|\|`
	`52`	`+ content.blocks[i].type === 'paragraph'`
`53`	`53`	`) {`
`54`	`54`	`abstract += stripHtml(content.blocks[i].data.text).result + ' '`
`55`	`55`	`}`
`@@ -60,7 +60,7 @@ const getAbstract = (content: OutputData) => {`
`60`	`60`
`61`	`61`	`const getThubnail = (content: OutputData) => {`
`62`	`62`	`for (let i = 0; i < content.blocks.length; i++) {`
`63`		`- if (content.blocks[i].type == 'image' && content.blocks[i].data.file.url) {`
	`63`	`+ if (content.blocks[i].type === 'image' && content.blocks[i].data.file.url) {`
`64`	`64`	`return content.blocks[i].data.file.url`
`65`	`65`	`}`
`66`	`66`	`}`
`@@ -183,7 +183,7 @@ function Editor({ editable, body }: EditorProps) {`
`183`	`183`	`}`
`184`	`184`	`}
`185`	`185`	`</style>`
`186`		`- {editable && <Button onClick={() => handleStorySubmit()}>Submit </Button>}`
	`186`	`+ {editable && <Button onClick={handleStorySubmit}>Submit </Button>}`
`187`	`187`	`</Card>`
`188`	`188`	`)`
`189`	`189`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import { cookies } from 'next/headers'`
`2`	`1`	`import {`
`3`	`2`	`GraphQLResponse,`
`4`	`3`	`OperationType,`