Skip to content

Commit

Permalink
Final tweaks to the UI
Browse files Browse the repository at this point in the history
  • Loading branch information
alexanderwe committed Nov 4, 2017
1 parent 98fa92a commit 266a5dc
Show file tree
Hide file tree
Showing 14 changed files with 25 additions and 28 deletions.
Binary file modified .github/img/img1.png
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 .github/img/img2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ This project was only possible with these awesome technologies !

# Issues

If you find any bugs or issues with this application feel free to report them in the [issue section](https://github.com/alexanderwe/checksum-validator/issues)
If you find any bugs or issues with this application feel free to report them in the [issue section](https://github.com/alexanderwe/checksum-validator/issues).
In case you want to do some local debugging, open the logs via `Help --> Open Logs` and take a look at it.


# License
Expand Down
2 changes: 1 addition & 1 deletion app/main/src/TouchBarBuilder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default class TouchBarBuilder {
public build(): TouchBar {
const check: Electron.TouchBarConstructorOptions = {
items: [new TouchBarButton({
backgroundColor: '#00c4a7',
backgroundColor: '#8b4d93',
click: () => {
this.ipcHandler.initCheck();
},
Expand Down
2 changes: 1 addition & 1 deletion app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "checksum-validator",
"version": "0.1.2",
"version": "0.1.3",
"description": "Small Electron application to validate checksums.",
"main": "main/build/main.js",
"author": "Alexander Weiss",
Expand Down
6 changes: 3 additions & 3 deletions app/renderer/src/components/Checksum.component.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ipcRenderer } from 'electron';
import * as React from 'react'; // ES6
import Transition from 'react-transition-group/Transition';
const { ipcRenderer } = require('electron');

import Button from './bulma/element/Button.component';
import Icon from './bulma/element/Icon.component';
Expand Down Expand Up @@ -119,7 +119,7 @@ class ChecksumValidator extends React.Component<any, IChecksumValidatorState> {
});
}

public closeNotification = () => {
public closeNotification = (): any => {
this.setState({
notificationOpen: false,
});
Expand Down Expand Up @@ -200,7 +200,7 @@ class ChecksumValidator extends React.Component<any, IChecksumValidatorState> {
</span>
<Icon name={'nc-security'} isSmall isLeft />
</Form.Field>
<Button isPrimary onClick={() => this.check()} icon={this.state.loading ? <Icon name={'nc-dots'} isSmall spin style={{ marginRight: '10px' }} /> : null}>
<Button isOutLined isPrimary onClick={() => this.check()} icon={this.state.loading ? <Icon name={'nc-dots'} isSmall spin style={{ marginRight: '10px' }} /> : null}>
Check
</Button>
</Section>
Expand Down
17 changes: 8 additions & 9 deletions app/renderer/src/styles/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@
@import '../../../node_modules/bulma/sass/utilities/initial-variables';

// Customization
$green: #4da167;
$red: #db473f;
$primary: #08605f;
$green: #62c462;
$red: #ee5f5b;
$yellow: #fff457;
$orange: #f89406;
$primary: #8b4d93;

// Base

Expand All @@ -16,9 +18,8 @@ body {
input {
-webkit-app-region: no-drag;
}

.error {
color: #fe3b61;
::-webkit-scrollbar {
display: none;
}

// Layout
Expand All @@ -32,9 +33,7 @@ input {
.notification {
border-radius: 0px !important;
.delete {
&:hover {
cursor: pointer;
}
cursor: pointer;
}
}

Expand Down
Binary file modified build/icon.icns
Binary file not shown.
Binary file modified build/icon.png
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 build/icon.sketch
Binary file not shown.
5 changes: 3 additions & 2 deletions build/icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 0 additions & 3 deletions dev-app-update.yml

This file was deleted.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "checksum-validator",
"version": "0.1.2",
"version": "0.1.3",
"description": "Small Electron application to validate checksum.",
"main": "main.js",
"scripts": {
Expand Down
13 changes: 6 additions & 7 deletions webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
const ExtractTextPlugin = require('extract-text-webpack-plugin');
const DashboardPlugin = require('webpack-dashboard/plugin');
var CopyWebpackPlugin = require('copy-webpack-plugin');
var nodeExternals = require('webpack-node-externals');
var path = require('path');
const CopyWebpackPlugin = require('copy-webpack-plugin');
const nodeExternals = require('webpack-node-externals');
const path = require('path');

// TODO: check replacement of loader with use
var config = {
let config = {
module: {}
};

var rendererConfig = Object.assign({}, config, {
let rendererConfig = Object.assign({}, config, {
watch: true,
target: 'electron-renderer',
entry: './app/renderer/src/entry.tsx',
Expand Down Expand Up @@ -75,7 +74,7 @@ var rendererConfig = Object.assign({}, config, {
]
});

var mainConfig = Object.assign({}, config, {
let mainConfig = Object.assign({}, config, {
entry: './app/main/src/main.ts',
target: 'electron-main',
node: {
Expand Down

0 comments on commit 266a5dc

Please sign in to comment.