-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Improve login functionality and add logout ability
- Loading branch information
Showing
10 changed files
with
136 additions
and
52 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,13 @@ | ||
import React, { FC } from "react"; | ||
import Box from "./components/Box"; | ||
import { login } from "./api"; | ||
import Button from "./components/Button"; | ||
|
||
export const Login: FC = () => { | ||
return ( | ||
<div> | ||
<Box> | ||
<button onClick={login}>Click to login</button> | ||
</Box> | ||
<div className="w-full flex"> | ||
<Button className="w-1/3 mx-auto mt-12" onClick={login}> | ||
Click to login | ||
</Button> | ||
</div> | ||
); | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,17 @@ | ||
import React, { FC } from "react"; | ||
|
||
const CustomButton: FC< | ||
const Button: FC< | ||
React.DetailedHTMLProps< | ||
React.ButtonHTMLAttributes<HTMLButtonElement>, | ||
HTMLButtonElement | ||
> | ||
> = (props) => { | ||
> = ({className, ...props}) => { | ||
return ( | ||
<button | ||
{...props} | ||
className={`bg-secondary-300 rounded p-2 cursor-pointer hover:bg-secondary-500 ${props.className}`} | ||
className={`bg-secondary-300 rounded p-2 cursor-pointer hover:bg-secondary-500 active:bg-secondary-600 ${className}`} | ||
></button> | ||
); | ||
}; | ||
|
||
export default CustomButton; | ||
export default Button; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
import React, { FC, ReactNode, useEffect, useRef, useState } from "react"; | ||
|
||
interface ModalProps { | ||
children: ReactNode; | ||
trigger: ReactNode; | ||
isMenuOpen: boolean; | ||
closeMenu: () => void; | ||
} | ||
|
||
const DropdownMenu: FC<ModalProps> = ({ children, trigger, isMenuOpen, closeMenu }) => { | ||
const dropdownRef = useRef<HTMLDivElement>(null); | ||
useEffect(() => { | ||
function handleClickOutside({target}: MouseEvent) { | ||
if (dropdownRef.current && !dropdownRef.current.contains(target as Node)) { | ||
closeMenu(); | ||
} | ||
} | ||
document.addEventListener("mousedown", handleClickOutside); | ||
|
||
return () => { | ||
document.removeEventListener("mousedown", handleClickOutside); | ||
}; | ||
}, [dropdownRef, closeMenu]); | ||
|
||
return ( | ||
<div className="relative" ref={dropdownRef}> | ||
{trigger} | ||
{isMenuOpen && | ||
<div | ||
|
||
className={`bg-background-popover w-full h-fit absolute opacity-100 origin-top-right left-0 rounded-xl shadow p-6 z-50`} | ||
role={"menu"} | ||
> | ||
{children} | ||
</div> | ||
} | ||
</div> | ||
); | ||
}; | ||
|
||
export default DropdownMenu; |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
import * as React from "react"; | ||
import { Link } from "react-router-dom"; | ||
import { getCurrentUserDetails, login } from "../../api"; | ||
import { useQuery } from "@tanstack/react-query"; | ||
import { User } from "../../interfaces/User"; | ||
import UserMenu from "./UserMenu"; | ||
|
||
const Header = () => { | ||
const { data: userData } = useQuery<User>({ | ||
queryKey: ["current-user"], | ||
queryFn: () => { | ||
return getCurrentUserDetails(); | ||
}, | ||
}); | ||
|
||
return ( | ||
<div className="flex justify-between top-0 h-16 sm:h-20 bg-primary-300"> | ||
<Link to="/" className="flex mx-4 my-auto text-lg"> | ||
Playlist Manager | ||
</Link> | ||
<div className="flex mx-4"> | ||
{userData ? ( | ||
<UserMenu userData={userData} /> | ||
) : ( | ||
<button onClick={login}>Login</button> | ||
)} | ||
</div> | ||
</div> | ||
); | ||
}; | ||
|
||
export default Header; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
import React, { FC, ReactNode, useState } from "react"; | ||
import DropdownMenu from "../../components/DropdownMenu"; | ||
import { User } from "../../interfaces/User"; | ||
import Button from "../../components/Button"; | ||
import { logout } from "../../api"; | ||
|
||
interface UserMenuProps { | ||
userData: User; | ||
} | ||
|
||
const UserMenu: FC<UserMenuProps> = ({userData}) => { | ||
const [isMenuOpen, setIsMenuOpen] = useState(false); | ||
return ( | ||
<DropdownMenu isMenuOpen={isMenuOpen} closeMenu={() => setIsMenuOpen(false)} trigger={ | ||
<button className="flex space-x-4" onClick={() => setIsMenuOpen((open) => !open)}> | ||
<div className="my-auto">{userData.display_name}</div> | ||
{userData.images && ( | ||
<img | ||
src={userData.images[userData.images.length - 1].url} | ||
className="h-16 sm:h-20 rounded-full" | ||
></img> | ||
)} | ||
</button> | ||
} | ||
> | ||
<Button className={"w-full"} onClick={logout}>Logout</Button> | ||
</DropdownMenu>) | ||
} | ||
|
||
export default UserMenu |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters