From d1c0fa539bb297733037f595288dd82eeeb46ab3 Mon Sep 17 00:00:00 2001
From: Spencer Wohlers <4006420+seidior@users.noreply.github.com>
Date: Fri, 10 Jun 2022 00:00:18 -0700
Subject: [PATCH]  #356: Revert changes to webapp

This reverts commit 59f2f44740520216ccef3d605257b8718bb98f14 to ensure this branch only contains changes to the api/ subdirectory and not any changes to the webapp/ subdirectory. The changes from that commit will be migrated over to the appropriate branch.
---
 webapp/src/components/Profile.tsx | 30 ++++++++----------------------
 webapp/src/types/api.d.ts         | 24 ------------------------
 2 files changed, 8 insertions(+), 46 deletions(-)

diff --git a/webapp/src/components/Profile.tsx b/webapp/src/components/Profile.tsx
index 10f45432..0a2365a8 100644
--- a/webapp/src/components/Profile.tsx
+++ b/webapp/src/components/Profile.tsx
@@ -1,8 +1,5 @@
-import React, { useContext, useState } from 'react';
+import React from 'react';
 import { getGreeting } from '../helpers/greeting';
-import useApiData from '../helpers/useApiData';
-import { EntityId, Profile as APIProfile } from '../types/api';
-import SessionContext from './SessionContext';
 
 import {
   Container,
@@ -41,16 +38,6 @@ const user = {
 };
 
 const Profile = () => {
-  const { principalId} = useContext(SessionContext);
-  console.log({id: principalId})
-  const [changedUserDataIds, setChangedUserDataIds] = useState<EntityId[]>([]);
-  const { data: userData, error } = useApiData<APIProfile[]>({
-    deps: [changedUserDataIds],
-    path: `/profile/${principalId}`,
-    sendCredentials: true,
-  });
-
-  console.log( 'id', userData && userData[0].github_accounts[0].avatar_url );
   const greeting = getGreeting(user.name);
 
   return (
@@ -97,7 +84,7 @@ const Profile = () => {
               border: '3px solid #fff',
               outline: '2px solid #1976d2',
             }}
-            src={userData && userData[0].github_accounts[0].avatar_url || undefined}
+            src={user.avatar}
           ></Avatar>
         </Grid>
         <Grid
@@ -109,15 +96,14 @@ const Profile = () => {
           flexDirection="column"
         >
           <Typography component="h2" variant="h4">
-          {userData && userData[0].full_name ? userData[0].full_name : userData && userData[0].github_accounts[0].full_name ? userData[0].github_accounts[0].full_name : 'no name found!!'}&apos;s Profile
+            {user.name}&apos;s Profile
           </Typography>
           <Typography
             component="p"
             sx={{ display: 'flex', alignItems: 'center', mt: 1 }}
           >
             <EmailIcon sx={{ mr: 1 }} color="primary" />
-            {/* should we add "|| null" ? */}
-            {userData && userData[0].email_address || 'no email found!!'}
+            {user.email}
           </Typography>
           <Grid
             container
@@ -127,21 +113,21 @@ const Profile = () => {
           >
             <Grid item xs={1}>
               <Tooltip title="GitHub">
-                <IconButton component="a" sx={{ mr: 1 }} href={userData && userData[0].social_profiles[0] ? userData[0].social_profiles[0].profile_url : ''}>
+                <IconButton component="a" sx={{ mr: 1 }} href={user.github}>
                   <GitHubIcon color="primary" />
                 </IconButton>
               </Tooltip>
             </Grid>
             <Grid item xs={1}>
               <Tooltip title="LinkedIn">
-                <IconButton component="a" sx={{ mr: 1 }} href={userData && userData[0].social_profiles[1] ? userData[0].social_profiles[1].profile_url : ''}>
+                <IconButton component="a" sx={{ mr: 1 }} href={user.linkedIn}>
                   <LinkedInIcon color="primary" />
                 </IconButton>
               </Tooltip>
             </Grid>
             <Grid item xs={1}>
               <Tooltip title="Portfolio">
-                <IconButton component="a" sx={{ mr: 1 }} href={userData && userData[0].social_profiles[4] ? userData[0].social_profiles[4].profile_url : ''}>
+                <IconButton component="a" sx={{ mr: 1 }} href={user.website}>
                   <LanguageIcon color="primary" />
                 </IconButton>
               </Tooltip>
@@ -155,7 +141,7 @@ const Profile = () => {
           <Typography component="h3" variant="h4" sx={{ my: 2 }}>
             Summary
           </Typography>
-          <Typography component="p">{userData && userData[0].bio ? userData[0].bio : userData && userData[0].github_accounts[0].bio ? userData[0].github_accounts[0].bio : 'no bio found!!'}</Typography>
+          <Typography component="p">{user.summary}</Typography>
         </Grid>
         <Stack spacing={2} direction="row" sx={{ mt: 4 }}>
           <Button variant="outlined" component="a" href={'/'}>
diff --git a/webapp/src/types/api.d.ts b/webapp/src/types/api.d.ts
index ce2a0263..7ad5d563 100644
--- a/webapp/src/types/api.d.ts
+++ b/webapp/src/types/api.d.ts
@@ -76,27 +76,3 @@ export interface SessionData extends Entity {
 export interface Settings extends Entity {
   default_questionnaire_id: EntityId;
 }
-interface GithubAccounts extends Entity {
-  github_id: number;
-  username: string;
-  full_name: string;
-  bio: string;
-  avatar_url: string;
-  principal_id: EntityId;
-}
-interface SocialProfiles extends Entity {
-network_name: string;
-user_name: string;
-profile_url: string;
-public: boolean;
-
-}
-export interface Profile extends Entity {
-  id: number;
-  full_name: string;
-  email_address: string;
-  bio: string;
-  github_accounts: GithubAccounts[];
-  social_profiles: SocialProfiles[];
-  profile_url: string;
-}