Skip to content

Commit

Permalink
Merge pull request #201 from COW-dev/feat/DDING-58
Browse files Browse the repository at this point in the history
겨울 에디션 디자인 적용
  • Loading branch information
keemsebin authored Dec 4, 2024
2 parents 6e77748 + f5e1009 commit d909c83
Show file tree
Hide file tree
Showing 15 changed files with 202 additions and 86 deletions.
33 changes: 33 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
"react-dom": "18.2.0",
"react-hot-toast": "^2.4.1",
"react-lottie-player": "^1.5.4",
"react-snowfall": "^2.2.0",
"react-tailwindcss-datepicker": "^1.6.5",
"react-textarea-autosize": "^8.4.1",
"tailwind-merge": "^2.2.1",
Expand Down
Binary file added public/christmas_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/m_christmas_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/snowman.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/tree.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions src/components/common/Drawer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ export default function Drawer({ children, isOpen, setIsOpen }: DrawerProps) {
}
>
<article className="relative flex h-16 w-full justify-between">
<header className="flex w-full items-center justify-between bg-blue-600 px-6 text-lg font-bold">
<header className="flex w-full items-center justify-between bg-christmas-green px-6 text-lg font-bold">
<Image
src={'/m_logo.png'}
src={'/m_christmas_logo.png'}
width={1500}
height={700}
priority
alt="ddingdong"
className="w-30 md:w-34"
className="w-32"
/>
<button
className=""
Expand Down
4 changes: 2 additions & 2 deletions src/components/feed/Tabs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ export default function Tabs({ TabMenus, tabContext }: Props) {
} shrink-0 border-b-2 pb-4 text-base font-medium md:text-xl md:font-semibold
${
activeTab === tab.label
? 'border-blue-500 text-blue-500'
: 'border-transparent text-gray-500 hover:border-blue-500 hover:text-blue-500'
? 'border-christmas-red text-christmas-red'
: 'border-transparent text-gray-500 hover:border-christmas-red hover:text-christmas-red'
}`}
aria-current={activeTab === tab.label ? 'page' : undefined}
>
Expand Down
4 changes: 2 additions & 2 deletions src/components/home/FilterCategory.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ function FilterCategory({ option, setOption }: Props) {
<div className="my-2 hidden w-full rounded-xl bg-gray-50 p-2 px-4 font-semibold text-gray-500 md:flex">
<span
className={`cursor-pointer ${
option.category.length === 0 && 'text-blue-500'
option.category.length === 0 && 'text-christmas-red'
}`}
onClick={() => setOption((prev) => ({ ...prev, category: [] }))}
>
Expand All @@ -30,7 +30,7 @@ function FilterCategory({ option, setOption }: Props) {
<div
onClick={() => filterCategory(category.title)}
className={`cursor-pointer before:p-2 before:text-gray-300 before:content-['|'] ${
option.category.includes(category.title) && 'text-blue-500'
option.category.includes(category.title) && 'text-christmas-red'
}`}
key={`category${index}`}
>
Expand Down
44 changes: 31 additions & 13 deletions src/components/layout/AdminHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,31 +15,49 @@ export default function AdminHeader() {
<div className="flex w-full max-w-6xl items-center justify-between px-6 md:px-16">
<Link
href={isLoginPage ? '/login' : '/'}
className="-ml-3 inline-block p-3"
className="-ml-3 inline-block pb-2"
>
<Image
src={'/logo.png'}
src={'/christmas_logo.png'}
width={1544}
height={380}
priority
alt="ddingdong"
className="w-30 md:w-34"
className="w-36"
/>
</Link>
{!isLoginPage && (
<nav className="-mr-4 md:block">
<ul className="flex">
<li>
<button
className="rounded-xl p-3 font-semibold text-gray-500 hover:text-blue-500"
onClick={() => {
removeToken();
resetAuth();
router.push('/login');
}}
>
로그아웃
</button>
<div className="flex w-full items-end">
<Image
src={'/snowman.png'}
width={450}
height={450}
priority
className="w-8"
alt="snowman"
/>
<Image
src={'/tree.png'}
width={450}
height={450}
priority
className="w-12 md:w-14"
alt="tree"
/>
<button
className="rounded-xl p-3 font-semibold text-gray-500 hover:text-blue-500"
onClick={() => {
removeToken();
resetAuth();
router.push('/login');
}}
>
로그아웃
</button>
</div>
</li>
</ul>
</nav>
Expand Down
Loading

0 comments on commit d909c83

Please sign in to comment.