diff --git a/common/user.ts b/common/user.ts index ccaf2414..73186ac8 100644 --- a/common/user.ts +++ b/common/user.ts @@ -6,6 +6,13 @@ export type User = { username: string avatarUrl?: string + // For their user page + bio?: string + bannerUrl?: string + website?: string + twitterHandle?: string + discordHandle?: string + balance: number totalDeposits: number totalPnLCached: number diff --git a/common/util/random.ts b/common/util/random.ts index ce2bc54a..740379e5 100644 --- a/common/util/random.ts +++ b/common/util/random.ts @@ -3,22 +3,22 @@ export const randomString = (length = 12) => .toString(16) .substring(2, length + 2) +export function genHash(str: string) { + // xmur3 + for (var i = 0, h = 1779033703 ^ str.length; i < str.length; i++) { + h = Math.imul(h ^ str.charCodeAt(i), 3432918353) + h = (h << 13) | (h >>> 19) + } + return function () { + h = Math.imul(h ^ (h >>> 16), 2246822507) + h = Math.imul(h ^ (h >>> 13), 3266489909) + return (h ^= h >>> 16) >>> 0 + } +} + export function createRNG(seed: string) { // https://stackoverflow.com/a/47593316/1592933 - function genHash(str: string) { - // xmur3 - for (var i = 0, h = 1779033703 ^ str.length; i < str.length; i++) { - h = Math.imul(h ^ str.charCodeAt(i), 3432918353) - h = (h << 13) | (h >>> 19) - } - return function () { - h = Math.imul(h ^ (h >>> 16), 2246822507) - h = Math.imul(h ^ (h >>> 13), 3266489909) - return (h ^= h >>> 16) >>> 0 - } - } - const gen = genHash(seed) let [a, b, c, d] = [gen(), gen(), gen(), gen()] diff --git a/firestore.rules b/firestore.rules index a626ce1f..385e2f44 100644 --- a/firestore.rules +++ b/firestore.rules @@ -13,6 +13,9 @@ service cloud.firestore { match /users/{userId} { allow read; + allow update: if resource.data.id == request.auth.uid + && request.resource.data.diff(resource.data).affectedKeys() + .hasOnly(['bio', 'bannerUrl', 'website', 'twitterHandle', 'discordHandle']); } match /private-users/{userId} { diff --git a/web/components/avatar.tsx b/web/components/avatar.tsx index b487de6d..5f9aa074 100644 --- a/web/components/avatar.tsx +++ b/web/components/avatar.tsx @@ -7,8 +7,9 @@ export function Avatar(props: { avatarUrl?: string noLink?: boolean size?: number + className?: string }) { - const { username, avatarUrl, noLink, size } = props + const { username, avatarUrl, noLink, size, className } = props const s = size || 10 const onClick = @@ -25,7 +26,8 @@ export function Avatar(props: { className={clsx( 'flex items-center justify-center rounded-full object-cover', `w-${s} h-${s}`, - !noLink && 'cursor-pointer' + !noLink && 'cursor-pointer', + className )} src={avatarUrl} onClick={onClick} diff --git a/web/components/profile-menu.tsx b/web/components/profile-menu.tsx index 50d2fcbc..04b37406 100644 --- a/web/components/profile-menu.tsx +++ b/web/components/profile-menu.tsx @@ -35,8 +35,8 @@ function getNavigationOptions( href: user ? '/home' : '/', }, { - name: 'Profile', - href: '/profile', + name: `Your profile`, + href: `/${user?.username}`, }, ...(mobile ? [ @@ -54,10 +54,6 @@ function getNavigationOptions( name: 'Your trades', href: '/trades', }, - { - name: 'Your markets', - href: `/${user?.username ?? ''}`, - }, { name: 'Leaderboards', href: '/leaderboards', diff --git a/web/components/site-link.tsx b/web/components/site-link.tsx index 79f43118..c59e106a 100644 --- a/web/components/site-link.tsx +++ b/web/components/site-link.tsx @@ -12,10 +12,11 @@ export const SiteLink = (props: { e.stopPropagation()} > {children} @@ -24,7 +25,7 @@ export const SiteLink = (props: { - + {/* Banner image up top, with an circle avatar overlaid */} + <div + className="h-32 w-full bg-cover bg-center sm:h-40" + style={{ + backgroundImage: `url(${bannerUrl})`, + }} + ></div> + <div className="relative mb-20"> + <div className="absolute -top-10 left-4"> + <Avatar + username={user.username} + avatarUrl={user.avatarUrl} + size={20} + className="bg-white ring-4 ring-white" + /> + </div> - <CreatorContractsList creator={user} /> + {/* Top right buttons (e.g. edit, follow) */} + <div className="absolute right-0 top-0 mt-4 mr-4"> + {isCurrentUser && ( + <SiteLink className="btn" href="/profile"> + <PencilIcon className="h-5 w-5" />{' '} + <div className="ml-2">Edit</div> + </SiteLink> + )} + </div> + </div> + + {/* Profile details: name, username, bio, and link to twitter/discord */} + <Col className="mx-4 -mt-6"> + <span className="text-2xl font-bold">{user.name}</span> + <span className="text-gray-500">@{user.username}</span> + <Spacer h={4} /> + + <div> + <Linkify text={user.bio || placeholderBio}></Linkify> + </div> + <Spacer h={4} /> + + <Col className="sm:flex-row sm:gap-4"> + {user.website && ( + <SiteLink href={user.website}> + <Row className="items-center gap-1"> + <LinkIcon className="h-4 w-4" /> + <span className="text-sm text-gray-500">{user.website}</span> + </Row> + </SiteLink> + )} + + {user.twitterHandle && ( + <SiteLink href={`https://twitter.com/${user.twitterHandle}`}> + <Row className="items-center gap-1"> + <img + src="/twitter-logo.svg" + className="h-4 w-4" + alt="Twitter" + /> + <span className="text-sm text-gray-500"> + {user.twitterHandle} + </span> + </Row> + </SiteLink> + )} + + {user.discordHandle && ( + <SiteLink href="https://discord.com/invite/eHQBNBqXuh"> + <Row className="items-center gap-1"> + <img + src="/discord-logo.svg" + className="h-4 w-4" + alt="Discord" + /> + <span className="text-sm text-gray-500"> + {user.discordHandle} + </span> + </Row> + </SiteLink> + )} + </Col> + + <Spacer h={10} /> + + <CreatorContractsList creator={user} /> + </Col> </Page> ) } + +// Assign each user to a random default banner based on the hash of userId +// TODO: Consider handling banner uploads using our own storage bucket, like user avatars. +export function defaultBannerUrl(userId: string) { + const defaultBanner = [ + 'https://images.unsplash.com/photo-1501523460185-2aa5d2a0f981?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=2131&q=80', + 'https://images.unsplash.com/photo-1458682625221-3a45f8a844c7?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=1974&q=80', + 'https://images.unsplash.com/photo-1558517259-165ae4b10f7f?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=2080&q=80', + 'https://images.unsplash.com/photo-1563260797-cb5cd70254c8?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=2069&q=80', + 'https://images.unsplash.com/photo-1603399587513-136aa9398f2d?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=1467&q=80', + ] + return defaultBanner[genHash(userId)() % defaultBanner.length] +} diff --git a/web/lib/firebase/users.ts b/web/lib/firebase/users.ts index 56403358..04d82571 100644 --- a/web/lib/firebase/users.ts +++ b/web/lib/firebase/users.ts @@ -9,6 +9,7 @@ import { limit, getDocs, orderBy, + updateDoc, } from 'firebase/firestore' import { getAuth } from 'firebase/auth' import { ref, getStorage, uploadBytes, getDownloadURL } from 'firebase/storage' @@ -21,7 +22,8 @@ import { import { app } from './init' import { PrivateUser, User } from '../../../common/user' import { createUser } from './api-call' -import { getValue, getValues, listenForValue, listenForValues } from './utils' +import { getValues, listenForValue, listenForValues } from './utils' + export type { User } const db = getFirestore(app) @@ -45,6 +47,10 @@ export async function setUser(userId: string, user: User) { await setDoc(doc(db, 'users', userId), user) } +export async function updateUser(userId: string, update: Partial<User>) { + await updateDoc(doc(db, 'users', userId), { ...update }) +} + export function listenForUser( userId: string, setUser: (user: User | null) => void diff --git a/web/pages/profile.tsx b/web/pages/profile.tsx index 036f2972..2b3445e5 100644 --- a/web/pages/profile.tsx +++ b/web/pages/profile.tsx @@ -16,6 +16,48 @@ import { changeUserInfo } from '../lib/firebase/api-call' import { uploadImage } from '../lib/firebase/storage' import { Col } from '../components/layout/col' import { Row } from '../components/layout/row' +import { User } from '../../common/user' +import { updateUser } from '../lib/firebase/users' +import { defaultBannerUrl } from '../components/user-page' +import { SiteLink } from '../components/site-link' +import Textarea from 'react-expanding-textarea' + +function EditUserField(props: { + user: User + field: 'bio' | 'bannerUrl' | 'twitterHandle' | 'discordHandle' + label: string +}) { + const { user, field, label } = props + const [value, setValue] = useState(user[field] ?? '') + + async function updateField() { + // Note: We trim whitespace before uploading to Firestore + await updateUser(user.id, { [field]: value.trim() }) + } + + return ( + <div> + <label className="label">{label}</label> + + {field === 'bio' ? ( + <Textarea + className="textarea textarea-bordered w-full" + value={value} + onChange={(e) => setValue(e.target.value)} + onBlur={updateField} + /> + ) : ( + <input + type="text" + className="input input-bordered" + value={value} + onChange={(e) => setValue(e.target.value || '')} + onBlur={updateField} + /> + )} + </div> + ) +} export default function ProfilePage() { const user = useUser() @@ -26,8 +68,6 @@ export default function ProfilePage() { const [name, setName] = useState(user?.name || '') const [username, setUsername] = useState(user?.username || '') - const [isEditing, setIsEditing] = useState(false) - useEffect(() => { if (user) { setAvatarUrl(user.avatarUrl || '') @@ -95,23 +135,10 @@ export default function ProfilePage() { <Col className="max-w-lg rounded bg-white p-6 shadow-md sm:mx-auto"> <Row className="justify-between"> - <Title className="!mt-0" text="Profile" /> - {isEditing ? ( - <button - className="btn btn-primary" - onClick={() => setIsEditing(false)} - > - Done - </button> - ) : ( - <button - className="btn btn-ghost" - onClick={() => setIsEditing(true)} - > - <PencilIcon className="h-5 w-5" />{' '} - <div className="ml-2">Edit</div> - </button> - )} + <Title className="!mt-0" text="Edit Profile" /> + <SiteLink className="btn btn-primary" href={`/${user?.username}`}> + Done + </SiteLink> </Row> <Col className="gap-4"> <Row className="items-center gap-4"> @@ -125,9 +152,7 @@ export default function ProfilePage() { height={80} className="flex items-center justify-center rounded-full bg-gray-400" /> - {isEditing && ( - <input type="file" name="file" onChange={fileHandler} /> - )} + <input type="file" name="file" onChange={fileHandler} /> </> )} </Row> @@ -135,37 +160,69 @@ export default function ProfilePage() { <div> <label className="label">Display name</label> - {isEditing ? ( - <input - type="text" - placeholder="Display name" - className="input input-bordered" - value={name} - onChange={(e) => setName(e.target.value || '')} - onBlur={updateDisplayName} - /> - ) : ( - <div className="ml-1 text-gray-500">{name}</div> - )} + <input + type="text" + placeholder="Display name" + className="input input-bordered" + value={name} + onChange={(e) => setName(e.target.value || '')} + onBlur={updateDisplayName} + /> </div> <div> <label className="label">Username</label> - {isEditing ? ( - <input - type="text" - placeholder="Username" - className="input input-bordered" - value={username} - onChange={(e) => setUsername(e.target.value || '')} - onBlur={updateUsername} - /> - ) : ( - <div className="ml-1 text-gray-500">{username}</div> - )} + <input + type="text" + placeholder="Username" + className="input input-bordered" + value={username} + onChange={(e) => setUsername(e.target.value || '')} + onBlur={updateUsername} + /> </div> + {user && ( + <> + {/* TODO: Allow users with M$ 2000 of assets to set custom banners */} + {/* <EditUserField + user={user} + field="bannerUrl" + label="Banner Url" + isEditing={isEditing} + /> */} + <label className="label"> + Banner image{' '} + <span className="text-sm text-gray-400"> + Not editable for now + </span> + </label> + <div + className="h-32 w-full bg-cover bg-center sm:h-40" + style={{ + backgroundImage: `url(${ + user.bannerUrl || defaultBannerUrl(user.id) + })`, + }} + /> + + {[ + ['bio', 'Bio'], + ['website', 'Website URL'], + ['twitterHandle', 'Twitter'], + ['discordHandle', 'Discord'], + ].map(([field, label]) => ( + <EditUserField + user={user} + // @ts-ignore + field={field} + label={label} + /> + ))} + </> + )} + <div> <label className="label">Email</label> <div className="ml-1 text-gray-500"> diff --git a/web/public/discord-logo.svg b/web/public/discord-logo.svg new file mode 100644 index 00000000..3efe1ec1 --- /dev/null +++ b/web/public/discord-logo.svg @@ -0,0 +1,10 @@ +<svg width="71" height="55" viewBox="0 0 71 55" fill="none" xmlns="http://www.w3.org/2000/svg"> +<g clip-path="url(#clip0)"> +<path d="M60.1045 4.8978C55.5792 2.8214 50.7265 1.2916 45.6527 0.41542C45.5603 0.39851 45.468 0.440769 45.4204 0.525289C44.7963 1.6353 44.105 3.0834 43.6209 4.2216C38.1637 3.4046 32.7345 3.4046 27.3892 4.2216C26.905 3.0581 26.1886 1.6353 25.5617 0.525289C25.5141 0.443589 25.4218 0.40133 25.3294 0.41542C20.2584 1.2888 15.4057 2.8186 10.8776 4.8978C10.8384 4.9147 10.8048 4.9429 10.7825 4.9795C1.57795 18.7309 -0.943561 32.1443 0.293408 45.3914C0.299005 45.4562 0.335386 45.5182 0.385761 45.5576C6.45866 50.0174 12.3413 52.7249 18.1147 54.5195C18.2071 54.5477 18.305 54.5139 18.3638 54.4378C19.7295 52.5728 20.9469 50.6063 21.9907 48.5383C22.0523 48.4172 21.9935 48.2735 21.8676 48.2256C19.9366 47.4931 18.0979 46.6 16.3292 45.5858C16.1893 45.5041 16.1781 45.304 16.3068 45.2082C16.679 44.9293 17.0513 44.6391 17.4067 44.3461C17.471 44.2926 17.5606 44.2813 17.6362 44.3151C29.2558 49.6202 41.8354 49.6202 53.3179 44.3151C53.3935 44.2785 53.4831 44.2898 53.5502 44.3433C53.9057 44.6363 54.2779 44.9293 54.6529 45.2082C54.7816 45.304 54.7732 45.5041 54.6333 45.5858C52.8646 46.6197 51.0259 47.4931 49.0921 48.2228C48.9662 48.2707 48.9102 48.4172 48.9718 48.5383C50.038 50.6034 51.2554 52.5699 52.5959 54.435C52.6519 54.5139 52.7526 54.5477 52.845 54.5195C58.6464 52.7249 64.529 50.0174 70.6019 45.5576C70.6551 45.5182 70.6887 45.459 70.6943 45.3942C72.1747 30.0791 68.2147 16.7757 60.1968 4.9823C60.1772 4.9429 60.1437 4.9147 60.1045 4.8978ZM23.7259 37.3253C20.2276 37.3253 17.3451 34.1136 17.3451 30.1693C17.3451 26.225 20.1717 23.0133 23.7259 23.0133C27.308 23.0133 30.1626 26.2532 30.1066 30.1693C30.1066 34.1136 27.28 37.3253 23.7259 37.3253ZM47.3178 37.3253C43.8196 37.3253 40.9371 34.1136 40.9371 30.1693C40.9371 26.225 43.7636 23.0133 47.3178 23.0133C50.9 23.0133 53.7545 26.2532 53.6986 30.1693C53.6986 34.1136 50.9 37.3253 47.3178 37.3253Z" fill="#5865F2"/> +</g> +<defs> +<clipPath id="clip0"> +<rect width="71" height="55" fill="white"/> +</clipPath> +</defs> +</svg> diff --git a/web/public/twitter-logo.svg b/web/public/twitter-logo.svg new file mode 100644 index 00000000..b25ac935 --- /dev/null +++ b/web/public/twitter-logo.svg @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 24.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<svg version="1.1" id="Logo" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + viewBox="0 0 248 204" style="enable-background:new 0 0 248 204;" xml:space="preserve"> +<style type="text/css"> + .st0{fill:#1D9BF0;} +</style> +<g id="Logo_1_"> + <path id="white_background" class="st0" d="M221.95,51.29c0.15,2.17,0.15,4.34,0.15,6.53c0,66.73-50.8,143.69-143.69,143.69v-0.04 + C50.97,201.51,24.1,193.65,1,178.83c3.99,0.48,8,0.72,12.02,0.73c22.74,0.02,44.83-7.61,62.72-21.66 + c-21.61-0.41-40.56-14.5-47.18-35.07c7.57,1.46,15.37,1.16,22.8-0.87C27.8,117.2,10.85,96.5,10.85,72.46c0-0.22,0-0.43,0-0.64 + c7.02,3.91,14.88,6.08,22.92,6.32C11.58,63.31,4.74,33.79,18.14,10.71c25.64,31.55,63.47,50.73,104.08,52.76 + c-4.07-17.54,1.49-35.92,14.61-48.25c20.34-19.12,52.33-18.14,71.45,2.19c11.31-2.23,22.15-6.38,32.07-12.26 + c-3.77,11.69-11.66,21.62-22.2,27.93c10.01-1.18,19.79-3.86,29-7.95C240.37,35.29,231.83,44.14,221.95,51.29z"/> +</g> +</svg>