Merge branch 'main' into testnav

This commit is contained in:
jahooma 2022-01-27 17:04:25 -06:00
commit 520307f9da
3 changed files with 3 additions and 7 deletions

View File

@ -1,5 +1,4 @@
import Link from 'next/link' import Link from 'next/link'
import Image from 'next/image'
import clsx from 'clsx' import clsx from 'clsx'
import { useUser } from '../hooks/use-user' import { useUser } from '../hooks/use-user'
@ -15,7 +14,7 @@ export function ManifoldLogo(props: {
return ( return (
<Link href={user ? '/home' : '/'}> <Link href={user ? '/home' : '/'}>
<a className={clsx('flex flex-row gap-4 flex-shrink-0', className)}> <a className={clsx('flex flex-row gap-4 flex-shrink-0', className)}>
<Image <img
className="hover:rotate-12 transition-all" className="hover:rotate-12 transition-all"
src={darkBackground ? '/logo-white.svg' : '/logo.svg'} src={darkBackground ? '/logo-white.svg' : '/logo.svg'}
width={45} width={45}

View File

@ -1,4 +1,3 @@
import Image from 'next/image'
import { firebaseLogout, User } from '../lib/firebase/users' import { firebaseLogout, User } from '../lib/firebase/users'
import { formatMoney } from '../lib/util/format' import { formatMoney } from '../lib/util/format'
import { AvatarPlaceholder } from './contract-feed' import { AvatarPlaceholder } from './contract-feed'
@ -81,7 +80,7 @@ function ProfileSummary(props: { user: User | undefined }) {
<Col className="avatar items-center sm:flex-row gap-2 sm:gap-0"> <Col className="avatar items-center sm:flex-row gap-2 sm:gap-0">
<div className="rounded-full w-10 h-10 sm:mr-4"> <div className="rounded-full w-10 h-10 sm:mr-4">
{user?.avatarUrl ? ( {user?.avatarUrl ? (
<Image src={user.avatarUrl} width={40} height={40} /> <img src={user?.avatarUrl} width={40} height={40} />
) : ( ) : (
<AvatarPlaceholder /> <AvatarPlaceholder />
)} )}

View File

@ -5,8 +5,6 @@ import { Title } from '../components/title'
import { FundsSelector } from '../components/yes-no-selector' import { FundsSelector } from '../components/yes-no-selector'
import { useUser } from '../hooks/use-user' import { useUser } from '../hooks/use-user'
import { checkoutURL } from '../lib/service/stripe' import { checkoutURL } from '../lib/service/stripe'
import Image from 'next/image'
import { Spacer } from '../components/layout/spacer'
import { Page } from '../components/page' import { Page } from '../components/page'
export default function AddFundsPage() { export default function AddFundsPage() {
@ -23,7 +21,7 @@ export default function AddFundsPage() {
<Col className="items-center"> <Col className="items-center">
<Col> <Col>
<Title text="Get Manifold Dollars" /> <Title text="Get Manifold Dollars" />
<Image <img
className="block mt-6" className="block mt-6"
src="/praying-mantis-light.svg" src="/praying-mantis-light.svg"
width={200} width={200}