Skip to content

Commit 36cbc0e

Browse files
committed
* Simplified home page
* Simplified settings page * Window should be smaller * Added labels to certain input fields
1 parent 7054965 commit 36cbc0e

File tree

17 files changed

+61
-58
lines changed

17 files changed

+61
-58
lines changed

public/electron.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ const createWindow = () => {
1313
},
1414
frame: false,
1515
title: "DeadHash",
16-
width: 980,
17-
height: 550,
16+
width: 960,
17+
height: 520,
1818
icon: path.join(__dirname, '../build/Icon-512x512.png')
1919
});
2020

src/components/Theme/index.js

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,24 @@ import React from "react";
22
import {makeStyles} from '@material-ui/core/styles';
33
import Card from '@material-ui/core/Card';
44
import CardActionArea from '@material-ui/core/CardActionArea';
5-
import CardActions from '@material-ui/core/CardActions';
65
import CardContent from '@material-ui/core/CardContent';
76
import CardMedia from '@material-ui/core/CardMedia';
8-
import Button from '@material-ui/core/Button';
97
import Typography from '@material-ui/core/Typography';
108
import blank from "./blank.png";
119

1210
const useStyles = makeStyles({
1311
media: {
14-
height: 80,
12+
height: 60,
1513
},
1614
});
1715

18-
const Theme = ({title, description, color, selected, actionText, onAction}) => {
16+
const Theme = ({title, description, color, selected, onAction}) => {
1917

2018
const classes = useStyles();
21-
const variant = selected ? "contained" : "text";
2219
const action = onAction ? onAction : null;
2320

2421
return (
25-
<Card>
22+
<Card raised={!selected}>
2623
<CardActionArea onClick={action}>
2724
<CardMedia
2825
className={classes.media}
@@ -39,11 +36,6 @@ const Theme = ({title, description, color, selected, actionText, onAction}) => {
3936
</Typography>
4037
</CardContent>
4138
</CardActionArea>
42-
<CardActions>
43-
<Button size="small" color="primary" variant={variant} disabled={selected} onClick={action}>
44-
{actionText}
45-
</Button>
46-
</CardActions>
4739
</Card>
4840
)
4941
};

src/languages/de_DE.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@ const de_DE = () => {
7070
exit: "Schließen",
7171
darkTheme: "Dunkel",
7272
darkThemeDescription: "Schont die Augen.",
73-
export: "Export"
73+
export: "Export",
74+
yourTextHere: "Dein Text hier",
75+
filePath: "Dateipfad"
7476
}
7577
};
7678

src/languages/en_US.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@ const en_US = () => {
7070
exit: "Exit",
7171
darkTheme: "Dark",
7272
darkThemeDescription: "Easy on the eyes.",
73-
export: "Export"
73+
export: "Export",
74+
yourTextHere: "Your text here",
75+
filePath: "File path"
7476
}
7577
};
7678

src/languages/es_ES.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@ const es_ES = () => {
7070
exit: "Salida",
7171
darkTheme: "Oscuro",
7272
darkThemeDescription: "Fácil para los ojos.",
73-
export: "Exportar"
73+
export: "Exportar",
74+
yourTextHere: "Tu texto aqui",
75+
filePath: "Ruta de archivo"
7476
}
7577
};
7678

src/languages/fr_FR.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@ const fr_FR = () => {
7070
exit: "Fermer",
7171
darkTheme: "Foncé",
7272
darkThemeDescription: "Facile sur les yeux.",
73-
export: "Exporter"
73+
export: "Exporter",
74+
yourTextHere: "Votre texte ici",
75+
filePath: "Chemin du fichier"
7476
}
7577
};
7678

src/languages/it_IT.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@ const it_IT = () => {
7070
exit: "Uscire",
7171
darkTheme: "Buio",
7272
darkThemeDescription: "Facile per gli occhi.",
73-
export: "Esportare"
73+
export: "Esportare",
74+
yourTextHere: "Il tuo testo qui",
75+
filePath: "Percorso del file"
7476
}
7577
};
7678

src/languages/jp_JP.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@ const jp_JP = () => {
7070
exit: "出口",
7171
darkTheme: "闇",
7272
darkThemeDescription: "目に優しい。",
73-
export: "書き出す"
73+
export: "書き出す",
74+
yourTextHere: "ここにあなたのテキスト",
75+
filePath: "ファイルパス"
7476
}
7577
};
7678

src/languages/nl_NL.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@ const nl_NL = () => {
7070
exit: "Sluiten",
7171
darkTheme: "Donker",
7272
darkThemeDescription: "Makkelijk voor de ogen.",
73-
export: "Exporteren"
73+
export: "Exporteren",
74+
yourTextHere: "Jouw text hier",
75+
filePath: "Bestandspad"
7476
}
7577
};
7678

src/languages/pt_PT.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@ const pt_PT = () => {
7070
exit: "Saída",
7171
darkTheme: "Sombrio",
7272
darkThemeDescription: "Fácil para os olhos.",
73-
export: "Exportação"
73+
export: "Exportação",
74+
yourTextHere: "Seu texto aqui",
75+
filePath: "Caminho de arquivo"
7476
}
7577
};
7678

0 commit comments

Comments
 (0)