Skip to content

Commit

Permalink
merge dev
Browse files Browse the repository at this point in the history
  • Loading branch information
BasVanDeGroep committed Jan 16, 2024
2 parents 307196a + 572215e commit ec89c84
Show file tree
Hide file tree
Showing 31 changed files with 284 additions and 231 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
node_modules
.DS_Store

/.cache
/build
Expand Down
13 changes: 11 additions & 2 deletions app/components/CartridgeSlider.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from "react";
import { ArrowTopRightOnSquareIcon } from "@heroicons/react/24/solid";
import { useKeenSlider } from "keen-slider/react";
import { motion } from "framer-motion";
import { twMerge } from "tailwind-merge";
Expand Down Expand Up @@ -111,8 +112,16 @@ export const CartridgeSlider = () => {
))}
</div>
<div className="mt-12 flex justify-center">
<CTAButton as="link" type="primary" to="/games" className="mx-auto">
View all games
<CTAButton
as="link"
type="primary"
to="https://app.treasure.lol/games"
rel="noopener noreferrer"
target="_blank"
className="mx-auto"
>
View all games{" "}
<ArrowTopRightOnSquareIcon className="ml-1.5 h-4 w-4 fill-ruby-200 [&>path]:stroke-ruby-200 [&>path]:stroke-[1] group-hover:[&>path]:stroke-white" />
</CTAButton>
</div>
</div>
Expand Down
26 changes: 11 additions & 15 deletions app/components/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,11 @@ export const Header = () => {
>
Newsletter
</a>
<a
href="https://magicswap.lol/"
target="_blank"
rel="noreferrer noopener"
className="text-xs text-ruby-100 hover:text-ruby-200"
>
MagicSwap
</a>
<button
onClick={openModal}
className="text-xs text-ruby-100 hover:text-ruby-200"
>
Buy MAGIC
Get MAGIC
</button>
</div>
<div className="flex space-x-6">
Expand Down Expand Up @@ -193,10 +185,12 @@ export const Header = () => {
</Popover.Group>
<div className="absolute right-4 hidden items-center sm:right-8 xl:right-12 xl:flex xl:space-x-8">
<Link
to="/build"
className="inline-flex items-center space-x-2 rounded-lg border border-transparent bg-ruby-900 py-3.25 px-6.5 text-base font-bold text-white hover:bg-ruby-1000"
to="https://app.treasure.lol"
rel="noopener noreferrer"
target="_blank"
className="inline-flex items-center space-x-2 rounded-lg border border-transparent bg-ruby-900 py-3.25 px-6.5 text-lg font-bold text-white hover:bg-ruby-1000"
>
Build with Treasure
Play Now
</Link>
</div>
</div>
Expand Down Expand Up @@ -320,10 +314,12 @@ export const Header = () => {
</nav>
<div className="mt-6 px-5">
<Link
to="/build"
className="inline-flex w-full items-center justify-center space-x-2 rounded-lg border border-transparent bg-ruby-900 py-3.25 px-6.5 text-base font-bold text-white hover:bg-ruby-1000"
to="https://app.treasure.lol"
rel="noopener noreferrer"
target="_blank"
className="inline-flex w-full items-center justify-center space-x-2 rounded-lg border border-transparent bg-ruby-900 py-3.25 px-6.5 text-lg font-bold text-white hover:bg-ruby-1000"
>
Build with Treasure
Play Now
</Link>
</div>
</div>
Expand Down
9 changes: 6 additions & 3 deletions app/components/Icons.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,12 @@ export const BridgeIcon = ({ className }: { className?: string }) => (
</svg>
);

export const TwitterIcon = ({ className }: { className?: string }) => (
<svg fill="currentColor" viewBox="0 0 24 24" className={className}>
<path d="M8.29 20.251c7.547 0 11.675-6.253 11.675-11.675 0-.178 0-.355-.012-.53A8.348 8.348 0 0022 5.92a8.19 8.19 0 01-2.357.646 4.118 4.118 0 001.804-2.27 8.224 8.224 0 01-2.605.996 4.107 4.107 0 00-6.993 3.743 11.65 11.65 0 01-8.457-4.287 4.106 4.106 0 001.27 5.477A4.072 4.072 0 012.8 9.713v.052a4.105 4.105 0 003.292 4.022 4.095 4.095 0 01-1.853.07 4.108 4.108 0 003.834 2.85A8.233 8.233 0 012 18.407a11.616 11.616 0 006.29 1.84" />
export const XIcon = ({ className }: { className?: string }) => (
<svg fill="currentColor" viewBox="0 0 20 20" className={className}>
<path
d="M2.04069 2L8.48459 10.8249L2 18H3.45942L9.13667 11.7181L13.7237 18H18.6902L11.8837 8.67867L17.9195 2H16.4601L11.2317 7.78548L7.00716 2H2.04069ZM4.18688 3.10107H6.46849L16.5437 16.8988H14.2621L4.18688 3.10107Z"
fill="currentColor"
></path>
</svg>
);

Expand Down
6 changes: 3 additions & 3 deletions app/components/Reviews.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ export function Tweet({
const animationDelay = useMemo(() => {
const possibleAnimationDelays = [
"0s",
"0.1s",
"0.15s",
"0.25s",
"0.35s",
"0.45s",
"0.55s",
"0.3s",
"0.4s",
];
return possibleAnimationDelays[
Math.floor(Math.random() * possibleAnimationDelays.length)
Expand Down
Loading

0 comments on commit ec89c84

Please sign in to comment.