Skip to content

Commit

Permalink
Update Drawers imports & paths
Browse files Browse the repository at this point in the history
  • Loading branch information
chimpdev committed Apr 4, 2024
1 parent b21e1c9 commit d2e1e31
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 62 deletions.
5 changes: 3 additions & 2 deletions client/app/(emojis)/emojis/components/Hero/Topbar/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ import { motion } from 'framer-motion';
import { useState } from 'react';
import cn from '@/lib/cn';
import { Drawer } from 'vaul';
import CategoriesDrawer from '@/app/components/Drawer/EmojiCategories';
import CategoriesDrawer from '@/app/components/Drawer/CategoriesDrawer';
import config from '@/config';

export default function Sidebar() {
const { fetchEmojis, selectedCategory, setCategory, sort, setSort, search, loading, setPage } = useSearchStore(useShallow(state => ({
Expand Down Expand Up @@ -49,7 +50,7 @@ export default function Sidebar() {
<p className='text-sm font-medium text-tertiary'>Category</p>
</button>

<CategoriesDrawer openState={categoriesDrawerOpen} setOpenState={setCategoriesDrawerOpen} state={selectedCategory} setState={setCategory} />
<CategoriesDrawer openState={categoriesDrawerOpen} setOpenState={setCategoriesDrawerOpen} state={selectedCategory} setState={setCategory} categories={config.emojiCategories} />

<Drawer.Root shouldScaleBackground={true} closeThreshold={0.5} open={sortDrawerOpen} onOpenChange={setSortDrawerOpen}>
<Drawer.Trigger asChild>
Expand Down
4 changes: 2 additions & 2 deletions client/app/(servers)/servers/[id]/manage/content.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { useEffect, useState } from 'react';
import { IoMdCheckmarkCircle } from 'react-icons/io';
import { MdChevronLeft } from 'react-icons/md';
import { toast } from 'sonner';
import CategoriesDrawer from '@/app/components/Drawer/ServerCategories';
import CategoriesDrawer from '@/app/components/Drawer/CategoriesDrawer';
import { TbLoader } from 'react-icons/tb';
import editServer from '@/lib/request/servers/editServer';
import { RiErrorWarningFill } from 'react-icons/ri';
Expand Down Expand Up @@ -144,7 +144,7 @@ export default function Content({ server }) {
<IoMdCheckmarkCircle />
</button>

<CategoriesDrawer openState={categoriesDrawerIsOpen} setOpenState={setCategoriesDrawerIsOpen} state={newCategory} setState={setNewCategory} />
<CategoriesDrawer openState={categoriesDrawerIsOpen} setOpenState={setCategoriesDrawerIsOpen} state={newCategory} setState={setNewCategory} categories={config.serverCategories} />
</div>

<div className='flex flex-col gap-y-2'>
Expand Down
5 changes: 3 additions & 2 deletions client/app/(servers)/servers/components/Hero/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,14 @@ import { TbLoader, TbSquareRoundedChevronUp } from 'react-icons/tb';
import { BsEmojiAngry } from 'react-icons/bs';
import { BiSolidCategory } from 'react-icons/bi';
import { FaUsers } from 'react-icons/fa';
import CategoriesDrawer from '@/app/components/Drawer/ServerCategories';
import CategoriesDrawer from '@/app/components/Drawer/CategoriesDrawer';
import { useState } from 'react';
import SortingDrawer from '../Drawer/Sorting';
import { MdKeyboardVoice } from 'react-icons/md';
import { HiOutlineStatusOnline, HiSortAscending, HiSortDescending } from 'react-icons/hi';
import { TiStar } from 'react-icons/ti';
import Pagination from '@/app/components/Pagination';
import config from '@/config';

const SourceSerif4 = Source_Serif_4({ subsets: ['latin'] });

Expand Down Expand Up @@ -114,7 +115,7 @@ export default function Hero() {
</div>
</button>

<CategoriesDrawer state={category} setState={setCategory} openState={categoryDrawerOpenState} setOpenState={setCategoryDrawerOpenState} />
<CategoriesDrawer state={category} setState={setCategory} openState={categoryDrawerOpenState} setOpenState={setCategoryDrawerOpenState} categories={config.serverCategories} />

<button className='text-secondary hover:text-primary flex flex-col items-center justify-center font-semibold text-lg mobile:w-[50%] h-[70px] rounded-xl bg-secondary hover:bg-tertiary' onClick={() => setSortingDrawerOpenState(true)}>
<div className='text-sm font-medium text-tertiary'>
Expand Down
4 changes: 2 additions & 2 deletions client/app/(servers)/servers/manage/page.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import Link from 'next/link';
import config from '@/config';
import { RiAddCircleFill } from 'react-icons/ri';
import ServerIcon from '@/app/(servers)/servers/components/ServerIcon';
import CategoriesDrawer from '@/app/components/Drawer/ServerCategories';
import CategoriesDrawer from '@/app/components/Drawer/CategoriesDrawer';
import { IoMdCheckmarkCircle } from 'react-icons/io';
import { useRouter } from 'next-nprogress-bar';
import { MdChevronLeft } from 'react-icons/md';
Expand Down Expand Up @@ -170,7 +170,7 @@ export default function Page() {
}
</button>

<CategoriesDrawer openState={categoriesDrawerIsOpen} setOpenState={setCategoriesDrawerIsOpen} state={serverCategory} setState={setServerCategory} />
<CategoriesDrawer openState={categoriesDrawerIsOpen} setOpenState={setCategoriesDrawerIsOpen} state={serverCategory} setState={setServerCategory} categories={config.serverCategories} />
</div>

<div className='flex flex-col gap-y-2'>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
'use client';

import config from '@/config';
import cn from '@/lib/cn';
import { nanoid } from 'nanoid';
import { IoMdCheckmarkCircle } from 'react-icons/io';
import { Drawer } from 'vaul';

export default function EmojiCategoriesDrawer({ openState, setOpenState, state, setState }) {
export default function CategoriesDrawer({ openState, setOpenState, state, setState, categories }) {
return (
<Drawer.Root shouldScaleBackground={true} closeThreshold={0.5} open={openState} onOpenChange={setOpenState}>
<Drawer.Portal>
Expand All @@ -27,7 +26,7 @@ export default function EmojiCategoriesDrawer({ openState, setOpenState, state,
{state === 'All' && <IoMdCheckmarkCircle />}
</button>

{config.emojiCategories.map(category => (
{categories.map(category => (
<button
key={nanoid()}
onClick={() => {
Expand Down
51 changes: 0 additions & 51 deletions client/app/components/Drawer/ServerCategories.jsx

This file was deleted.

0 comments on commit d2e1e31

Please sign in to comment.