Skip to content

Commit

Permalink
Add solution: MacBrewer
Browse files Browse the repository at this point in the history
  • Loading branch information
Alan Tai committed Nov 8, 2024
1 parent dc0be97 commit 8fefc6a
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 27 deletions.
Binary file modified design/logo.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 15 additions & 15 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,39 +25,39 @@
"dependencies" : {
"@ant-design/colors" : "^7.1.0",
"@ant-design/icons" : "^5.5.1",
"@contentful/rich-text-html-renderer" : "^16.6.10",
"antd" : "^5.21.5",
"contentful" : "^11.1.4",
"i18next" : "^23.16.2",
"@contentful/rich-text-html-renderer" : "^17.0.0",
"antd" : "^5.21.6",
"contentful" : "^11.2.1",
"i18next" : "^23.16.5",
"i18next-browser-languagedetector" : "^8.0.0",
"react" : "^18.3.1",
"react-dom" : "^18.3.1",
"react-i18next" : "^15.1.0",
"react-router-dom" : "^6.27.0",
"react-i18next" : "^15.1.1",
"react-router-dom" : "^6.28.0",
"usehooks-ts" : "^3.1.0"
},
"devDependencies" : {
"@eslint/eslintrc" : "^3.1.0",
"@eslint/js" : "^9.13.0",
"@stylistic/eslint-plugin-ts" : "^2.9.0",
"@eslint/js" : "^9.14.0",
"@stylistic/eslint-plugin-ts" : "^2.10.1",
"@types/eslint__js" : "^8.42.3",
"@types/node" : "^22.7.7",
"@types/react" : "^18.3.11",
"@types/node" : "^22.9.0",
"@types/react" : "^18.3.12",
"@types/react-dom" : "^18.3.1",
"@typescript-eslint/parser" : "^8.10.0",
"@typescript-eslint/parser" : "^8.13.0",
"@vitejs/plugin-react-swc" : "^3.7.1",
"eslint" : "^9.13.0",
"eslint" : "^9.14.0",
"eslint-plugin-import" : "^2.31.0",
"eslint-plugin-prefer-arrow" : "^1.2.3",
"eslint-plugin-react" : "^7.37.1",
"eslint-plugin-react" : "^7.37.2",
"eslint-plugin-react-hooks" : "^5.0.0",
"eslint-plugin-unicorn" : "^56.0.0",
"jsdom" : "^25.0.1",
"prop-types" : "^15.8.1",
"rollup-plugin-visualizer" : "^5.12.0",
"typescript" : "^5.6.3",
"typescript-eslint" : "^8.10.0",
"vite" : "^5.4.9"
"typescript-eslint" : "^8.13.0",
"vite" : "^5.4.10"
},
"engines" : {
"node" : ">=20",
Expand Down
Binary file modified public/apple-touch-icon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/web-app-manifest-192x192.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/web-app-manifest-512x512.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 6 additions & 8 deletions src/pages/Agreement.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,12 @@ export const AgreementPage = () => {
<Layout>
<Header />
<Layout.Content>
<section
id='about'
style={{
display : 'flex',
flexDirection : 'column',
alignItems : 'center',
justifyContent : 'center',
}}>
<section style={{
display : 'flex',
flexDirection : 'column',
alignItems : 'center',
justifyContent : 'center',
}}>
<div
style={{
width : isDesktop ? SECTION_WIDTH : '100%',
Expand Down
19 changes: 15 additions & 4 deletions src/pages/Home.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,11 @@ const Divider = ({
);

const ImageMask = ({
comingSoon,
index,
} : {
index : number,
comingSoon? : boolean,
index : number,
}) => {
const { t, } = useTranslation();

Expand All @@ -116,7 +118,7 @@ const ImageMask = ({
alignItems : 'center',
justifyContent : 'center',
}}>
<Tag color={themeColor[5]}>{t('tags.coming_soon')}</Tag>
{comingSoon && <Tag color={themeColor[5]}>{t('tags.coming_soon')}</Tag>}
<Typography.Title
style={{
marginTop : 8,
Expand Down Expand Up @@ -147,6 +149,8 @@ export const HomePage = () => {

const { t, } = useTranslation();

const handleOpenMacBrewer = () => window.open('https://macbrewer.geekylifehacks.com', '_blank');

return (
<Layout>
<Header isHome />
Expand Down Expand Up @@ -327,9 +331,14 @@ export const HomePage = () => {
}}
src={COVERS[index]}
alt={t('sections.products.0.caption')}
onClick={handleOpenMacBrewer}
preview={{
visible : false,
mask : <ImageMask index={index} />,
mask : (
<ImageMask
comingSoon={index !== 2}
index={index} />
),
}} />
{!isDesktop && (
<div style={{
Expand All @@ -338,7 +347,9 @@ export const HomePage = () => {
marginBottom : 48,
backgroundColor : '#000',
}}>
<ImageMask index={index} />
<ImageMask
comingSoon={index !== 2}
index={index} />
</div>
)}
</Col>
Expand Down

0 comments on commit 8fefc6a

Please sign in to comment.