From 030bc2d8efb511a17a2703eaefa898c71222ac96 Mon Sep 17 00:00:00 2001
From: Matthew Penner <me@matthewp.io>
Date: Mon, 2 Aug 2021 10:01:55 -0600
Subject: [PATCH] ui(admin): fix server table links

---
 .../components/admin/servers/ServersTable.tsx        | 10 ++++------
 .../components/admin/users/UsersContainer.tsx        |  4 ++--
 resources/scripts/routers/AdminRouter.tsx            | 12 +++---------
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/resources/scripts/components/admin/servers/ServersTable.tsx b/resources/scripts/components/admin/servers/ServersTable.tsx
index da395c224..fe9c33a1f 100644
--- a/resources/scripts/components/admin/servers/ServersTable.tsx
+++ b/resources/scripts/components/admin/servers/ServersTable.tsx
@@ -1,5 +1,5 @@
 import React, { useContext, useEffect } from 'react';
-import { NavLink, useRouteMatch } from 'react-router-dom';
+import { NavLink } from 'react-router-dom';
 import tw from 'twin.macro';
 import getServers, { Context as ServersContext, Filters } from '@/api/admin/servers/getServers';
 import AdminCheckbox from '@/components/admin/AdminCheckbox';
@@ -33,8 +33,6 @@ interface Props {
 }
 
 function ServersTable ({ filters }: Props) {
-    const match = useRouteMatch();
-
     const { clearFlashes, clearAndAddHttpError } = useFlash();
 
     const { page, setPage, setFilters, sort, setSort, sortDirection } = useContext(ServersContext);
@@ -106,7 +104,7 @@ function ServersTable ({ filters }: Props) {
                                         </td>
 
                                         <td css={tw`px-6 text-sm text-left whitespace-nowrap`}>
-                                            <NavLink to={`${match.url}/${server.id}`} css={tw`text-primary-400 hover:text-primary-300`}>
+                                            <NavLink to={`/admin/servers/${server.id}`} css={tw`text-primary-400 hover:text-primary-300`}>
                                                 {server.name}
                                             </NavLink>
                                         </td>
@@ -115,11 +113,11 @@ function ServersTable ({ filters }: Props) {
                                         <td css={tw`px-6 text-sm text-left whitespace-nowrap`}>
                                             <NavLink to={`/admin/users/${server.relations.user?.id}`} css={tw`text-primary-400 hover:text-primary-300`}>
                                                 <div css={tw`text-sm text-neutral-200`}>
-                                                    Silly User
+                                                    {server.relations.user?.email}
                                                 </div>
 
                                                 <div css={tw`text-sm text-neutral-400`}>
-                                                    {server.relations.user?.email}
+                                                    {server.relations.user?.uuid.split('-')[0]}
                                                 </div>
                                             </NavLink>
                                         </td>
diff --git a/resources/scripts/components/admin/users/UsersContainer.tsx b/resources/scripts/components/admin/users/UsersContainer.tsx
index a77a58233..533219bb7 100644
--- a/resources/scripts/components/admin/users/UsersContainer.tsx
+++ b/resources/scripts/components/admin/users/UsersContainer.tsx
@@ -130,11 +130,11 @@ const UsersContainer = () => {
 
                                                             <div css={tw`ml-4`}>
                                                                 <div css={tw`text-sm text-neutral-200`}>
-                                                                    Silly User
+                                                                    {user.email}
                                                                 </div>
 
                                                                 <div css={tw`text-sm text-neutral-400`}>
-                                                                    {user.email}
+                                                                    {user.uuid.split('-')[0]}
                                                                 </div>
                                                             </div>
                                                         </div>
diff --git a/resources/scripts/routers/AdminRouter.tsx b/resources/scripts/routers/AdminRouter.tsx
index 0f964290a..637296004 100644
--- a/resources/scripts/routers/AdminRouter.tsx
+++ b/resources/scripts/routers/AdminRouter.tsx
@@ -78,7 +78,7 @@ const Sidebar = styled.div<{ collapsed?: boolean }>`
     }
 
     & > div.user {
-        ${tw`h-16 w-full flex items-center justify-center bg-neutral-700`};
+        ${tw`h-16 w-full flex items-center bg-neutral-700`};
         ${props => !props.collapsed && tw`mt-auto px-5`};
 
         & > div, a {
@@ -172,16 +172,10 @@ const AdminRouter = ({ location, match }: RouteComponentProps) => {
                 <div className={'user'}>
                     <img src={user !== undefined ? user.avatarURL + '?s=64' : ''} alt="Profile Picture" css={tw`h-10 w-10 rounded-full select-none`} />
 
-                    <div css={tw`flex flex-col ml-4`}>
-                        <span css={tw`font-header font-medium text-sm text-neutral-50 whitespace-nowrap leading-tight select-none`}>Silly User</span>
+                    <div css={tw`flex flex-col ml-3`}>
+                        <span css={tw`font-sans font-normal text-sm text-neutral-50 whitespace-nowrap leading-tight select-none`}>{user?.email}</span>
                         <span css={tw`font-header font-normal text-xs text-neutral-300 whitespace-nowrap leading-tight select-none`}>{user?.roleName}</span>
                     </div>
-
-                    <NavLink to={'/'} css={tw`h-8 w-8 flex items-center justify-center text-neutral-300 hover:text-primary-400 hover:bg-neutral-800 rounded ml-auto transition-all duration-100`}>
-                        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" css={tw`h-6 w-6`}>
-                            <path strokeWidth={2} strokeLinecap="round" strokeLinejoin="round" d="M3 10h10a8 8 0 018 8v2M3 10l6 6m-6-6l6-6"/>
-                        </svg>
-                    </NavLink>
                 </div>
             </Sidebar>