Skip to content

Commit

Permalink
Merge pull request #283 from TreasureProject/add-portal
Browse files Browse the repository at this point in the history
Add Portal links throughout site
  • Loading branch information
karelvuong authored Apr 29, 2024
2 parents 9db1f89 + e430d47 commit 477539d
Show file tree
Hide file tree
Showing 26 changed files with 128 additions and 174 deletions.
40 changes: 22 additions & 18 deletions app/components/NewNavigation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,6 @@ const dropdownItems: DropDownItems[] = [
type: "external",
target: LINKS.WHAT_IS_MAGIC,
},
// {
// label: "Infrastructure",
// type: "internal",
// target: "/infrastructure",
// },
{
label: "Team",
type: "internal",
Expand All @@ -78,12 +73,12 @@ const dropdownItems: DropDownItems[] = [
},
{
label: "Build",
target: "/build",
type: "internal",
},
{
label: "Solutions",
items: [
{
label: "Build on Treasure",
target: "/build",
type: "internal",
},
{
label: "Platform",
type: "external",
Expand All @@ -96,6 +91,11 @@ const dropdownItems: DropDownItems[] = [
},
],
},
{
label: "Portal",
target: LINKS.PORTAL,
type: "external",
},
{
label: "Community",
items: [
Expand All @@ -119,9 +119,13 @@ const dropdownItems: DropDownItems[] = [
type: "external",
target: LINKS.SNAPSHOT,
},
{
label: "Shop",
type: "external",
target: LINKS.SHOP,
},
],
},
{ label: "Shop", type: "external", target: "https://shop.treasure.lol" },
];

const NewNavigation = () => {
Expand Down Expand Up @@ -166,7 +170,7 @@ const NewNavigation = () => {
if (item.items) {
return (
<button
className="group relative flex h-9 cursor-pointer items-center gap-2.5 rounded-lg px-3.5 font-semibold text-new-night-100 transition-colors focus:outline-none hover:bg-new-night-100/10"
className="group relative flex h-9 cursor-pointer items-center gap-2.5 rounded-lg px-3.5 text-sm font-semibold text-new-night-100 transition-colors focus:outline-none hover:bg-new-night-100/10 lg:text-base"
key={item.label}
>
{item.label}
Expand Down Expand Up @@ -202,7 +206,7 @@ const NewNavigation = () => {
to={item.target ? item.target : "/"}
target={item.type === "external" ? "_blank" : "_self"}
key={index}
className="flex h-9 items-center gap-1.5 rounded-lg px-3.5 font-semibold text-new-night-100 transition-colors focus:outline-none hover:bg-new-night-100/10"
className="flex h-9 items-center gap-1.5 rounded-lg px-3.5 text-sm font-semibold text-new-night-100 transition-colors focus:outline-none hover:bg-new-night-100/10 lg:text-base"
>
{item.label}
{item.type === "external" && <ExternalIcon className="w-4" />}
Expand Down Expand Up @@ -247,7 +251,7 @@ const NewNavigation = () => {
</a>
</div>
<Button as="a" color="ruby" href={LINKS.APP}>
Start Playing
Play Now
</Button>
</div>
<button
Expand Down Expand Up @@ -334,11 +338,11 @@ const NewNavigation = () => {
</div>
</div>
<div className="space-y-2 border-t border-white/5 p-6 pb-0 sm:p-8">
<Button as="button" color="ruby">
Start Building
<Button as="a" color="ruby" href={LINKS.APP}>
Play Now{" "}
</Button>
<Button as="button" color="ruby">
Start Playing
<Button color="honey" to="/build">
Build with Treasure
</Button>
{/* <Button color="honey">Read Litepaper</Button> */}
<div className="flex items-center gap-4 pt-2 text-new-night-100">
Expand Down
5 changes: 5 additions & 0 deletions app/components/new-landing/Footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ const FooterLinks = [
url: "/build",
external: false,
},
{
title: "Treasure Portal",
url: LINKS.PORTAL,
external: true,
},
{
title: "Game Builders Program",
url: LINKS.DEVELOPERS,
Expand Down
2 changes: 2 additions & 0 deletions app/components/new-landing/misc/const.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export const LINKS = {
DEVELOPERS:
"https://docs.treasure.lol/for-game-developers/game-builders-program",
APP: "https://app.treasure.lol",
PORTAL: "https://portal.treasure.lol",
CREATORS: "https://go.treasure.lol/creators-apply?utm_source=website",
GAMES: "https://app.treasure.lol/games",
LITEPAPER: "https://go.treasure.lol/litepaper",
Expand All @@ -23,4 +24,5 @@ export const LINKS = {
GOVERNANCE: "https://forum.treasure.lol",
SNAPSHOT: "https://vote.treasure.lol",
BRIDGEWORLD: "https://bridgeworld.treasure.lol",
SHOP: "https://shop.treasure.lol",
};
8 changes: 1 addition & 7 deletions app/components/new-landing/sections/BuildOnTreasure.tsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,13 @@
import React from "react";
import Button from "../Button";
import { twMerge } from "tailwind-merge";
import {
ChevronRightIcon,
DiscordIcon,
SteamIcon,
TwitterIcon,
} from "../misc/Icons";
import { DiscordIcon, SteamIcon, TwitterIcon } from "../misc/Icons";
import {
Badge,
BoTGraphicFour,
BoTGraphicOne,
BoTGraphicThree,
BoTGraphicTwo,
LandingCutOff,
} from "../misc/Svgs";
import { LINKS } from "../misc/const";

Expand Down
2 changes: 1 addition & 1 deletion app/components/new-landing/sections/Hero.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const Hero = () => {
</p>
<div className="flex gap-4">
<Button as="a" color="ruby" href={LINKS.APP}>
Start Playing
Play Now
</Button>
<Button as="a" color="honey" href={LINKS.LITEPAPER}>
Read Litepaper
Expand Down
4 changes: 0 additions & 4 deletions app/components/new-landing/sections/Intro.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
import { Link } from "@remix-run/react";
import PLACEHOLDER_IMAGE from "~/../public/img/new-landing/PLR_enSG_1920x1080_SOCIAL_MAHmovieposter3.webp";
import VIDEO from "~/../public/img/new-landing/Treasure_Mini_Game_Trailer_No_Intro_LR_1080p.mp4";

import { ChevronRightIcon } from "../misc/Icons";
import { VideoCutOff } from "../misc/Svgs";
import Button from "../Button";
import { LINKS } from "../misc/const";

const Intro = () => {
return (
Expand Down
74 changes: 52 additions & 22 deletions app/const.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -93,21 +93,26 @@ import IconMagicImg from "../public/img/icons/Magic.svg";
import IconCommunityImg from "../public/img/icons/Community.svg";

// Team
import AndyImg from "../public/img/pfps/Andy.png";
import AnimenImg from "../public/img/pfps/Animen.png";
import AntlionImg from "../public/img/pfps/Antlion.png";
import BasImg from "../public/img/pfps/Bas.png";
import CrisisImg from "../public/img/pfps/Crisis.png";
import DanielImg from "../public/img/pfps/Daniel.png";
import DeathMonkeyImg from "../public/img/pfps/DeathMonkey.png";
import Ent1T7Img from "../public/img/pfps/ENT1T7.png";
import FrannyImg from "../public/img/pfps/Franny.png";
import GinaImg from "../public/img/pfps/Gina.png";
import JenImg from "../public/img/pfps/Jen.png";
import JohnImg from "../public/img/pfps/John.png";
import JonImg from "../public/img/pfps/Jon.png";
import JoshImg from "../public/img/pfps/Josh.png";
import JpegapeImg from "../public/img/pfps/Jpegape.png";
import JustCheeseImg from "../public/img/pfps/JustCheese.png";
import KarelImg from "../public/img/pfps/Karel.png";
import MouseDevImg from "../public/img/pfps/MouseDev.webp";
import MulfImg from "../public/img/pfps/Mulf.png";
import NoisewarImg from "../public/img/pfps/Noisewar.png";
import PeitaImg from "../public/img/pfps/Peita.png";
import PeterImg from "../public/img/pfps/Peter.webp";
import PreeminentImg from "../public/img/pfps/Preeminent.png";
Expand All @@ -117,8 +122,8 @@ import VinnyImg from "../public/img/pfps/Vinny.png";
import XImg from "../public/img/pfps/X_.webp";
import ZakImg from "../public/img/pfps/Zak.png";
import WagingBullImg from "../public/img/pfps/Wagingbull.png";
import YenImg from "../public/img/pfps/Yen.png";
import YuriImg from "../public/img/pfps/Yuri.png";
import DefaultImg from "../public/img/pfps/default.png";

// Twitter
import OfficialAbengerImg from "../public/img/twitter/OfficialAbenger.webp";
Expand Down Expand Up @@ -234,6 +239,12 @@ export const teamMembers = [
image: ZakImg,
team: "Creative",
},
{
name: "daniel",
title: "Brand Designer",
image: DanielImg,
team: "Creative",
},
{
name: "Jen Stuber",
title: "Community Manager",
Expand All @@ -258,13 +269,41 @@ export const teamMembers = [
image: XImg,
team: "Marketing",
},
{
name: "DeathMonkey",
title: "Social Content Creator",
discordLink: "https://discordapp.com/users/221421997488340993",
twitterLink: "https://twitter.com/deathorcrypto",
image: DeathMonkeyImg,
team: "Marketing",
},
{
name: "andy",
title: "Principal Artist",
image: AndyImg,
team: "Creative",
},
{
name: "Yen",
title: "Artist",
twitterLink: "https://twitter.com/YenLeeArt",
image: DefaultImg,
image: YenImg,
team: "Creative",
},
{
name: "noisewar",
title: "Executive Producer",
discordLink: "https://discordapp.com/users/344520580290052096",
twitterLink: "https://twitter.com/warandnoise",
image: NoisewarImg,
team: "Product & Engineering",
},
{
name: "jon",
title: "Product Manager",
image: JonImg,
team: "Product & Engineering",
},
{
name: "Antlion",
title: "Backend Engineer",
Expand All @@ -274,7 +313,7 @@ export const teamMembers = [
team: "Product & Engineering",
},
{
name: "Rappzula",
name: "rappzula",
title: "Full-Stack Engineer",
discordLink: "https://discordapp.com/users/690989750127165581",
twitterLink: "https://twitter.com/0xrappzula",
Expand All @@ -290,7 +329,7 @@ export const teamMembers = [
team: "Product & Engineering",
},
{
name: "Frannyverse",
name: "frannyverse",
title: "Front-End Engineer",
discordLink: "https://discordapp.com/users/766502243699523615",
twitterLink: "https://twitter.com/fr4nnyverse",
Expand All @@ -306,7 +345,7 @@ export const teamMembers = [
team: "Product & Engineering",
},
{
name: "Crisis",
name: "crisis",
title: "Full-Stack Engineer",
discordLink: "https://discordapp.com/users/351558969568788482",
twitterLink: "https://twitter.com/crisidot",
Expand Down Expand Up @@ -369,23 +408,14 @@ export const teamMembers = [
},
];

export const teamCore = teamMembers.filter((member) => member.team === "Core");
export const teamCreative = teamMembers.filter(
(member) => member.team === "Creative"
);
export const teamMarketing = teamMembers.filter(
(member) => member.team === "Marketing"
);
export const teamProduct = teamMembers.filter(
(member) => member.team === "Product & Engineering"
);
export const teamEcosystem = teamMembers.filter(
(member) => member.team === "Ecosystem"
);
export const teamSmol = teamMembers.filter((member) => member.team === "Smol");
export const teamOperations = teamMembers.filter(
(member) => member.team === "Operations"
);
export const teams = [
"Core",
"Creative",
"Marketing",
"Product & Engineering",
"Ecosystem",
"Smol",
];

export type MemberT = (typeof teamMembers)[number];

Expand Down
1 change: 0 additions & 1 deletion app/root.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import { genericImagePath, getSocialMetas, getUrl } from "./utils/seo";
import NProgress from "nprogress";
import { i18n } from "./utils/i18n.server";
import { useTranslation } from "react-i18next";
import { Layout } from "./components/Layout";
import { NewLayout } from "./components/new-landing/NewLayout";
import { i18nCookie } from "./utils/cookie";
import {
Expand Down
1 change: 0 additions & 1 deletion app/routes/brand-assets.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import treasureSpacingImg from "../../public/img/resources/treasure/spacing.png"
import magicSpacingImg from "../../public/img/resources/magic/spacing.png";
import { ColorPalette } from "~/components/ColorPalette";

import brandGuidelinesImg from "../../public/img/brand-guidelines.png";
import mediaKitImg from "../../public/img/media-kit.jpg";

import { ArrowDownTrayIcon } from "@heroicons/react/24/outline";
Expand Down
Loading

0 comments on commit 477539d

Please sign in to comment.