Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: lootsurvivor theme #7

Merged
merged 1 commit into from
Sep 10, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -58,7 +58,7 @@
}

if (
!data ||

Check failure on line 61 in apps/arkmarket/src/app/collection/[collectionAddress]/components/collection-items-buy-now.tsx

GitHub Actions / lint

Unnecessary conditional, value is always falsy
data.value < BigInt(tokenMarketData.listing.start_amount ?? 0)
) {
sonner.error("Insufficient balance");
@@ -74,7 +74,7 @@
tokenId: token.token_id,
orderHash: tokenMarketData.listing.order_hash,
startAmount: tokenMarketData.listing.start_amount,
currencyAddress: tokenMarketData.listing.currency_address,
currencyAddress: env.NEXT_PUBLIC_LORDS_TOKEN_ADDRESS,
});
};

Original file line number Diff line number Diff line change
@@ -90,7 +90,7 @@ export default function CollectionItemsDataGridView({
/>
</NftCardMedia>
<NftCardContent>
<div className="flex w-full justify-between">
<div className="flex w-full justify-between text-foreground">
<div className="w-full">
<p
className={cn(
Original file line number Diff line number Diff line change
@@ -18,6 +18,7 @@ import {

import type { CollectionToken } from "~/types";
import Media from "~/components/media";
import { PriceTag } from "@ark-market/ui/price-tag";

const gridTemplateColumnValue =
"grid-cols-[minmax(10rem,2fr)_repeat(5,minmax(7.25rem,1fr))]";
8 changes: 4 additions & 4 deletions apps/arkmarket/src/app/components/main-carousel.tsx
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
CarouselContent,
CarouselItem,
} from "@ark-market/ui/carousel";
import { Ethereum } from "@ark-market/ui/icons";

Check failure on line 15 in apps/arkmarket/src/app/components/main-carousel.tsx

GitHub Actions / lint

'Ethereum' is defined but never used. Allowed unused vars must match /^_/u

import { homepageConfig } from "~/config/homepage";

@@ -69,7 +69,7 @@
}

return (
<div className="md:text-white">
<div className="text-primary">
<Carousel setApi={setApi}>
<CarouselContent>
{homepageConfig.mainCarousel.map((carouselItem, index) => {
@@ -98,11 +98,11 @@
</h1>
<div className="flex items-center text-sm font-semibold">
<p className="mr-1">{carouselItem.itemsCount}</p>
<p className="mr-1 text-muted-foreground">
<p className="mr-1">
ITEMS
</p> | <Ethereum className="size-4" />
</p>
{/* <p className="mr-1">{carouselItem.floorPrice}</p> */}
<p className="text-muted-foreground">ETH</p>
{/* <p> ETH</p> */}
</div>
</div>
</div>
32 changes: 31 additions & 1 deletion apps/arkmarket/src/app/globals.css
Original file line number Diff line number Diff line change
@@ -139,7 +139,6 @@
--chart-5: 27 87% 67%;
}
.realms.dark {

--background: 69 9% 15%;
--foreground: 36 88.9% 85.9%;
--card: 69 9% 15%;
@@ -215,6 +214,37 @@
--limit: 320;
--distance: 8;
}

.lootsurvivor.dark, .lootsurvivor.light {
--font-spacemono: var(--font-vt323);
--font-baebasneue: var(--font-vt323);
--font-silkscreen: var(--font-vt323);
--background: 0 0 8%;
--foreground: 110 92% 56%;
--card: var(--background);
--card-foreground: 36 5% 10%;
--popover: var(--background);
--popover-foreground: var(--primary);
--primary: 110 92% 56%;
--primary-foreground: 0 0% 0%;
--secondary: var(--background);
--secondary-foreground: var(--primary);
--muted: var(--background);
--muted-foreground: var(--primary);
--accent: 110 92% 56%;
--accent-foreground: var(--background);
--destructive: 0 50% 30%;
--destructive-foreground: 36 5% 90%;
--border: 110 92% 56%;
--input: 110 92% 56%;
--ring: 36 88.9% 85.9%;
--radius: 0.3rem;
--chart-1: 12 76% 61%;
--chart-2: 173 58% 39%;
--chart-3: 197 37% 24%;
--chart-4: 43 74% 66%;
--chart-5: 27 87% 67%;
}
}

@layer base {
9 changes: 8 additions & 1 deletion apps/arkmarket/src/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { Metadata, Viewport } from "next";
import { Bebas_Neue, Space_Mono } from "next/font/google";
import { Bebas_Neue, Space_Mono, VT323 } from "next/font/google";
import { SpeedInsights } from "@vercel/speed-insights/next";

import { cn } from "@ark-market/ui";
@@ -113,6 +113,12 @@ const inconsolata = Space_Mono({
weight: "400",
display: "swap",
});
const vt323 = VT323({
subsets: ["latin"],
variable: "--font-vt323",
weight: "400",
display: "swap",
})

const backgroundImageStyle = {
backgroundImage: `url(/backgrounds/map.svg)`,
@@ -137,6 +143,7 @@ export default function RootLayout({ children }: PropsWithChildren) {
"min-h-screen overscroll-y-none bg-background text-foreground antialiased lg:pb-10",
silkscreen.variable,
inconsolata.variable,
vt323.variable,
)}
>
<CustomFonts />
2 changes: 1 addition & 1 deletion apps/arkmarket/src/env.ts
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ export const env = createEnv({
NEXT_PUBLIC_WALLET_CONNECT_PROJECT_ID: z.string(),
NEXT_PUBLIC_IMAGE_CDN_URL: z.string().url(),
NEXT_PUBLIC_IMAGE_PROXY_URL: z.string().url(),
NEXT_PUBLIC_THEME: z.enum(["unframed", "realms", "default"]).default("default"),
NEXT_PUBLIC_THEME: z.enum(["unframed", "realms", "lootsurvivor", "default"]).default("default"),
NEXT_PUBLIC_MOBULA_API_KEY: z.string(),
NEXT_PUBLIC_LORDS_TOKEN_ADDRESS: z.string(),
NEXT_PUBLIC_RPC_API_KEY: z.string(),

Unchanged files with check annotations Beta

return (
<>
<svg
className={className}

Check failure on line 7 in packages/ui/src/github-icon.tsx

GitHub Actions / lint

Unsafe assignment of an error typed value
aria-hidden="true"
xmlns="http://www.w3.org/2000/svg"
fill="currentColor"
import { cn, formatUnits } from ".";
import { Ethereum, Lords } from "./icons";
import LordsLogo from "./svg/lords.svg";

Check failure on line 5 in packages/ui/src/price-tag.tsx

GitHub Actions / lint

'LordsLogo' is defined but never used. Allowed unused vars must match /^_/u
interface PriceTagProps {
price: number | bigint | string;
token?: "ethereum" | "starknet" | "lords";
import type { PropsWithClassName } from "@ark-market/ui";

Check failure on line 1 in apps/arkmarket/src/app/collection/[collectionAddress]/components/collection-header-stats.tsx

GitHub Actions / lint

'PropsWithClassName' is defined but never used. Allowed unused vars must match /^_/u
import { cn, formatNumber, formatUnits } from "@ark-market/ui";

Check failure on line 2 in apps/arkmarket/src/app/collection/[collectionAddress]/components/collection-header-stats.tsx

GitHub Actions / lint

'cn' is defined but never used. Allowed unused vars must match /^_/u
import LordsLogo from "~/icons/lords.svg";
import { Separator } from "@ark-market/ui/separator";
FormLabel,
FormMessage,
} from "@ark-market/ui/form";
import { ActivityOffer, LoaderCircle, NoOffer } from "@ark-market/ui/icons";

Check failure on line 29 in apps/arkmarket/src/app/token/[contractAddress]/[tokenId]/components/token-actions-make-offer.tsx

GitHub Actions / lint

'NoOffer' is defined but never used. Allowed unused vars must match /^_/u
import {
Select,
SelectContent,
(val) => {
const num = parseEther(val);
return data && data.value >= num;

Check failure on line 92 in apps/arkmarket/src/app/token/[contractAddress]/[tokenId]/components/token-actions-make-offer.tsx

GitHub Actions / lint

Unnecessary conditional, value is always truthy
},
{
message: "You don't have enough funds in your wallet",
icons: [],
description: "Realms.World",
}),
] as Connector[], []);

Check warning on line 44 in apps/arkmarket/src/components/starknet-provider.tsx

GitHub Actions / lint

React Hook useMemo has a missing dependency: 'injectedConnectors'. Either include it or remove the dependency array
return (
<StarknetConfig