xx

arkitektio · Oct 23, 2023 · e395dcb · e395dcb
1 parent 9ddf6b7
commit e395dcb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 36 deletions.
diff --git a/src/components/navigation/NavigationBar.tsx b/src/components/navigation/NavigationBar.tsx
@@ -144,18 +144,6 @@ const NavigationBar: React.FC<INavigationBarProps> = ({ children }) => {
  <TbLayoutDashboard />
  </DroppableNavLink>
  </RekuestGuard>
- <RekuestGuard>
- <NavLink
- key={"History"}
- to={"rekuest/history"}
- className={({ isActive }) =>
- ` dark:hover:text-back-400 px-2 py-2 hidden md:block
- } ${isActive ? "dark:text-back-400" : "text-back-500"}`
- }
- >
- <TbHistory />
- </NavLink>
- </RekuestGuard>
  <MikroNextGuard>
  <DroppableNavLink
  key={"MikroNext"}

diff --git a/src/lok/pages/TeamHome.tsx b/src/lok/pages/TeamHome.tsx
@@ -17,6 +17,8 @@ import {
  useMyMentionsQuery,
  useResolveCommentMutation,
 } from "../api/graphql";
+import { CommentEdit } from "../komment/edit/CommentEdit";
+import { Comment } from "../komment/display/Comment";
 
 interface IFlowHomeProps {}
 
@@ -50,28 +52,7 @@ export const MentionedComment = ({
  <div className="flex flex-col text-white">
  {comment?.user && (
  <div className="mt-2 flex flex-col w-full">
- <div className="flex flex-row ">
- <LokUser.DetailLink
- object={comment?.user?.id}
- className="flex flex-row p-1 bg-back-700 rounded"
- >
- <div className="my-auto mr-2">{comment?.user.username}</div>
- <img
- className="h-6 w-6 rounded-full hover:ring-pink-500 hover:ring-2 cursor-pointer"
- src={
- comment?.user?.profile?.avatar
- ? s3resolve(comment?.user?.profile.avatar)
- : `https://eu.ui-avatars.com/api/?name=${comment?.user?.username}&background=random`
- }
- alt=""
- />
- </LokUser.DetailLink>
- <div className="flex flex-grow my-auto">
- mentioned you <div className="mr-2"></div>
- {comment.mentions.length > 1 &&
- "and " + comment.mentions.length + " others"}{" "}
- <Timestamp relative date={comment?.createdAt} />
- </div>
+ <div className="flex flex-row-reverse">
  <div className="flex flex-initial my-auto">
  {comment.resolved ? (
  <div className="flex flex-row mr-2">
@@ -98,15 +79,17 @@ export const MentionedComment = ({
  )}
  <div className="text-gray-500 my-auto">
  <Model.DetailLink
- object={comment.identifier}
+ object={comment.object}
  className="text-slate-50 mt-5 "
  >
  <BsFolder2Open />
  </Model.DetailLink>
  </div>
  </div>
  </div>
- <div className="flex-initial my-auto w-full"></div>
+ <div className="flex-initial my-auto w-full">
+ <Comment comment={comment} />
+ </div>
  </div>
  )}
  </div>