diff --git a/public/android-chrome-192x192.png b/public/android-chrome-192x192.png index 3f7ede6..357dd3d 100644 Binary files a/public/android-chrome-192x192.png and b/public/android-chrome-192x192.png differ diff --git a/public/android-chrome-512x512.png b/public/android-chrome-512x512.png index 585d616..fed79e5 100644 Binary files a/public/android-chrome-512x512.png and b/public/android-chrome-512x512.png differ diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png index 630db55..3b8305d 100644 Binary files a/public/apple-touch-icon.png and b/public/apple-touch-icon.png differ diff --git a/public/index.html b/public/index.html index 1c66b4c..d68ed44 100644 --- a/public/index.html +++ b/public/index.html @@ -1,5 +1,5 @@ - + @@ -13,10 +13,10 @@ - + - Expenses + Haushaltsbuch diff --git a/public/manifest.json b/public/manifest.json index 654da71..6243266 100644 --- a/public/manifest.json +++ b/public/manifest.json @@ -1,6 +1,6 @@ { - "short_name": "Expenses", - "name": "Expense Manager", + "short_name": "Haushaltsbuch", + "name": "Haushaltsbuch", "icons": [ { "src": "/android-chrome-192x192.png", @@ -13,8 +13,8 @@ "type": "image/png" } ], - "theme_color": "#50d29d", - "background_color": "#50d29d", + "theme_color": "#55b223", + "background_color": "#55b223", "display": "standalone", "start_url": "." } \ No newline at end of file diff --git a/src/App.css b/src/App.css index 4add029..7ab7d06 100644 --- a/src/App.css +++ b/src/App.css @@ -5,7 +5,7 @@ } header.mdc-toolbar { - background-color: #50d29d; + background-color: #55b223; } button.mdc-toolbar__icon { display: inline-block; diff --git a/src/App.js b/src/App.js index a91af1b..f9bf512 100644 --- a/src/App.js +++ b/src/App.js @@ -1,6 +1,6 @@ -import React, { Component } from "react"; -import { ExpenseList, ExpenseForm, LoadingBar } from "./components/index"; -import { MDCSnackbar } from "@material/snackbar/dist/mdc.snackbar.js"; +import React, {Component} from "react"; +import {ExpenseList, ExpenseForm, LoadingBar} from "./components/index"; +import {MDCSnackbar} from "@material/snackbar/dist/mdc.snackbar.js"; import "@material/fab/dist/mdc.fab.css"; import "@material/button/dist/mdc.button.css"; @@ -72,40 +72,40 @@ class App extends Component { } signedInChanged = (signedIn) => { - this.setState({ signedIn: signedIn }); + this.setState({signedIn: signedIn}); if (this.state.signedIn) { this.load(); } } handleExpenseSubmit = () => { - this.setState({ processing: true, showExpenseForm: false }); + this.setState({processing: true, showExpenseForm: false}); const submitAction = (this.state.expense.id ? this.update : this.append).bind(this); submitAction(this.state.expense).then( response => { this.snackbar.show({ - message: `Expense ${this.state.expense.id ? "updated" : "added"}!` + message: `Ausgabe ${this.state.expense.id ? "aktualisiert" : "hinzugefügt"}!` }); this.load(); }, response => { - console.error("Something went wrong"); + console.error("Ausgabe konnte nicht gespeichert werden!"); console.error(response); - this.setState({ loading: false }); + this.setState({loading: false}); } ); } handleExpenseChange = (attribute, value) => { this.setState({ - expense: Object.assign({}, this.state.expense, { [attribute]: value }) + expense: Object.assign({}, this.state.expense, {[attribute]: value}) }); } handleExpenseDelete = (expense) => { - this.setState({ processing: true, showExpenseForm: false }); + this.setState({processing: true, showExpenseForm: false}); const expenseRow = expense.id.substring(10); window.gapi.client.sheets.spreadsheets .batchUpdate({ @@ -127,23 +127,23 @@ class App extends Component { }) .then( response => { - this.snackbar.show({ message: "Expense deleted!" }); + this.snackbar.show({message: "Ausgabe entfernt!"}); this.load(); }, response => { - console.error("Something went wrong"); + console.error("Ausgabe konnte nicht entfernt werden!"); console.error(response); - this.setState({ loading: false }); + this.setState({loading: false}); } ); } handleExpenseSelect = (expense) => { - this.setState({ expense: expense, showExpenseForm: true }); + this.setState({expense: expense, showExpenseForm: true}); } handleExpenseCancel = () => { - this.setState({ showExpenseForm: false }); + this.setState({showExpenseForm: false}); } onExpenseNew() { @@ -156,8 +156,8 @@ class App extends Component { date: `${now.getFullYear()}-${now.getMonth() < 9 ? "0" + (now.getMonth() + 1) : now.getMonth() + 1}-${now.getDate() < 10 - ? "0" + now.getDate() - : now.getDate()}`, + ? "0" + now.getDate() + : now.getDate()}`, category: this.state.categories[0], account: this.state.accounts[0] } @@ -246,7 +246,7 @@ class App extends Component {
- Expenses + Haushaltsrechner
-

This month you've spent:

+

Ausgaben dieses Monat:

{this.state.currentMonth}

- Previous month: {this.state.previousMonth} + Vorheriges Monat: {this.state.previousMonth}
- +
@@ -130,7 +130,7 @@ class ExpenseForm extends Component { onChange={this.handleInputChange} type="text" /> - + @@ -144,7 +144,7 @@ class ExpenseForm extends Component { type="date" required /> - + @@ -166,7 +166,7 @@ class ExpenseForm extends Component { {this.props.expense.id && @@ -174,13 +174,13 @@ class ExpenseForm extends Component { type="button" className="mdc-button" onClick={() => this.dialog.show()} - value="Delete" + value="Löschen" />} this.props.onCancel()} - value="Close" + value="Schliessen" /> diff --git a/src/components/expense-list/ExpenseDetail.js b/src/components/expense-list/ExpenseDetail.js index 2db7723..5baad94 100644 --- a/src/components/expense-list/ExpenseDetail.js +++ b/src/components/expense-list/ExpenseDetail.js @@ -1,10 +1,10 @@ -import React, { Component } from "react"; +import React, {Component} from "react"; import ExpenseIcon from "./ExpenseIcon"; export default class ExpenseDetail extends Component { formatDate(date) { const dateParts = date.split("-"); - return `${dateParts[2]}/${dateParts[1]}/${dateParts[0]}`; + return `${dateParts[2]}.${dateParts[1]}.${dateParts[0]}`; } render() { diff --git a/src/components/expense-list/ExpenseList.css b/src/components/expense-list/ExpenseList.css index e85e2d9..f1a559b 100644 --- a/src/components/expense-list/ExpenseList.css +++ b/src/components/expense-list/ExpenseList.css @@ -15,23 +15,20 @@ .Lebensmittel { background: rgb(85, 178, 35); } -.Restaurant { - background: rgb(242, 60, 0); -} .Auto, .Transport, .Tanken { - background: rgb(166, 2, 221); + background: rgb(242, 60, 0); } .Hobbies { - background: rgb(38, 94, 4); + background: rgb(39, 70, 211); } .Kleidung, .Shopping, Drogerie { background: rgb(0, 183, 224); } -.Übernachtung { +.Übernachtung, .Restaurant { background: rgb(214, 214, 0); } .Gesundheit { - background: rgb(252, 169, 5); + background: rgb(242, 60, 0); } .Unterhaltung { background: rgb(245, 151, 29);