Skip to content
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

refactor: remove issue card #151

Merged
merged 2 commits into from
Aug 27, 2024
Merged

refactor: remove issue card #151

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8391380
refactor: remove issue card
ifaoji Aug 27, 2024
f6b0ca4
Merge branch 'main' into ifaoji/refactor/issues-card
itislu Aug 27, 2024
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
64 changes: 24 additions & 40 deletions src/app/routes/issues._index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ import {
} from '@tanstack/react-table';
import { ScrollArea, ScrollBar } from '~/components/ui/scroll-area';
import { formatDate } from '~/utils/date';
import { H3 } from '~/components/ui/H3';
import { H2 } from '~/components/ui/H2';
import { H1 } from '~/components/ui/H1';

export const meta: MetaFunction = () => {
return [{ title: 'Issues' }, { name: 'description', content: 'List of all public issues from the students.' }];
Expand Down Expand Up @@ -94,10 +97,11 @@ export default function Issues() {
return (
<div>
<NavBar login={session.login} role={session.role} />
<div className='flex flex-col items-center mt-4 mx-2 md:mx-4 '>
<Tabs defaultValue={filter} className='w-11/12' onValueChange={(value) => setFilter(value)}>
<div className='flex flex-col items-center mt-4 mx-4'>
<Tabs defaultValue={filter} className='w-full md:w-3/5' onValueChange={(value) => setFilter(value)}>
<H1 className='mb-4'>Issues</H1>
<div className='flex justify-between items-center mb-2'>
<TabsList defaultValue={'archived'}>
<TabsList>
<TabsTrigger value='open'>Open</TabsTrigger>
<TabsTrigger value='archived'>Archived</TabsTrigger>
</TabsList>
Expand All @@ -113,44 +117,24 @@ export default function Issues() {
</Link>
</div>
</div>
<TabsContent value='open' className='flex justify-center'>
<Card x-chunk='dashboard-06-chunk-0' className='w-full'>
<CardHeader>
<CardTitle>Issues</CardTitle>
<CardDescription>This is what students are currently talking about.</CardDescription>
</CardHeader>
<CardContent>
<IssuesTable issues={visibleIssues} />
</CardContent>
<CardFooter>
<div className='text-xs text-muted-foreground'>
Showing <span className='font-bold'>{visibleIssues.length}</span>{' '}
{issues.length === 1 ? 'issue' : 'issues'}
</div>
</CardFooter>
</Card>
<TabsContent value='open' className='flex flex-col justify-center'>
<p className='text-muted-foreground pb-2'>This is what students are currently talking about.</p>
<IssuesTable issues={visibleIssues} />
<div className='text-xs text-muted-foreground pt-2 pl-2'>
Showing <span className='font-bold'>{visibleIssues.length}</span>{' '}
{visibleIssues.length === 1 ? 'issue' : 'issues'}
</div>
</TabsContent>
<TabsContent value='archived' className='flex justify-center'>
<Card x-chunk='dashboard-06-chunk-0' className='w-full'>
<CardHeader>
<CardTitle>Archived Issues</CardTitle>
<CardDescription>
<div>
Issues that have been resolved or have been open for 2 weeks and showed no
activity for 3 days.
</div>
</CardDescription>
</CardHeader>
<CardContent>
<IssuesTable issues={archivedIssues} />
</CardContent>
<CardFooter>
<div className='text-xs text-muted-foreground'>
Showing <span className='font-bold'>{archivedIssues.length}</span>{' '}
{issues.length === 1 ? 'issue' : 'issues'}
</div>
</CardFooter>
</Card>
<TabsContent value='archived' className='flex flex-col justify-center'>
<p className='text-muted-foreground pb-2'>
Issues that have been resolved or have been open for 2 weeks and showed no activity for 3
days.
</p>
<IssuesTable issues={archivedIssues} />
<div className='text-xs text-muted-foreground pt-2 pl-2'>
Showing <span className='font-bold'>{archivedIssues.length}</span> archived{' '}
{archivedIssues.length === 1 ? 'issue' : 'issues'}
</div>
</TabsContent>
</Tabs>
</div>
Expand Down
Loading