mirror
/
moonstream
kopia lustrzana https://github.com/bugout-dev/moonstream
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge branch 'main' into improve-subscriptions-screen

pull/470/head
kellan-simiotics 2022-04-21 08:42:09 -04:00 zatwierdzone przez GitHub
rodzic b566132245 9dff3ab721
commit df04f0495f
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
8 zmienionych plików z 103 dodań i 45 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
db/server/cmd/data.go
Wyświetl plik

@ -5,6 +5,7 @@ type PingResponse struct {
}
type BlockLatestResponse struct {
EthereumBlockLatest uint64 `json:"ethereum_block_latest"`
PolygonBlockLatest uint64 `json:"polygon_block_latest"`
EthereumBlockLatest uint64 `json:"ethereum_block_latest"`
PolygonBlockLatest uint64 `json:"polygon_block_latest"`
PolygonBlockLatestLabelsMoonwormAlpha uint64 `json:"polygon_block_latest_label_moonworm_alpha"`
}

11
db/server/cmd/routes.go
Wyświetl plik

@ -20,8 +20,10 @@ func (es *extendedServer) blocksLatestRoute(w http.ResponseWriter, req *http.Req
var blockNumbers []uint64
var blockLatest BlockLatestResponse
rows, err := es.db.Query(`(SELECT block_number FROM ethereum_blocks ORDER BY block_number DESC LIMIT 1)
UNION
(SELECT block_number FROM polygon_blocks ORDER BY block_number DESC LIMIT 1)`)
UNION ALL
(SELECT block_number FROM polygon_blocks ORDER BY block_number DESC LIMIT 1)
UNION ALL
(SELECT block_number FROM polygon_labels WHERE label = 'moonworm-alpha' ORDER BY block_number DESC LIMIT 1)`)
if err != nil {
log.Printf("An error occurred during sql operation: %s", err)
http.Error(w, "Internal server error", http.StatusInternalServerError)
@ -45,8 +47,9 @@ func (es *extendedServer) blocksLatestRoute(w http.ResponseWriter, req *http.Req
}
blockLatest = BlockLatestResponse{
EthereumBlockLatest: blockNumbers[0],
PolygonBlockLatest: blockNumbers[1],
EthereumBlockLatest: blockNumbers[0],
PolygonBlockLatest: blockNumbers[1],
PolygonBlockLatestLabelsMoonwormAlpha: blockNumbers[2],
}
json.NewEncoder(w).Encode(blockLatest)

91
frontend/pages/index.js
Wyświetl plik

@ -34,10 +34,7 @@ import { v4 as uuidv4 } from "uuid";
import RouteButton from "../src/components/RouteButton";
import { MODAL_TYPES } from "../src/core/providers/OverlayProvider/constants";
import mixpanel from "mixpanel-browser";
import {
MIXPANEL_PROPS,
MIXPANEL_EVENTS,
} from "../src/core/providers/AnalyticsProvider/constants";
import { MIXPANEL_EVENTS } from "../src/core/providers/AnalyticsProvider/constants";
const SplitWithImage = dynamic(
() => import("../src/components/SplitWithImage"),
@ -144,6 +141,8 @@ const assets = {
game7io: `${AWS_ASSETS_PATH}/featured_by/game7io_logo.png`,
orangedao: `${AWS_ASSETS_PATH}/featured_by/orangedao_logo.png`,
meetup: `${AWS_ASSETS_PATH}/featured_by/meetup_logo.png`,
gnosis: `${AWS_ASSETS_PATH}/gnosis_chain_logo_no_text.png`,
immutable: `${AWS_ASSETS_PATH}/immutable_x_logo.png`,
};
const carousel_content = [
@ -151,10 +150,8 @@ const carousel_content = [
{ title: "Ethereum", img: assets["ethereumBlackLogo"] },
{ title: "Ethereum transaction pool", img: assets["ethereumRainbowLogo"] },
{ title: "Polygon", img: assets["maticLogo"] },
{ title: "Bitcoin coming soon!", img: assets["bitcoinLogo"] },
{ title: "Ethereum", img: assets["ethereumBlackLogo"] },
{ title: "Ethereum transaction pool", img: assets["ethereumRainbowLogo"] },
{ title: "Polygon", img: assets["maticLogo"] },
{ title: "immutable x coming soon!", img: assets["immutable"] },
{ title: "gnosis chain coming soon!", img: assets["gnosis"] },
];
const Homepage = () => {
const ui = useContext(UIContext);
@ -284,6 +281,7 @@ const Homepage = () => {
flexDirection="column"
sx={{ scrollBehavior: "smooth" }}
bgSize="cover"
id="page:landing"
>
<Flex
direction="column"
@ -589,10 +587,9 @@ const Homepage = () => {
<GridItem
px="7%"
mt={["32px", "64px", null]}
pt={["98px", "126px", null]}
py={["98px", "128px", null]}
colSpan="12"
bgColor="blue.50"
pb={["20px", "30px", "92px", null, "92px", "196px"]}
>
<Heading {...HEADING_PROPS} textAlign="center" pb={14} pt={0}>
Trusted by{" "}
@ -653,10 +650,6 @@ const Homepage = () => {
cta={{
colorScheme: "orange",
onClick: () => {
mixpanel.get_distinct_id() &&
mixpanel.track(`${MIXPANEL_EVENTS.BUTTON_CLICKED}`, {
[`${MIXPANEL_PROPS.BUTTON_NAME}`]: `Early access CTA: developer txpool button`,
});
router.push("/whitepapers");
},
label: "NFT market report",
@ -857,10 +850,9 @@ const Homepage = () => {
<GridItem
px="7%"
mt={["32px", "64px", null]}
pt={["98px", "226px", null]}
py={["98px", "128px", null]}
colSpan="12"
bgColor="blue.50"
pb={["20px", "30px", "92px", null, "92px", "196px"]}
>
<Heading {...HEADING_PROPS} textAlign="center" pb={14} pt={0}>
Featured by{" "}
@ -912,6 +904,7 @@ const Homepage = () => {
pt={["0", "0", "5.125rem", null, "5.125rem"]}
pb="120px"
px="7%"
id={"bottom-line"}
>
<Stack direction="column" justifyContent="center">
<chakra.span
@ -932,33 +925,65 @@ const Homepage = () => {
<Flex direction="row" flexWrap="wrap" placeContent="center">
<RouteButton
placeSelf="center"
href={`https://github.com/bugout-dev/moonstream`}
size="md"
href={"https://discord.gg/K56VNUQGvA"}
size="lg"
variant="outline"
colorScheme="blue"
w="250px"
leftIcon={<FaDiscord />}
w="280px"
onClick={() => {
if (mixpanel.get_distinct_id()) {
mixpanel.track(`${MIXPANEL_EVENTS.BUTTON_CLICKED}`, {
full_url: router.nextRouter.asPath,
buttonName: `Join our Discord`,
page: `landing`,
section: `bottom-line`,
});
}
}}
>
Join our Discord
</RouteButton>
<RouteButton
// mt={3}
// p={8}
placeSelf="center"
href={`https://github.com/bugout-dev/moonstream`}
size="lg"
variant="outline"
colorScheme="blue"
w="280px"
onClick={() => {
if (mixpanel.get_distinct_id()) {
mixpanel.track(`${MIXPANEL_EVENTS.BUTTON_CLICKED}`, {
full_url: router.nextRouter.asPath,
buttonName: `git clone moonstream`,
page: `landing`,
section: `bottom-line`,
});
}
}}
leftIcon={<FaGithubSquare />}
>
git clone moonstream
</RouteButton>
<RouteButton
placeSelf="center"
href={"https://discord.gg/K56VNUQGvA"}
size="md"
variant="outline"
colorScheme="blue"
leftIcon={<FaDiscord />}
w="250px"
>
Join our Discord
</RouteButton>
</Flex>
<Button
mt={3}
// mt={3}
placeSelf="center"
w={["100%", "100%", "fit-content", null]}
maxW={["250px", null, "fit-content"]}
onClick={() => toggleModal({ type: MODAL_TYPES.SIGNUP })}
maxW={["280px", null, "fit-content"]}
onClick={() => {
if (mixpanel.get_distinct_id()) {
mixpanel.track(`${MIXPANEL_EVENTS.BUTTON_CLICKED}`, {
full_url: router.nextRouter.asPath,
buttonName: `sign up`,
page: `landing`,
section: `bottom-line`,
});
}
toggleModal({ type: MODAL_TYPES.SIGNUP });
}}
size="lg"
variant="solid"
colorScheme="orange"

5
frontend/pages/status/index.js
Wyświetl plik

@ -1,14 +1,11 @@
import React, { useContext } from "react";
import React from "react";
import { useStatus } from "../../src/core/hooks";
import { Heading, Text, Flex, Spacer, chakra, Spinner } from "@chakra-ui/react";
import { getLayout, getLayoutProps } from "../../src/layouts/InfoPageLayout";
import UserContext from "../../src/core/providers/UserProvider/context";
const Status = () => {
const user = useContext(UserContext);
const healthyStatusText = "Available";
const downStatusText = "Unavailable";
const unauthorizedText = "Please login";
const healthyStatusColor = "green.900";
const downStatusColor = "red.600";

3
frontend/src/components/SignUp.js
Wyświetl plik

@ -40,6 +40,7 @@ const SignUp = ({ toggleModal }) => {
colorScheme="blue"
placeholder="Your username here"
name="username"
autoComplete="username"
ref={register({ required: "Username is required!" })}
/>
<InputRightElement>
@ -57,6 +58,7 @@ const SignUp = ({ toggleModal }) => {
colorScheme="blue"
placeholder="Your email here"
name="email"
autoComplete="email"
ref={register({ required: "Email is required!" })}
/>
<InputRightElement>
@ -71,6 +73,7 @@ const SignUp = ({ toggleModal }) => {
<PasswordInput
placeholder="Add password"
name="password"
autoComplete="new-password"
ref={register({ required: "Password is required!" })}
/>
<FormErrorMessage color="red.400" pl="1">

28
frontend/src/components/SplitWithImage.js
Wyświetl plik

@ -17,6 +17,9 @@ import React, { useContext } from "react";
import UIContext from "../core/providers/UIProvider/context";
import { FaDiscord, FaGithubSquare } from "react-icons/fa";
import RouteButton from "../components/RouteButton";
import mixpanel from "mixpanel-browser";
import MIXPANEL_EVENTS from "../core/providers/AnalyticsProvider/constants";
import { useRouter } from "../core/hooks";
const Feature = ({ text, icon, iconBg, bullets }) => {
return (
@ -72,6 +75,8 @@ const SplitWithImage = ({
imgBoxShadow,
py,
}) => {
const router = useRouter();
var buttonSize = useBreakpointValue({
base: { single: "sm", double: "xs" },
sm: { single: "md", double: "sm" },
@ -186,6 +191,16 @@ const SplitWithImage = ({
w={["100%", "100%", "fit-content", null]}
maxW={["250px", null, "fit-content"]}
href={socialButton.url}
onClick={() => {
if (mixpanel.get_distinct_id()) {
mixpanel.track(`${MIXPANEL_EVENTS.BUTTON_CLICKED}`, {
full_url: router.nextRouter.asPath,
buttonName: `${socialButton.title}`,
page: `splitWImage`,
section: `${badge}`,
});
}
}}
mt={[0, 0, null, 16]}
size={socialButton ? buttonSize.double : buttonSize.single}
variant="outline"
@ -206,7 +221,18 @@ const SplitWithImage = ({
variant="outline"
mt={[0, 0, null, 16]}
size={socialButton ? buttonSize.double : buttonSize.single}
onClick={cta.onClick}
onClick={() => {
if (mixpanel.get_distinct_id()) {
mixpanel.track(`${MIXPANEL_EVENTS.BUTTON_CLICKED}`, {
full_url: router.nextRouter.asPath,
buttonName: `${cta.label}`,
page: `splitWImage`,
section: `${badge}`,
});
}
cta.onClick();
}}
>
{cta.label}
</Button>

2
frontend/src/components/TrustedBadge.js
Wyświetl plik

@ -11,7 +11,7 @@ const TrustedBadge = ({
}) => {
const _scale = scale ?? 1;
return (
<LinkBox m={2}>
<LinkBox m={2} bgColor="blue.300" borderRadius="md">
<LinkOverlay href={boxURL} isExternal>
<Flex
m={1}

3
frontend/src/core/providers/AnalyticsProvider/index.js
Wyświetl plik

@ -5,6 +5,8 @@ import { useClientID, useUser, useRouter } from "../../hooks";
import { MIXPANEL_EVENTS, MIXPANEL_PROPS } from "./constants";
import UIContext from "../UIProvider/context";
const TELEMETRY_SCHEMA_VERSION = 1.0;
const AnalyticsProvider = ({ children }) => {
const clientID = useClientID();
const analytics = process.env.NEXT_PUBLIC_MIXPANEL_TOKEN;
@ -138,6 +140,7 @@ const AnalyticsProvider = ({ children }) => {
loaded: () => {
setIsLoaded(true);
mixpanel.identify(clientID);
mixpanel.register({ schema_version: TELEMETRY_SCHEMA_VERSION });
},
});
} catch (error) {