kopia lustrzana https://github.com/bugout-dev/moonstream
Merge pull request #688 from bugout-dev/landing-improvements
Fixing layout colors when logged in.pull/692/head
commit
8886a76ea6
|
@ -112,6 +112,7 @@ const Analytics = () => {
|
||||||
direction="column"
|
direction="column"
|
||||||
alignItems="center"
|
alignItems="center"
|
||||||
minH="100vh"
|
minH="100vh"
|
||||||
|
color="black"
|
||||||
>
|
>
|
||||||
<Stack
|
<Stack
|
||||||
direction={["column", "row", null]}
|
direction={["column", "row", null]}
|
||||||
|
@ -122,6 +123,7 @@ const Analytics = () => {
|
||||||
<Editable
|
<Editable
|
||||||
as={Heading}
|
as={Heading}
|
||||||
colorScheme="blue"
|
colorScheme="blue"
|
||||||
|
textColor="white"
|
||||||
placeholder="enter note here"
|
placeholder="enter note here"
|
||||||
defaultValue={dashboardCache.data.resource_data.name}
|
defaultValue={dashboardCache.data.resource_data.name}
|
||||||
onSubmit={(nextValue) =>
|
onSubmit={(nextValue) =>
|
||||||
|
|
|
@ -27,7 +27,7 @@ const Welcome = () => {
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Scrollable>
|
<Scrollable>
|
||||||
<Stack px="7%" pt={4} w="100%" spacing={4} ref={scrollRef}>
|
<Stack px="7%" pt={4} w="100%" color="black" spacing={4} ref={scrollRef}>
|
||||||
{/* <StepProgress
|
{/* <StepProgress
|
||||||
numSteps={ui.onboardingSteps.length}
|
numSteps={ui.onboardingSteps.length}
|
||||||
currentStep={ui.onboardingStep}
|
currentStep={ui.onboardingStep}
|
||||||
|
|
|
@ -36,6 +36,7 @@ const AccountIconButton = (props) => {
|
||||||
zIndex="dropdown"
|
zIndex="dropdown"
|
||||||
width={["100vw", "100vw", "18rem", "20rem", "22rem", "24rem"]}
|
width={["100vw", "100vw", "18rem", "20rem", "22rem", "24rem"]}
|
||||||
borderRadius={0}
|
borderRadius={0}
|
||||||
|
color="black"
|
||||||
>
|
>
|
||||||
<MenuGroup>
|
<MenuGroup>
|
||||||
<RouterLink href="/account/security" passHref>
|
<RouterLink href="/account/security" passHref>
|
||||||
|
|
|
@ -7,6 +7,7 @@ import {
|
||||||
MenuGroup,
|
MenuGroup,
|
||||||
MenuDivider,
|
MenuDivider,
|
||||||
IconButton,
|
IconButton,
|
||||||
|
Text,
|
||||||
chakra,
|
chakra,
|
||||||
} from "@chakra-ui/react";
|
} from "@chakra-ui/react";
|
||||||
import { PlusSquareIcon } from "@chakra-ui/icons";
|
import { PlusSquareIcon } from "@chakra-ui/icons";
|
||||||
|
@ -44,7 +45,7 @@ const AddNewIconButton = (props) => {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
New Dashboard...
|
<Text color="black">New Dashboard...</Text>
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
<MenuItem
|
<MenuItem
|
||||||
onClick={() =>
|
onClick={() =>
|
||||||
|
@ -54,7 +55,7 @@ const AddNewIconButton = (props) => {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
New Subscription...
|
<Text color="black">New Subscription...</Text>
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
|
|
||||||
{ui.isInDashboard && <MenuItem>New report...</MenuItem>}
|
{ui.isInDashboard && <MenuItem>New report...</MenuItem>}
|
||||||
|
|
|
@ -76,7 +76,7 @@ const AppNavbar = () => {
|
||||||
icon={<QuestionOutlineIcon />}
|
icon={<QuestionOutlineIcon />}
|
||||||
/>
|
/>
|
||||||
</PopoverTrigger>
|
</PopoverTrigger>
|
||||||
<PopoverContent bgColor="white.100">
|
<PopoverContent bgColor="white.100" color="black">
|
||||||
<PopoverArrow />
|
<PopoverArrow />
|
||||||
<PopoverCloseButton />
|
<PopoverCloseButton />
|
||||||
<PopoverHeader>Support</PopoverHeader>
|
<PopoverHeader>Support</PopoverHeader>
|
||||||
|
@ -110,7 +110,7 @@ const AppNavbar = () => {
|
||||||
<Flex px={2}>
|
<Flex px={2}>
|
||||||
<Spacer />
|
<Spacer />
|
||||||
<Flex placeSelf="flex-end">
|
<Flex placeSelf="flex-end">
|
||||||
<ButtonGroup variant="link" spacing={4} colorScheme="orange">
|
<ButtonGroup variant="link" spacing={4}>
|
||||||
{SITEMAP.map((item, idx) => {
|
{SITEMAP.map((item, idx) => {
|
||||||
if (
|
if (
|
||||||
!item.children &&
|
!item.children &&
|
||||||
|
@ -121,10 +121,9 @@ const AppNavbar = () => {
|
||||||
key={`${idx}-${item.title}-landing-all-links`}
|
key={`${idx}-${item.title}-landing-all-links`}
|
||||||
variant="link"
|
variant="link"
|
||||||
href={item.path}
|
href={item.path}
|
||||||
color="white"
|
|
||||||
isActive={!!(router.pathname === item.path)}
|
isActive={!!(router.pathname === item.path)}
|
||||||
>
|
>
|
||||||
{item.title}
|
<Text color="black">{item.title}</Text>
|
||||||
</RouteButton>
|
</RouteButton>
|
||||||
);
|
);
|
||||||
} else if (!item.footerOnly) {
|
} else if (!item.footerOnly) {
|
||||||
|
@ -147,7 +146,7 @@ const AppNavbar = () => {
|
||||||
passHref
|
passHref
|
||||||
>
|
>
|
||||||
<MenuItem key={`menu-${idx}`} as={"a"} m={0}>
|
<MenuItem key={`menu-${idx}`} as={"a"} m={0}>
|
||||||
{child.title}
|
<Text color="black">{child.title}</Text>
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
</RouterLink>
|
</RouterLink>
|
||||||
))}
|
))}
|
||||||
|
@ -163,7 +162,6 @@ const AppNavbar = () => {
|
||||||
key={`${idx}-${item.title}-navlink`}
|
key={`${idx}-${item.title}-navlink`}
|
||||||
variant="link"
|
variant="link"
|
||||||
href={item.path}
|
href={item.path}
|
||||||
color="white"
|
|
||||||
isActive={!!(router.nextRouter.pathname === item.path)}
|
isActive={!!(router.nextRouter.pathname === item.path)}
|
||||||
>
|
>
|
||||||
{item.title}
|
{item.title}
|
||||||
|
|
|
@ -77,7 +77,7 @@ const LandingNavbar = () => {
|
||||||
key={`${idx}-${item.title}-landing-all-links`}
|
key={`${idx}-${item.title}-landing-all-links`}
|
||||||
variant="link"
|
variant="link"
|
||||||
href={item.path}
|
href={item.path}
|
||||||
color="white"
|
color="black"
|
||||||
isActive={!!(router.pathname === item.path)}
|
isActive={!!(router.pathname === item.path)}
|
||||||
>
|
>
|
||||||
{item.title}
|
{item.title}
|
||||||
|
|
|
@ -100,6 +100,9 @@ const Report = ({ data, timeRange }) => {
|
||||||
enableSlices={false}
|
enableSlices={false}
|
||||||
enableGridX={true}
|
enableGridX={true}
|
||||||
enableGridY={true}
|
enableGridY={true}
|
||||||
|
theme={{
|
||||||
|
textColor: "white",
|
||||||
|
}}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
|
@ -105,7 +105,11 @@ const SubscriptionReport = ({
|
||||||
flexBasis={plotMinW}
|
flexBasis={plotMinW}
|
||||||
direction="column"
|
direction="column"
|
||||||
>
|
>
|
||||||
<Text fontSize="xs" textAlign="right">{`Latest block number: ${
|
<Text
|
||||||
|
fontSize="xs"
|
||||||
|
textAlign="right"
|
||||||
|
textColor="white"
|
||||||
|
>{`Latest block number: ${
|
||||||
data?.blocks_state?.latest_labelled_block ?? "Not available"
|
data?.blocks_state?.latest_labelled_block ?? "Not available"
|
||||||
}`}</Text>
|
}`}</Text>
|
||||||
<Flex
|
<Flex
|
||||||
|
@ -154,7 +158,7 @@ const SubscriptionReport = ({
|
||||||
flexBasis={plotMinW}
|
flexBasis={plotMinW}
|
||||||
direction="column"
|
direction="column"
|
||||||
>
|
>
|
||||||
<Heading size="md" pt={4}>
|
<Heading size="md" pt={4} textColor="white">
|
||||||
Events
|
Events
|
||||||
</Heading>
|
</Heading>
|
||||||
{eventKeys.map((key) => {
|
{eventKeys.map((key) => {
|
||||||
|
|
|
@ -270,7 +270,7 @@ const OverlayProvider = ({ children }) => {
|
||||||
>
|
>
|
||||||
<ModalOverlay />
|
<ModalOverlay />
|
||||||
|
|
||||||
<ModalContent>
|
<ModalContent textColor="black">
|
||||||
<ModalHeader bgColor="white.200" py={2} fontSize="lg">
|
<ModalHeader bgColor="white.200" py={2} fontSize="lg">
|
||||||
{modal.type === MODAL_TYPES.NEW_SUBSCRIPTON &&
|
{modal.type === MODAL_TYPES.NEW_SUBSCRIPTON &&
|
||||||
"Subscribe to a new address"}
|
"Subscribe to a new address"}
|
||||||
|
@ -345,7 +345,7 @@ const OverlayProvider = ({ children }) => {
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<DrawerOverlay />
|
<DrawerOverlay />
|
||||||
<DrawerContent overflowY="scroll">
|
<DrawerContent overflowY="scroll" textColor="black">
|
||||||
<DrawerCloseButton />
|
<DrawerCloseButton />
|
||||||
<DrawerHeader borderBottomWidth="1px">
|
<DrawerHeader borderBottomWidth="1px">
|
||||||
{drawer.type === DRAWER_TYPES.NEW_DASHBOARD && "New dashboard"}
|
{drawer.type === DRAWER_TYPES.NEW_DASHBOARD && "New dashboard"}
|
||||||
|
|
|
@ -3,6 +3,7 @@ import { getLayout as getSiteLayout } from "./RootLayout";
|
||||||
import React, { useContext, useEffect } from "react";
|
import React, { useContext, useEffect } from "react";
|
||||||
import UIContext from "../core/providers/UIProvider/context";
|
import UIContext from "../core/providers/UIProvider/context";
|
||||||
import AppNavbar from "../components/AppNavbar";
|
import AppNavbar from "../components/AppNavbar";
|
||||||
|
import { BACKGROUND_COLOR } from "../core/constants";
|
||||||
|
|
||||||
const AppLayout = ({ children }) => {
|
const AppLayout = ({ children }) => {
|
||||||
const ui = useContext(UIContext);
|
const ui = useContext(UIContext);
|
||||||
|
@ -18,6 +19,7 @@ const AppLayout = ({ children }) => {
|
||||||
return (
|
return (
|
||||||
<Flex
|
<Flex
|
||||||
id="JournalsWrapper"
|
id="JournalsWrapper"
|
||||||
|
bgColor={BACKGROUND_COLOR}
|
||||||
flexGrow={1}
|
flexGrow={1}
|
||||||
maxH="100%"
|
maxH="100%"
|
||||||
w="100%"
|
w="100%"
|
||||||
|
@ -45,7 +47,12 @@ const AppLayout = ({ children }) => {
|
||||||
zIndex={1010}
|
zIndex={1010}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
<Flex direction={"column"} bgColor="blue.900" id="Navbar">
|
<Flex
|
||||||
|
direction={"column"}
|
||||||
|
bgColor={BACKGROUND_COLOR}
|
||||||
|
borderBottom="1px solid white"
|
||||||
|
id="Navbar"
|
||||||
|
>
|
||||||
<AppNavbar />
|
<AppNavbar />
|
||||||
</Flex>
|
</Flex>
|
||||||
{ui.isAppReady && ui.isLoggedIn && children}
|
{ui.isAppReady && ui.isLoggedIn && children}
|
||||||
|
|
Ładowanie…
Reference in New Issue