Skip to content

Commit 0b5ef65

Browse files
committed
feat:sidebar fixed
1 parent 0374b8b commit 0b5ef65

5 files changed

Lines changed: 25 additions & 23 deletions

File tree

src/app/idea/page.tsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
"use client";
2-
import React, { useState, useEffect } from 'react';
3-
import { useQuery } from '@tanstack/react-query';
2+
import { fetchSubmission, type Submission } from "@/api/fetchIdeas";
3+
import { fetchTeams } from "@/api/fetchTeams";
44
import { DataTable } from "@/components/table/data-table";
55
import { DataTableColumnHeader } from "@/components/table/data-table-column-header";
66
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
77
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
8-
import { fetchTeams } from "@/api/fetchTeams";
9-
import { fetchSubmission, type Submission } from "@/api/fetchIdeas";
108
import { type Team } from "@/data/schema";
9+
import { useQuery } from '@tanstack/react-query';
1110
import { type ColumnDef } from "@tanstack/react-table";
11+
import { useEffect, useState } from 'react';
1212

1313
interface TeamData {
1414
id: string;
@@ -186,11 +186,11 @@ export default function TeamsIdeasTable() {
186186
value={selectedTrack || "all"}
187187
onValueChange={(value) => setSelectedTrack(value === "all" ? "" : value)}
188188
>
189-
<SelectTrigger className="w-48">
189+
<SelectTrigger className="w-48 p-6">
190190
<SelectValue placeholder="Filter by track" />
191191
</SelectTrigger>
192-
<SelectContent>
193-
<SelectItem value="all">All Tracks</SelectItem>
192+
<SelectContent >
193+
<SelectItem value="all" >All Tracks</SelectItem>
194194
{availableTracks.map((track) => (
195195
<SelectItem key={track} value={track}>
196196
{track}

src/app/team/[id]/page.tsx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
"use client";
2+
import { createScore, deleteScore, fetchScores, updateScore } from "@/api/fetchScores";
23
import { fetchTeamDetails } from "@/api/fetchTeamDetails";
3-
import Image from "next/image";
4-
import { useParams } from "next/navigation";
54
import loading from "@/assets/images/loading.gif";
6-
import Link from "next/link";
75
import { Button } from "@/components/ui/button";
86
import { Input } from "@/components/ui/input";
97
import { Label } from "@/components/ui/label";
10-
import { useEffect, useState } from "react";
118
import useToast from "@/lib/toast";
12-
import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
13-
import { createScore, deleteScore, fetchScores, updateScore } from "@/api/fetchScores";
9+
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
10+
import Image from "next/image";
11+
import Link from "next/link";
12+
import { useParams } from "next/navigation";
13+
import { useEffect, useState } from "react";
1414

1515

1616
interface Score {
@@ -285,14 +285,14 @@ function ScoreSection({ teamId }: { teamId: string }) {
285285
Total Score: {calculateTotalScore(score)}
286286
</div>
287287
<div className="space-x-2">
288-
<Button
288+
{/* <Button
289289
size="sm"
290290
variant="secondary"
291291
onClick={() => handleEdit(score)}
292292
disabled={editMode}
293293
>
294294
Edit
295-
</Button>
295+
</Button> */}
296296
<Button
297297
size="sm"
298298
variant="destructive"

src/components/navbar.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use client"
22

3-
import Link from "next/link";
3+
import { logout } from "@/api/auth";
44
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
55
import { Button } from "@/components/ui/button";
66
import {
@@ -17,7 +17,6 @@ import {
1717
import { LogOutIcon, MenuIcon } from "lucide-react";
1818
import { useRouter } from "next/navigation";
1919
import { Sidebar } from "./sidebar";
20-
import { logout } from "@/api/auth";
2120

2221
export function Navbar() {
2322
const router = useRouter();
Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// app/components/navigation-wrapper.tsx
2-
"use client"
2+
"use client";
33

44
import { usePathname } from 'next/navigation';
5-
import { Sidebar } from './sidebar';
65
import { Navbar } from './navbar';
6+
import { Sidebar } from './sidebar';
77

88
export function NavigationWrapper({ children }: { children: React.ReactNode }) {
99
const pathname = usePathname();
@@ -14,8 +14,11 @@ export function NavigationWrapper({ children }: { children: React.ReactNode }) {
1414
}
1515

1616
return (
17-
<div className="flex h-screen bg-black">
18-
<Sidebar />
17+
<div className="flex min-h-screen bg-black ">
18+
{/* Sidebar is hidden on smaller screens and visible on medium screens and larger */}
19+
<div className="hidden md:block">
20+
<Sidebar />
21+
</div>
1922
<div className="flex flex-col flex-1">
2023
<Navbar />
2124
<main className="p-8 overflow-y-scroll">
@@ -24,4 +27,4 @@ export function NavigationWrapper({ children }: { children: React.ReactNode }) {
2427
</div>
2528
</div>
2629
);
27-
}
30+
}

src/components/sidebar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export function Sidebar() {
1616
];
1717

1818
return (
19-
<aside className="border-r border-gray-200 h-full w-64 dark:border-gray-700">
19+
<aside className="md:border-r md:border-gray-700 h-full w-64">
2020
<ScrollArea className="h-full">
2121
<div className="p-4">
2222
<Link href="/" className="text-2xl font-bold mb-6 block">

0 commit comments

Comments
 (0)