Skip to content
This repository was archived by the owner on Jan 19, 2023. It is now read-only.

Commit e3126f3

Browse files
marwan38marwan38
committed
minor changes
1 parent cdeb043 commit e3126f3

File tree

9 files changed

+70
-28
lines changed

9 files changed

+70
-28
lines changed

‎app/components/FileUploader.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import React, { useCallback, useState } from 'react';
33

44
import { useDropzone } from 'react-dropzone';
5-
import { Button, Elevation, Card } from '@blueprintjs/core';
5+
import { Button } from '@blueprintjs/core';
66
import { returnFileMeta } from '../utils';
77

88
type Props = {

‎app/components/Home.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import Toaster from './Toaster';
1212

1313
// import { Link } from 'react-router-dom';
1414
// import routes from '../constants/routes.json';
15-
import styles from './Home.css';
15+
// import styles from './Home.css';
1616

1717
export default function Home() {
1818
const [files, setFiles] = useState();
@@ -26,7 +26,7 @@ export default function Home() {
2626

2727
const filesAvailable = files && files.length > 0;
2828
return (
29-
<div className={styles.container}>
29+
<div>
3030
<FileUploader onUpload={setFiles} style={{ marginBottom: 20 }} />
3131
<InputGroup
3232
placeholder="Output path"

‎app/components/Progress.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ function Progress({ style = {} }: Props) {
3636
intent={value < 1 ? Intent.PRIMARY : Intent.SUCCESS}
3737
value={value}
3838
stripes={value !== 1}
39-
className={style.progressBar}
39+
className={styles.progressBar}
4040
/>
4141
</div>
4242
);

‎app/components/progress.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
.progressBar {
2-
background: rgba(255, 255, 255, 0.8);
2+
background: rgba(255, 255, 255, 0.7) !important;
33
}

‎app/events.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ export const Events = {
44
Compare: 'execute:compare',
55
GetPath: 'get-path',
66
Message: 'deliver-message',
7-
Progress: 'progress-log'
7+
Progress: 'progress-log',
8+
Version: 'version',
89
};

‎app/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"name": "johns-xlsx-helper",
33
"productName": "johns-xlsx-helper",
4-
"version": "0.1.0",
4+
"version": "0.1.3",
55
"description": "Utility built for John to help with XLSX stuff.",
66
"main": "./main.prod.js",
77
"author": {
8-
"name": "Electron React Boilerplate Maintainers",
9-
"email": "electronreactboilerplate@gmail.com",
10-
"url": "https://github.com/electron-react-boilerplate"
8+
"name": "Marwan Fikrat",
9+
"email": "marwan.mm@live.com",
10+
"url": "https://github.com/marwan38"
1111
},
1212
"scripts": {
1313
"electron-rebuild": "node -r ../internals/scripts/BabelRegister.js ../internals/scripts/ElectronRebuild.js",

‎configs/webpack.config.renderer.dev.babel.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import chalk from 'chalk';
1212
import merge from 'webpack-merge';
1313
import { spawn, execSync } from 'child_process';
1414
import { TypedCssModulesPlugin } from 'typed-css-modules-webpack-plugin';
15+
import ThreadsPlugin from 'threads-plugin';
1516
import baseConfig from './webpack.config.base';
1617
import CheckNodeEnv from '../internals/scripts/CheckNodeEnv';
1718

@@ -232,7 +233,9 @@ export default merge.smart(baseConfig, {
232233

233234
new webpack.LoaderOptionsPlugin({
234235
debug: true
235-
})
236+
}),
237+
238+
new ThreadsPlugin()
236239
],
237240

238241
node: {

‎package.json‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"name": "johns-xlsx-helper",
33
"productName": "Johns XLSX Helper",
4-
"version": "0.1.0",
4+
"version": "0.1.3",
55
"description": "Utility built for John to help with XLSX stuff.",
66
"scripts": {
77
"build": "concurrently \"yarn build-main\" \"yarn build-renderer\"",
88
"build-dll": "cross-env NODE_ENV=development webpack --config ./configs/webpack.config.renderer.dev.dll.babel.js --colors",
99
"build-e2e": "cross-env E2E_BUILD=true yarn build",
10-
"build-main": "cross-env NODE_ENV=production webpack --config ./configs/webpack.config.main.prod.babel.js --colors",
11-
"build-renderer": "cross-env NODE_ENV=production webpack --config ./configs/webpack.config.renderer.prod.babel.js --colors",
10+
"build-main": "cross-env NODE_ENV=production DEBUG_PROD=true webpack --config ./configs/webpack.config.main.prod.babel.js --colors",
11+
"build-renderer": "cross-env NODE_ENV=production DEBUG_PROD=true webpack --config ./configs/webpack.config.renderer.prod.babel.js --colors",
1212
"dev": "cross-env START_HOT=1 node -r @babel/register ./internals/scripts/CheckPortInUse.js && cross-env START_HOT=1 yarn start-renderer-dev",
1313
"electron-rebuild": "electron-rebuild --parallel --force --types prod,dev,optional --module-dir app",
1414
"ts": "tsc",
@@ -20,13 +20,13 @@
2020
"package-all": "yarn build && electron-builder build -mwl",
2121
"package-ci": "yarn postinstall && yarn build && electron-builder --publish always",
2222
"package-linux": "yarn build && electron-builder build --linux",
23-
"package-win": "yarn build && electron-builder build --win --x64",
23+
"package-win": "yarn build && electron-builder build --win --x64 -p always",
2424
"postinstall": "node -r @babel/register internals/scripts/CheckNativeDep.js && electron-builder install-app-deps && yarn build-dll && opencollective-postinstall",
2525
"postlint-fix": "prettier --ignore-path .eslintignore --single-quote --write '**/*.{js,jsx,json,html,css,less,scss,yml}'",
2626
"postlint-styles-fix": "prettier --ignore-path .eslintignore --single-quote --write '**/*.{css,scss}'",
2727
"preinstall": "node ./internals/scripts/CheckYarn.js",
2828
"prestart": "yarn build",
29-
"start": "cross-env NODE_ENV=production electron ./app/main.prod.js",
29+
"start": "cross-env NODE_ENV=development DEBUG_PROD=\"true\" electron ./app/main.prod.js",
3030
"start-main-dev": "cross-env START_HOT=1 NODE_ENV=development electron -r ./internals/scripts/BabelRegister ./app/main.dev.ts",
3131
"start-renderer-dev": "cross-env NODE_ENV=development webpack-dev-server --config configs/webpack.config.renderer.dev.babel.js",
3232
"test": "cross-env NODE_ENV=test BABEL_DISABLE_CACHE=1 jest",
@@ -107,10 +107,9 @@
107107
"author": {
108108
"name": "Marwan Fikrat",
109109
"email": "marwan.mm@live.com",
110-
"url": "https://marwan38.github.io"
110+
"url": "https://github.com/marwan38"
111111
},
112-
"contributors": [
113-
],
112+
"contributors": [],
114113
"license": "MIT",
115114
"keywords": [
116115
"electron",
@@ -201,8 +200,8 @@
201200
"cross-spawn": "^7.0.1",
202201
"css-loader": "^3.4.2",
203202
"detect-port": "^1.3.0",
204-
"electron": "7.1.13",
205-
"electron-builder": "^22.2.0",
203+
"electron": "^8.0.1",
204+
"electron-builder": "^22.3.2",
206205
"electron-devtools-installer": "^2.2.4",
207206
"electron-rebuild": "^1.10.0",
208207
"enzyme": "^3.11.0",
@@ -247,6 +246,7 @@
247246
"testcafe": "^1.8.0",
248247
"testcafe-browser-provider-electron": "^0.0.14",
249248
"testcafe-react-selectors": "^4.0.0",
249+
"threads-plugin": "^1.3.0",
250250
"typed-css-modules-webpack-plugin": "^0.1.2",
251251
"typescript": "^3.7.5",
252252
"url-loader": "^3.0.0",
@@ -278,7 +278,9 @@
278278
"react-router-dom": "^5.1.2",
279279
"redux": "^4.0.5",
280280
"redux-thunk": "^2.3.0",
281-
"source-map-support": "^0.5.16"
281+
"source-map-support": "^0.5.16",
282+
"threads": "^1.2.0",
283+
"tiny-worker": "^2.3.0"
282284
},
283285
"devEngines": {
284286
"node": ">=7.x",

‎yarn.lock‎

Lines changed: 42 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3971,7 +3971,7 @@ callsites@^2.0.0:
39713971
resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
39723972
integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=
39733973

3974-
callsites@^3.0.0:
3974+
callsites@^3.0.0, callsites@^3.1.0:
39753975
version "3.1.0"
39763976
resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
39773977
integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
@@ -5658,7 +5658,7 @@ ejs@~2.5.6:
56585658
resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.9.tgz#7ba254582a560d267437109a68354112475b0ce5"
56595659
integrity sha512-GJCAeDBKfREgkBtgrYSf9hQy9kTb3helv0zGdzqhM7iAkW8FA/ZF97VQDbwFiwIT8MQLLOe5VlPZOEvZAqtUAQ==
56605660

5661-
electron-builder@^22.2.0:
5661+
electron-builder@^22.3.2:
56625662
version "22.3.2"
56635663
resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.3.2.tgz#902d150fc0670cb90213262e5e0aa3c4f299ffa4"
56645664
integrity sha512-bDjHfKtA4DapI6qqy4FC18fzLsOJtlSVGBqjSjhrgv+gbcppp3tjR6ASsUX5K64/8L9MGjhRGdfQ7iP78OLx8g==
@@ -5804,10 +5804,10 @@ electron-updater@^4.2.0:
58045804
pako "^1.0.10"
58055805
semver "^6.3.0"
58065806

5807-
electron@7.1.13:
5808-
version "7.1.13"
5809-
resolved "https://registry.yarnpkg.com/electron/-/electron-7.1.13.tgz#f98838de70d74890cf639bbbbbe1f3b4b341ae78"
5810-
integrity sha512-WFfjhAG/B2iVjZcGoQkwkn/Zf1YN3U5Ux/hTcnANRiM6qPMAX23CINQC+vhlHspcjM9/jbF310fHCSrsXMGlAg==
5807+
electron@^8.0.1:
5808+
version "8.0.1"
5809+
resolved "https://registry.yarnpkg.com/electron/-/electron-8.0.1.tgz#7f5070a1625f423cddcece25a1eb9e6d2f1339fb"
5810+
integrity sha512-kLZAQkbrAFNjQVpcHJUnjRYQNafuuWKnsdxzag5do1ewMqN0J4Pi/hPE27+5/1YAFMcbvCrPqhWIpcMsi8mKXQ==
58115811
dependencies:
58125812
"@electron/get" "^1.0.1"
58135813
"@types/node" "^12.0.12"
@@ -6303,6 +6303,11 @@ eslint@^6.8.0:
63036303
text-table "^0.2.0"
63046304
v8-compile-cache "^2.0.3"
63056305

6306+
esm@^3.2.25:
6307+
version "3.2.25"
6308+
resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.25.tgz#342c18c29d56157688ba5ce31f8431fbb795cc10"
6309+
integrity sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==
6310+
63066311
esotope-hammerhead@^0.5.1:
63076312
version "0.5.1"
63086313
resolved "https://registry.yarnpkg.com/esotope-hammerhead/-/esotope-hammerhead-0.5.1.tgz#3e4646c337b346633d183ba85df2ff1887fb9257"
@@ -10604,6 +10609,11 @@ object.values@^1.1.0, object.values@^1.1.1:
1060410609
function-bind "^1.1.1"
1060510610
has "^1.0.3"
1060610611

10612+
observable-fns@^0.5.0:
10613+
version "0.5.1"
10614+
resolved "https://registry.yarnpkg.com/observable-fns/-/observable-fns-0.5.1.tgz#9b56478690dd0fa8603e3a7e7d2975d88bca0904"
10615+
integrity sha512-wf7g4Jpo1Wt2KIqZKLGeiuLOEMqpaOZ5gJn7DmSdqXgTdxRwSdBhWegQQpPteQ2gZvzCKqNNpwb853wcpA0j7A==
10616+
1060710617
obuf@^1.0.0, obuf@^1.1.2:
1060810618
version "1.1.2"
1060910619
resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
@@ -14274,6 +14284,25 @@ text-table@^0.2.0:
1427414284
resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
1427514285
integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
1427614286

14287+
threads-plugin@^1.3.0:
14288+
version "1.3.0"
14289+
resolved "https://registry.yarnpkg.com/threads-plugin/-/threads-plugin-1.3.0.tgz#4fd2665854fe062b48ff0f42ef4210e485da0d16"
14290+
integrity sha512-94pZAdctmYtPMvozYj9Vc4wDf4NtJnFgREuRUAhWp18mw+fhJABZwcVphPuvCVTZ5mPind1ndMabMktmc4pVjQ==
14291+
dependencies:
14292+
loader-utils "^1.1.0"
14293+
14294+
threads@^1.2.0:
14295+
version "1.2.0"
14296+
resolved "https://registry.yarnpkg.com/threads/-/threads-1.2.0.tgz#f8a7a70aa355f003cccf894f85d55ff0bb87436b"
14297+
integrity sha512-QGHWxkLA+5IYe+Z1d/uhfYk+AbproPFAZoW48vrd+1N3MP37+e4wsyntpwhSixlY42dGtqRgP4b/Fqy/D6QBEQ==
14298+
dependencies:
14299+
callsites "^3.1.0"
14300+
debug "^4.1.1"
14301+
is-observable "^1.1.0"
14302+
observable-fns "^0.5.0"
14303+
optionalDependencies:
14304+
tiny-worker ">= 2"
14305+
1427714306
throat@^5.0.0:
1427814307
version "5.0.0"
1427914308
resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b"
@@ -14342,6 +14371,13 @@ tiny-warning@^1.0.0, tiny-warning@^1.0.2:
1434214371
resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754"
1434314372
integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==
1434414373

14374+
"tiny-worker@>= 2", tiny-worker@^2.3.0:
14375+
version "2.3.0"
14376+
resolved "https://registry.yarnpkg.com/tiny-worker/-/tiny-worker-2.3.0.tgz#715ae34304c757a9af573ae9a8e3967177e6011e"
14377+
integrity sha512-pJ70wq5EAqTAEl9IkGzA+fN0836rycEuz2Cn6yeZ6FRzlVS5IDOkFHpIoEsksPRQV34GDqXm65+OlnZqUSyK2g==
14378+
dependencies:
14379+
esm "^3.2.25"
14380+
1434514381
tmp-promise@^1.0.5:
1434614382
version "1.1.0"
1434714383
resolved "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-1.1.0.tgz#bb924d239029157b9bc1d506a6aa341f8b13e64c"

0 commit comments

Comments
 (0)