Merge pull request #83 from itizaworld/develop

Release

.vscode/settings.json

@@ -23,8 +23,8 @@
     "editor.formatOnSave": false
   },
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true,
-    "source.fixAll.markdownlint": true
+    "source.fixAll.eslint": "explicit",
+    "source.fixAll.markdownlint": "explicit"
   },
   "cSpell.words": [
     "automerge",

package.json

@@ -38,11 +38,11 @@
     "@types/node": "^20",
     "@types/react": "^18",
     "@types/react-dom": "^18",
-    "@typescript-eslint/eslint-plugin": "6.13.1",
+    "@typescript-eslint/eslint-plugin": "6.13.2",
     "autoprefixer": "^10",
     "eslint": "8.55.0",
-    "eslint-config-next": "14.0.3",
-    "eslint-config-prettier": "9.0.0",
+    "eslint-config-next": "14.0.4",
+    "eslint-config-prettier": "9.1.0",
     "eslint-import-resolver-typescript": "3.6.1",
     "eslint-plugin-flowtype": "8.0.3",
     "eslint-plugin-import": "2.29.0",
@@ -51,8 +51,8 @@
     "eslint-plugin-react": "7.33.2",
     "eslint-plugin-react-hooks": "4.6.0",
     "postcss": "^8.4.30",
-    "prettier": "3.1.0",
+    "prettier": "3.1.1",
     "tailwindcss": "^3.3.3",
-    "typescript": "5.3.2"
+    "typescript": "5.3.3"
   }
 }

src/app/[slug]/[date]/_components/NippoBreadcrumbs.tsx

@@ -0,0 +1,24 @@
+'use client';
+
+import { BreadcrumbItem, Breadcrumbs, Link } from '@nextui-org/react';
+import { FC } from 'react';
+import { URLS } from '~/app/_constants/urls';
+import { Objective } from '~/domains/Objective';
+
+type Props = {
+  objective: Objective;
+  date: string;
+};
+
+export const NippoBreadcrumbs: FC<Props> = ({ objective, date }) => {
+  return (
+    <Breadcrumbs size="sm">
+      <BreadcrumbItem>
+        <Link size="sm" href={URLS.SLUG(objective.slug)} className="text-black">
+          {objective.name}
+        </Link>
+      </BreadcrumbItem>
+      <BreadcrumbItem>{date}</BreadcrumbItem>
+    </Breadcrumbs>
+  );
+};

src/app/[slug]/[date]/page.tsx

@@ -1,12 +1,12 @@
 import { Metadata } from 'next';
+import { NippoBreadcrumbs } from './_components/NippoBreadcrumbs';
 import { getNippoByDate } from '~/app/_actions/nippoActions';
 import { getObjectiveBySlug } from '~/app/_actions/objectiveActions';
 import { URLS } from '~/app/_constants/urls';
 import { generateNippoMetadata } from '~/libs/generateNippoMetadata';
 import { fetchMe } from '~/app/_actions/userActions';
 import { NippoEditor } from '~/app/_components/domains/Nippo/NippoEditor';
 import { getDateString } from '~/libs/getDateString';
-import { ObjectiveStickyHeader } from '~/app/_components/domains/Objective/ObjectiveStickyHeader';
 import { NippoPreview } from '~/app/_components/domains/Nippo/NippoPreview';
 
 type Props = { params: { slug: string; date: string } };
@@ -29,8 +29,8 @@ export default async function Page({ params }: Props) {
   return (
     <div className="drop-shadow-sm">
       <div className="min-h-[500px] max-w-[1024px] mx-auto flex gap-[16px] md:gap-[48px]">
-        <div className="px-[8px] pt-[16px] pb-[32px] w-[100%]">
-          <ObjectiveStickyHeader objective={objective} />
+        <div className="px-[8px] pt-[8px] pb-[32px] w-[100%]">
+          <NippoBreadcrumbs objective={objective} date={dateString} />
           <p className="mt-[32px] text-xl font-bold mb-[8px] text-gray-700">{dateString}</p>
           {currentUser?._id === objective.createdUserId ? (
             <NippoEditor objectiveId={objective._id} nippo={nippo} date={params.date} />

src/app/_components/domains/Nippo/NippoEditor/NippoEditor.tsx

@@ -27,9 +27,9 @@ export const NippoEditor: FC<Props> = ({ objectiveId, nippo, date }) => {
 
   const handleEditorChange = useCallback(
     async (body: string) => {
-      await postNippo({ objectiveId, date: nippo?.date || date, body });
+      await postNippo({ objectiveId, date, body });
     },
-    [date, nippo?.date, objectiveId],
+    [date, objectiveId],
   );
 
   useEffect(() => {