Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release #1877

Merged
merged 7 commits into from
Nov 24, 2023
Merged

Release #1877

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions apps/web/lib/components/kanban-card.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ export default function Item(props: any) {
{...provided.draggableProps}
{...provided.dragHandleProps}
style={getStyle(provided, style)}
className="flex flex-col rounded-2xl bg-white p-4 relative"
className="flex flex-col rounded-2xl bg-white dark:bg-dark--theme-light p-4 relative"
data-is-dragging={isDragging}
data-testid={item.id}
data-index={index}
Expand All @@ -115,8 +115,8 @@ export default function Item(props: any) {
<div className="bg-indianRed rounded p-1">
<BugIcon/>
</div>
<p className="text-grey">#213</p>
<p className="text-black capitalize">{item.content}</p>
<p className="text-grey text-normal">#213</p>
<p className="text-black dark:text-white text-normal capitalize">{item.content}</p>

</div>
</div>
Expand All @@ -126,8 +126,8 @@ export default function Item(props: any) {
</div>
<div className="flex flex-row justify-between items-center pt-4">
<div className="flex flex-row items-center gap-2">
<small className="text-[#7E7991] text-xs text-normal">Worked:</small>
<p className="text-black font-medium text-sm">0 h 0 m </p>
<small className="text-grey text-xs text-normal">Worked:</small>
<p className="text-black dark:text-white font-medium text-sm">0 h 0 m </p>
</div>
<div className="relative">
<div className="w-10 flex flex-row justify-end items-center relative bg-primary">
Expand Down
17 changes: 12 additions & 5 deletions apps/web/lib/components/svgs/icons.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2221,11 +2221,18 @@ export function QuoteBlockIcon({ className }: IClassName) {
);
}

export function AddIcon({ className }: IClassName) {
return (
<svg
width="14"
height="14"
export function AddIcon({
className,
width=14,
height=14
}: IClassName<{
width?: number,
height?: number,
}>) {
return (
<svg
width={width}
height={height}
viewBox="0 0 14 14"
fill="none"
xmlns="http://www.w3.org/2000/svg"
Expand Down
6 changes: 3 additions & 3 deletions apps/web/lib/features/team-members-kanban-view.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ export const KanbanView = ({ itemsArray }: { itemsArray: any}) => {
>
{(provided: DroppableProvided, snapshot: DroppableStateSnapshot) => (
<div
className={clsxm("flex flex-row gap-[20px] w-full h-full p-[32px] bg-transparent", snapshot.isDraggingOver ? "lightblue" : "#F7F7F8")}
className={clsxm("flex flex-row gap-[20px] w-full h-full p-[32px] bg-transparent dark:bg-[#181920]", snapshot.isDraggingOver ? "lightblue" : "#F7F7F8")}
ref={provided.innerRef}
{...provided.droppableProps}
>
Expand All @@ -165,8 +165,8 @@ export const KanbanView = ({ itemsArray }: { itemsArray: any}) => {
title={column}
items={items[column]}
/>
<div className="flex flex-row items-center text-base not-italic font-semibold rounded-2xl gap-4 bg-white p-4">
<AddIcon/>
<div className="flex flex-row items-center text-base not-italic font-semibold rounded-2xl gap-4 bg-white dark:bg-dark--theme-light p-4">
<AddIcon height={20} width={20}/>
<p>Create Issues</p>
</div>
</div>
Expand Down
4 changes: 3 additions & 1 deletion apps/web/pages/kanban/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { withAuthentication } from "lib/app/authenticator";
import { KanbanView } from "lib/features/team-members-kanban-view"
import { MainLayout } from "lib/layout";
import { useRouter } from "next/router";
import { useEffect, useState } from "react";

Expand Down Expand Up @@ -153,12 +154,13 @@ const Kanban= () => {

return (
<>
<MainLayout>
{winReady ?
<KanbanView itemsArray={demoData}/>
:
null
}
</MainLayout>
</>
)
}
Expand Down
Loading