Skip to content

Commit

Permalink
merge next
Browse files Browse the repository at this point in the history
  • Loading branch information
RedBeardEth committed Dec 14, 2024
1 parent 251ad42 commit cd6a13a
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 24 deletions.
2 changes: 1 addition & 1 deletion landing/.env.production
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ VITE_PUBLIC_WORLD_ADDRESS="0x5013b17c43a2b664ec2a38aa45f6d891db1188622ec7cf32041
VITE_PUBLIC_ACCOUNT_CLASS_HASH="0x07dc7899aa655b0aae51eadff6d801a58e97dd99cf4666ee59e704249e51adf2"
VITE_PUBLIC_FEE_TOKEN_ADDRESS=0x49d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7

VITE_PUBLIC_TORII=https://eternum.glihm.xyz/
VITE_PUBLIC_TORII=https://eternum.glihm.xyz
VITE_PUBLIC_NODE_URL=https://api.cartridge.gg/x/starknet/mainnet
VITE_PUBLIC_DEV=false
VITE_PUBLIC_GAME_VERSION="v1.0.0-rc0"
Expand Down
4 changes: 2 additions & 2 deletions landing/src/components/modules/bridge-in.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ export const BridgeIn = () => {

return (
<>
<div className="max-w-md flex flex-col bg-background gap-3 relative max-h-[calc(75vh-100px)] overflow-y-auto p-3">
<div className="max-w-md flex flex-col gap-3 relative max-h-[calc(75vh-100px)] overflow-y-auto p-3">
<TypeP>
<div className="space-y-4">
<h2 className="text-2xl font-bold mb-4 text-gold border-b border-gold/20 pb-2">
Expand Down Expand Up @@ -226,7 +226,7 @@ export const BridgeIn = () => {
<div className="text-xs text-slate-500 uppercase mb-1">To Realm</div>

<Select onValueChange={(value) => setRealmEntityId(Number(value))}>
<SelectTrigger className="w-full dark:[background:linear-gradient(45deg,#1a1311,#1a1311)_padding-box,conic-gradient(from_var(--border-angle),#8b7355_80%,_#c6a366_86%,_#e5c088_90%,_#c6a366_94%,_#8b7355)_border-box] light:[background:linear-gradient(45deg,#ffffff,#ffffff)_padding-box,conic-gradient(from_var(--border-angle),#b08c4f_80%,_#daa520_86%,_#ffd700_90%,_#daa520_94%,_#b08c4f)_border-box] border border-transparent animate-border">
<SelectTrigger className={"w-full " + (!realmEntityId ? "bg-dark-brown dark:[background:linear-gradient(45deg,#1a1311,#1a1311)_padding-box,conic-gradient(from_var(--border-angle),#8b7355_80%,_#c6a366_86%,_#e5c088_90%,_#c6a366_94%,_#8b7355)_border-box] border border-transparent animate-border [background:linear-gradient(45deg,#ffffff,#ffffff)_padding-box,conic-gradient(from_var(--border-angle),#8b7355_80%,_#c6a366_86%,_#e5c088_90%,_#c6a366_94%,_#8b7355)_border-box]" : "border-gold/15")}>
{address ? (
<SelectValue placeholder="Select Realm To Transfer" />
) : (
Expand Down
11 changes: 9 additions & 2 deletions landing/src/components/modules/bridge-out-step-1.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ export const BridgeOutStep1 = () => {

return (
<>
<div className="max-w-md bg-background flex flex-col gap-3 max-h-[calc(75vh-100px)] overflow-y-auto p-3">
<div className="max-w-md flex flex-col gap-3 max-h-[calc(75vh-100px)] overflow-y-auto p-3">
<TypeP>
<div className="space-y-4">
<h2 className="text-2xl font-bold mb-4 text-gold border-b border-gold/20 pb-2">
Expand Down Expand Up @@ -215,7 +215,14 @@ export const BridgeOutStep1 = () => {
<div className="flex flex-col min-w-40">
<div className="text-xs uppercase mb-1 ">From Realm</div>
<Select onValueChange={(value) => setRealmEntityId(value)}>
<SelectTrigger className="w-full bg-background dark:[background:linear-gradient(45deg,#1a1311,#1a1311)_padding-box,conic-gradient(from_var(--border-angle),#8b7355_80%,_#c6a366_86%,_#e5c088_90%,_#c6a366_94%,_#8b7355)_border-box] light:[background:linear-gradient(45deg,#ffffff,#ffffff)_padding-box,conic-gradient(from_var(--border-angle),#d4b17d_80%,_#e8c088_86%,_#f5d4a3_90%,_#e8c088_94%,_#d4b17d)_border-box] border border-transparent animate-border">
<SelectTrigger
className={
"w-full " +
(!realmEntityId
? "dark:bg-dark-brown dark:[background:linear-gradient(45deg,#1a1311,#1a1311)_padding-box,conic-gradient(from_var(--border-angle),#8b7355_80%,_#c6a366_86%,_#e5c088_90%,_#c6a366_94%,_#8b7355)_border-box] border border-transparent animate-border [background:linear-gradient(45deg,#ffffff,#ffffff)_padding-box,conic-gradient(from_var(--border-angle),#8b7355_80%,_#c6a366_86%,_#e5c088_90%,_#c6a366_94%,_#8b7355)_border-box]"
: "border-gold/40")
}
>
{address ? <SelectValue placeholder="Select Settled Realm" /> : <div> -- Connect your wallet --</div>}
</SelectTrigger>
<SelectContent>
Expand Down
2 changes: 1 addition & 1 deletion landing/src/components/modules/bridge-out-step-2.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ export const BridgeOutStep2 = () => {

return (
<>
<div className="max-w-md bg-background flex flex-col gap-3 max-h-[calc(75vh-100px)] overflow-y-auto p-3">
<div className="max-w-md flex flex-col gap-3 max-h-[calc(75vh-100px)] overflow-y-auto p-3">
<TypeP>
<div className="space-y-4">
<h2 className="text-2xl font-bold mb-4 text-gold border-b border-gold/20 pb-2">
Expand Down
6 changes: 3 additions & 3 deletions landing/src/components/modules/swap-panel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ export const SwapPanel = () => {
Bridge Out (Finish)
</TabsTrigger>
</TabsList>
<TabsContent className="border-2 rounded-xl bg-brown border-gold/15 round-tr-none" value="in">
<TabsContent className="border-2 rounded-xl border-opacity-15 round-tr-none" value="in">
<BridgeIn />
</TabsContent>
<TabsContent className="border-2 rounded-xl bg-brown border-gold/15 round-tr-none" value="out-start">
<TabsContent className="border-2 rounded-xl border-opacity-15 round-tr-none" value="out-start">
<BridgeOutStep1 />
</TabsContent>
<TabsContent className="border-2 rounded-xl bg-brown border-gold/15 round-tr-none" value="out-finish">
<TabsContent className="border-2 rounded-xl border-opacity-15 round-tr-none" value="out-finish">
<BridgeOutStep2 />
</TabsContent>
</Tabs>
Expand Down
4 changes: 2 additions & 2 deletions landing/src/components/modules/top-navigation-view.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export const TopNavigationView = ({
onClick={() => {
window.open("https://eternum.realms.world", "_blank");
}}
className="gap-2"
className="gap-2 hidden sm:flex"
>
<PlayIcon className="!w-4 h-2" />
Play Eternum
Expand Down Expand Up @@ -92,7 +92,7 @@ export const TopNavigationView = ({
{isConnected ? (
<Button
variant="outline"
className="gap-2"
className="px-1"
size={"default"}
onClick={() => {
onDisconnect();
Expand Down
26 changes: 13 additions & 13 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit cd6a13a

Please sign in to comment.