diff --git a/db/server/cmd/data.go b/db/server/cmd/data.go index 64bdd738..242fb6a1 100644 --- a/db/server/cmd/data.go +++ b/db/server/cmd/data.go @@ -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"` } diff --git a/db/server/cmd/routes.go b/db/server/cmd/routes.go index 65d878e7..2f997408 100644 --- a/db/server/cmd/routes.go +++ b/db/server/cmd/routes.go @@ -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) diff --git a/frontend/pages/index.js b/frontend/pages/index.js index ba3c0f76..641a8373 100644 --- a/frontend/pages/index.js +++ b/frontend/pages/index.js @@ -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" > { 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 = () => { Featured by{" "} @@ -912,6 +904,7 @@ const Homepage = () => { pt={["0", "0", "5.125rem", null, "5.125rem"]} pb="120px" px="7%" + id={"bottom-line"} > { } + 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 + + { + 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={} > git clone moonstream - } - w="250px" - > - Join our Discord - diff --git a/frontend/src/components/TrustedBadge.js b/frontend/src/components/TrustedBadge.js index 29fd8064..b65ecbb2 100644 --- a/frontend/src/components/TrustedBadge.js +++ b/frontend/src/components/TrustedBadge.js @@ -11,7 +11,7 @@ const TrustedBadge = ({ }) => { const _scale = scale ?? 1; return ( - + { 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) {