Skip to content

Commit 40f8d01

Browse files
committed
Fix height to fit inside viewport
1 parent 68050c3 commit 40f8d01

File tree

22 files changed

+24
-24
lines changed

22 files changed

+24
-24
lines changed

src/app/(authenticated)/companies/[id]/connections/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export default async function CompanyConnections({
2020
}
2121

2222
return (
23-
<div className="container mx-auto h-full">
23+
<div className="container mx-auto">
2424
<List title="Company connections">
2525
{connections.map((u) => (
2626
<UserTile key={u.id} user={u} />

src/app/(authenticated)/companies/[id]/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export default async function Company({ params }: { params: CompanyParams }) {
4747
const companyConnections = await CompanyService.getConnections(companyID);
4848

4949
return (
50-
<div className="container mx-auto h-full">
50+
<div className="container mx-auto">
5151
<div className="flex flex-col items-center gap-y-2 p-4 text-center">
5252
<h2 className="text-2xl font-bold">{company.name}</h2>
5353
<Image

src/app/(authenticated)/companies/[id]/promote/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export default async function CompanyPromote({
2323
const session = await getServerSession(authOptions);
2424

2525
return (
26-
<div className="container mx-auto h-full">
26+
<div className="container mx-auto flex-1">
2727
<CompanyPromoteScanner
2828
company={company}
2929
cannonToken={session!.cannonToken}

src/app/(authenticated)/companies/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export default async function Companies() {
1212
companies = companies.sort((a, b) => a.name.localeCompare(b.name));
1313

1414
return (
15-
<div className="container mx-auto h-full">
15+
<div className="container mx-auto">
1616
<CompaniesList companies={companies} />
1717
</div>
1818
);

src/app/(authenticated)/home/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export default async function Home() {
3636
: [];
3737

3838
return (
39-
<div className="container mx-auto h-full">
39+
<div className="container mx-auto">
4040
{/* Upcoming Sessions */}
4141
<List title="Next Up" link="/schedule?day=today" linkText="See all">
4242
{upcomingSessions.length > 0 ? (

src/app/(authenticated)/layout.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ export default async function AuthenticatedLayout({
1313
if (!session) redirect("/login");
1414

1515
return (
16-
<div className="h-0 min-h-screen text-white flex flex-col">
16+
<div className="min-h-dvh text-white flex flex-col">
1717
<Toolbar />
18-
<div className="flex-1 bg-gray-100 text-black pb-navbar">{children}</div>
18+
<div className="flex-1 bg-gray-100 text-black flex">{children}</div>
1919
<BottomNavbar />
2020
</div>
2121
);

src/app/(authenticated)/prizes/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export default async function Prizes() {
3737
}
3838

3939
return (
40-
<div className="container mx-auto h-full">
40+
<div className="container mx-auto">
4141
<div className="flex flex-col items-start gap-y-2 p-4 text-start text-sm">
4242
<h1 className="text-2xl font-bold">Prizes</h1>
4343
{user && isCompany(user.role) && (

src/app/(authenticated)/profile/achievements/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export default async function Achievements() {
3131
).sort() as AchievementKind[];
3232

3333
return (
34-
<div className="container mx-auto h-full">
34+
<div className="container mx-auto">
3535
<div className="flex flex-col items-start gap-y-2 p-4 text-start text-sm">
3636
<h1 className="text-2xl font-bold">Achievements</h1>
3737
<span className="text-gray-600">

src/app/(authenticated)/profile/connections/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export default async function Connections() {
88
const user: User | null = await UserService.getMe(session!.cannonToken);
99

1010
return (
11-
<div className="container mx-auto h-full">
11+
<div className="container mx-auto">
1212
<List title="Connections"></List>
1313
</div>
1414
);

src/app/(authenticated)/profile/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export default async function Profile() {
3030
);
3131

3232
return (
33-
<div className="container mx-auto h-full">
33+
<div className="container mx-auto">
3434
<ProfileHeader user={user} />
3535
<div className="px-4 py-2">
3636
<Link

src/app/(authenticated)/qr/page.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ export default async function QR() {
4848
})();
4949

5050
return (
51-
<div className="container m-auto h-full">
52-
<div className="flex flex-col justify-center items-center text-center p-4 gap-y-4">
51+
<div className="container mx-auto flex-1">
52+
<div className="flex flex-col h-full justify-center items-center text-center p-4 gap-y-4">
5353
<div className="flex flex-col justify-center items-center">
5454
<QRCode
5555
className="w-72 h-72 p-4 border-[14px] bg-white rounded-lg"

src/app/(authenticated)/qr/scan/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export default async function ScanQRCode() {
1111
if (!user) return <UserSignOut />;
1212

1313
return (
14-
<div className="container mx-auto h-full">
14+
<div className="container mx-auto flex-1">
1515
<QRScanner user={user} cannonToken={session!.cannonToken} />
1616
</div>
1717
);

src/app/(authenticated)/schedule/ScheduleTable.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export default function ScheduleTable({ sessions }: ScheduleTableProps) {
5252
},
5353
{} as Record<string, SINFOSession[]>,
5454
);
55-
}, [sessions]);
55+
}, [sessions, kindParam, placeParam]);
5656

5757
const sortedDays = useMemo(
5858
() => Object.keys(sessionsByDay).sort(),

src/app/(authenticated)/schedule/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export default async function Schedule() {
99
}
1010

1111
return (
12-
<div className="container mx-auto h-full">
12+
<div className="container mx-auto">
1313
<ScheduleTable sessions={sessions} />
1414
</div>
1515
);

src/app/(authenticated)/sessions/[id]/check-in/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export default async function SessionCheckIn({
2323
const session = await getServerSession(authOptions);
2424

2525
return (
26-
<div className="container mx-auto h-full">
26+
<div className="container mx-auto flex-1">
2727
<SessionCheckInScanner
2828
sinfoSession={sinfoSession}
2929
cannonToken={session!.cannonToken}

src/app/(authenticated)/sessions/[id]/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export default async function Session({ params }: { params: SessionParams }) {
3131
const user: User | null = await UserService.getMe(session!.cannonToken);
3232

3333
return (
34-
<div className="container mx-auto h-full">
34+
<div className="container mx-auto">
3535
<div className="flex flex-col items-center gap-y-2 p-4 text-center text-sm">
3636
{sinfoSession.company && (
3737
<span className="text-2xl text-gray-600">

src/app/(authenticated)/sessions/[id]/participants/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export default async function SessionParticipants({
4444
(sessionAchievement.users?.length ?? 0) + unregisteredUsers;
4545

4646
return (
47-
<div className="container mx-auto h-full">
47+
<div className="container mx-auto">
4848
<List
4949
title="Participants"
5050
description={`Total ${totalUsers} participants (${unregisteredUsers} unregistered users)`}

src/app/(authenticated)/speakers/[id]/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export default async function Speaker({ params }: { params: SpeakerParams }) {
2222
);
2323

2424
return (
25-
<div className="container mx-auto h-full">
25+
<div className="container mx-auto">
2626
<div className="flex flex-col items-center gap-y-2 p-4 text-center">
2727
<h2 className="text-2xl font-bold">{speaker.name}</h2>
2828
<Image

src/app/(authenticated)/speakers/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export default async function Speakers() {
1212
speakers = speakers.sort((a, b) => a.name.localeCompare(b.name));
1313

1414
return (
15-
<div className="container mx-auto h-full">
15+
<div className="container mx-auto">
1616
<SpeakersList speakers={speakers} />
1717
</div>
1818
);

src/app/(authenticated)/terms-and-conditions/layout.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export default function TermsAndConditionsLayout({
66
children: ReactNode;
77
}) {
88
return (
9-
<div className="container mx-auto h-full">
9+
<div className="container mx-auto">
1010
<div className="p-4">
1111
<h2 className="text-2xl font-bold mb-4">Terms and conditions</h2>
1212
<div className="flex flex-col justify-start items-start gap-4">

src/app/(authenticated)/users/[id]/page.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export default async function UserProfile({
3838
);
3939

4040
return (
41-
<div className="container mx-auto h-full">
41+
<div className="container mx-auto">
4242
<ProfileHeader user={userProfile} />
4343
{!isMyself && (
4444
<div className="px-4 py-2">

src/components/BottomNavbar/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export default async function BottomNavbar() {
2222
if (!user) return <></>;
2323

2424
return (
25-
<div className="fixed z-10 bottom-0 left-0 right-0 bg-sinfo-primary">
25+
<div className="sticky z-10 bottom-0 left-0 right-0 bg-sinfo-primary">
2626
<div className="relative container mx-auto flex h-navbar flex-row">
2727
{navbarItemKeysByRole[convertToAppRole(user.role)].map((k) => (
2828
<NavbarItem key={k} name={k} />

0 commit comments

Comments
 (0)