rebased and resolved merge conflicts

JumboCode · Mar 7, 2024 · 5c82e67 · 5c82e67
1 parent 61422d3
commit 5c82e67
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 32 deletions.
diff --git a/src/app/private/[uid]/user/layout.tsx b/src/app/private/[uid]/user/layout.tsx
@@ -1,10 +1,6 @@
 "use client";
 
-<<<<<<< HEAD
 import { CollapsableSidebarContainer } from "@components/container";
-=======
-import Sidebar, { ISideBar } from "@components/Sidebar";
->>>>>>> 9bd5bd7 (finish first draft)
 import { faHome, faUsers, faUser } from "@fortawesome/free-solid-svg-icons";
 import React, { useContext } from "react";
 import { UserContext } from "src/context/UserProvider";

diff --git a/src/components/Sidebar.tsx b/src/components/Sidebar.tsx
@@ -12,11 +12,8 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { UserContext } from "src/context/UserProvider";
 import Logo from "@public/icons/logo.svg";
 import Image from "next/image";
-<<<<<<< HEAD
 import { RoleAlias } from "@constants/RoleAlias";
 import { fullName } from "@utils";
-=======
->>>>>>> 9bd5bd7 (finish first draft)
 
 interface Button {
   name: string;
@@ -101,7 +98,6 @@ const Sidebar = (props: ISideBar) => {
       <div className="sticky top-0 hidden lg:block">
         <_Sidebar {...props} />
       </div>
-<<<<<<< HEAD
       <div
         className="mt-6 block lg:hidden"
         onMouseLeave={() => setSidebarVisible(false)}
@@ -123,30 +119,6 @@ const Sidebar = (props: ISideBar) => {
             <_Sidebar {...props} />
           </div>
         )}
-=======
-
-      <div className="w-full px-11 py-20">
-        {/* TODO(nickbar01234) - Render university name */}
-        {/* <div className="text-md flex pb-2 pt-20 text-left font-serif text-xxs text-dark-gray">
-          <div className="w-4">
-            <FontAwesomeIcon icon={faCity} />
-          </div>
-          University
-        </div>
-        <div className="text-md flex w-full text-left font-serif text-xs">
-          Tufts University
-        </div> */}
-        <hr className="my-6 h-px w-full rounded border-0 bg-black" />
-        <div className="mb-1 flex w-full text-left font-serif text-lg font-bold">
-          {user.name ?? ""}
-        </div>
-        <div className="flex w-full pb-6 pt-0 text-left font-serif text-sm text-med-gray">
-          {user.role[0] + user.role.toLowerCase().slice(1)}
-        </div>
-        <button onClick={() => signOut({ callbackUrl: "/public/" })}>
-          <SidebarItem label="Sign Out" iconName={faArrowRightFromBracket} />
-        </button>
->>>>>>> 9bd5bd7 (finish first draft)
       </div>
     </>
   );