diff --git a/packages/fakeyou.com/src/components/common/Tabs/Tabs.scss b/packages/fakeyou.com/src/components/common/Tabs/Tabs.scss new file mode 100644 index 0000000000..fd2558e755 --- /dev/null +++ b/packages/fakeyou.com/src/components/common/Tabs/Tabs.scss @@ -0,0 +1,25 @@ +@import "scss/colours.scss"; + +.nav-tabs { + border-bottom: 2px solid #ffffff15; + + .nav-link { + border: none; + padding: 1rem 1.4rem; + border-bottom: 4px solid transparent; + color: rgba($white, 0.5); + font-weight: 500; + white-space: nowrap; + transition: 0.2s; + + &:hover { + color: rgba($white, 0.75); + } + + &.active { + color: $white; + background-color: transparent; + border-bottom: 4px solid $primary; + } + } +} diff --git a/packages/fakeyou.com/src/components/common/Tabs/Tabs.tsx b/packages/fakeyou.com/src/components/common/Tabs/Tabs.tsx index c205a96d76..ec31ca44fc 100644 --- a/packages/fakeyou.com/src/components/common/Tabs/Tabs.tsx +++ b/packages/fakeyou.com/src/components/common/Tabs/Tabs.tsx @@ -1,5 +1,7 @@ -import React, { useState } from "react"; +import React, { useEffect, useState } from "react"; import { NavLink } from "react-router-dom"; +import { useSpring, a } from "@react-spring/web"; +import "./Tabs.scss"; interface TabProps { to: string; @@ -15,13 +17,14 @@ interface TabContentProps { children: React.ReactNode; } -function Tab({ to, label }: TabProps) { +function Tab({ to, label, onClick }: TabProps & { onClick: () => void }) { return (
  • {label} @@ -36,23 +39,44 @@ function TabContent({ children }: TabContentProps) { function Tabs({ tabs }: TabsProps) { const [activeTab, setActiveTab] = useState(tabs[0].to); + const [fade, setFade] = useSpring(() => ({ + opacity: 1, + from: { opacity: 0 }, + config: { duration: 50 }, + })); + + useEffect(() => { + setFade({ opacity: 1 }); + }, [activeTab, setFade]); + + const handleTabClick = (tabTo: string) => { + setFade({ opacity: 0 }); + setTimeout(() => setActiveTab(tabTo), 50); + }; + return ( diff --git a/packages/fakeyou.com/src/v2/view/pages/profile/profile_view/NewProfilePage.tsx b/packages/fakeyou.com/src/v2/view/pages/profile/profile_view/NewProfilePage.tsx index 99f87cd8f3..15396dc6f0 100644 --- a/packages/fakeyou.com/src/v2/view/pages/profile/profile_view/NewProfilePage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/profile/profile_view/NewProfilePage.tsx @@ -1,7 +1,7 @@ /* eslint-disable jsx-a11y/anchor-is-valid */ import React, { useCallback, useEffect, useState } from "react"; import { Gravatar } from "@storyteller/components/src/elements/Gravatar"; -import { Link, NavLink, Redirect, useLocation } from "react-router-dom"; +import { Link, Redirect, useLocation } from "react-router-dom"; import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper"; import { SessionSubscriptionsWrapper } from "@storyteller/components/src/session/SessionSubscriptionsWrapper"; import { useParams } from "react-router-dom"; @@ -153,7 +153,7 @@ function NewProfilePage(this: any, props: Props) { // Mods shouldn't edit preferences. const buttonLabel = props.sessionWrapper.userTokenMatches( - userData.user_token + userData.user_token, ) ? "Edit Profile & Preferences" : "Edit Profile"; @@ -207,7 +207,7 @@ function NewProfilePage(this: any, props: Props) { >

    Joined {joinDate}

    - + , ); if (userData.website_url !== undefined && userData.website_url !== null) { @@ -299,7 +299,7 @@ function NewProfilePage(this: any, props: Props) { > - + , ); }