Skip to content

Commit 403d2a9

Browse files
vamsivamsi
authored
Merge pull request #19 from makeplane/revert-18-stage-release
Revert "build: bumped next version from 12.2.2 to 13"
2 parents 38c4d8e + 9024368 commit 403d2a9

26 files changed

+1786
-1510
lines changed

‎apps/app/components/forms/EmailPasswordForm.tsx‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,10 @@ const EmailPasswordForm = ({ onSuccess }: any) => {
8787
</div>
8888
<div className="flex items-center justify-between mt-2">
8989
<div className="text-sm ml-auto">
90-
<Link
91-
href={"/forgot-password"}
92-
className="font-medium text-indigo-600 hover:text-indigo-500"
93-
>
94-
Forgot your password?
90+
<Link href={"/forgot-password"}>
91+
<a className="font-medium text-indigo-600 hover:text-indigo-500">
92+
Forgot your password?
93+
</a>
9594
</Link>
9695
</div>
9796
</div>

‎apps/app/components/project/issues/BoardView/SingleBoard.tsx‎

Lines changed: 98 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -191,107 +191,107 @@ const SingleBoard: React.FC<Props> = ({
191191
{groupedByIssues[groupTitle].map((childIssue: any, index: number) => (
192192
<Draggable key={childIssue.id} draggableId={childIssue.id} index={index}>
193193
{(provided, snapshot) => (
194-
<Link
195-
href={`/projects/${childIssue.project}/issues/${childIssue.id}`}
196-
className={`group block border rounded bg-white shadow-sm ${
197-
snapshot.isDragging ? "border-indigo-600 shadow-lg bg-indigo-50" : ""
198-
}`}
199-
ref={provided.innerRef}
200-
{...provided.draggableProps}
201-
>
202-
<div
203-
className="px-2 py-3 space-y-1.5 select-none"
204-
{...provided.dragHandleProps}
194+
<Link href={`/projects/${childIssue.project}/issues/${childIssue.id}`}>
195+
<a
196+
className={`group block border rounded bg-white shadow-sm ${
197+
snapshot.isDragging ? "border-indigo-600 shadow-lg bg-indigo-50" : ""
198+
}`}
199+
ref={provided.innerRef}
200+
{...provided.draggableProps}
205201
>
206-
{Object.keys(properties).map(
207-
(key) =>
208-
properties[key as keyof Properties] &&
209-
!Array.isArray(childIssue[key as keyof IIssue]) && (
210-
<div
211-
key={key}
212-
className={`${
213-
key === "name"
214-
? "text-sm mb-2"
215-
: key === "description"
216-
? "text-xs text-black"
217-
: key === "priority"
218-
? `text-xs bg-gray-200 px-2 py-1 mt-2 flex items-center gap-x-1 rounded w-min whitespace-nowrap capitalize font-medium ${
219-
childIssue.priority === "high"
220-
? "bg-red-100 text-red-600"
221-
: childIssue.priority === "medium"
222-
? "bg-orange-100 text-orange-500"
223-
: childIssue.priority === "low"
224-
? "bg-green-100 text-green-500"
225-
: "hidden"
226-
}`
227-
: key === "target_date"
228-
? "text-xs bg-indigo-50 px-2 py-1 mt-2 flex items-center gap-x-1 rounded w-min whitespace-nowrap"
229-
: "text-sm text-gray-500"
230-
} gap-1
202+
<div
203+
className="px-2 py-3 space-y-1.5 select-none"
204+
{...provided.dragHandleProps}
205+
>
206+
{Object.keys(properties).map(
207+
(key) =>
208+
properties[key as keyof Properties] &&
209+
!Array.isArray(childIssue[key as keyof IIssue]) && (
210+
<div
211+
key={key}
212+
className={`${
213+
key === "name"
214+
? "text-sm mb-2"
215+
: key === "description"
216+
? "text-xs text-black"
217+
: key === "priority"
218+
? `text-xs bg-gray-200 px-2 py-1 mt-2 flex items-center gap-x-1 rounded w-min whitespace-nowrap capitalize font-medium ${
219+
childIssue.priority === "high"
220+
? "bg-red-100 text-red-600"
221+
: childIssue.priority === "medium"
222+
? "bg-orange-100 text-orange-500"
223+
: childIssue.priority === "low"
224+
? "bg-green-100 text-green-500"
225+
: "hidden"
226+
}`
227+
: key === "target_date"
228+
? "text-xs bg-indigo-50 px-2 py-1 mt-2 flex items-center gap-x-1 rounded w-min whitespace-nowrap"
229+
: "text-sm text-gray-500"
230+
} gap-1
231231
`}
232-
>
233-
{key === "target_date" ? (
234-
<>
235-
<CalendarDaysIcon className="h-4 w-4" />{" "}
236-
{childIssue.target_date
237-
? renderShortNumericDateFormat(childIssue.target_date)
238-
: "N/A"}
239-
</>
240-
) : (
241-
""
242-
)}
243-
{key === "name" && (
244-
<span className="group-hover:text-theme">
245-
{childIssue.name}
246-
</span>
247-
)}
248-
{key === "state" && (
249-
<>{addSpaceIfCamelCase(childIssue["state_detail"].name)}</>
250-
)}
251-
{key === "priority" && <>{childIssue.priority}</>}
252-
{key === "description" && <>{childIssue.description}</>}
253-
{key === "assignee" ? (
254-
<div className="flex items-center gap-1 text-xs">
255-
{childIssue?.assignee_details?.length > 0 ? (
256-
childIssue?.assignee_details?.map(
257-
(assignee: any, index: number) => (
258-
<div
259-
key={index}
260-
className={`relative z-[1] h-5 w-5 rounded-full ${
261-
index !== 0 ? "-ml-2.5" : ""
262-
}`}
263-
>
264-
{assignee.avatar && assignee.avatar !== "" ? (
265-
<div className="h-5 w-5 border-2 bg-white border-white rounded-full">
266-
<Image
267-
src={assignee.avatar}
268-
height="100"
269-
width="100"
270-
className="rounded-full"
271-
alt={assignee.name}
272-
/>
273-
</div>
274-
) : (
275-
<div
276-
className={`h-5 w-5 bg-gray-700 text-white border-2 border-white grid place-items-center rounded-full`}
277-
>
278-
{assignee.first_name.charAt(0)}
279-
</div>
280-
)}
281-
</div>
232+
>
233+
{key === "target_date" ? (
234+
<>
235+
<CalendarDaysIcon className="h-4 w-4" />{" "}
236+
{childIssue.target_date
237+
? renderShortNumericDateFormat(childIssue.target_date)
238+
: "N/A"}
239+
</>
240+
) : (
241+
""
242+
)}
243+
{key === "name" && (
244+
<span className="group-hover:text-theme">
245+
{childIssue.name}
246+
</span>
247+
)}
248+
{key === "state" && (
249+
<>{addSpaceIfCamelCase(childIssue["state_detail"].name)}</>
250+
)}
251+
{key === "priority" && <>{childIssue.priority}</>}
252+
{key === "description" && <>{childIssue.description}</>}
253+
{key === "assignee" ? (
254+
<div className="flex items-center gap-1 text-xs">
255+
{childIssue?.assignee_details?.length > 0 ? (
256+
childIssue?.assignee_details?.map(
257+
(assignee: any, index: number) => (
258+
<div
259+
key={index}
260+
className={`relative z-[1] h-5 w-5 rounded-full ${
261+
index !== 0 ? "-ml-2.5" : ""
262+
}`}
263+
>
264+
{assignee.avatar && assignee.avatar !== "" ? (
265+
<div className="h-5 w-5 border-2 bg-white border-white rounded-full">
266+
<Image
267+
src={assignee.avatar}
268+
height="100%"
269+
width="100%"
270+
className="rounded-full"
271+
alt={assignee.name}
272+
/>
273+
</div>
274+
) : (
275+
<div
276+
className={`h-5 w-5 bg-gray-700 text-white border-2 border-white grid place-items-center rounded-full`}
277+
>
278+
{assignee.first_name.charAt(0)}
279+
</div>
280+
)}
281+
</div>
282+
)
282283
)
283-
)
284-
) : (
285-
<span>None</span>
286-
)}
287-
</div>
288-
) : null}
289-
</div>
290-
)
291-
)}
292-
</div>
284+
) : (
285+
<span>None</span>
286+
)}
287+
</div>
288+
) : null}
289+
</div>
290+
)
291+
)}
292+
</div>
293293

294-
{/* <div
294+
{/* <div
295295
className={`p-2 bg-indigo-50 flex items-center justify-between ${
296296
snapshot.isDragging ? "bg-indigo-200" : ""
297297
}`}
@@ -313,6 +313,7 @@ const SingleBoard: React.FC<Props> = ({
313313
</button>
314314
</div>
315315
</div> */}
316+
</a>
316317
</Link>
317318
)}
318319
</Draggable>

‎apps/app/components/project/issues/ListView/index.tsx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,10 @@ const ListView: React.FC<Props> = ({
167167
<p className="w-[15rem]">
168168
<Link
169169
href={`/projects/${issue.project}/issues/${issue.id}`}
170-
className="hover:text-theme duration-300"
171170
>
172-
{issue.name}
171+
<a className="hover:text-theme duration-300">
172+
{issue.name}
173+
</a>
173174
</Link>
174175
</p>
175176
) : (key as keyof Properties) === "key" ? (

‎apps/app/components/project/memberInvitations.tsx‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -63,18 +63,19 @@ const ProjectMemberInvitations = ({
6363
type="checkbox"
6464
/>
6565
) : null}
66-
<Link href={`/projects/${project.id}/issues`} className="flex flex-col">
67-
{project.name}
68-
<span className="text-xs">({project.identifier})</span>
66+
<Link href={`/projects/${project.id}/issues`}>
67+
<a className="flex flex-col">
68+
{project.name}
69+
<span className="text-xs">({project.identifier})</span>
70+
</a>
6971
</Link>
7072
</div>
7173
{isMember ? (
7274
<div className="flex">
73-
<Link
74-
href={`/projects/${project.id}/settings`}
75-
className="h-7 w-7 p-1 grid place-items-center rounded hover:bg-gray-200 duration-300 cursor-pointer"
76-
>
77-
<PencilIcon className="h-4 w-4" />
75+
<Link href={`/projects/${project.id}/settings`}>
76+
<a className="h-7 w-7 p-1 grid place-items-center rounded hover:bg-gray-200 duration-300 cursor-pointer">
77+
<PencilIcon className="h-4 w-4" />
78+
</a>
7879
</Link>
7980
<button
8081
type="button"
@@ -114,12 +115,11 @@ const ProjectMemberInvitations = ({
114115
Member
115116
</span>
116117
)}
117-
<Link
118-
href={`/projects/${project.id}/issues`}
119-
className="flex items-center gap-1 text-xs font-medium bg-blue-200 hover:bg-blue-300 p-2 rounded duration-300"
120-
>
121-
<EyeIcon className="h-3 w-3" />
122-
View
118+
<Link href={`/projects/${project.id}/issues`}>
119+
<a className="flex items-center gap-1 text-xs font-medium bg-blue-200 hover:bg-blue-300 p-2 rounded duration-300">
120+
<EyeIcon className="h-3 w-3" />
121+
View
122+
</a>
123123
</Link>
124124
</div>
125125
<div className="flex items-center gap-1 text-xs mb-1">

‎apps/app/layouts/Navbar/DefaultTopBar.tsx‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,20 @@ const DefaultTopBar: React.FC = () => {
1111
<div className="flex justify-between items-center px-4 h-16 sm:px-6 md:justify-start md:space-x-10 absolute top-0 w-full">
1212
<div className="w-full flex items-center justify-between">
1313
<div>
14-
<Link href="/" className="flex">
15-
<span className="sr-only">Plane</span>
16-
<h2 className="text-2xl font-semibold">
17-
Plan<span className="text-indigo-600">e</span>
18-
</h2>
14+
<Link href="/">
15+
<a className="flex">
16+
<span className="sr-only">Plane</span>
17+
<h2 className="text-2xl font-semibold">
18+
Plan<span className="text-indigo-600">e</span>
19+
</h2>
20+
</a>
1921
</Link>
2022
</div>
2123
{user && (
2224
<div>
23-
<p className="text-sm text-gray-500">logged in as {user.first_name}</p>
25+
<p className="text-sm text-gray-500">
26+
logged in as {user.first_name}
27+
</p>
2428
</div>
2529
)}
2630
</div>

0 commit comments

Comments
 (0)