Skip to content

Commit 74f2579

Browse files
committed
chore: css updates
1 parent 249cac0 commit 74f2579

File tree

1 file changed

+34
-15
lines changed

1 file changed

+34
-15
lines changed

web/src/components/database-entries/entry-sliver.tsx

Lines changed: 34 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ import {
1010
} from "@nextui-org/react";
1111
import EditEntry, { Conflict } from "../../pages/edit-entry";
1212
import { useEffect, useRef, useState } from "react";
13-
import { MdWarningAmber } from "react-icons/md";
1413
import { useForm } from "../../DataContext";
14+
import { HiCheckCircle } from "react-icons/hi2";
15+
import { HiExclamationCircle } from "react-icons/hi2";
1516

1617
// TempPaperData is for testing only
1718
type EntrySliverProp = {
@@ -122,7 +123,6 @@ export default function EntrySliver({
122123
handleConflictAnalysis(conflict);
123124
}
124125
});
125-
console.log("entry at end of useEffect", editedEntry);
126126

127127
setEditedEntry(updatedEntry);
128128

@@ -166,29 +166,48 @@ export default function EntrySliver({
166166
{editedEntry.author}
167167
</div>
168168
</div>
169-
<div className="col-span-2 flex flex-row items-center justify-center gap-2">
169+
<div className="col-span-2 flex flex-col gap-2">
170170
<div>
171+
<div>
172+
{unresolvedConflicts.length === 0 ? (
173+
<div className="flex flex-row gap-2">
174+
<HiCheckCircle color="green" size="1.5em" /> No Problems
175+
</div>
176+
) : (
177+
<></>
178+
)}
179+
</div>
171180
{unresolvedConflicts.map((conflict) => {
172181
return (
173-
<div className="text-xs text-left text-slate-900">
182+
<div className="text-left text-slate-900">
174183
{conflict.severity === 1 ? (
175-
<MdWarningAmber color="yellow" size="1.5em" />
184+
<div className="flex flex-row gap-2">
185+
<HiExclamationCircle color="#FF4542" size="1.5em" /> Review
186+
Required
187+
</div>
176188
) : (
177-
<MdWarningAmber color="red" size="1.5em" />
189+
<></>
178190
)}
179191
</div>
180192
);
181193
})}
182194
</div>
183-
<button
184-
className="bg-usask-green text-[#DADADA]"
185-
onClick={() => onHandleDeleteChange(index)}
186-
>
187-
Delete Entry
188-
</button>
189-
<button className="bg-usask-green text-[#DADADA]" onClick={handleOpen}>
190-
Modify Entry
191-
</button>
195+
<div className="flex flex-row justify-end gap-2">
196+
<Button
197+
className="bg-[#ff5353] text-white rounded-md"
198+
size="md"
199+
onClick={() => onHandleDeleteChange(index)}
200+
>
201+
Delete
202+
</Button>
203+
<Button
204+
className="bg-usask-green text-[#DADADA] rounded-md"
205+
size="md"
206+
onClick={handleOpen}
207+
>
208+
Review
209+
</Button>
210+
</div>
192211
</div>
193212

194213
<Modal

0 commit comments

Comments
 (0)