Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DDW-696] Update createTheme Definitions #1424

Merged
merged 33 commits into from
Jul 11, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
b2da7b6
[DDW-696] Fixes name of button key in createTheme
MarcusHurney Jun 12, 2019
3f6ae4a
[DDW-696] Cleans up react-polymorph theme definitions in cardano theme
MarcusHurney Jun 12, 2019
2dc7bdb
[DDW-696] Cleans up react-polymorph theme definitions in dark-blue theme
MarcusHurney Jun 12, 2019
f204950
[DDW-696] Cleans up react-polymorph theme definitions in light-blue t…
MarcusHurney Jun 12, 2019
4617d7a
Merge branch 'develop' of github.com:input-output-hk/daedalus into ch…
MarcusHurney Jun 18, 2019
10dd825
[DDW-696] Fixes key names in createTheme react-polymorph components, …
MarcusHurney Jun 18, 2019
fda9f34
[DDW-696] Exports theme config objects
MarcusHurney Jul 4, 2019
c7bfe59
[DDW-696] Adds check for write property in createTheme params
MarcusHurney Jul 4, 2019
3ac0494
[DDW-696] Creates writeCSSVariables.css
MarcusHurney Jul 4, 2019
f0b83d1
[DDW-696] Merges latest develop, resolves merge conflicts:
MarcusHurney Jul 4, 2019
71ea210
[DDW-696] Adds checkCreateTheme.js and splits update logic into new f…
MarcusHurney Jul 6, 2019
daac259
[DDW-696] Fixes flow error
MarcusHurney Jul 6, 2019
6b98ec5
[DDW-696] Adds script for chekcing createTheme missing definitions
MarcusHurney Jul 9, 2019
ff4bce8
[DDW-696] Refactors checkCreateTheme to produce intended behavior
MarcusHurney Jul 9, 2019
9905297
[DDW-696] Adds chalk.js as a dev dependency
MarcusHurney Jul 9, 2019
e1cb111
Merge branch 'develop' into chore/ddw-696-update-create-theme-definit…
thedanheller Jul 9, 2019
56070c2
[DDW-696] Adds gulp pipeline which allows themes to be tested in a No…
MarcusHurney Jul 10, 2019
821b879
[DDW-696] Adds esm and gulp-flow-remove-types packages for running th…
MarcusHurney Jul 10, 2019
8753973
[DDW-696] Removes update functionality from createTheme.js (see DDW-697)
MarcusHurney Jul 10, 2019
e5655ff
Sets up the correct implementation of checkCreateTheme and connects i…
MarcusHurney Jul 10, 2019
75f07c4
Merge branch 'develop' of github.com:input-output-hk/daedalus into ch…
MarcusHurney Jul 10, 2019
cf1f2e7
Merge branch 'chore/ddw-696-update-create-theme-definitions' of githu…
MarcusHurney Jul 10, 2019
e458993
Fixes error in createTheme.js after merging develop
MarcusHurney Jul 10, 2019
2dd93c4
Automatic update for defaultMessages.json
MarcusHurney Jul 10, 2019
1b931ab
Fixes ESlint error
MarcusHurney Jul 10, 2019
a26dd28
[DDW-696] Fixes ESlint comment
MarcusHurney Jul 10, 2019
368e703
[DDW-696] Adds missing 'staking' CSS vars to createTheme.js
MarcusHurney Jul 11, 2019
6a58372
[DDW-696] Adds console message to checkCreateTheme.js for no missing …
MarcusHurney Jul 11, 2019
509901b
[DDW-696] Updates CHANGELOG
MarcusHurney Jul 11, 2019
a245ae9
[DDW-696] Merges latest develop branch and resolves merge conflicts
MarcusHurney Jul 11, 2019
e7c6fef
[DDW-696] Mutes unnecessary flow error
MarcusHurney Jul 11, 2019
ad80419
[DDW-696] Freeze package.json packages, Fix yarn.lock
nikolaglumac Jul 11, 2019
9b6f099
[DDW-696] Improve CHANGELOG
nikolaglumac Jul 11, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ Changelog

