{props.user.name || props.user.username}
{props.user.bio}
{props.user.name}
{props.eventType.title}
@@ -347,6 +342,7 @@ export async function getServerSideProps(context) {
id: true,
username: true,
name: true,
+ email: true,
bio: true,
avatar: true,
eventTypes: true,
diff --git a/pages/[user]/book.tsx b/pages/[user]/book.tsx
index ad59279e..a500ce6d 100644
--- a/pages/[user]/book.tsx
+++ b/pages/[user]/book.tsx
@@ -9,6 +9,7 @@ import dayjs from 'dayjs';
import 'react-phone-number-input/style.css';
import PhoneInput from 'react-phone-number-input';
import { LocationType } from '../../lib/location';
+import Avatar from '../../components/Avatar';
export default function Book(props) {
const router = useRouter();
@@ -67,7 +68,7 @@ export default function Book(props) {
- {props.user.avatar &&
}
+
{props.user.name}
{props.eventType.title}
@@ -142,6 +143,7 @@ export async function getServerSideProps(context) {
select: {
username: true,
name: true,
+ email:true,
bio: true,
avatar: true,
eventTypes: true
diff --git a/pages/settings/profile.tsx b/pages/settings/profile.tsx
index 74aa19b5..69de830e 100644
--- a/pages/settings/profile.tsx
+++ b/pages/settings/profile.tsx
@@ -6,6 +6,7 @@ import prisma from '../../lib/prisma';
import Modal from '../../components/Modal';
import Shell from '../../components/Shell';
import SettingsShell from '../../components/Settings';
+import Avatar from '../../components/Avatar';
import { signIn, useSession, getSession } from 'next-auth/client';
import TimezoneSelect from 'react-timezone-select';
@@ -110,7 +111,7 @@ export default function Settings(props) {
@@ -125,8 +126,11 @@ export default function Settings(props) {
- {props.user.avatar &&
}
- {!props.user.avatar && }
+ }
+ />
{/*
{/*
{props.user.name}
{props.eventType.title}
@@ -142,6 +143,7 @@ export async function getServerSideProps(context) { select: { username: true, name: true, + email:true, bio: true, avatar: true, eventTypes: true diff --git a/pages/settings/profile.tsx b/pages/settings/profile.tsx index 74aa19b5..69de830e 100644 --- a/pages/settings/profile.tsx +++ b/pages/settings/profile.tsx @@ -6,6 +6,7 @@ import prisma from '../../lib/prisma'; import Modal from '../../components/Modal'; import Shell from '../../components/Shell'; import SettingsShell from '../../components/Settings'; +import Avatar from '../../components/Avatar'; import { signIn, useSession, getSession } from 'next-auth/client'; import TimezoneSelect from 'react-timezone-select'; @@ -110,7 +111,7 @@ export default function Settings(props) {