Skip to content

Commit b5e8b18

Browse files
dekkerglendekkerglen
committed
remove year of the snake merch
1 parent 09c1cfe commit b5e8b18

File tree

7 files changed

+23
-92
lines changed

7 files changed

+23
-92
lines changed

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cubecobra",
3-
"version": "1.1.24",
3+
"version": "1.1.25",
44
"description": "",
55
"private": true,
66
"main": "app.js",

‎public/content/discord.png

26.4 KB
Loading

‎src/client/components/Banner.tsx

+6-50
Original file line numberDiff line numberDiff line change
@@ -3,62 +3,18 @@ import React, { useContext, useState } from 'react';
33
import UserContext, { UserContextValue } from '../contexts/UserContext';
44
import Advertisment from './Advertisment';
55
import { Card, CardBody } from './base/Card';
6-
import { Col, Flexbox, Row } from './base/Layout';
6+
import { Flexbox } from './base/Layout';
77
import Link from './base/Link';
88
import ResponsiveDiv from './base/ResponsiveDiv';
99
import Text from './base/Text';
1010

11-
const BANNER_RATE: number = 3; // an alternate message appears with probability of 1/BANNER_RATE
11+
const BANNER_RATE: number = 10; // an alternate message appears with probability of 1/BANNER_RATE
1212

1313
const options: React.ReactNode[] = [
14-
<Row xs={6} key={0}>
15-
<Col xs={3} md={1}>
16-
<a href="/merchandise">
17-
<img src="/content/Final_cubecobra_small.png" alt="Year of the Snake" />
18-
</a>
19-
</Col>
20-
<Col xs={3} md={5} className="content-center">
21-
<Text lg>
22-
Our 2025 Lunar New Year merchandise is now available for pre-order! Check out our Year of the Snake playmat, pin
23-
and tokens <Link href="/merchandise">on our merchandise page</Link>!
24-
</Text>
25-
</Col>
26-
</Row>,
27-
<Row xs={6} key={0}>
28-
<Col xs={3} md={1}>
29-
<a href="/merchandise">
30-
<img src="/content/year_of_the_snake_tokens.png" alt="Year of the Snake" />
31-
</a>
32-
</Col>
33-
<Col xs={3} md={5} className="content-center">
34-
<Text lg>
35-
Our 2025 Lunar New Year merchandise is now available for pre-order! Check out our Year of the Snake playmat, pin
36-
and tokens <Link href="/merchandise">on our merchandise page</Link>!
37-
</Text>
38-
</Col>
39-
</Row>,
40-
<Row xs={6} key={0}>
41-
<Col xs={3} md={1}>
42-
<a href="/merchandise">
43-
<img src="/content/sticker_red.png" alt="Year of the Snake" />
44-
</a>
45-
</Col>
46-
<Col xs={3} md={5} className="content-center">
47-
<Text lg>
48-
Our 2025 Lunar New Year merchandise is now available for pre-order! Check out our Year of the Snake playmat, pin
49-
and tokens <Link href="/merchandise">on our merchandise page</Link>!
50-
</Text>
51-
</Col>
52-
</Row>,
53-
// <Text lg key={1}>
54-
// Want to showcase your cube? You can feature it as a reward for{' '}
55-
// <Link href="https://www.patreon.com/cubecobra">donating</Link> to Cube Cobra.{' '}
56-
// <Link href="/donate">Find out more.</Link>
57-
// </Text>,
58-
// <Text lg key={2}>
59-
// Become a supporter of Cube Cobra to remove these messages and gain access to exclusive features!{' '}
60-
// <Link href="/donate">Find out more.</Link>
61-
// </Text>,
14+
<Text lg key={2}>
15+
Become a supporter of Cube Cobra to remove these messages and gain access to exclusive features!{' '}
16+
<Link href="/donate">Find out more.</Link>
17+
</Text>,
6218
];
6319

