Skip to content

Commit 510bb34

Browse files
authored
Merge pull request #53 from coderKrysio/dev-1
updated api endpoint
2 parents d7f340f + d20dda5 commit 510bb34

File tree

4 files changed

+30
-18
lines changed

4 files changed

+30
-18
lines changed

app/api/[roomcode]/route.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,20 @@ export async function GET(_request: Request, context: RoomCodeRouteContext) {
55
try {
66
const client = await clientPromise
77
const db = client.db('get_interval')
8-
let result: any[] = []
8+
let result: number[][] = []
99

1010
const rooms = await db
1111
.collection('rooms')
1212
.find({ roomcode: context.params.roomcode })
1313
.limit(15)
1414
.toArray()
1515

16+
if (rooms.length === 0) {
17+
return new Response(JSON.stringify(result), { status: 400 })
18+
}
19+
1620
//to get all the intervals in a single array
17-
let intervals: any[] = [[]]
21+
let intervals: number[][] = []
1822
let counter = 0
1923
for (let i = 0; i < rooms.length; i++) {
2024
var room = rooms[i].timeRanges
@@ -36,7 +40,7 @@ export async function GET(_request: Request, context: RoomCodeRouteContext) {
3640
}
3741

3842
//to merge the intervals
39-
let finalintervals: any[]
43+
let finalintervals: number[][] = []
4044
finalintervals = [[intervals[0][0], intervals[0][1]]]
4145
for (let i = 0; i < intervals.length; i++) {
4246
if (

components/GetForm.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ const GetForm = ({ roomCode }: RoomCode) => {
4040
></iframe>
4141
</div>
4242

43-
<div className="absolute bottom-0 right-0 m-8 mb-[42px] flex gap-6 max-[985px]:relative max-[985px]:my-0 max-[985px]:mx-auto">
43+
<div className="absolute bottom-0 right-0 m-8 mb-[42px] flex gap-6 max-[985px]:relative max-[985px]:my-0 max-[985px]:mx-auto max-[500px]:mt-[20px]">
4444
<button
4545
className="py-2 px-5 border-[3px] border-white rounded-lg text-xl font-medium hover:font-semibold hover:border-[#48d399] hover:text-[#48d399]"
4646
onClick={() => checkFields()}

components/ListIntervals.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ const ListIntervals = ({ addInterval, removeInterval, setFormData }: any) => {
2626
defaultValue={'08:00'}
2727
name="start"
2828
onChange={(e: any) => updatedRange(e, index)}
29-
className={`border-2 border-white text-black text-[24px] font-semibold rounded-lg py-[3px] px-4 m-1 focus:outline focus:outline-2 focus:outline-[#48d399] focus:border-[#48d399] focus:bg-transparent focus:text-white ${rajdhani.className}`}
29+
className={`border-2 border-white text-black text-[24px] font-semibold rounded-lg py-[3px] px-4 m-1 focus:outline focus:outline-2 focus:outline-[#48d399] focus:border-[#48d399] focus:bg-transparent focus:text-white max-[500px]:w-fit ${rajdhani.className}`}
3030
/>
3131

3232
<span className="font-semibold text-2xl">-</span>
@@ -36,7 +36,7 @@ const ListIntervals = ({ addInterval, removeInterval, setFormData }: any) => {
3636
defaultValue={'10:00'}
3737
name="end"
3838
onChange={(e: any) => updatedRange(e, index)}
39-
className={`border-2 border-white text-black text-[24px] font-semibold rounded-lg py-[3px] px-4 m-1 focus:outline focus:outline-2 focus:outline-[#48d399] focus:border-[#48d399] focus:bg-transparent focus:text-white ${rajdhani.className}`}
39+
className={`border-2 border-white text-black text-[24px] font-semibold rounded-lg py-[3px] px-4 m-1 focus:outline focus:outline-2 focus:outline-[#48d399] focus:border-[#48d399] focus:bg-transparent focus:text-white max-[500px]:w-fit ${rajdhani.className}`}
4040
/>
4141

4242
<div className="flex max-[500px]:absolute gap-[15px] max-[500px]:-bottom-full">

components/Results.tsx

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,15 @@ const Results = ({ roomCode }: RoomCode) => {
3838
Room Code: {roomCode}
3939
</p>
4040

41-
{result.map((interval: number[], index: number) => (
42-
<p className="text-3xl text-[#48d399] my-1" key={index}>
43-
{NumToTime(interval[0])} - {NumToTime(interval[1])}
44-
</p>
45-
))}
41+
{result.length == 0 ? (
42+
<p className="text-3xl text-[#db696d]">No data found</p>
43+
) : (
44+
result.map((interval: number[], index: number) => (
45+
<p className="text-3xl text-[#48d399] my-1" key={index}>
46+
{NumToTime(interval[0])} - {NumToTime(interval[1])}
47+
</p>
48+
))
49+
)}
4650

4751
<div className="timeline px-4 flex items-center justify-start w-full overflow-auto">
4852
<Timeline timeRanges={result} />
@@ -53,13 +57,17 @@ const Results = ({ roomCode }: RoomCode) => {
5357
</p>
5458

5559
<div className="max-w[1200px] grid grid-flow-row grid-cols-1 md:grid-cols-2 lg:grid-cols-3 justify-center items-start gap-[70px]">
56-
{membersData.map((values: MemberData, id: number) => (
57-
<MemberInfo
58-
name={values.username}
59-
intervals={values.timeRanges}
60-
key={id}
61-
/>
62-
))}
60+
{membersData.length == 0 ? (
61+
<p className="text-2xl text-[#db696d]">No Data Found</p>
62+
) : (
63+
membersData.map((values: MemberData, id: number) => (
64+
<MemberInfo
65+
name={values.username}
66+
intervals={values.timeRanges}
67+
key={id}
68+
/>
69+
))
70+
)}
6371
</div>
6472
</div>
6573
)

0 commit comments

Comments
 (0)