Skip to content

Commit a7d9216

Browse files
quentinguideequentinguidee
committed
Prepare website for Omega 2.0 with minor redesign
1 parent a8d18d6 commit a7d9216

25 files changed

+44197
-14140
lines changed

‎package-lock.json

+44,040-14,089
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
{
22
"name": "omega-website",
3-
"version": "3.0.0-dev",
3+
"version": "4.0.0",
44
"private": true,
55
"dependencies": {
6-
"@octokit/core": "^3.4.0",
7-
"@testing-library/jest-dom": "^4.2.4",
8-
"@testing-library/react": "^9.5.0",
9-
"@testing-library/user-event": "^7.2.1",
10-
"@types/jest": "^26.0.22",
11-
"@types/node": "^14.14.37",
12-
"@types/react": "^17.0.3",
13-
"@types/react-dom": "^17.0.3",
6+
"@octokit/core": "^3.5.1",
7+
"@testing-library/jest-dom": "^5.16.2",
8+
"@testing-library/react": "^12.1.3",
9+
"@testing-library/user-event": "^13.5.0",
10+
"@types/jest": "^27.4.1",
11+
"@types/node": "^17.0.21",
12+
"@types/react": "^17.0.39",
13+
"@types/react-dom": "^17.0.11",
1414
"classnames": "^2.3.1",
1515
"firebase": "^7.17.2",
16-
"jszip": "^3.5.0",
16+
"jszip": "^3.7.1",
1717
"monaco-editor": "^0.20.0",
1818
"monaco-editor-webpack-plugin": "^1.9.1",
19-
"node-sass": "^4.14.1",
19+
"node-sass": "^7.0.1",
2020
"numworks.js": "^1.2.1",
21-
"react": "^16.14.0",
22-
"react-dom": "^16.14.0",
23-
"react-intl": "^5.17.6",
21+
"react": "^17.0.2",
22+
"react-dom": "^17.0.2",
23+
"react-intl": "^5.24.6",
2424
"react-intl-cra": "^0.3.4",
2525
"react-intl-translations-manager": "^5.0.3",
2626
"react-monaco-editor": "^0.34.0",
2727
"react-resize-detector": "^4.2.3",
2828
"react-reveal": "^1.2.2",
2929
"react-router-dom": "^5.2.0",
30-
"react-scripts": "^3.4.1",
31-
"typescript": "^4.2.4"
30+
"react-scripts": "^5.0.0",
31+
"typescript": "^4.5.5"
3232
},
3333
"scripts": {
3434
"start": "react-app-rewired start",
@@ -55,6 +55,6 @@
5555
},
5656
"devDependencies": {
5757
"@types/react-router-dom": "^5.1.7",
58-
"react-app-rewired": "^2.1.6"
58+
"react-app-rewired": "^2.2.1"
5959
}
6060
}

‎src/App.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ function App() {
3737
initLang = "en";
3838
}
3939

40-
const [theme, setTheme] = useState(getCookie("theme") || "light");
40+
const [theme, setTheme] = useState(getCookie("theme") || "dark");
4141
const [lang, setLang] = useState(initLang);
4242
// @ts-ignore
4343
const [messages, setMessages] = useState(translations[initLang]);

‎src/components/button/sass/Button.module.sass

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
.button
44
background-color: #e0e0e0
55
color: #303030
6-
font-size: 13px
6+
font-size: 12px
77
cursor: pointer
88
font-weight: 700
99
padding: 9px 12px
@@ -89,7 +89,7 @@
8989
& .button
9090
display: inline-block
9191
border-radius: 5px
92-
font-size: 13px
92+
font-size: 12px
9393
transition: all 0.15s
9494
text-transform: uppercase
9595
background-color: transparent

