Skip to content

Commit 7c80373

Browse files
authored
Refactor/staging branch commits (#355)
* added alec/changed from text-justify to text-left in truncated description * added lyn/Bugfix/uni 342 rmv empty pg arrows
1 parent 2a21a5a commit 7c80373

File tree

4 files changed

+33
-20
lines changed

4 files changed

+33
-20
lines changed

frontend/src/components/TruncatedDescription/TruncatedDescription.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ export default function TruncatedDescription({
99
content: string;
1010
maxCharacters: number;
1111
}) {
12-
12+
1313
const [showFullContent, setShowFullContent] = useState(false);
1414
const [exceed, setExceed] = useState(false);
1515
const [shortenedContent, setShortenedContent] = useState(" ");
1616

1717
/**
1818
* If the content exceeds the maxCharacters, find the next whitespace
1919
* and make the cutoff point there so the break does not happen mid-word
20-
*
20+
*
2121
* If the new cutoff point is the end of the entire content, make it so
2222
* the See More/Less button does not appear
2323
*/
@@ -35,7 +35,7 @@ export default function TruncatedDescription({
3535
newMax++;
3636
index++;
3737
}
38-
38+
3939
if (index === content.length) {
4040
setShortenedContent(content);
4141
} else {
@@ -52,11 +52,11 @@ export default function TruncatedDescription({
5252

5353
return (
5454
<div className="break-words">
55-
<p className="whitespace-pre-line text-justify">
55+
<p className="whitespace-pre-line text-left">
5656
{showFullContent ? content : shortenedContent}
5757
</p>
5858
<div className="mt-1">
59-
{exceed &&
59+
{exceed &&
6060
(
6161
<button
6262
className="text-unilectives-blue hover:underline"

frontend/src/components/UserBookmarkedReviews/UserBookmarkedReviews.tsx

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -193,11 +193,15 @@ export default function UserBookmarkedReviews({
193193
</div>
194194
)}
195195
{/* Pagination */}
196-
<Pagination
197-
totalItems={reviews.length}
198-
itemPerPage={itemPerPage}
199-
onPageChange={(page: number) => setPage(page)}
200-
/>
196+
{reviews.length > 0 ? (
197+
<Pagination
198+
totalItems={reviews.length}
199+
itemPerPage={itemPerPage}
200+
onPageChange={(page: number) => setPage(page)}
201+
/>
202+
):(
203+
<div className="text-center">No reviews bookmarked yet.</div>
204+
)}
201205
</div>
202206
);
203207
}

frontend/src/components/UserReports/UserReports.tsx

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import {
1010
} from "react";
1111
import Dropdown from "../Dropdown/Dropdown";
1212
import Pagination from "../Pagination/Pagination";
13+
import ReviewCard from "../ReviewCard/ReviewCard";
1314

1415
type STATUS = {
1516
UNSEEN: boolean;
@@ -182,11 +183,15 @@ export default function UserReports({
182183
))}
183184
</div>
184185
{/* Pagination */}
185-
<Pagination
186-
totalItems={reports.length}
187-
itemPerPage={itemPerPage}
188-
onPageChange={(page: number) => setPage(page)}
189-
/>
186+
{reports.length > 0 ? (
187+
<Pagination
188+
totalItems={reports.length}
189+
itemPerPage={itemPerPage}
190+
onPageChange={(page: number) => setPage(page)}
191+
/>
192+
) : (
193+
<div className="text-center">No reports made yet.</div>
194+
)}
190195
</div>
191196
);
192197
}

frontend/src/components/UserReviews/UserReviews.tsx

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -185,11 +185,15 @@ export default function UserReviews({
185185
</div>
186186
)}
187187
{/* Pagination */}
188-
<Pagination
189-
totalItems={reviews.length}
190-
itemPerPage={itemPerPage}
191-
onPageChange={(page: number) => setPage(page)}
192-
/>
188+
{reviews.length > 0 ? (
189+
<Pagination
190+
totalItems={reviews.length}
191+
itemPerPage={itemPerPage}
192+
onPageChange={(page: number) => setPage(page)}
193+
/>
194+
) : (
195+
<div className="text-center">No courses reviewed yet.</div>
196+
)}
193197
</div>
194198
);
195199
}

0 commit comments

Comments
 (0)