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

로그인!! #195

Merged
merged 1 commit into from
Feb 7, 2025
Merged

로그인!! #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions src/app/(user)/Main.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,7 @@
padding: 0 10px;
}
}
/*
.project{
justify-content: center;
} */
2 changes: 1 addition & 1 deletion src/components/common/Header/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export function Header() {
<div className={styles.header} role="banner">
<HeaderSymbol setIsOpen={setIsOpen} />
<HeaderTopNav setIsOpen={setIsOpen} />
<HeaderToolBar isOpen={isOpen} setIsOpen={setIsOpen} isLoggedIn={isLoggedIn} />
<HeaderToolBar isOpen={isOpen} setIsOpen={setIsOpen} />
</div>
<div className={`${styles.handout} ${isOpen ? styles.show : ""}`}>
<HandoutOverview setIsOpen={setIsOpen} />
Expand Down
14 changes: 8 additions & 6 deletions src/components/common/Header/elements/HeaderToolBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,22 @@ import styles from "../Header.module.css";
interface IHeaderToolBarProps {
isOpen: boolean;
setIsOpen: (value: boolean) => void;
isLoggedIn: boolean;
}

export function HeaderToolBar({ isOpen, setIsOpen, isLoggedIn }: IHeaderToolBarProps) {
export function HeaderToolBar({ isOpen, setIsOpen }: IHeaderToolBarProps) {
const [userData, setUserData] = useState<{ name: string } | null>(null);

const { logout, isLoading } = useAuth();
const [isDarkMode, setIsDarkMode] = useState(false); // 다크모드 상태 추가

const { token } = useAuth();
const { token, isLoggedIn } = useAuth();

const toggleHamburger = () => {
setIsOpen(!isOpen);
};
const offHamburger = () => {
setIsOpen(false);
};

const fetchData = async () => {
try {
Expand Down Expand Up @@ -70,7 +72,7 @@ export function HeaderToolBar({ isOpen, setIsOpen, isLoggedIn }: IHeaderToolBarP
<Link
href="/mypage"
style={{ textDecoration: "none", color: "inherit" }}
onClick={toggleHamburger}
onClick={offHamburger}
>
{userData.name}
</Link>
Expand All @@ -80,7 +82,7 @@ export function HeaderToolBar({ isOpen, setIsOpen, isLoggedIn }: IHeaderToolBarP
<Link
href="/mypage"
style={{ textDecoration: "none", color: "inherit" }}
onClick={toggleHamburger}
onClick={offHamburger}
>
내 정보
</Link>
Expand All @@ -106,7 +108,7 @@ export function HeaderToolBar({ isOpen, setIsOpen, isLoggedIn }: IHeaderToolBarP
<Link
href="/login"
style={{ textDecoration: "none", color: "inherit" }}
onClick={toggleHamburger}
onClick={offHamburger}
>
Login
</Link>
Expand Down
1 change: 1 addition & 0 deletions src/styles/UserBoard.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
margin: 0 auto;
padding-top: 100px;
padding-bottom: 40px;
width: 80%;
}

@media screen and (max-width: 480px) {
Expand Down
Loading