‎src/components/downloads/Downloads.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export class Downloads extends Component {
2929
<div
3030
className="download"
3131
style={{
32-
backgroundImage: `url(https://unsplash.com/photos/Ceuh97A6OYM/download?force=true&w=1920)`,
32+
backgroundImage: `url(https://unsplash.com/photos/bMkRxaVMvj4/download?ixid=MnwxMjA3fDB8MXx0b3BpY3x8Ym84alFLVGFFMFl8fHx8fDJ8fDE2NDYwNzYyMjg&force=true&w=1920)`,
3333
}}
3434
>
3535
<h2 className="download__title">

‎src/components/featurecard/sass/FeatureCard.module.sass

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343

4444
.description
4545
color: $color-secondary-text
46-
font-size: 16px
47-
line-height: 1.5
46+
font-size: 15px
47+
line-height: 1.7
4848
margin: 32px
4949
margin-top: 24px
5050

‎src/components/footer/sass/Footer.module.sass

+5-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
list-style-type: none
2424
border-radius: 12px
2525
transition: all 0.1s
26-
padding: 12px 16px
26+
padding: 12px 20px
2727
cursor: pointer
2828
text-decoration: none
2929
color: $color-secondary-text
@@ -43,7 +43,7 @@
4343
margin-left: 6px
4444

4545
&Title
46-
font-size: 16px
46+
font-size: 15px
4747
font-weight: 500
4848

4949
&Stats
@@ -53,9 +53,12 @@
5353
margin-right: 12px
5454

5555
&Icon
56+
padding-bottom: 1px
5657
vertical-align: middle
5758

5859
&Label
60+
font-size: 14px
61+
margin-left: 4px
5962
vertical-align: middle
6063

6164
&:hover

‎src/components/releasecard/sass/ReleaseCard.module.sass

+4-3
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,14 @@
5151
margin: 20px 0
5252

5353
&Element
54-
line-height: 1.2
54+
line-height: 1.3
5555
margin: 8px
56+
font-size: 15px
5657

5758
&Tag
5859
width: 40px
5960
text-align: center
60-
font-size: 14px
61+
font-size: 13px
6162
line-height: 26px
6263
font-weight: 600
6364
display: inline-block
@@ -78,7 +79,7 @@
7879
&Content
7980
width: calc(100% - 100px)
8081
display: inline-block
81-
margin-left: 12px
82+
margin-left: 16px
8283
vertical-align: top
8384
margin-top: 3px
8485

‎src/firmware/firmwares.tsx

+25
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,31 @@ export type Language = "en" | "fr" | "nl" | "pt" | "it" | "de" | "es" | "hu";
2828
export const releases: Releases = {
2929
latest: "O1.23.0-E15",
3030
firmwares: [
31+
{
32+
name: "O2.0.0-E15",
33+
commit: "",
34+
changelog: [
35+
"New: Bootloader !",
36+
"New: For the bootloader, press Reset+4 to boot the DFU stack and see the installed OSes",
37+
"New: For the bootloader, press Reset+1 to boot Slot A and Reset+2 to boot Slot B",
38+
"New: For the bootloader, save last booted slot in flash",
39+
"New: Numworks Workshop compatibility",
40+
"Change: Reduced python and external heap from 100k to 99k",
41+
"Fix: Web simulator builds again",
42+
],
43+
compatibility: {
44+
N0110: true,
45+
N0100: true,
46+
web: true,
47+
android: true,
48+
"3ds": false,
49+
},
50+
available: true,
51+
setname: true,
52+
languages: {
53+
"0100": ["en", "fr", "nl", "pt", "it", "de", "es", "hu"],
54+
}
55+
},
3156
{
3257
name: "O1.23.0-E15",
3358
commit: "b93c9187b93d76fbe206b576208ec24ea146b7e3",

‎src/i18n/locales/de.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"home.features.symbolic.description": "Die symbolische Berechnung wurde in Version 11.2 aus Epsilon entfernt. Omega führt diese Funktion wieder ein.",
4242
"home.features.symbolic.name": "Symbolische Berechnung",
4343
"home.head.description": "Omega ist eine Abzweigung von Numworks 'Epsilon, dem Betriebssystem, das auf dem Taschenrechner ausgeführt wird und viele Funktionen bietet. Omega ist für Personen gedacht, die Funktionen zum Taschenrechner hinzufügen möchten, dies jedoch nicht können, da sie von Numworks abgelehnt wurden (aus Gründen, die zu 100% verständlich sind!).",
44-
"home.head.subtitle": "Die nächste Entwicklung von Epsilon.",
44+
"home.head.subtitle": "Kompatibel mit ",
4545
"home.head.title": "Omega",
4646
"home.head.tryit": "VERSUCHEN SIE ES ONLINE",
4747
"installer.agree": "GENAU",

‎src/i18n/locales/en.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"home.features.and-more.android": "Android simulator with script backup",
2323
"home.features.and-more.constants": "Physical and chemical constants",
2424
"home.features.and-more.hungarian": "Hungarian support",
25-
"home.features.and-more.python": "100 KB Python heap (instead of a 32 KB)",
25+
"home.features.and-more.python": "99 KB Python heap (instead of a 32 KB)",
2626
"home.features.and-more.mult-symbol": "Choice of multiplication symbol",
2727
"home.features.and-more.os": "Open method and os module",
2828
"home.features.atom.description": "Inspired by the TI83PCE's periodic table app, Omega's periodic table is clean and simple to use.",
@@ -40,7 +40,7 @@
4040
"home.features.theme-engine-omega-dark": "Omega dark theme",
4141
"home.features.theme-engine-omega-light": "Omega light theme",
4242
"home.head.description": "Omega is a fork of Numworks' Epsilon, the OS that runs on their calculator, which brings many features to it. Omega is for the people who want to add features to the calculator, but cannot because they have been rejected by Numworks (for reasons that are 100% understandable!).",
43-
"home.head.subtitle": "The next evolution of Epsilon.",
43+
"home.head.subtitle": "Compatible with ",
4444
"home.head.title": "Omega",
4545
"home.head.tryit": "TRY IT ONLINE",
4646
"home.install": "Omega installation",

‎src/i18n/locales/fr.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"home.features.and-more.android": "Simulateur Android avec sauvegarde des scripts",
2323
"home.features.and-more.constants": "Constantes physiques et chimiques",
2424
"home.features.and-more.hungarian": "Support du hongrois",
25-
"home.features.and-more.python": "100 KB de heap Python (au lieu de 32 KB)",
25+
"home.features.and-more.python": "99 KB de heap Python (au lieu de 32 KB)",
2626
"home.features.and-more.mult-symbol": "Choix du symbole de multiplication",
2727
"home.features.and-more.os": "Méthode open et module os",
2828
"home.features.atom.description": "Inspiré par le tableau périodique de la TI83PCE, le tableau périodique d'Omega est propre et simple à utiliser.",
@@ -40,7 +40,7 @@
4040
"home.features.theme-engine-omega-dark": "Thème sombre Omega",
4141
"home.features.theme-engine-omega-light": "Thème clair Omega",
4242
"home.head.description": "Omega est un fork d'Epsilon, l'OS utilisé sur les calculatrices Numworks, ajoutant de nombreuses fonctionnalités. Omega est destiné aux personnes qui souhaitent ajouter des fonctionnalités à la calculatrice, mais ne le peuvent pas car elles ont été rejetées par Numworks (pour des raisons totalement compréhensibles!).",
43-
"home.head.subtitle": "La prochaine évolution d'Epsilon.",
43+
"home.head.subtitle": "Compatible avec ",
4444
"home.head.title": "Omega",
4545
"home.head.tryit": "ESSAYER EN LIGNE",
4646
"home.install": "Installation d'Omega",

‎src/i18n/locales/it.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"home.features.symbolic.description": "Il calcolo simbolico è stato rimosso da Epsilon alla versione 11.2. Omega ripropone questa funzione.",
4242
"home.features.symbolic.name": "Calcolo simbolico",
4343
"home.head.description": "Omega è un fork d'Epsilon, l'OS usato sulle calcolatrici Numworks, aggiungendo numerose funzioni. Omega è destinata alle persone che desiderano aggiungere delle funzioni alla calcolatrice, ma non possono perché queste sono state rifiutate da Numworks (per delle ragioni totalmente comprensibili!).",
44-
"home.head.subtitle": "La prossima evoluzione di Epsilon.",
44+
"home.head.subtitle": "Compatibile con ",
4545
"home.head.title": "Omega",
4646
"home.head.tryit": "PROVARE ONLINE",
4747
"installer.agree": "ACCETTO",

‎src/i18n/messages/messages.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@
269269
},
270270
{
271271
"id": "home.features.and-more.python",
272-
"defaultMessage": "100 KB Python heap (instead of a 32 KB)",
272+
"defaultMessage": "99 KB Python heap (instead of a 32 KB)",
273273
"filepath": "src/pages/Home.js"
274274
},
275275
{

‎src/img/bootloader-dark.png

142 KB
Loading

‎src/img/bootloader-light.png

67.6 KB
Loading

‎src/img/logo-neon.png

127 KB
Loading

‎src/img/phi-home.png

118 KB
Loading

‎src/img/phi.png

3.56 MB
Loading

‎src/img/shrug.png

5.17 KB
Loading

‎src/pages/Home.tsx

+73-5
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ import ImgRpn from "../img/rpn.png";
77
import ImgRpnDark from "../img/rpn-dark.png";
88
import Img3ds from "../img/3ds.png";
99
import Img3dsDark from "../img/3ds-dark.png";
10+
import ImgBootloader from "../img/bootloader-light.png"
11+
import ImgBootloaderDark from "../img/bootloader-dark.png"
12+
import ImgPhi from "../img/phi-home.png"
13+
import OmegaNeonLogo from "../img/logo-neon.png"
14+
import ShrugIcon from "../img/shrug.png"
1015
import Button from "../components/button/Button";
1116
import { FormattedMessage } from "react-intl";
1217
import Fade from "react-reveal";
@@ -25,6 +30,10 @@ type HomeProps = {
2530
theme: string;
2631
};
2732

33+
function PhiURL() {
34+
return <a className="phi-link" href="https://phi.getomega.dev">Phi</a>;
35+
}
36+
2837
export default class Home extends Component<HomeProps> {
2938
constructor(props: HomeProps) {
3039
super(props);
@@ -38,20 +47,25 @@ export default class Home extends Component<HomeProps> {
3847
<div
3948
className="project-description"
4049
style={{
41-
backgroundImage: `url(https://unsplash.com/photos/TOmVNJZN1AA/download?force=true&w=1920)`,
50+
backgroundImage: `url(https://unsplash.com/photos/bMkRxaVMvj4/download?ixid=MnwxMjA3fDB8MXx0b3BpY3x8Ym84alFLVGFFMFl8fHx8fDJ8fDE2NDYwNzYyMjg&force=true&w=1920)`
4251
}}
4352
>
4453
<h1 className="project-description__title">
45-
<FormattedMessage
54+
{/* <FormattedMessage
4655
id="home.head.title"
4756
defaultMessage="Omega"
48-
/>
57+
/> */}
58+
<img alt="Omega 2.0" src={OmegaNeonLogo} height="72" />
4959
</h1>
5060
<h2 className="project-description__subtitle">
5161
<FormattedMessage
5262
id="home.head.subtitle"
53-
defaultMessage="The next evolution of Epsilon."
63+
defaultMessage="Compatible with "
5464
/>
65+
<PhiURL />.
66+
</h2>
67+
<h2 className="project-description__subtitle">
68+
<img alt="Omega 2.0" src={ShrugIcon} height="24" />
5569
</h2>
5670
<Button
5771
to="/simulator"
@@ -75,6 +89,60 @@ export default class Home extends Component<HomeProps> {
7589

7690
<div style={{ height: "16px" }}></div>
7791

92+
93+
<Fade>
94+
<FeatureCardRow className="featureCardRow">
95+
<FeatureCardColumn>
96+
<FeatureCard>
97+
<FeatureCardTitle>
98+
{/* <FormattedMessage
99+
id="home.features.symbolic.name"
100+
defaultMessage="Symbolic computation"
101+
/> */}
102+
Bootloader
103+
</FeatureCardTitle>
104+
<FeatureCardDescription>
105+
Omega integrates a new Bootloader. It allows you to boot multiple OS from different slots.
106+
{/* <FormattedMessage
107+
id="home.features.symbolic.description"
108+
defaultMessage="Symbolic computation was removed from Epsilon in version 11.2. Omega reintroduces that feature."
109+
/> */}
110+
</FeatureCardDescription>
111+
<FeatureCardImage
112+
src={
113+
this.props.theme === "light"
114+
? ImgBootloader
115+
: ImgBootloaderDark
116+
}
117+
alt="Symbolic Calculation"
118+
/>
119+
</FeatureCard>
120+
</FeatureCardColumn>
121+
<FeatureCardColumn>
122+
<FeatureCard>
123+
<FeatureCardTitle>
124+
{/* <FormattedMessage
125+
id="home.features.symbolic.name"
126+
defaultMessage="Symbolic computation"
127+
/> */}
128+
Compatible with Phi
129+
</FeatureCardTitle>
130+
<FeatureCardDescription>
131+
{/* <FormattedMessage
132+
id="home.features.symbolic.description"
133+
defaultMessage="Symbolic computation was removed from Epsilon in version 11.2. Omega reintroduces that feature."
134+
/> */}
135+
<PhiURL /> is a tool that unlocks your calculator after an Epsilon 16+ update.
136+
</FeatureCardDescription>
137+
<FeatureCardImage
138+
src={ImgPhi}
139+
alt="Symbolic Calculation"
140+
/>
141+
</FeatureCard>
142+
</FeatureCardColumn>
143+
</FeatureCardRow>
144+
</Fade>
145+
78146
<Fade>
79147
<FeatureCardRow className="featureCardRow">
80148
<FeatureCardColumn>
@@ -281,7 +349,7 @@ export default class Home extends Component<HomeProps> {
281349
</li>
282350
<li>
283351
<FormattedMessage
284-
defaultMessage="100 KB Python heap (instead of a 32 KB)"
352+
defaultMessage="99 KB Python heap (instead of a 32 KB)"
285353
id="home.features.and-more.python"
286354
/>
287355
</li>

0 commit comments

Comments
 (0)