From 19e840648061c99fc225cecb085a7873ff3a5a5f Mon Sep 17 00:00:00 2001 From: jahooma Date: Fri, 10 Dec 2021 17:43:22 -0600 Subject: [PATCH] Change color scheme to be primary green (secondary purple, accent yellow). --- web/components/bet-panel.tsx | 12 ++++++--- web/components/contracts-list.tsx | 2 +- web/components/yes-no-selector.tsx | 2 +- web/next.config.js | 3 +++ web/pages/_document.tsx | 2 +- web/pages/account.tsx | 18 ++++++++++---- web/pages/contract/index.tsx | 10 ++++---- web/tailwind.config.js | 39 ++++++++++++++++++++++++++++++ 8 files changed, 72 insertions(+), 16 deletions(-) diff --git a/web/components/bet-panel.tsx b/web/components/bet-panel.tsx index 7845f0b2..acb081a6 100644 --- a/web/components/bet-panel.tsx +++ b/web/components/bet-panel.tsx @@ -57,7 +57,9 @@ export function BetPanel(props: { contract: Contract; className?: string }) { const betDisabled = isSubmitting || wasSubmitted return ( - +
Pick outcome
@@ -116,7 +122,7 @@ export function BetPanel(props: { contract: Contract; className?: string }) { - diff --git a/web/components/contracts-list.tsx b/web/components/contracts-list.tsx index c9acebbf..92fb8cbc 100644 --- a/web/components/contracts-list.tsx +++ b/web/components/contracts-list.tsx @@ -9,7 +9,7 @@ function ContractCard(props: { contract: Contract }) {
-

+

{contract.question}

diff --git a/web/components/yes-no-selector.tsx b/web/components/yes-no-selector.tsx index d4162067..2c6b2bbf 100644 --- a/web/components/yes-no-selector.tsx +++ b/web/components/yes-no-selector.tsx @@ -49,7 +49,7 @@ function Button(props: { !hideFocusRing && 'focus:outline-none focus:ring-2 focus:ring-offset-2', color === 'green' && 'bg-green-500 hover:bg-green-600 focus:ring-green-500', - color === 'red' && 'bg-red-500 hover:bg-red-600 focus:ring-red-500', + color === 'red' && 'bg-red-400 hover:bg-red-500 focus:ring-red-400', color === 'deemphasized' && 'text-gray-700 bg-gray-200 hover:bg-gray-300 focus:ring-gray-300', className diff --git a/web/next.config.js b/web/next.config.js index 8b61df4e..a0c27a69 100644 --- a/web/next.config.js +++ b/web/next.config.js @@ -1,4 +1,7 @@ /** @type {import('next').NextConfig} */ module.exports = { reactStrictMode: true, + images: { + domains: ['lh3.googleusercontent.com'], + }, } diff --git a/web/pages/_document.tsx b/web/pages/_document.tsx index 303701fa..91a70e51 100644 --- a/web/pages/_document.tsx +++ b/web/pages/_document.tsx @@ -2,7 +2,7 @@ import { Html, Head, Main, NextScript } from 'next/document' export default function Document() { return ( - + Mantic Markets diff --git a/web/pages/account.tsx b/web/pages/account.tsx index 8c9c5ca2..cc50959b 100644 --- a/web/pages/account.tsx +++ b/web/pages/account.tsx @@ -5,6 +5,7 @@ import { useUser } from '../hooks/use-user' import { useState, useEffect } from 'react' import { Contract, listContracts } from '../lib/firebase/contracts' import { ContractsList } from '../components/contracts-list' +import Image from 'next/image' export default function Account() { const user = useUser() @@ -19,11 +20,18 @@ export default function Account() { return (
-
+
-
+
- + {user?.avatarUrl && ( + + )}

{user?.name}

@@ -31,7 +39,7 @@ export default function Account() {

${user?.balanceUsd} USD

-

+

Your markets

diff --git a/web/pages/contract/index.tsx b/web/pages/contract/index.tsx index b3e6488c..34367333 100644 --- a/web/pages/contract/index.tsx +++ b/web/pages/contract/index.tsx @@ -32,9 +32,9 @@ export default function NewContract() { creatorId: creator.id, creatorName: creator.name, })) - listContracts(creator?.id).then(setContracts) + listContracts(creator.id).then(setContracts) } - }, [creator?.id]) + }, [creator]) async function saveContract() { await pushContract(contract) @@ -52,8 +52,8 @@ export default function NewContract() { return (
-
-

+
+

Create a new prediction market

@@ -164,7 +164,7 @@ export default function NewContract() {
{/* Show a separate card for each contract */} -

+

Your markets

diff --git a/web/tailwind.config.js b/web/tailwind.config.js index ece84771..2ea8587f 100644 --- a/web/tailwind.config.js +++ b/web/tailwind.config.js @@ -17,4 +17,43 @@ module.exports = { extend: {}, }, plugins: [require('@tailwindcss/forms'), require('daisyui')], + + daisyui: { + themes: [ + { + mantic: { + 'primary': '#11b981', + 'primary-focus': '#069668', + // Foreground content color to use on primary color + 'primary-content': '#ffffff', + + secondary: '#a991f7', + 'secondary-focus': '#8462f4', + // Foreground content color to use on secondary color + 'secondary-content': '#ffffff', + + accent: '#f6d860', + 'accent-focus': '#f3cc30', + // Foreground content color to use on accent color + 'accent-content': '#ffffff', + + neutral: '#3d4451', + 'neutral-focus': '#2a2e37', + // Foreground content color to use on neutral color + 'neutral-content': '#ffffff', + + 'base-100': '#ffffff' /* Base page color, for blank backgrounds */, + 'base-200': '#f9fafb' /* Base color, a little darker */, + 'base-300': '#d1d5db' /* Base color, even more dark */, + // Foreground content color to use on base color + 'base-content': '#1f2937', + + info: '#2094f3', + success: '#009485', + warning: '#ff9900', + error: '#ff5724', + }, + }, + ], + }, }