Skip to content

Commit b893da4

Browse files
sekwah41sekwah41
committed
chore: number of small updates and tweaks to the website
I'll be honest it's quite a rough edit. I want to come back and clean up the page a bit
1 parent 616025f commit b893da4

File tree

12 files changed

+172
-46
lines changed

12 files changed

+172
-46
lines changed

‎.github/workflows/release-please.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@ jobs:
5959
built-*/*.snap
6060
built-*/*.blockmap
6161
tauri-release/*
62+
- name: Invoke website publish
63+
uses: benc-uk/workflow-dispatch@v1
64+
with:
65+
workflow: Deploy Website
6266
publish-to-homebrew-cask:
6367
name: Publish to Homebrew Cask
6468
needs:

‎.github/workflows/website-deploy.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ on:
55
- master
66
paths:
77
- "website"
8-
release:
98
workflow_dispatch:
109
jobs:
1110
deploy:

‎website/content/hero.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
---
2-
title: Stay Focused, Take a Break.
3-
subTitle: Download this elegant multi-platform Pomodoro desktop app to boost your productivity.
2+
title: Stay Focused, Take a Break!
3+
subTitle: Download this elegant multi-platform Pomodoro desktop app to boost your productivity
4+
betaText: Or check out the Tauri Beta version
5+
mobileText: Mobile versions coming soon!
46
image: ../assets/images/preview-light.png
57
---

‎website/content/roadmap.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ title: Roadmap
33
subTitle: Features to look forward to.
44

55
features:
6+
- heading: Mobile Version
7+
description: Take it on the go! A mobile version of the app is currently in the works.
8+
69
- heading: Customizable shortcuts
710
description: Provide a way to make the default keyboard shortcuts customizable by the user.
811

9-
- heading: Website Blocker
10-
description: Enable user to block specific website while working in order to stay on focus.
11-
1212
- heading: Productivity report
1313
description: Provide some useful summary about user's productivity to have some sense of accomplishments.
1414

‎website/src/config.ts

Lines changed: 47 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,54 @@ export const AUTHOR_GITHUB_URL = "https://github.com/roldanjr";
99
export const PROJECT_GITHUB_URL = `${AUTHOR_GITHUB_URL}/pomatez`;
1010
export const PROJECT_RELEASES_URL = `${PROJECT_GITHUB_URL}/releases`;
1111

12-
export const INSTALLER = `${PROJECT_RELEASES_URL}/download/${APP_VERSION}/Pomatez-${APP_VERSION}`;
12+
export const DOWNLOAD_PREFIX = `${PROJECT_RELEASES_URL}/download/${APP_VERSION}`;
13+
export const INSTALLER = `${DOWNLOAD_PREFIX}/Pomatez-${APP_VERSION}`;
1314

14-
export const WINDOWS_INSTALLER = `${INSTALLER}-setup.exe`;
15-
export const DEB_INSTALLER = `${INSTALLER}-linux.deb`;
16-
export const APP_IMAGE_INSTALLER = `${INSTALLER}-linux.AppImage`;
17-
export const RPM_INSTALLER = `${INSTALLER}-linux.rpm`;
18-
export const MAC_INSTALLER = `${INSTALLER}-mac.dmg`;
15+
export const WINDOWS_x64_INSTALLER = `${INSTALLER}-win-x64-setup.exe`;
16+
export const WINDOWS_ARM_INSTALLER = `${INSTALLER}-win-arm64-setup.exe`;
17+
export const DEB_INSTALLER = `${INSTALLER}-linux-amd64.deb`;
18+
export const APP_IMAGE_x64_INSTALLER = `${INSTALLER}-linux-x86_64.AppImage`;
19+
export const APP_IMAGE_ARM_INSTALLER = `${INSTALLER}-linux-arm64.AppImage`;
20+
export const RPM_INSTALLER = `${INSTALLER}-linux-x86_64.rpm`;
21+
export const MAC_x64_INSTALLER = `${INSTALLER}-mac-x64.dmg`;
22+
export const MAC_ARM_INSTALLER = `${INSTALLER}-mac-arm64.dmg`;
23+
24+
export const INSTALLERS = {
25+
ELECTRON: {
26+
WINDOWS: {
27+
x64: WINDOWS_x64_INSTALLER,
28+
arm: WINDOWS_ARM_INSTALLER,
29+
},
30+
LINUX: {
31+
deb: DEB_INSTALLER,
32+
appImage: {
33+
x64: APP_IMAGE_x64_INSTALLER,
34+
arm: APP_IMAGE_ARM_INSTALLER,
35+
},
36+
rpm: RPM_INSTALLER,
37+
},
38+
MAC: {
39+
x64: MAC_x64_INSTALLER,
40+
arm: MAC_ARM_INSTALLER,
41+
},
42+
},
43+
// Only done like this because of the different caps and it doesn't have v before the version.
44+
TAURI: {
45+
WINDOWS: {
46+
x64: `${DOWNLOAD_PREFIX}/Pomatez_${json.version}_x64_en-US-win-tauri-beta.msi`,
47+
arm: `${DOWNLOAD_PREFIX}/Pomatez_${json.version}_arm64-setup-win-tauri-beta.exe`,
48+
},
49+
LINUX: {
50+
deb: `${DOWNLOAD_PREFIX}/pomatez_${json.version}_amd64-linux-tauri-beta.deb`,
51+
appImage: {
52+
x64: `${DOWNLOAD_PREFIX}/pomatez_${json.version}_amd64-linux-tauri-beta.AppImage`,
53+
},
54+
},
55+
MAC: {
56+
universal: `${DOWNLOAD_PREFIX}/Pomatez_${json.version}_universal-mac-tauri-beta.dmg`,
57+
},
58+
},
59+
};
1960

2061
export const NAV_LINKS = [
2162
{ label: "Features", link: "features", offset: -24 },

‎website/src/queries/hero.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ export const useLandingQuery = () =>
2727
frontmatter {
2828
title
2929
subTitle
30+
betaText
31+
mobileText
3032
}
3133
}
3234
}

‎website/src/sections/download.tsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ import {
1515
} from "../styles";
1616
import { Header, SVG } from "../components";
1717
import {
18-
WINDOWS_INSTALLER,
1918
DEB_INSTALLER,
20-
APP_IMAGE_INSTALLER,
2119
RPM_INSTALLER,
22-
MAC_INSTALLER,
20+
MAC_x64_INSTALLER,
21+
WINDOWS_x64_INSTALLER,
22+
APP_IMAGE_x64_INSTALLER,
2323
} from "../config";
2424
import { useDownloadQuery } from "../queries";
2525

@@ -50,9 +50,9 @@ export function Download() {
5050
</StyledDownloadOSLogo>
5151

5252
<StyledDownloadButton>
53-
<a href={WINDOWS_INSTALLER}>
53+
<a href={WINDOWS_x64_INSTALLER}>
5454
<SVG name="download" />
55-
Windows 7, 8 and 10
55+
Windows 7+ x64
5656
</a>
5757
</StyledDownloadButton>
5858
</StyledDownloadForWindows>
@@ -70,7 +70,7 @@ export function Download() {
7070
</a>
7171
</StyledDownloadButton>
7272
<StyledDownloadButton>
73-
<a href={APP_IMAGE_INSTALLER} id="app-image">
73+
<a href={APP_IMAGE_x64_INSTALLER} id="app-image">
7474
<SVG name="download" />
7575
.AppImage
7676
</a>
@@ -103,7 +103,7 @@ export function Download() {
103103
</StyledDownloadOSLogo>
104104

105105
<StyledDownloadButton>
106-
<a href={MAC_INSTALLER}>
106+
<a href={MAC_x64_INSTALLER}>
107107
<SVG name="download" />
108108
Mac OS 10.10+
109109
</a>

‎website/src/sections/hero.tsx

Lines changed: 80 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@ import {
1616
StyledHeroHeading,
1717
StyledHeroDescription,
1818
StyledWatermarkContainer,
19+
StyledHeroBetaDescription,
1920
} from "../styles";
2021
import {
21-
WINDOWS_INSTALLER,
22-
MAC_INSTALLER,
22+
MAC_x64_INSTALLER,
2323
PROJECT_GITHUB_URL,
24+
INSTALLERS,
2425
} from "../config";
2526
import { OSTypes, detectOS } from "../utils";
2627
import { ThemeContext } from "../context";
@@ -55,27 +56,71 @@ export function Hero() {
5556
setOperatingSystem(detectOS());
5657
}, []);
5758

58-
const renderDownloadButton = () => {
59+
const renderDownloadButton = (beta: boolean, isArm: boolean) => {
5960
switch (operatingSystem) {
6061
case "Windows":
6162
return (
6263
<StyledCTADownloader>
63-
<a href={WINDOWS_INSTALLER}>
64+
<a
65+
href={
66+
INSTALLERS[beta ? "TAURI" : "ELECTRON"].WINDOWS[
67+
isArm ? "arm" : "x64"
68+
]
69+
}
70+
>
6471
<SVG name="windows" />
65-
for Windows
72+
for Windows {isArm ? "ARM" : "x64"}
6673
</a>
6774
</StyledCTADownloader>
6875
);
6976
case "MacOS":
77+
if (beta) {
78+
if (isArm) {
79+
// We only want to show one universal button
80+
return <></>;
81+
} else {
82+
return (
83+
<StyledCTADownloader>
84+
<a href={INSTALLERS.TAURI.MAC.universal}>
85+
<SVG name="apple" />
86+
for macOS Intel & Apple Silicon
87+
</a>
88+
</StyledCTADownloader>
89+
);
90+
}
91+
}
7092
return (
7193
<StyledCTADownloader>
72-
<a href={MAC_INSTALLER}>
94+
<a href={MAC_x64_INSTALLER}>
7395
<SVG name="apple" />
74-
for Mac OS
96+
for macOS {isArm ? "Apple Silicon" : "Intel"}
7597
</a>
7698
</StyledCTADownloader>
7799
);
78100
case "Linux":
101+
if (beta) {
102+
// Weird way of doing it, but arm versions are not currently being build for these.
103+
if (isArm) {
104+
return (
105+
<StyledCTADownloader>
106+
<a href={INSTALLERS.TAURI.LINUX.deb}>
107+
<SVG name="tux" />
108+
for Linux Deb
109+
</a>
110+
</StyledCTADownloader>
111+
);
112+
} else {
113+
return (
114+
<StyledCTADownloader>
115+
<a href={INSTALLERS.TAURI.LINUX.appImage.x64}>
116+
<SVG name="tux" />
117+
for Linux AppImage
118+
</a>
119+
</StyledCTADownloader>
120+
);
121+
}
122+
}
123+
if (!isArm) return <></>;
79124
return (
80125
<StyledCTADownloader>
81126
<ScrollLink
@@ -91,20 +136,23 @@ export function Hero() {
91136
</StyledCTADownloader>
92137
);
93138
default:
94-
return (
95-
<StyledCTADownloader>
96-
<ScrollLink
97-
href="/"
98-
to="installers"
99-
offset={-24}
100-
duration={420}
101-
smooth
102-
>
103-
<SVG name="download" />
104-
See Installers
105-
</ScrollLink>
106-
</StyledCTADownloader>
107-
);
139+
if (!beta && !isArm) {
140+
return (
141+
<StyledCTADownloader>
142+
<ScrollLink
143+
href="/"
144+
to="installers"
145+
offset={-24}
146+
duration={420}
147+
smooth
148+
>
149+
<SVG name="download" />
150+
See Installers
151+
</ScrollLink>
152+
</StyledCTADownloader>
153+
);
154+
}
155+
return <></>;
108156
}
109157
};
110158

@@ -125,7 +173,8 @@ export function Hero() {
125173
</StyledHeroHeader>
126174

127175
<StyledHeroActionWrapper>
128-
{renderDownloadButton()}
176+
{renderDownloadButton(false, false)}
177+
{renderDownloadButton(false, true)}
129178
<StyledGithubLink
130179
as={"a"}
131180
href={PROJECT_GITHUB_URL}
@@ -136,6 +185,15 @@ export function Hero() {
136185
GitHub Repo
137186
</StyledGithubLink>
138187
</StyledHeroActionWrapper>
188+
<StyledHeroBetaDescription>
189+
{operatingSystem === "Mobile"
190+
? frontmatter.mobileText
191+
: frontmatter.betaText}
192+
</StyledHeroBetaDescription>
193+
<StyledHeroActionWrapper>
194+
{renderDownloadButton(true, false)}
195+
{renderDownloadButton(true, true)}
196+
</StyledHeroActionWrapper>
139197
</StyledHeroActionContainer>
140198

141199
<StyledPreviewWrapper>

‎website/src/styles/animate.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ export const stagger = {
22
animate: {
33
transition: {
44
delayChildren: 0.3,
5-
staggerChildren: 0.3,
5+
staggerChildren: 0.2,
66
},
77
},
88
};

‎website/src/styles/sections/download.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,6 @@ export const StyledLinuxInstallerWrapper = styled.div`
122122
123123
padding: 0 1.2rem;
124124
125-
overflow: hidden;
126-
127125
& > a {
128126
padding: 0 1.2rem;
129127
}

‎website/src/styles/sections/hero.ts

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ export const StyledWaterMarkRight = styled(WaterMarkRight)`
9898

9999
export const StyledHeroActionContainer = styled.div`
100100
display: grid;
101-
row-gap: 4.8rem;
102101
justify-content: center;
103102
justify-items: center;
104103
@@ -150,6 +149,27 @@ export const StyledHeroDescription = styled(motion.h2).attrs(() => ({
150149
font-size: 2.2rem;
151150
font-weight: 400;
152151
line-height: 1.7;
152+
margin-bottom: 4.8rem;
153+
154+
${media.tabletSm} {
155+
line-height: 1.5;
156+
}
157+
158+
${media.mobileXl} {
159+
font-size: 2rem;
160+
}
161+
`;
162+
163+
export const StyledHeroBetaDescription = styled(motion.h2).attrs(
164+
() => ({
165+
variants: fadeFromBottom,
166+
})
167+
)`
168+
font-size: 2.2rem;
169+
font-weight: 400;
170+
line-height: 1.7;
171+
margin-top: 4.8rem;
172+
margin-bottom: 2.8rem;
153173
154174
${media.tabletSm} {
155175
line-height: 1.5;
@@ -164,7 +184,7 @@ export const StyledHeroActionWrapper = styled(motion.div).attrs(() => ({
164184
variants: fadeFromBottom,
165185
}))`
166186
display: grid;
167-
grid-template-columns: repeat(2, max-content);
187+
grid-template-columns: repeat(3, max-content);
168188
gap: 2rem;
169189
170190
${media.tabletMd} {

‎website/src/types/markdown.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ type CompanyList = {
3535
export type Frontmatter = {
3636
title: string;
3737
subTitle?: string;
38+
betaText?: string;
39+
mobileText?: string;
3840
features?: FeatureList[];
3941
boosters?: BoosterList[];
4042
stepList?: StepList[];

0 commit comments

Comments
 (0)