Skip to content

Commit 20a035f

Browse files
authored
Organization fixes (#337)
* fix: modify api.ts * fix: remove google auth buttom * fix: fixes responsive fixes on organization
1 parent 1c80425 commit 20a035f

4 files changed

Lines changed: 56 additions & 31 deletions

File tree

components/organization/OrganizationContent.tsx

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,25 @@ import OrganizationCard from './cards/OrganzationCards';
66
import Link from 'next/link';
77
import { BoundlessButton } from '../buttons';
88
import { useOrganization } from '@/lib/providers/OrganizationProvider';
9+
import LoadingSpinner from '../LoadingSpinner';
910

1011
export default function OrganizationContent() {
11-
const { organizations } = useOrganization();
12+
const { organizations, isLoading, isLoadingOrganizations } =
13+
useOrganization();
14+
const loading = isLoading || isLoadingOrganizations;
1215
const hasOrganizations = organizations.length > 0;
16+
17+
if (loading) {
18+
return (
19+
<main className='flex h-[70vh] items-center justify-center'>
20+
<div className='flex flex-col items-center gap-3 text-zinc-400'>
21+
<LoadingSpinner size='lg' color='primary' variant='spinner' />
22+
<p className='text-sm text-zinc-400'>Loading organizations...</p>
23+
</div>
24+
</main>
25+
);
26+
}
27+
1328
return (
1429
<main className=''>
1530
{hasOrganizations && (

components/organization/OrganizationHeader.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ export default function OrganizationHeader() {
2626
pathname !== '/organizations' && pathname.startsWith('/organizations');
2727

2828
return (
29-
<header className='sticky top-0 z-50 flex items-center justify-between border-b-1 border-b-zinc-800 bg-black px-10 py-4'>
30-
<div className='flex items-center gap-6'>
29+
<header className='sticky top-0 z-50 flex w-full flex-wrap items-center justify-between overflow-x-hidden border-b border-b-zinc-800 bg-black px-4 py-3 md:flex-nowrap md:px-10'>
30+
<div className='flex min-w-0 flex-1 items-center gap-4 overflow-x-auto md:overflow-visible'>
3131
<div className='flex items-center gap-2'>
3232
<Image
3333
src='/footer/logo.svg'

components/organization/OrganizationSettings.tsx

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -55,32 +55,34 @@ export default function OrganizationSettings({
5555
</button>
5656
<div className='h-[50px] w-[0.5px] bg-gray-900 md:hidden' />
5757

58-
<TabsList className='h-auto gap-10 bg-transparent p-0'>
59-
<TabsTrigger
60-
value='profile'
61-
className='data-[state=active]:border-b-primary rounded-none border-b-2 border-transparent bg-transparent px-0 pt-4 pb-3 text-sm font-medium text-zinc-400 transition-all data-[state=active]:text-white data-[state=active]:shadow-none'
62-
>
63-
Profile
64-
</TabsTrigger>
65-
<TabsTrigger
66-
value='links'
67-
className='data-[state=active]:border-b-primary rounded-none border-b-2 border-transparent bg-transparent px-0 pt-4 pb-3 text-sm font-medium text-zinc-400 transition-all data-[state=active]:text-white data-[state=active]:shadow-none'
68-
>
69-
Links
70-
</TabsTrigger>
71-
<TabsTrigger
72-
value='members'
73-
className='data-[state=active]:border-b-primary rounded-none border-b-2 border-transparent bg-transparent px-0 pt-4 pb-3 text-sm font-medium text-zinc-400 transition-all data-[state=active]:text-white data-[state=active]:shadow-none'
74-
>
75-
Members
76-
</TabsTrigger>
77-
<TabsTrigger
78-
value='transfer'
79-
className='data-[state=active]:border-b-primary rounded-none border-b-2 border-transparent bg-transparent px-0 pt-4 pb-3 text-sm font-medium text-zinc-400 transition-all data-[state=active]:text-white data-[state=active]:shadow-none'
80-
>
81-
Transfer Ownership
82-
</TabsTrigger>
83-
</TabsList>
58+
<div className='scrollbar-hide overflow-x-auto'>
59+
<TabsList className='inline-flex h-auto gap-10 bg-transparent p-0'>
60+
<TabsTrigger
61+
value='profile'
62+
className='data-[state=active]:border-b-primary rounded-none border-b-2 border-transparent bg-transparent px-0 pt-4 pb-3 text-sm font-medium text-zinc-400 transition-all data-[state=active]:text-white data-[state=active]:shadow-none'
63+
>
64+
Profile
65+
</TabsTrigger>
66+
<TabsTrigger
67+
value='links'
68+
className='data-[state=active]:border-b-primary rounded-none border-b-2 border-transparent bg-transparent px-0 pt-4 pb-3 text-sm font-medium text-zinc-400 transition-all data-[state=active]:text-white data-[state=active]:shadow-none'
69+
>
70+
Links
71+
</TabsTrigger>
72+
<TabsTrigger
73+
value='members'
74+
className='data-[state=active]:border-b-primary rounded-none border-b-2 border-transparent bg-transparent px-0 pt-4 pb-3 text-sm font-medium text-zinc-400 transition-all data-[state=active]:text-white data-[state=active]:shadow-none'
75+
>
76+
Members
77+
</TabsTrigger>
78+
<TabsTrigger
79+
value='transfer'
80+
className='data-[state=active]:border-b-primary rounded-none border-b-2 border-transparent bg-transparent px-0 pt-4 pb-3 text-sm font-medium text-zinc-400 transition-all data-[state=active]:text-white data-[state=active]:shadow-none'
81+
>
82+
Transfer Ownership
83+
</TabsTrigger>
84+
</TabsList>
85+
</div>
8486
</div>
8587
</div>
8688

components/organization/ResponsiveSidebar.tsx

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use client';
22

3-
import { Trophy, HandCoins, Settings, Plus } from 'lucide-react';
3+
import { Trophy, HandCoins, Settings, Plus, X } from 'lucide-react';
44
import Link from 'next/link';
55
import { usePathname } from 'next/navigation';
66
import { cn } from '@/lib/utils';
@@ -45,8 +45,16 @@ export default function ResponsiveSidebar({
4545
<Sheet open={open} onOpenChange={onOpenChange}>
4646
<SheetContent
4747
side='left'
48-
className='w-[350px] border-r border-zinc-800 bg-black p-0'
48+
className='w-[350px] border-r border-zinc-800 bg-black p-0 [&_[data-radix-sheet-close-icon]]:text-white'
4949
>
50+
<button
51+
onClick={() => onOpenChange?.(false)}
52+
className='absolute top-4 right-4 rounded-md p-2 transition hover:bg-zinc-800'
53+
aria-label='Close'
54+
>
55+
<X className='cursor-pointer text-white' />
56+
</button>
57+
5058
<nav className='flex h-full flex-col gap-1 py-4'>
5159
<h3 className='mb-2 px-6 text-xs font-semibold tracking-wider text-zinc-500 uppercase'>
5260
Menu

0 commit comments

Comments
 (0)