Skip to content

All my CodeKids contributions #431

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.

Sign up for GitHub

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

Open
nathnaelm wants to merge 6 commits into
base: main
Choose a base branch
from
Open

All my CodeKids contributions #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ec13974
Changes to the Tabbar UI/UX
nathnaelm Nov 7, 2025
a335ec3
I need to stay up to date with my peers changes to the CodeKids websi…
nathnaelm Nov 7, 2025
240cdfd
Fixed comparison activity by improving visibility of the tool without…
nathnaelm Nov 10, 2025
2b49972
Book details in the book editor is now scrollable, before there was c…
nathnaelm Nov 10, 2025
139a6d3
Fixed Prettier formatting error
nathnaelm Dec 14, 2025
c5538b4
Syncing all of my changes from my branch to the main repo.
nathnaelm Dec 18, 2025
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
16 changes: 8 additions & 8 deletions frontend/src/components/Comparison.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,35 +235,35 @@ export function Comparison({
<h1 className="text-center font-bold">
{props?.command || "Drag and Drop Classification"}
</h1>

<div className="flex flex-row space-x-4 justify-center">
{/* These changes ensure the comparison activity can be viewed without any/slight scrolling and is larger. */}
<div className="flex flex-col lg:flex-row gap-8 lg:gap-16 justify-center items-center lg:items-start p-4">
{/* Bank of Options (Now droppable) */}
<div
className="flex flex-col space-y-2 p-4 bg-white rounded-2xl border-2 border-gray-300 w-96 h-96"
className="flex flex-col space-y-6 p-6 bg-white rounded-2xl border-2 border-gray-300 w-full max-w-md lg:max-w-lg xl:max-w-xl"
onDrop={(e) => onDrop(e, "bank")}
onDragOver={(e) => onDragOver(e)}
>
<h2 className="text-center font-semibold">Options</h2>
<h2 className="text-center font-semibold text-xl">Options</h2>
{renderOptionsForStatus("bank")}
</div>

{/* Category A Box */}
<div
onDrop={(e) => onDrop(e, categoryA)}
onDragOver={(e) => onDragOver(e)}
className="flex-1 flex flex-col space-y-2 p-4 bg-white rounded-2xl border-2 border-gray-300 w-96 h-96"
className="flex-1 flex flex-col space-y-6 p-6 bg-white rounded-2xl border-2 border-gray-300 w-full max-w-md lg:max-w-lg xl:max-w-xl"
>
<h2 className="text-center font-semibold">{categoryA}</h2>
<h2 className="text-center font-semibold text-xl">{categoryA}</h2>
{renderOptionsForStatus(categoryA)}
</div>

{/* Category B Box */}
<div
onDrop={(e) => onDrop(e, categoryB)}
onDragOver={(e) => onDragOver(e)}
className="flex-1 flex flex-col space-y-2 p-4 bg-white rounded-2xl border-2 border-gray-300 w-96 h-96"
className="flex-1 flex flex-col space-y-6 p-6 bg-white rounded-2xl border-2 border-gray-300 w-full max-w-md lg:max-w-lg xl:max-w-xl"
>
<h2 className="text-center font-semibold">{categoryB}</h2>
<h2 className="text-center font-semibold text-xl">{categoryB}</h2>
{renderOptionsForStatus(categoryB)}
</div>
</div>
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/components/Navbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export default function Navbar() {

return (
<header className="top-0 sticky w-full px-2 z-[100] bg-white">
<div className="flex flex-row justify-between relative h-[60px]">
<div className="flex flex-row justify-between relative">
<div className="flex flex-row items-center justify-between py-1 sm:py-0">
<a href="/">
<img
Expand Down Expand Up @@ -108,7 +108,8 @@ export default function Navbar() {
</button>
</div>

<nav className="px-1 bg-stone-800 text-white hidden sm:block my-auto sm:py-0 rounded-b-md font-semibold absolute left-1/2 transform -translate-x-1/2">
{/* removed "absolute left-1/2 transform -translate-x-1/2" and replaced it with "mx-auto" to allow the navbar to stop overlapping with the content borders in the book pages */}
<nav className="px-2 bg-stone-800 text-white hidden sm:block my-auto sm:py-0 rounded-b-md font-semibold mx-auto">
<ul className="tablet:mx-auto sm:flex sm:items-center text-center text-lg">
{navLinks.map((route, i) => (
<NavButton {...route} key={`nav-${i}`} />
Expand Down
58 changes: 30 additions & 28 deletions frontend/src/pages/BookEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1074,7 +1074,7 @@ function BookDetailsEditor({
}, []);

return (
<div className="flex flex-row h-full p-2 gap-2 w-full">
<div className="flex flex-row h-full min-h-screen p-2 gap-2 overflow-y-auto">
<div className="flex flex-col gap-2 w-full">
{textFields.map((field, i) => (
<div key={i} className="flex flex-col w-full gap-2">
Expand Down Expand Up @@ -1409,33 +1409,35 @@ export default function BookEditor() {
return (
<div className="text-lg xl:text-lg 2xl:text-lg h-screen flex flex-col overflow-hidden">
<Navbar />
<div className="flex-1 flex flex-row p-2 gap-2 min-h-0 overflow-hidden">
<PageNavigator
pages={book.pages.sort((a, b) => a.pageNumber - b.pageNumber)}
pageNum={pageNum}
setPageNum={setPageNum}
addPage={addPage}
deletePage={deletePage}
swapPages={swapPages}
bookId={bookId}
isCollapsed={isNavigatorCollapsed}
setIsCollapsed={setIsNavigatorCollapsed}
/>
<div className="flex-1 min-w-0 overflow-hidden">
{currentPage && (
<PageEditor
page={currentPage}
setPage={setPage}
isNavigatorCollapsed={isNavigatorCollapsed}
/>
)}
{pageNum === 0 && book && (
<BookDetailsEditor
book={book}
setBook={setBook}
saveBook={saveBook}
/>
)}
<div className="flex-1 overflow-y-auto">
<div className="flex flex-row p-2 gap-2 min-h-0 overflow-hidden">
<PageNavigator
pages={book.pages.sort((a, b) => a.pageNumber - b.pageNumber)}
pageNum={pageNum}
setPageNum={setPageNum}
addPage={addPage}
deletePage={deletePage}
swapPages={swapPages}
bookId={bookId}
isCollapsed={isNavigatorCollapsed}
setIsCollapsed={setIsNavigatorCollapsed}
/>
<div className="flex-1 min-w-0 overflow-hidden">
{currentPage && (
<PageEditor
page={currentPage}
setPage={setPage}
isNavigatorCollapsed={isNavigatorCollapsed}
/>
)}
{pageNum === 0 && book && (
<BookDetailsEditor
book={book}
setBook={setBook}
saveBook={saveBook}
/>
)}
</div>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/BookPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ export default function BookPage() {
return (
<div className="text-xs xl:text-lg 2xl:text-xl">
<Navbar />
<div className="mx-auto h-[calc(100vh-60px)]">
<div className="mx-auto h-[calc(100vh-68px)]">
<div className="px-2 py-2 min-h-full flex">
{page ? (
<div className="flex flex-col w-full min-h-full justify-between gap-1">
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/pages/HomePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ export default function HomePage() {
<div className="relative flex flex-row min-h-screen">
{/* Sidebar */}
<div
className={`fixed left-0 h-full bg-gradient-to-br from-[#d0ecd5] to-[#ecbfa3] shadow-lg transition-all duration-300 z-20 ${
sidebarVisible ? "w-64" : "w-36"
className={`fixed left-0 h-full bg-gradient-to-br from-[#d0ecd5] to-[#ecbfa3] shadow-lg transition-all duration-300 z-40 ${
sidebarVisible ? "w-60" : "w-36"
}`}
onMouseEnter={() => handleSidebarHover(true)}
onMouseLeave={() => handleSidebarHover(true)}
Expand Down Expand Up @@ -208,7 +208,7 @@ export default function HomePage() {
{/* Main Content */}
<div
className={`flex-1 transition-all duration-300 ${
sidebarVisible ? "ml-64" : "ml-16"
sidebarVisible ? "ml-60" : "ml-36"
}`}
>
<div className="flex flex-col items-center w-full z-10">
Expand Down