-
- {keyName}
- {canEdit &&
- (isEditable ? (
-
- ) : (
-
- ))}
-
-
{children}
+ keyName,
+ children,
+ hide = false,
+ canEdit = false,
+ onEdit,
+ isEditable = false,
+ bottom = false,
+ className = '',
+}: KeyValueType) => {
+ if (!children || hide) return null
+ return (
+
+
+ {keyName}
+ {canEdit &&
+ (isEditable ? (
+
+ ) : (
+
+ ))}
- )
- }
+
+ {children}
+
+
+ )
+}
- export default KeyValue
\ No newline at end of file
+export default KeyValue
diff --git a/app/web/src/components/NavPlusButton/NavPlusButton.tsx b/app/web/src/components/NavPlusButton/NavPlusButton.tsx
index 73ea57d..b5ea48f 100644
--- a/app/web/src/components/NavPlusButton/NavPlusButton.tsx
+++ b/app/web/src/components/NavPlusButton/NavPlusButton.tsx
@@ -52,7 +52,11 @@ const NavPlusButton: React.FC = () => {
' px-4 py-1 my-4 bg-opacity-30 hover:bg-opacity-70 grid grid-flow-col-dense items-center gap-2'
}
>
-
+
{name}
{sub}
diff --git a/app/web/src/components/ProfileSlashLogin/ProfileSlashLogin.tsx b/app/web/src/components/ProfileSlashLogin/ProfileSlashLogin.tsx
index ba6a615..f90ecf7 100644
--- a/app/web/src/components/ProfileSlashLogin/ProfileSlashLogin.tsx
+++ b/app/web/src/components/ProfileSlashLogin/ProfileSlashLogin.tsx
@@ -46,7 +46,8 @@ const ProfileSlashLogin = () => {
+ className="h-full w-full outline-none border-ch-gray-400 border-2 rounded-full"
+ >
{!loading && (
{
/>
)}
- { currentUser && (
-
+ {currentUser && (
+
Hello {user?.name}
@@ -65,14 +66,18 @@ const ProfileSlashLogin = () => {
+ to={routes.user({ userName: user?.userName })}
+ >
View Your Profile
-
+
Logout
-
+
)}
) : (
diff --git a/app/web/src/components/ProjectCard/ProjectCard.tsx b/app/web/src/components/ProjectCard/ProjectCard.tsx
index bb446e8..9f6fbd4 100644
--- a/app/web/src/components/ProjectCard/ProjectCard.tsx
+++ b/app/web/src/components/ProjectCard/ProjectCard.tsx
@@ -34,7 +34,7 @@ const ProjectCard = ({ title, mainImage, user, Reaction, cadPackage }) => (
diff --git a/app/web/src/components/ProjectProfile/ProjectProfile.tsx b/app/web/src/components/ProjectProfile/ProjectProfile.tsx
index b3d1d26..d015a09 100644
--- a/app/web/src/components/ProjectProfile/ProjectProfile.tsx
+++ b/app/web/src/components/ProjectProfile/ProjectProfile.tsx
@@ -257,4 +257,3 @@ const ProjectProfile = ({
}
export default ProjectProfile
-
diff --git a/app/web/src/components/UserProfile/UserProfile.tsx b/app/web/src/components/UserProfile/UserProfile.tsx
index 7b18bfe..9f97fdc 100644
--- a/app/web/src/components/UserProfile/UserProfile.tsx
+++ b/app/web/src/components/UserProfile/UserProfile.tsx
@@ -4,18 +4,24 @@ import { Link, navigate, routes } from '@redwoodjs/router'
import ProjectsOfUser from 'src/components/ProjectsOfUserCell'
import IdeHeader from 'src/components/IdeHeader/IdeHeader'
import Svg from 'src/components/Svg/Svg'
-import { fieldsConfig, fieldReducer, UserProfileType, FieldConfigType } from './userProfileConfig'
+import {
+ fieldsConfig,
+ fieldReducer,
+ UserProfileType,
+ FieldConfigType,
+} from './userProfileConfig'
function buildFieldsConfig(fieldsConfig, user) {
- Object.entries(fieldsConfig).forEach(([key, field] : [string, FieldConfigType]) => {
- field.currentValue = field.newValue = user[key]
- field.name = key
- })
+ Object.entries(fieldsConfig).forEach(
+ ([key, field]: [string, FieldConfigType]) => {
+ field.currentValue = field.newValue = user[key]
+ field.name = key
+ }
+ )
return fieldsConfig
}
-
const UserProfile = ({
user,
isEditable,
@@ -23,11 +29,13 @@ const UserProfile = ({
onSave,
error,
projects,
-} : UserProfileType) => {
+}: UserProfileType) => {
const { currentUser } = useAuth()
const hasEditPermission = currentUser?.sub === user.id
useEffect(() => {
- isEditable && !hasEditPermission && navigate(routes.user({ userName: user.userName }))
+ isEditable &&
+ !hasEditPermission &&
+ navigate(routes.user({ userName: user.userName }))
}, [currentUser])
const initializedFields = buildFieldsConfig(fieldsConfig, user)
@@ -49,8 +57,7 @@ const UserProfile = ({
projectOwnerImage={user?.image}
projectOwnerId={user?.id}
>
-
-
+
@@ -63,7 +70,7 @@ const UserProfile = ({
@@ -95,14 +102,14 @@ const UserProfile = ({
/>