### Chores

- Added `themes:check` script for checking missing definitions on createTheme object ([PR 1424](https://github.com/input-output-hk/daedalus/pull/1424))
- Refactored the Loading screen, adding containers for each overlay ([PR 1446](https://github.com/input-output-hk/daedalus/pull/1446))
- Added button to open local state directory on Daedalus Diagnostics Screen ([PR 1438](https://github.com/input-output-hk/daedalus/pull/1438))
- Updated the list of contributors on the "About" screen ([PR 1450](https://github.com/input-output-hk/daedalus/pull/1450))
Expand Down
30 changes: 30 additions & 0 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ const webpack = require('webpack');
const webpackStream = require('webpack-stream');
const shell = require('gulp-shell');
const electronConnect = require('electron-connect');
const flowRemoveTypes = require('gulp-flow-remove-types');
const mainWebpackConfig = require('./source/main/webpack.config');
const rendererWebpackConfig = require('./source/renderer/webpack.config');

Expand Down Expand Up @@ -113,6 +114,30 @@ gulp.task('build:renderer:watch', buildRendererWatch());

gulp.task('build', gulp.series('clean:dist', 'build:main', 'build:renderer'));

gulp.task('prepare:themes:utils', () =>
gulp
.src([
'source/renderer/app/themes/utils/checkCreateTheme.js',
'source/renderer/app/themes/utils/constants.js',
'source/renderer/app/themes/utils/createTheme.js',
'source/renderer/app/themes/utils/createShades.js',
'source/renderer/app/themes/utils/index.js',
])
.pipe(flowRemoveTypes())
.pipe(gulp.dest('dist/utils'))
);

gulp.task('prepare:themes:daedalus', () =>
gulp
.src([
'source/renderer/app/themes/daedalus/cardano.js',
'source/renderer/app/themes/daedalus/dark-blue.js',
'source/renderer/app/themes/daedalus/light-blue.js',
])
.pipe(flowRemoveTypes())
.pipe(gulp.dest('dist/daedalus'))
);

gulp.task(
'build:watch',
gulp.series(
Expand All @@ -124,6 +149,11 @@ gulp.task(
)
);

gulp.task(
'build:themes',
gulp.series('clean:dist', 'prepare:themes:utils', 'prepare:themes:daedalus')
);

gulp.task(
'test:e2e:nodemon',
shell.task(
Expand Down
4 changes: 4 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"manage:translations": "gulp purge:translations && gulp clear:cache && gulp build && node ./translations/translation-runner.js",
"storybook": "start-storybook -p 6006 -c storybook",
"storybook:build": "build-storybook -c storybook -o dist/storybook",
"themes:check": "gulp build:themes && node -r esm ./dist/utils/index.js",
"clear:cache": "gulp clear:cache",
"nix:dev": "nix-shell --arg autoStartBackend true --arg allowFaultInjection true --arg systemStart",
"nix:staging": "nix-shell --arg autoStartBackend true --argstr cluster staging"
Expand Down Expand Up @@ -61,6 +62,7 @@
"bufferutil": "4.0.0",
"cache-loader": "2.0.1",
"chai": "4.2.0",
"chalk": "2.4.2",
"concurrently": "4.1.0",
"cross-env": "5.2.0",
"css-loader": "2.0.1",
Expand All @@ -85,9 +87,11 @@
"eslint-plugin-jsx-a11y": "6.1.2",
"eslint-plugin-promise": "4.0.1",
"eslint-plugin-react": "7.11.1",
"esm": "3.2.25",
"faker": "4.1.0",
"file-loader": "2.0.0",
"flow-bin": "0.98.1",
"gulp-flow-remove-types": "1.0.0",
"gulp-shell": "0.6.5",
"hash.js": "1.1.7",
"html-loader": "0.5.5",
Expand Down