diff --git a/components/Dashboard/Header.tsx b/components/Dashboard/Header.tsx index 19ae6fc..e5bebec 100644 --- a/components/Dashboard/Header.tsx +++ b/components/Dashboard/Header.tsx @@ -15,6 +15,7 @@ import router from "next/router"; import Moment from "react-moment"; import { User } from "../../models/user"; import { generateGreetings } from "../../helpers/dateTime"; +import { Dropdown, Menu } from "antd"; export default function Header() { const { logOut } = useAuth(); @@ -32,6 +33,17 @@ export default function Header() { } } + const UserMenu = ( + + + + + + + + + ); + const today = new Date(); const periodOfDay = generateGreetings(); return ( @@ -96,16 +108,17 @@ export default function Header() { {/* avatar */} - - - - profile - + + + + + asdf + + ); diff --git a/pages/teams/index.tsx b/pages/teams/index.tsx index 952745a..62f072d 100644 --- a/pages/teams/index.tsx +++ b/pages/teams/index.tsx @@ -10,6 +10,7 @@ import unfetch from "isomorphic-unfetch"; import { FaPeopleCarry, FaArrowRight, FaBullhorn } from "react-icons/fa"; import BackgroundLayout from "../../components/Layouts/BackgroundLayout"; import TeamService from "../../services/teamService"; +import Loading from "../../components/Loading"; /** * figure out where to take the user based on everything @@ -68,13 +69,13 @@ function RouteHandler() { console.log(error); router.push("/teams/login"); } - })(); - setLoading(false); + setLoading(false); + })(); }, [currUser]); if (loading || !user) { - return
; + return ; } // not in a team yet, and have not created a team yet