6420
interface BannerProps {

‎src/client/components/nav/Navbar.tsx

+11-14
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import React, { useContext } from 'react';
22

33
import { ChevronUpIcon, ThreeBarsIcon } from '@primer/octicons-react';
44

5-
import Tooltip from 'components/base/Tooltip';
65
import { getCubeId } from 'utils/Util';
76

87
import UserContext from '../../contexts/UserContext';
@@ -55,10 +54,10 @@ const navItems = [
5554
items: [
5655
{ label: 'Dev Blog', href: '/dev/blog' },
5756
{ label: 'Contact', href: '/contact' },
58-
{
59-
label: 'Merchandise',
60-
href: '/merchandise',
61-
},
57+
// {
58+
// label: 'Merchandise',
59+
// href: '/merchandise',
60+
// },
6261
{ label: 'Donate', href: '/donate' },
6362
{ label: 'Github', href: 'https://github.com/dekkerglen/CubeCobra' },
6463
],
@@ -135,15 +134,13 @@ const Navbar: React.FC<NavbarProps> = ({ toggle, expanded }) => {
135134
<Container xxl>
136135
<Flexbox direction="col">
137136
<Flexbox justify="between" alignItems="center" direction="row" gap="4">
138-
<Tooltip text="新年快乐! Happy Year of the Snake!" position="bottom">
139-
<a href="/merchandise">
140-
<img
141-
className="h-10"
142-
src="/content/banner_red.png"
143-
alt="Cube Cobra: a site for Magic: the Gathering Cubing"
144-
/>
145-
</a>
146-
</Tooltip>
137+
<a href="/">
138+
<img
139+
className="h-10"
140+
src="/content/banner.png"
141+
alt="Cube Cobra: a site for Magic: the Gathering Cubing"
142+
/>
143+
</a>
147144
<ResponsiveDiv baseVisible lg>
148145
<Button color="secondary" onClick={toggle}>
149146
{expanded ? <ChevronUpIcon size={32} /> : <ThreeBarsIcon size={32} />}

‎src/client/layouts/Footer.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ const Footer: React.FC = () => {
9797
<li className="mb-2">
9898
<FooterLink href="/contact">Contact</FooterLink>
9999
</li>
100-
<li className="mb-2">
100+
{/* <li className="mb-2">
101101
<FooterLink href="/merchandise">Merchandise</FooterLink>
102-
</li>
102+
</li> */}
103103
<li className="mb-2">
104104
<FooterLink href="/donate">Donate</FooterLink>
105105
</li>

‎src/router/routes/merchandise.ts

+1-23
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,7 @@ const stripe = new Stripe(process.env.STRIPE_SECRET_KEY as string, {
88
apiVersion: '2025-01-27.acacia',
99
});
1010

11-
const products = [
12-
{
13-
name: 'Year of the Snake Playmat',
14-
description: `A commemorative Year of the Snake playmat to celebrate the Lunar Year. 24" x 14" Playmat, Black stitched edging.`,
15-
price: 4000,
16-
image: 'Final_cubecobra_small.png',
17-
id: 'prod_Rg7XQwlS2OmWMy',
18-
},
19-
{
20-
name: 'Year of the Snake Token',
21-
description: `A commemorative token (Snake on one side, Treasure on the back) to celebrate the Year of the Snake. Tokens are standard playing card size (2.5" x 3.5"). Included image is the source art, not a token preview.`,
22-
price: 100,
23-
image: 'year_of_the_snake_tokens.png',
24-
id: 'prod_Rg7ZFbdYo7jUkN',
25-
},
26-
{
27-
name: 'Year of the Snake Pin',
28-
description: `Commemorative 2" enamel pin to celebrate the lunar new year, ushering in the year of the snake! Glossy red on a shiny gold colored metal plating.`,
29-
price: 1000,
30-
image: 'sticker_red.png',
31-
id: 'prod_Rg7Iknvca5vxzF',
32-
},
33-
];
11+
const products: any[] = [];
3412

3513
const handler = async (req: Request, res: Response) => {
3614
try {

‎webpack.common.mjs

+2-2
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ export const clientConfig = merge(config, {
129129
FeaturedCubesQueuePage: './src/client/pages/FeaturedCubesQueuePage.tsx',
130130
PackagesPage: './src/client/pages/PackagesPage.tsx',
131131
RecentlyUpdateCubesPage: './src/client/pages/RecentlyUpdateCubesPage.tsx',
132-
MerchandisePage: './src/client/pages/MerchandisePage.tsx',
132+
// MerchandisePage: './src/client/pages/MerchandisePage.tsx',
133133
},
134134
output: {
135135
filename: '[name].bundle.js',
@@ -207,7 +207,7 @@ export const serverConfig = merge(config, {
207207
'pages/FeaturedCubesQueuePage': './src/client/pages/FeaturedCubesQueuePage.tsx',
208208
'pages/PackagesPage': './src/client/pages/PackagesPage.tsx',
209209
'pages/RecentlyUpdateCubesPage': './src/client/pages/RecentlyUpdateCubesPage.tsx',
210-
'pages/MerchandisePage': './src/client/pages/MerchandisePage.tsx',
210+
// 'pages/MerchandisePage': './src/client/pages/MerchandisePage.tsx',
211211
},
212212
output: {
213213
filename: '[name].js',

0 commit comments

Comments
 (0)