diff options
-rw-r--r-- | .storybook/withTheme/index.tsx | 6 | ||||
-rw-r--r-- | gulpfile.babel.js | 21 | ||||
-rw-r--r-- | package-lock.json | 315 | ||||
-rw-r--r-- | package.json | 7 | ||||
-rw-r--r-- | packages/forms/package-lock.json | 396 | ||||
-rw-r--r-- | packages/forms/package.json | 8 | ||||
-rw-r--r-- | packages/forms/src/index.ts | 6 | ||||
-rw-r--r-- | packages/forms/src/input/index.tsx | 4 | ||||
-rw-r--r-- | packages/forms/webpack.config.js | 41 | ||||
-rw-r--r-- | packages/theme/package.json | 7 | ||||
-rw-r--r-- | packages/theme/src/themes/dark/index.ts | 2 | ||||
-rw-r--r-- | packages/theme/src/themes/default/index.ts | 2 | ||||
-rw-r--r-- | packages/theme/webpack.config.js | 25 | ||||
-rw-r--r-- | src/components/settings/account/AccountDashboard.js | 71 | ||||
-rw-r--r-- | src/components/settings/user/EditUserForm.js | 27 | ||||
-rw-r--r-- | src/stores/UIStore.js | 6 | ||||
-rw-r--r-- | stories/input.stories.tsx | 2 | ||||
-rw-r--r-- | tsconfig.json | 3 |
18 files changed, 440 insertions, 509 deletions
diff --git a/.storybook/withTheme/index.tsx b/.storybook/withTheme/index.tsx index b357aa658..b2f80f438 100644 --- a/.storybook/withTheme/index.tsx +++ b/.storybook/withTheme/index.tsx | |||
@@ -2,7 +2,9 @@ import React from 'react'; | |||
2 | import { Classes } from 'jss'; | 2 | import { Classes } from 'jss'; |
3 | import injectSheet, { ThemeProvider } from 'react-jss'; | 3 | import injectSheet, { ThemeProvider } from 'react-jss'; |
4 | import addons, { makeDecorator } from '@storybook/addons'; | 4 | import addons, { makeDecorator } from '@storybook/addons'; |
5 | import theme, { Theme, ThemeType } from '../../packages/theme/src'; | 5 | import theme, { ThemeType, Theme } from '@meetfranz/theme'; |
6 | |||
7 | console.log(theme); | ||
6 | 8 | ||
7 | const defaultTheme = { | 9 | const defaultTheme = { |
8 | name: 'Default', | 10 | name: 'Default', |
@@ -29,7 +31,7 @@ const styles = (theme: Theme) => ({ | |||
29 | }, | 31 | }, |
30 | }); | 32 | }); |
31 | 33 | ||
32 | const Container = injectSheet(styles)(({ name, classes, story }: { name: string, classes: Classes, story: React.ReactNode }) => ( | 34 | const Container = injectSheet(styles)(({ name, classes, story }: { name: string, classes: Classes, story: any }) => ( |
33 | <article> | 35 | <article> |
34 | <h1 className={classes.title}>{name}</h1> | 36 | <h1 className={classes.title}>{name}</h1> |
35 | <div className={classes.container}> | 37 | <div className={classes.container}> |
diff --git a/gulpfile.babel.js b/gulpfile.babel.js index 54d200b14..06e995d07 100644 --- a/gulpfile.babel.js +++ b/gulpfile.babel.js | |||
@@ -42,10 +42,18 @@ const paths = { | |||
42 | src: 'src/**/*.js', | 42 | src: 'src/**/*.js', |
43 | dest: 'build/', | 43 | dest: 'build/', |
44 | watch: [ | 44 | watch: [ |
45 | 'packages/**/*.js', | 45 | // 'packages/**/*.js', |
46 | 'src/**/*.js', | 46 | 'src/**/*.js', |
47 | ], | 47 | ], |
48 | }, | 48 | }, |
49 | packages: { | ||
50 | watch: 'packages/**/*', | ||
51 | // dest: 'build/', | ||
52 | // watch: [ | ||
53 | // // 'packages/**/*.js', | ||
54 | // 'src/**/*.js', | ||
55 | // ], | ||
56 | }, | ||
49 | }; | 57 | }; |
50 | 58 | ||
51 | function _shell(cmd, cb) { | 59 | function _shell(cmd, cb) { |
@@ -77,8 +85,9 @@ export function mvSrc() { | |||
77 | [ | 85 | [ |
78 | `${paths.src}/*`, | 86 | `${paths.src}/*`, |
79 | `${paths.src}/*/**`, | 87 | `${paths.src}/*/**`, |
80 | `!${paths.scripts.watch}`, | 88 | `!${paths.scripts.watch[1]}`, |
81 | `!${paths.src}/styles/**`, | 89 | `!${paths.src}/styles/**`, |
90 | `!${paths.src}/**/*.js`, | ||
82 | ], { since: gulp.lastRun(mvSrc) }, | 91 | ], { since: gulp.lastRun(mvSrc) }, |
83 | ) | 92 | ) |
84 | .pipe(gulp.dest(paths.dest)); | 93 | .pipe(gulp.dest(paths.dest)); |
@@ -93,7 +102,7 @@ export function mvPackageJson() { | |||
93 | .pipe(gulp.dest(paths.dest)); | 102 | .pipe(gulp.dest(paths.dest)); |
94 | } | 103 | } |
95 | 104 | ||
96 | export function mvPackages() { | 105 | export function mvLernaPackages() { |
97 | return gulp.src( | 106 | return gulp.src( |
98 | [ | 107 | [ |
99 | 'packages/**', | 108 | 'packages/**', |
@@ -130,7 +139,7 @@ export function scripts() { | |||
130 | } | 139 | } |
131 | 140 | ||
132 | export function watch() { | 141 | export function watch() { |
133 | gulp.watch(paths.scripts.watch, scripts); | 142 | gulp.watch(paths.packages.watch, mvLernaPackages); |
134 | gulp.watch(paths.styles.watch, styles); | 143 | gulp.watch(paths.styles.watch, styles); |
135 | 144 | ||
136 | gulp.watch([ | 145 | gulp.watch([ |
@@ -138,6 +147,8 @@ export function watch() { | |||
138 | `${paths.scripts.src}`, | 147 | `${paths.scripts.src}`, |
139 | `${paths.styles.src}`, | 148 | `${paths.styles.src}`, |
140 | ], mvSrc); | 149 | ], mvSrc); |
150 | |||
151 | gulp.watch(paths.scripts.watch, scripts); | ||
141 | } | 152 | } |
142 | 153 | ||
143 | export function webserver() { | 154 | export function webserver() { |
@@ -173,7 +184,7 @@ export function sign(done) { | |||
173 | 184 | ||
174 | const build = gulp.series( | 185 | const build = gulp.series( |
175 | clean, | 186 | clean, |
176 | gulp.parallel(mvSrc, mvPackageJson, mvPackages), | 187 | gulp.parallel(mvSrc, mvPackageJson, mvLernaPackages), |
177 | gulp.parallel(html, scripts, styles), | 188 | gulp.parallel(html, scripts, styles), |
178 | dictionaries, | 189 | dictionaries, |
179 | ); | 190 | ); |
diff --git a/package-lock.json b/package-lock.json index e1e640bd7..7895266dd 100644 --- a/package-lock.json +++ b/package-lock.json | |||
@@ -3035,14 +3035,7 @@ | |||
3035 | "requires": { | 3035 | "requires": { |
3036 | "@mdi/js": "^3.3.92", | 3036 | "@mdi/js": "^3.3.92", |
3037 | "@mdi/react": "^1.1.0", | 3037 | "@mdi/react": "^1.1.0", |
3038 | "@meetfranz/theme": "file:packages/theme", | 3038 | "react-html-attributes": "^1.4.3" |
3039 | "classnames": "^2.2.6", | ||
3040 | "lodash": "^4.17.11", | ||
3041 | "mobx": "^5.8.0", | ||
3042 | "mobx-react": "^5.4.3", | ||
3043 | "react": "^16.7.0", | ||
3044 | "react-html-attributes": "^1.4.3", | ||
3045 | "react-jss": "^8.6.1" | ||
3046 | }, | 3039 | }, |
3047 | "dependencies": { | 3040 | "dependencies": { |
3048 | "debug": { | 3041 | "debug": { |
@@ -13322,6 +13315,12 @@ | |||
13322 | "resolve-dir": "^1.0.0" | 13315 | "resolve-dir": "^1.0.0" |
13323 | } | 13316 | } |
13324 | }, | 13317 | }, |
13318 | "global-modules-path": { | ||
13319 | "version": "2.3.1", | ||
13320 | "resolved": "https://registry.npmjs.org/global-modules-path/-/global-modules-path-2.3.1.tgz", | ||
13321 | "integrity": "sha512-y+shkf4InI7mPRHSo2b/k6ix6+NLDtyccYv86whhxrSGX9wjPX1VMITmrDbE1eh7zkzhiWtW2sHklJYoQ62Cxg==", | ||
13322 | "dev": true | ||
13323 | }, | ||
13325 | "global-prefix": { | 13324 | "global-prefix": { |
13326 | "version": "1.0.2", | 13325 | "version": "1.0.2", |
13327 | "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", | 13326 | "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", |
@@ -13406,7 +13405,7 @@ | |||
13406 | }, | 13405 | }, |
13407 | "got": { | 13406 | "got": { |
13408 | "version": "6.7.1", | 13407 | "version": "6.7.1", |
13409 | "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz", | 13408 | "resolved": "http://registry.npmjs.org/got/-/got-6.7.1.tgz", |
13410 | "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=", | 13409 | "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=", |
13411 | "dev": true, | 13410 | "dev": true, |
13412 | "requires": { | 13411 | "requires": { |
@@ -16400,6 +16399,12 @@ | |||
16400 | "resolve": "^1.1.7" | 16399 | "resolve": "^1.1.7" |
16401 | } | 16400 | } |
16402 | }, | 16401 | }, |
16402 | "lightercollective": { | ||
16403 | "version": "0.1.0", | ||
16404 | "resolved": "https://registry.npmjs.org/lightercollective/-/lightercollective-0.1.0.tgz", | ||
16405 | "integrity": "sha512-J9tg5uraYoQKaWbmrzDDexbG6hHnMcWS1qLYgJSWE+mpA3U5OCSeMUhb+K55otgZJ34oFdR0ECvdIb3xuO5JOQ==", | ||
16406 | "dev": true | ||
16407 | }, | ||
16403 | "load-json-file": { | 16408 | "load-json-file": { |
16404 | "version": "1.1.0", | 16409 | "version": "1.1.0", |
16405 | "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", | 16410 | "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", |
@@ -17907,7 +17912,7 @@ | |||
17907 | "dependencies": { | 17912 | "dependencies": { |
17908 | "pretty-bytes": { | 17913 | "pretty-bytes": { |
17909 | "version": "1.0.4", | 17914 | "version": "1.0.4", |
17910 | "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz", | 17915 | "resolved": "http://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz", |
17911 | "integrity": "sha1-CiLoIQYJrTVUL4yNXSFZr/B1HIQ=", | 17916 | "integrity": "sha1-CiLoIQYJrTVUL4yNXSFZr/B1HIQ=", |
17912 | "dev": true, | 17917 | "dev": true, |
17913 | "requires": { | 17918 | "requires": { |
@@ -18537,7 +18542,7 @@ | |||
18537 | "dependencies": { | 18542 | "dependencies": { |
18538 | "color-convert": { | 18543 | "color-convert": { |
18539 | "version": "0.5.3", | 18544 | "version": "0.5.3", |
18540 | "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-0.5.3.tgz", | 18545 | "resolved": "http://registry.npmjs.org/color-convert/-/color-convert-0.5.3.tgz", |
18541 | "integrity": "sha1-vbbGnOZg+t/+CwAHzER+G59ygr0=", | 18546 | "integrity": "sha1-vbbGnOZg+t/+CwAHzER+G59ygr0=", |
18542 | "dev": true | 18547 | "dev": true |
18543 | } | 18548 | } |
@@ -19279,7 +19284,7 @@ | |||
19279 | }, | 19284 | }, |
19280 | "readable-stream": { | 19285 | "readable-stream": { |
19281 | "version": "1.1.14", | 19286 | "version": "1.1.14", |
19282 | "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", | 19287 | "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", |
19283 | "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", | 19288 | "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", |
19284 | "dev": true, | 19289 | "dev": true, |
19285 | "requires": { | 19290 | "requires": { |
@@ -19291,13 +19296,13 @@ | |||
19291 | }, | 19296 | }, |
19292 | "string_decoder": { | 19297 | "string_decoder": { |
19293 | "version": "0.10.31", | 19298 | "version": "0.10.31", |
19294 | "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", | 19299 | "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", |
19295 | "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", | 19300 | "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", |
19296 | "dev": true | 19301 | "dev": true |
19297 | }, | 19302 | }, |
19298 | "through2": { | 19303 | "through2": { |
19299 | "version": "0.2.3", | 19304 | "version": "0.2.3", |
19300 | "resolved": "https://registry.npmjs.org/through2/-/through2-0.2.3.tgz", | 19305 | "resolved": "http://registry.npmjs.org/through2/-/through2-0.2.3.tgz", |
19301 | "integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=", | 19306 | "integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=", |
19302 | "dev": true, | 19307 | "dev": true, |
19303 | "requires": { | 19308 | "requires": { |
@@ -22363,9 +22368,9 @@ | |||
22363 | } | 22368 | } |
22364 | }, | 22369 | }, |
22365 | "terser": { | 22370 | "terser": { |
22366 | "version": "3.14.0", | 22371 | "version": "3.14.1", |
22367 | "resolved": "https://registry.npmjs.org/terser/-/terser-3.14.0.tgz", | 22372 | "resolved": "https://registry.npmjs.org/terser/-/terser-3.14.1.tgz", |
22368 | "integrity": "sha512-KQC1QNKbC/K1ZUjLIWsezW7wkTJuB4v9ptQQUNOzAPVHuVf2LrwEcB0I9t2HTEYUwAFVGiiS6wc+P4ClLDc5FQ==", | 22373 | "integrity": "sha512-NSo3E99QDbYSMeJaEk9YW2lTg3qS9V0aKGlb+PlOrei1X02r1wSBHCNX/O+yeTRFSWPKPIGj6MqvvdqV4rnVGw==", |
22369 | "dev": true, | 22374 | "dev": true, |
22370 | "requires": { | 22375 | "requires": { |
22371 | "commander": "~2.17.1", | 22376 | "commander": "~2.17.1", |
@@ -22765,9 +22770,9 @@ | |||
22765 | } | 22770 | } |
22766 | }, | 22771 | }, |
22767 | "chalk": { | 22772 | "chalk": { |
22768 | "version": "2.4.1", | 22773 | "version": "2.4.2", |
22769 | "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", | 22774 | "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", |
22770 | "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", | 22775 | "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", |
22771 | "dev": true, | 22776 | "dev": true, |
22772 | "requires": { | 22777 | "requires": { |
22773 | "ansi-styles": "^3.2.1", | 22778 | "ansi-styles": "^3.2.1", |
@@ -23476,6 +23481,12 @@ | |||
23476 | "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", | 23481 | "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", |
23477 | "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==" | 23482 | "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==" |
23478 | }, | 23483 | }, |
23484 | "v8-compile-cache": { | ||
23485 | "version": "2.0.2", | ||
23486 | "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz", | ||
23487 | "integrity": "sha512-1wFuMUIM16MDJRCrpbpuEPTUGmM5QMUg0cr3KFwra2XgOgFcPGDQHDh3CszSCD2Zewc/dh/pamNEW8CbfDebUw==", | ||
23488 | "dev": true | ||
23489 | }, | ||
23479 | "v8flags": { | 23490 | "v8flags": { |
23480 | "version": "3.1.1", | 23491 | "version": "3.1.1", |
23481 | "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.1.1.tgz", | 23492 | "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.1.1.tgz", |
@@ -23836,6 +23847,270 @@ | |||
23836 | } | 23847 | } |
23837 | } | 23848 | } |
23838 | }, | 23849 | }, |
23850 | "webpack-cli": { | ||
23851 | "version": "3.2.1", | ||
23852 | "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.2.1.tgz", | ||
23853 | "integrity": "sha512-jeJveHwz/vwpJ3B8bxEL5a/rVKIpRNJDsKggfKnxuYeohNDW4Y/wB9N/XHJA093qZyS0r6mYL+/crLsIol4WKA==", | ||
23854 | "dev": true, | ||
23855 | "requires": { | ||
23856 | "chalk": "^2.4.1", | ||
23857 | "cross-spawn": "^6.0.5", | ||
23858 | "enhanced-resolve": "^4.1.0", | ||
23859 | "findup-sync": "^2.0.0", | ||
23860 | "global-modules": "^1.0.0", | ||
23861 | "global-modules-path": "^2.3.0", | ||
23862 | "import-local": "^2.0.0", | ||
23863 | "interpret": "^1.1.0", | ||
23864 | "lightercollective": "^0.1.0", | ||
23865 | "loader-utils": "^1.1.0", | ||
23866 | "supports-color": "^5.5.0", | ||
23867 | "v8-compile-cache": "^2.0.2", | ||
23868 | "yargs": "^12.0.4" | ||
23869 | }, | ||
23870 | "dependencies": { | ||
23871 | "ansi-regex": { | ||
23872 | "version": "3.0.0", | ||
23873 | "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", | ||
23874 | "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", | ||
23875 | "dev": true | ||
23876 | }, | ||
23877 | "ansi-styles": { | ||
23878 | "version": "3.2.1", | ||
23879 | "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", | ||
23880 | "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", | ||
23881 | "dev": true, | ||
23882 | "requires": { | ||
23883 | "color-convert": "^1.9.0" | ||
23884 | } | ||
23885 | }, | ||
23886 | "camelcase": { | ||
23887 | "version": "5.0.0", | ||
23888 | "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz", | ||
23889 | "integrity": "sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==", | ||
23890 | "dev": true | ||
23891 | }, | ||
23892 | "chalk": { | ||
23893 | "version": "2.4.2", | ||
23894 | "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", | ||
23895 | "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", | ||
23896 | "dev": true, | ||
23897 | "requires": { | ||
23898 | "ansi-styles": "^3.2.1", | ||
23899 | "escape-string-regexp": "^1.0.5", | ||
23900 | "supports-color": "^5.3.0" | ||
23901 | } | ||
23902 | }, | ||
23903 | "cliui": { | ||
23904 | "version": "4.1.0", | ||
23905 | "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", | ||
23906 | "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", | ||
23907 | "dev": true, | ||
23908 | "requires": { | ||
23909 | "string-width": "^2.1.1", | ||
23910 | "strip-ansi": "^4.0.0", | ||
23911 | "wrap-ansi": "^2.0.0" | ||
23912 | } | ||
23913 | }, | ||
23914 | "execa": { | ||
23915 | "version": "1.0.0", | ||
23916 | "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", | ||
23917 | "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", | ||
23918 | "dev": true, | ||
23919 | "requires": { | ||
23920 | "cross-spawn": "^6.0.0", | ||
23921 | "get-stream": "^4.0.0", | ||
23922 | "is-stream": "^1.1.0", | ||
23923 | "npm-run-path": "^2.0.0", | ||
23924 | "p-finally": "^1.0.0", | ||
23925 | "signal-exit": "^3.0.0", | ||
23926 | "strip-eof": "^1.0.0" | ||
23927 | } | ||
23928 | }, | ||
23929 | "find-up": { | ||
23930 | "version": "3.0.0", | ||
23931 | "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", | ||
23932 | "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", | ||
23933 | "dev": true, | ||
23934 | "requires": { | ||
23935 | "locate-path": "^3.0.0" | ||
23936 | } | ||
23937 | }, | ||
23938 | "get-stream": { | ||
23939 | "version": "4.1.0", | ||
23940 | "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", | ||
23941 | "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", | ||
23942 | "dev": true, | ||
23943 | "requires": { | ||
23944 | "pump": "^3.0.0" | ||
23945 | } | ||
23946 | }, | ||
23947 | "import-local": { | ||
23948 | "version": "2.0.0", | ||
23949 | "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz", | ||
23950 | "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==", | ||
23951 | "dev": true, | ||
23952 | "requires": { | ||
23953 | "pkg-dir": "^3.0.0", | ||
23954 | "resolve-cwd": "^2.0.0" | ||
23955 | } | ||
23956 | }, | ||
23957 | "invert-kv": { | ||
23958 | "version": "2.0.0", | ||
23959 | "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz", | ||
23960 | "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==", | ||
23961 | "dev": true | ||
23962 | }, | ||
23963 | "is-fullwidth-code-point": { | ||
23964 | "version": "2.0.0", | ||
23965 | "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", | ||
23966 | "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", | ||
23967 | "dev": true | ||
23968 | }, | ||
23969 | "lcid": { | ||
23970 | "version": "2.0.0", | ||
23971 | "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz", | ||
23972 | "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==", | ||
23973 | "dev": true, | ||
23974 | "requires": { | ||
23975 | "invert-kv": "^2.0.0" | ||
23976 | } | ||
23977 | }, | ||
23978 | "locate-path": { | ||
23979 | "version": "3.0.0", | ||
23980 | "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", | ||
23981 | "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", | ||
23982 | "dev": true, | ||
23983 | "requires": { | ||
23984 | "p-locate": "^3.0.0", | ||
23985 | "path-exists": "^3.0.0" | ||
23986 | } | ||
23987 | }, | ||
23988 | "os-locale": { | ||
23989 | "version": "3.1.0", | ||
23990 | "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz", | ||
23991 | "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==", | ||
23992 | "dev": true, | ||
23993 | "requires": { | ||
23994 | "execa": "^1.0.0", | ||
23995 | "lcid": "^2.0.0", | ||
23996 | "mem": "^4.0.0" | ||
23997 | } | ||
23998 | }, | ||
23999 | "p-limit": { | ||
24000 | "version": "2.1.0", | ||
24001 | "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.1.0.tgz", | ||
24002 | "integrity": "sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==", | ||
24003 | "dev": true, | ||
24004 | "requires": { | ||
24005 | "p-try": "^2.0.0" | ||
24006 | } | ||
24007 | }, | ||
24008 | "p-locate": { | ||
24009 | "version": "3.0.0", | ||
24010 | "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", | ||
24011 | "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", | ||
24012 | "dev": true, | ||
24013 | "requires": { | ||
24014 | "p-limit": "^2.0.0" | ||
24015 | } | ||
24016 | }, | ||
24017 | "p-try": { | ||
24018 | "version": "2.0.0", | ||
24019 | "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz", | ||
24020 | "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==", | ||
24021 | "dev": true | ||
24022 | }, | ||
24023 | "path-exists": { | ||
24024 | "version": "3.0.0", | ||
24025 | "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", | ||
24026 | "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", | ||
24027 | "dev": true | ||
24028 | }, | ||
24029 | "pkg-dir": { | ||
24030 | "version": "3.0.0", | ||
24031 | "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz", | ||
24032 | "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==", | ||
24033 | "dev": true, | ||
24034 | "requires": { | ||
24035 | "find-up": "^3.0.0" | ||
24036 | } | ||
24037 | }, | ||
24038 | "pump": { | ||
24039 | "version": "3.0.0", | ||
24040 | "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", | ||
24041 | "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", | ||
24042 | "dev": true, | ||
24043 | "requires": { | ||
24044 | "end-of-stream": "^1.1.0", | ||
24045 | "once": "^1.3.1" | ||
24046 | } | ||
24047 | }, | ||
24048 | "string-width": { | ||
24049 | "version": "2.1.1", | ||
24050 | "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", | ||
24051 | "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", | ||
24052 | "dev": true, | ||
24053 | "requires": { | ||
24054 | "is-fullwidth-code-point": "^2.0.0", | ||
24055 | "strip-ansi": "^4.0.0" | ||
24056 | } | ||
24057 | }, | ||
24058 | "strip-ansi": { | ||
24059 | "version": "4.0.0", | ||
24060 | "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", | ||
24061 | "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", | ||
24062 | "dev": true, | ||
24063 | "requires": { | ||
24064 | "ansi-regex": "^3.0.0" | ||
24065 | } | ||
24066 | }, | ||
24067 | "supports-color": { | ||
24068 | "version": "5.5.0", | ||
24069 | "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", | ||
24070 | "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", | ||
24071 | "dev": true, | ||
24072 | "requires": { | ||
24073 | "has-flag": "^3.0.0" | ||
24074 | } | ||
24075 | }, | ||
24076 | "which-module": { | ||
24077 | "version": "2.0.0", | ||
24078 | "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", | ||
24079 | "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", | ||
24080 | "dev": true | ||
24081 | }, | ||
24082 | "yargs": { | ||
24083 | "version": "12.0.5", | ||
24084 | "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz", | ||
24085 | "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==", | ||
24086 | "dev": true, | ||
24087 | "requires": { | ||
24088 | "cliui": "^4.0.0", | ||
24089 | "decamelize": "^1.2.0", | ||
24090 | "find-up": "^3.0.0", | ||
24091 | "get-caller-file": "^1.0.1", | ||
24092 | "os-locale": "^3.0.0", | ||
24093 | "require-directory": "^2.1.1", | ||
24094 | "require-main-filename": "^1.0.1", | ||
24095 | "set-blocking": "^2.0.0", | ||
24096 | "string-width": "^2.0.0", | ||
24097 | "which-module": "^2.0.0", | ||
24098 | "y18n": "^3.2.1 || ^4.0.0", | ||
24099 | "yargs-parser": "^11.1.1" | ||
24100 | } | ||
24101 | }, | ||
24102 | "yargs-parser": { | ||
24103 | "version": "11.1.1", | ||
24104 | "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz", | ||
24105 | "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==", | ||
24106 | "dev": true, | ||
24107 | "requires": { | ||
24108 | "camelcase": "^5.0.0", | ||
24109 | "decamelize": "^1.2.0" | ||
24110 | } | ||
24111 | } | ||
24112 | } | ||
24113 | }, | ||
23839 | "webpack-dev-middleware": { | 24114 | "webpack-dev-middleware": { |
23840 | "version": "3.4.0", | 24115 | "version": "3.4.0", |
23841 | "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz", | 24116 | "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz", |
diff --git a/package.json b/package.json index 67352b215..c11f1324a 100644 --- a/package.json +++ b/package.json | |||
@@ -121,8 +121,8 @@ | |||
121 | "cz-conventional-changelog": "2.1.0", | 121 | "cz-conventional-changelog": "2.1.0", |
122 | "dotenv": "^4.0.0", | 122 | "dotenv": "^4.0.0", |
123 | "electron": "4.0.0", | 123 | "electron": "4.0.0", |
124 | "electron-rebuild": "^1.6.0", | ||
125 | "electron-builder": "20.38.4", | 124 | "electron-builder": "20.38.4", |
125 | "electron-rebuild": "^1.6.0", | ||
126 | "eslint": "5.10.0", | 126 | "eslint": "5.10.0", |
127 | "eslint-config-airbnb": "17.1.0", | 127 | "eslint-config-airbnb": "17.1.0", |
128 | "eslint-loader": "^1.9.0", | 128 | "eslint-loader": "^1.9.0", |
@@ -147,10 +147,13 @@ | |||
147 | "react-docgen-typescript-loader": "3.0.0", | 147 | "react-docgen-typescript-loader": "3.0.0", |
148 | "react-docgen-typescript-webpack-plugin": "1.1.0", | 148 | "react-docgen-typescript-webpack-plugin": "1.1.0", |
149 | "storybook-addon-jss-theme": "^1.0.2", | 149 | "storybook-addon-jss-theme": "^1.0.2", |
150 | "terser-webpack-plugin": "1.2.1", | ||
150 | "ts-loader": "5.3.2", | 151 | "ts-loader": "5.3.2", |
151 | "tslint": "5.12.0", | 152 | "tslint": "5.12.0", |
152 | "tslint-config-airbnb": "5.11.1", | 153 | "tslint-config-airbnb": "5.11.1", |
153 | "typescript": "3.2.2" | 154 | "typescript": "3.2.2", |
155 | "webpack": "4.28.3", | ||
156 | "webpack-cli": "3.2.1" | ||
154 | }, | 157 | }, |
155 | "config": { | 158 | "config": { |
156 | "commitizen": { | 159 | "commitizen": { |
diff --git a/packages/forms/package-lock.json b/packages/forms/package-lock.json index f28619ff4..bf610fdfd 100644 --- a/packages/forms/package-lock.json +++ b/packages/forms/package-lock.json | |||
@@ -14,330 +14,11 @@ | |||
14 | "resolved": "https://registry.npmjs.org/@mdi/react/-/react-1.1.0.tgz", | 14 | "resolved": "https://registry.npmjs.org/@mdi/react/-/react-1.1.0.tgz", |
15 | "integrity": "sha512-c0+avMYEZ6i7Pg1ULLFs+p7k8bDPiie9rrgGYs8VWQhw2tUUYz7r0lIPVzD3bzMghWfyhfkArj88K5Of0WTMNw==" | 15 | "integrity": "sha512-c0+avMYEZ6i7Pg1ULLFs+p7k8bDPiie9rrgGYs8VWQhw2tUUYz7r0lIPVzD3bzMghWfyhfkArj88K5Of0WTMNw==" |
16 | }, | 16 | }, |
17 | "@meetfranz/theme": { | ||
18 | "version": "1.0.0", | ||
19 | "resolved": "https://registry.npmjs.org/@meetfranz/theme/-/theme-1.0.0.tgz", | ||
20 | "integrity": "sha512-oto6j5HR4DcwiW8/uDIvXnqmRsPKjQJXOfDeT0JAkEF1YNP/Rq8NWH/MRqzZTRdk3lXgXb9rBLmb/aHglfXy/Q==", | ||
21 | "requires": { | ||
22 | "color": "^3.1.0" | ||
23 | } | ||
24 | }, | ||
25 | "@types/classnames": { | ||
26 | "version": "2.2.6", | ||
27 | "resolved": "https://registry.npmjs.org/@types/classnames/-/classnames-2.2.6.tgz", | ||
28 | "integrity": "sha512-XHcYvVdbtAxVstjKxuULYqYaWIzHR15yr1pZj4fnGChuBVJlIAp9StJna0ZJNSgxPh4Nac2FL4JM3M11Tm6fqQ==", | ||
29 | "dev": true | ||
30 | }, | ||
31 | "@types/jss": { | ||
32 | "version": "9.5.7", | ||
33 | "resolved": "https://registry.npmjs.org/@types/jss/-/jss-9.5.7.tgz", | ||
34 | "integrity": "sha512-OZimStu2QdDMtZ0h72JXqvLVbWUjXd5ZLk8vxLmfuC/nM1AabRyyGoxSufnzixrbpEcVcyy/JV5qeQu2JnjVZw==", | ||
35 | "dev": true, | ||
36 | "requires": { | ||
37 | "csstype": "^2.0.0", | ||
38 | "indefinite-observable": "^1.0.1" | ||
39 | } | ||
40 | }, | ||
41 | "@types/lodash": { | ||
42 | "version": "4.14.119", | ||
43 | "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.119.tgz", | ||
44 | "integrity": "sha512-Z3TNyBL8Vd/M9D9Ms2S3LmFq2sSMzahodD6rCS9V2N44HUMINb75jNkSuwAx7eo2ufqTdfOdtGQpNbieUjPQmw==", | ||
45 | "dev": true | ||
46 | }, | ||
47 | "@types/prop-types": { | ||
48 | "version": "15.5.8", | ||
49 | "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.5.8.tgz", | ||
50 | "integrity": "sha512-3AQoUxQcQtLHsK25wtTWIoIpgYjH3vSDroZOUr7PpCHw/jLY1RB9z9E8dBT/OSmwStVgkRNvdh+ZHNiomRieaw==", | ||
51 | "dev": true | ||
52 | }, | ||
53 | "@types/react": { | ||
54 | "version": "16.7.18", | ||
55 | "resolved": "https://registry.npmjs.org/@types/react/-/react-16.7.18.tgz", | ||
56 | "integrity": "sha512-Tx4uu3ppK53/iHk6VpamMP3f3ahfDLEVt3ZQc8TFm30a1H3v9lMsCntBREswZIW/SKrvJjkb3Hq8UwO6GREBng==", | ||
57 | "dev": true, | ||
58 | "requires": { | ||
59 | "@types/prop-types": "*", | ||
60 | "csstype": "^2.2.0" | ||
61 | } | ||
62 | }, | ||
63 | "@types/react-jss": { | ||
64 | "version": "8.6.0", | ||
65 | "resolved": "https://registry.npmjs.org/@types/react-jss/-/react-jss-8.6.0.tgz", | ||
66 | "integrity": "sha512-kZvjHPPHJMKZqCgQWxNnYrBAsMquqj6J2ncIgG/Eq9AxNJobbPlCc0h2GtHe8Ap3aXi8Lgzj5JSWO9X5S2g8NQ==", | ||
67 | "dev": true, | ||
68 | "requires": { | ||
69 | "@types/jss": "*", | ||
70 | "@types/react": "*", | ||
71 | "@types/theming": "*", | ||
72 | "csstype": "^2.0.0" | ||
73 | } | ||
74 | }, | ||
75 | "@types/theming": { | ||
76 | "version": "1.3.2", | ||
77 | "resolved": "https://registry.npmjs.org/@types/theming/-/theming-1.3.2.tgz", | ||
78 | "integrity": "sha512-hglGgki3jUbSjl1UB6vc8rsOyELRfH+VVIMyymoHRlUizdgWmWiwteH2jdltsHCVlAtSCmAh0nB71t9G41vhxQ==", | ||
79 | "dev": true, | ||
80 | "requires": { | ||
81 | "@types/react": "*" | ||
82 | } | ||
83 | }, | ||
84 | "brcast": { | ||
85 | "version": "3.0.1", | ||
86 | "resolved": "https://registry.npmjs.org/brcast/-/brcast-3.0.1.tgz", | ||
87 | "integrity": "sha512-eI3yqf9YEqyGl9PCNTR46MGvDylGtaHjalcz6Q3fAPnP/PhpKkkve52vFdfGpwp4VUvK6LUr4TQN+2stCrEwTg==" | ||
88 | }, | ||
89 | "classnames": { | ||
90 | "version": "2.2.6", | ||
91 | "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz", | ||
92 | "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==" | ||
93 | }, | ||
94 | "color": { | ||
95 | "version": "3.1.0", | ||
96 | "resolved": "https://registry.npmjs.org/color/-/color-3.1.0.tgz", | ||
97 | "integrity": "sha512-CwyopLkuRYO5ei2EpzpIh6LqJMt6Mt+jZhO5VI5f/wJLZriXQE32/SSqzmrh+QB+AZT81Cj8yv+7zwToW8ahZg==", | ||
98 | "requires": { | ||
99 | "color-convert": "^1.9.1", | ||
100 | "color-string": "^1.5.2" | ||
101 | } | ||
102 | }, | ||
103 | "color-convert": { | ||
104 | "version": "1.9.3", | ||
105 | "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", | ||
106 | "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", | ||
107 | "requires": { | ||
108 | "color-name": "1.1.3" | ||
109 | } | ||
110 | }, | ||
111 | "color-name": { | ||
112 | "version": "1.1.3", | ||
113 | "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", | ||
114 | "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" | ||
115 | }, | ||
116 | "color-string": { | ||
117 | "version": "1.5.3", | ||
118 | "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz", | ||
119 | "integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==", | ||
120 | "requires": { | ||
121 | "color-name": "^1.0.0", | ||
122 | "simple-swizzle": "^0.2.2" | ||
123 | } | ||
124 | }, | ||
125 | "css-vendor": { | ||
126 | "version": "0.3.8", | ||
127 | "resolved": "https://registry.npmjs.org/css-vendor/-/css-vendor-0.3.8.tgz", | ||
128 | "integrity": "sha1-ZCHP0wNM5mT+dnOXL9ARn8KJQfo=", | ||
129 | "requires": { | ||
130 | "is-in-browser": "^1.0.2" | ||
131 | } | ||
132 | }, | ||
133 | "csstype": { | ||
134 | "version": "2.6.0", | ||
135 | "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.0.tgz", | ||
136 | "integrity": "sha512-by8hi8BlLbowQq0qtkx54d9aN73R9oUW20HISpka5kmgsR9F7nnxgfsemuR2sdCKZh+CDNf5egW9UZMm4mgJRg==", | ||
137 | "dev": true | ||
138 | }, | ||
139 | "hoist-non-react-statics": { | ||
140 | "version": "3.2.1", | ||
141 | "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.2.1.tgz", | ||
142 | "integrity": "sha512-TFsu3TV3YLY+zFTZDrN8L2DTFanObwmBLpWvJs1qfUuEQ5bTAdFcwfx2T/bsCXfM9QHSLvjfP+nihEl0yvozxw==", | ||
143 | "requires": { | ||
144 | "react-is": "^16.3.2" | ||
145 | } | ||
146 | }, | ||
147 | "html-element-attributes": { | 17 | "html-element-attributes": { |
148 | "version": "1.3.1", | 18 | "version": "1.3.1", |
149 | "resolved": "https://registry.npmjs.org/html-element-attributes/-/html-element-attributes-1.3.1.tgz", | 19 | "resolved": "https://registry.npmjs.org/html-element-attributes/-/html-element-attributes-1.3.1.tgz", |
150 | "integrity": "sha512-UrRKgp5sQmRnDy4TEwAUsu14XBUlzKB8U3hjIYDjcZ3Hbp86Jtftzxfgrv6E/ii/h78tsaZwAnAE8HwnHr0dPA==" | 20 | "integrity": "sha512-UrRKgp5sQmRnDy4TEwAUsu14XBUlzKB8U3hjIYDjcZ3Hbp86Jtftzxfgrv6E/ii/h78tsaZwAnAE8HwnHr0dPA==" |
151 | }, | 21 | }, |
152 | "hyphenate-style-name": { | ||
153 | "version": "1.0.2", | ||
154 | "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.2.tgz", | ||
155 | "integrity": "sha1-MRYKNpMK2vH8BMYHT360FGXU7Es=" | ||
156 | }, | ||
157 | "indefinite-observable": { | ||
158 | "version": "1.0.2", | ||
159 | "resolved": "https://registry.npmjs.org/indefinite-observable/-/indefinite-observable-1.0.2.tgz", | ||
160 | "integrity": "sha512-Mps0898zEduHyPhb7UCgNmfzlqNZknVmaFz5qzr0mm04YQ5FGLhAyK/dJ+NaRxGyR6juQXIxh5Ev0xx+qq0nYA==", | ||
161 | "dev": true, | ||
162 | "requires": { | ||
163 | "symbol-observable": "1.2.0" | ||
164 | } | ||
165 | }, | ||
166 | "is-function": { | ||
167 | "version": "1.0.1", | ||
168 | "resolved": "https://registry.npmjs.org/is-function/-/is-function-1.0.1.tgz", | ||
169 | "integrity": "sha1-Es+5i2W1fdPRk6MSH19uL0N2ArU=" | ||
170 | }, | ||
171 | "is-in-browser": { | ||
172 | "version": "1.1.3", | ||
173 | "resolved": "https://registry.npmjs.org/is-in-browser/-/is-in-browser-1.1.3.tgz", | ||
174 | "integrity": "sha1-Vv9NtoOgeMYILrldrX3GLh0E+DU=" | ||
175 | }, | ||
176 | "is-plain-object": { | ||
177 | "version": "2.0.4", | ||
178 | "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", | ||
179 | "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", | ||
180 | "requires": { | ||
181 | "isobject": "^3.0.1" | ||
182 | } | ||
183 | }, | ||
184 | "isobject": { | ||
185 | "version": "3.0.1", | ||
186 | "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", | ||
187 | "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" | ||
188 | }, | ||
189 | "js-tokens": { | ||
190 | "version": "4.0.0", | ||
191 | "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", | ||
192 | "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" | ||
193 | }, | ||
194 | "jss": { | ||
195 | "version": "9.8.7", | ||
196 | "resolved": "https://registry.npmjs.org/jss/-/jss-9.8.7.tgz", | ||
197 | "integrity": "sha512-awj3XRZYxbrmmrx9LUSj5pXSUfm12m8xzi/VKeqI1ZwWBtQ0kVPTs3vYs32t4rFw83CgFDukA8wKzOE9sMQnoQ==", | ||
198 | "requires": { | ||
199 | "is-in-browser": "^1.1.3", | ||
200 | "symbol-observable": "^1.1.0", | ||
201 | "warning": "^3.0.0" | ||
202 | } | ||
203 | }, | ||
204 | "jss-camel-case": { | ||
205 | "version": "6.1.0", | ||
206 | "resolved": "https://registry.npmjs.org/jss-camel-case/-/jss-camel-case-6.1.0.tgz", | ||
207 | "integrity": "sha512-HPF2Q7wmNW1t79mCqSeU2vdd/vFFGpkazwvfHMOhPlMgXrJDzdj9viA2SaHk9ZbD5pfL63a8ylp4++irYbbzMQ==", | ||
208 | "requires": { | ||
209 | "hyphenate-style-name": "^1.0.2" | ||
210 | } | ||
211 | }, | ||
212 | "jss-compose": { | ||
213 | "version": "5.0.0", | ||
214 | "resolved": "https://registry.npmjs.org/jss-compose/-/jss-compose-5.0.0.tgz", | ||
215 | "integrity": "sha512-YofRYuiA0+VbeOw0VjgkyO380sA4+TWDrW52nSluD9n+1FWOlDzNbgpZ/Sb3Y46+DcAbOS21W5jo6SAqUEiuwA==", | ||
216 | "requires": { | ||
217 | "warning": "^3.0.0" | ||
218 | } | ||
219 | }, | ||
220 | "jss-default-unit": { | ||
221 | "version": "8.0.2", | ||
222 | "resolved": "https://registry.npmjs.org/jss-default-unit/-/jss-default-unit-8.0.2.tgz", | ||
223 | "integrity": "sha512-WxNHrF/18CdoAGw2H0FqOEvJdREXVXLazn7PQYU7V6/BWkCV0GkmWsppNiExdw8dP4TU1ma1dT9zBNJ95feLmg==" | ||
224 | }, | ||
225 | "jss-expand": { | ||
226 | "version": "5.3.0", | ||
227 | "resolved": "https://registry.npmjs.org/jss-expand/-/jss-expand-5.3.0.tgz", | ||
228 | "integrity": "sha512-NiM4TbDVE0ykXSAw6dfFmB1LIqXP/jdd0ZMnlvlGgEMkMt+weJIl8Ynq1DsuBY9WwkNyzWktdqcEW2VN0RAtQg==" | ||
229 | }, | ||
230 | "jss-extend": { | ||
231 | "version": "6.2.0", | ||
232 | "resolved": "https://registry.npmjs.org/jss-extend/-/jss-extend-6.2.0.tgz", | ||
233 | "integrity": "sha512-YszrmcB6o9HOsKPszK7NeDBNNjVyiW864jfoiHoMlgMIg2qlxKw70axZHqgczXHDcoyi/0/ikP1XaHDPRvYtEA==", | ||
234 | "requires": { | ||
235 | "warning": "^3.0.0" | ||
236 | } | ||
237 | }, | ||
238 | "jss-global": { | ||
239 | "version": "3.0.0", | ||
240 | "resolved": "https://registry.npmjs.org/jss-global/-/jss-global-3.0.0.tgz", | ||
241 | "integrity": "sha512-wxYn7vL+TImyQYGAfdplg7yaxnPQ9RaXY/cIA8hawaVnmmWxDHzBK32u1y+RAvWboa3lW83ya3nVZ/C+jyjZ5Q==" | ||
242 | }, | ||
243 | "jss-nested": { | ||
244 | "version": "6.0.1", | ||
245 | "resolved": "https://registry.npmjs.org/jss-nested/-/jss-nested-6.0.1.tgz", | ||
246 | "integrity": "sha512-rn964TralHOZxoyEgeq3hXY8hyuCElnvQoVrQwKHVmu55VRDd6IqExAx9be5HgK0yN/+hQdgAXQl/GUrBbbSTA==", | ||
247 | "requires": { | ||
248 | "warning": "^3.0.0" | ||
249 | } | ||
250 | }, | ||
251 | "jss-preset-default": { | ||
252 | "version": "4.5.0", | ||
253 | "resolved": "https://registry.npmjs.org/jss-preset-default/-/jss-preset-default-4.5.0.tgz", | ||
254 | "integrity": "sha512-qZbpRVtHT7hBPpZEBPFfafZKWmq3tA/An5RNqywDsZQGrlinIF/mGD9lmj6jGqu8GrED2SMHZ3pPKLmjCZoiaQ==", | ||
255 | "requires": { | ||
256 | "jss-camel-case": "^6.1.0", | ||
257 | "jss-compose": "^5.0.0", | ||
258 | "jss-default-unit": "^8.0.2", | ||
259 | "jss-expand": "^5.3.0", | ||
260 | "jss-extend": "^6.2.0", | ||
261 | "jss-global": "^3.0.0", | ||
262 | "jss-nested": "^6.0.1", | ||
263 | "jss-props-sort": "^6.0.0", | ||
264 | "jss-template": "^1.0.1", | ||
265 | "jss-vendor-prefixer": "^7.0.0" | ||
266 | } | ||
267 | }, | ||
268 | "jss-props-sort": { | ||
269 | "version": "6.0.0", | ||
270 | "resolved": "https://registry.npmjs.org/jss-props-sort/-/jss-props-sort-6.0.0.tgz", | ||
271 | "integrity": "sha512-E89UDcrphmI0LzmvYk25Hp4aE5ZBsXqMWlkFXS0EtPkunJkRr+WXdCNYbXbksIPnKlBenGB9OxzQY+mVc70S+g==" | ||
272 | }, | ||
273 | "jss-template": { | ||
274 | "version": "1.0.1", | ||
275 | "resolved": "https://registry.npmjs.org/jss-template/-/jss-template-1.0.1.tgz", | ||
276 | "integrity": "sha512-m5BqEWha17fmIVXm1z8xbJhY6GFJxNB9H68GVnCWPyGYfxiAgY9WTQyvDAVj+pYRgrXSOfN5V1T4+SzN1sJTeg==", | ||
277 | "requires": { | ||
278 | "warning": "^3.0.0" | ||
279 | } | ||
280 | }, | ||
281 | "jss-vendor-prefixer": { | ||
282 | "version": "7.0.0", | ||
283 | "resolved": "https://registry.npmjs.org/jss-vendor-prefixer/-/jss-vendor-prefixer-7.0.0.tgz", | ||
284 | "integrity": "sha512-Agd+FKmvsI0HLcYXkvy8GYOw3AAASBUpsmIRvVQheps+JWaN892uFOInTr0DRydwaD91vSSUCU4NssschvF7MA==", | ||
285 | "requires": { | ||
286 | "css-vendor": "^0.3.8" | ||
287 | } | ||
288 | }, | ||
289 | "lodash": { | ||
290 | "version": "4.17.11", | ||
291 | "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", | ||
292 | "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==" | ||
293 | }, | ||
294 | "loose-envify": { | ||
295 | "version": "1.4.0", | ||
296 | "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", | ||
297 | "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", | ||
298 | "requires": { | ||
299 | "js-tokens": "^3.0.0 || ^4.0.0" | ||
300 | } | ||
301 | }, | ||
302 | "mobx": { | ||
303 | "version": "5.8.0", | ||
304 | "resolved": "https://registry.npmjs.org/mobx/-/mobx-5.8.0.tgz", | ||
305 | "integrity": "sha512-NsZB+9bF5j+nv9Qwk6bNeE3np26a4TbTGkMpOLf6o1zXoM9BtHPQn/00px4uZ2AXJXtQML5P4MEWdMm6icMIfQ==" | ||
306 | }, | ||
307 | "mobx-react": { | ||
308 | "version": "5.4.3", | ||
309 | "resolved": "https://registry.npmjs.org/mobx-react/-/mobx-react-5.4.3.tgz", | ||
310 | "integrity": "sha512-WC8yFlwvJ91hy8j6CrydAuFteUafcuvdITFQeHl3LRIf5ayfT/4W3M/byhEYD2BcJWejeXr8y4Rh2H26RunCRQ==", | ||
311 | "requires": { | ||
312 | "hoist-non-react-statics": "^3.0.0", | ||
313 | "react-lifecycles-compat": "^3.0.2" | ||
314 | } | ||
315 | }, | ||
316 | "object-assign": { | ||
317 | "version": "4.1.1", | ||
318 | "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", | ||
319 | "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" | ||
320 | }, | ||
321 | "prop-types": { | ||
322 | "version": "15.6.2", | ||
323 | "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.2.tgz", | ||
324 | "integrity": "sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ==", | ||
325 | "requires": { | ||
326 | "loose-envify": "^1.3.1", | ||
327 | "object-assign": "^4.1.1" | ||
328 | } | ||
329 | }, | ||
330 | "react": { | ||
331 | "version": "16.7.0", | ||
332 | "resolved": "https://registry.npmjs.org/react/-/react-16.7.0.tgz", | ||
333 | "integrity": "sha512-StCz3QY8lxTb5cl2HJxjwLFOXPIFQp+p+hxQfc8WE0QiLfCtIlKj8/+5tjjKm8uSTlAW+fCPaavGFS06V9Ar3A==", | ||
334 | "requires": { | ||
335 | "loose-envify": "^1.1.0", | ||
336 | "object-assign": "^4.1.1", | ||
337 | "prop-types": "^15.6.2", | ||
338 | "scheduler": "^0.12.0" | ||
339 | } | ||
340 | }, | ||
341 | "react-html-attributes": { | 22 | "react-html-attributes": { |
342 | "version": "1.4.3", | 23 | "version": "1.4.3", |
343 | "resolved": "https://registry.npmjs.org/react-html-attributes/-/react-html-attributes-1.4.3.tgz", | 24 | "resolved": "https://registry.npmjs.org/react-html-attributes/-/react-html-attributes-1.4.3.tgz", |
@@ -345,83 +26,6 @@ | |||
345 | "requires": { | 26 | "requires": { |
346 | "html-element-attributes": "^1.0.0" | 27 | "html-element-attributes": "^1.0.0" |
347 | } | 28 | } |
348 | }, | ||
349 | "react-is": { | ||
350 | "version": "16.7.0", | ||
351 | "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.7.0.tgz", | ||
352 | "integrity": "sha512-Z0VRQdF4NPDoI0tsXVMLkJLiwEBa+RP66g0xDHxgxysxSoCUccSten4RTF/UFvZF1dZvZ9Zu1sx+MDXwcOR34g==" | ||
353 | }, | ||
354 | "react-jss": { | ||
355 | "version": "8.6.1", | ||
356 | "resolved": "https://registry.npmjs.org/react-jss/-/react-jss-8.6.1.tgz", | ||
357 | "integrity": "sha512-SH6XrJDJkAphp602J14JTy3puB2Zxz1FkM3bKVE8wON+va99jnUTKWnzGECb3NfIn9JPR5vHykge7K3/A747xQ==", | ||
358 | "requires": { | ||
359 | "hoist-non-react-statics": "^2.5.0", | ||
360 | "jss": "^9.7.0", | ||
361 | "jss-preset-default": "^4.3.0", | ||
362 | "prop-types": "^15.6.0", | ||
363 | "theming": "^1.3.0" | ||
364 | }, | ||
365 | "dependencies": { | ||
366 | "hoist-non-react-statics": { | ||
367 | "version": "2.5.5", | ||
368 | "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz", | ||
369 | "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==" | ||
370 | } | ||
371 | } | ||
372 | }, | ||
373 | "react-lifecycles-compat": { | ||
374 | "version": "3.0.4", | ||
375 | "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz", | ||
376 | "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" | ||
377 | }, | ||
378 | "scheduler": { | ||
379 | "version": "0.12.0", | ||
380 | "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.12.0.tgz", | ||
381 | "integrity": "sha512-t7MBR28Akcp4Jm+QoR63XgAi9YgCUmgvDHqf5otgAj4QvdoBE4ImCX0ffehefePPG+aitiYHp0g/mW6s4Tp+dw==", | ||
382 | "requires": { | ||
383 | "loose-envify": "^1.1.0", | ||
384 | "object-assign": "^4.1.1" | ||
385 | } | ||
386 | }, | ||
387 | "simple-swizzle": { | ||
388 | "version": "0.2.2", | ||
389 | "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", | ||
390 | "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=", | ||
391 | "requires": { | ||
392 | "is-arrayish": "^0.3.1" | ||
393 | }, | ||
394 | "dependencies": { | ||
395 | "is-arrayish": { | ||
396 | "version": "0.3.2", | ||
397 | "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", | ||
398 | "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==" | ||
399 | } | ||
400 | } | ||
401 | }, | ||
402 | "symbol-observable": { | ||
403 | "version": "1.2.0", | ||
404 | "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz", | ||
405 | "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==" | ||
406 | }, | ||
407 | "theming": { | ||
408 | "version": "1.3.0", | ||
409 | "resolved": "https://registry.npmjs.org/theming/-/theming-1.3.0.tgz", | ||
410 | "integrity": "sha512-ya5Ef7XDGbTPBv5ENTwrwkPUexrlPeiAg/EI9kdlUAZhNlRbCdhMKRgjNX1IcmsmiPcqDQZE6BpSaH+cr31FKw==", | ||
411 | "requires": { | ||
412 | "brcast": "^3.0.1", | ||
413 | "is-function": "^1.0.1", | ||
414 | "is-plain-object": "^2.0.1", | ||
415 | "prop-types": "^15.5.8" | ||
416 | } | ||
417 | }, | ||
418 | "warning": { | ||
419 | "version": "3.0.0", | ||
420 | "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz", | ||
421 | "integrity": "sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=", | ||
422 | "requires": { | ||
423 | "loose-envify": "^1.0.0" | ||
424 | } | ||
425 | } | 29 | } |
426 | } | 30 | } |
427 | } | 31 | } |
diff --git a/packages/forms/package.json b/packages/forms/package.json index d7d88e7b6..68d500593 100644 --- a/packages/forms/package.json +++ b/packages/forms/package.json | |||
@@ -4,8 +4,8 @@ | |||
4 | "description": "React form components for Franz", | 4 | "description": "React form components for Franz", |
5 | "main": "lib/index.js", | 5 | "main": "lib/index.js", |
6 | "scripts": { | 6 | "scripts": { |
7 | "dev": "tsc -w", | 7 | "dev": "NODE_ENV=development ../../node_modules/.bin/webpack -w", |
8 | "prepare": "tsc" | 8 | "prepare": "../../node_modules/.bin/webpack" |
9 | }, | 9 | }, |
10 | "publishConfig": { | 10 | "publishConfig": { |
11 | "access": "public" | 11 | "access": "public" |
@@ -25,13 +25,15 @@ | |||
25 | "dependencies": { | 25 | "dependencies": { |
26 | "@mdi/js": "^3.3.92", | 26 | "@mdi/js": "^3.3.92", |
27 | "@mdi/react": "^1.1.0", | 27 | "@mdi/react": "^1.1.0", |
28 | "react-html-attributes": "^1.4.3" | ||
29 | }, | ||
30 | "peerDependencies": { | ||
28 | "@meetfranz/theme": "file:../theme", | 31 | "@meetfranz/theme": "file:../theme", |
29 | "classnames": "^2.2.6", | 32 | "classnames": "^2.2.6", |
30 | "lodash": "^4.17.11", | 33 | "lodash": "^4.17.11", |
31 | "mobx": "^5.8.0", | 34 | "mobx": "^5.8.0", |
32 | "mobx-react": "^5.4.3", | 35 | "mobx-react": "^5.4.3", |
33 | "react": "^16.7.0", | 36 | "react": "^16.7.0", |
34 | "react-html-attributes": "^1.4.3", | ||
35 | "react-jss": "^8.6.1" | 37 | "react-jss": "^8.6.1" |
36 | }, | 38 | }, |
37 | "gitHead": "e9a48f96f8659dcd6ac07a8445f60f27d6ae698a" | 39 | "gitHead": "e9a48f96f8659dcd6ac07a8445f60f27d6ae698a" |
diff --git a/packages/forms/src/index.ts b/packages/forms/src/index.ts index 3f24ecaf7..fe6f09222 100644 --- a/packages/forms/src/index.ts +++ b/packages/forms/src/index.ts | |||
@@ -1 +1,7 @@ | |||
1 | export { default as Input } from './input'; | 1 | export { default as Input } from './input'; |
2 | |||
3 | // import InputComponent from './input'; | ||
4 | |||
5 | console.log('YOLOOOOO00OO', 'InputComponent'); | ||
6 | |||
7 | // export const Input = InputComponent; | ||
diff --git a/packages/forms/src/input/index.tsx b/packages/forms/src/input/index.tsx index 107335573..0e19e3368 100644 --- a/packages/forms/src/input/index.tsx +++ b/packages/forms/src/input/index.tsx | |||
@@ -3,7 +3,7 @@ import Icon from '@mdi/react'; | |||
3 | import classnames from 'classnames'; | 3 | import classnames from 'classnames'; |
4 | import pick from 'lodash/pick'; | 4 | import pick from 'lodash/pick'; |
5 | import { observer } from 'mobx-react'; | 5 | import { observer } from 'mobx-react'; |
6 | import React, { Component } from 'react'; | 6 | import React, { Component, createRef } from 'react'; |
7 | import htmlElementAttributes from 'react-html-attributes'; | 7 | import htmlElementAttributes from 'react-html-attributes'; |
8 | import injectSheet from 'react-jss'; | 8 | import injectSheet from 'react-jss'; |
9 | 9 | ||
@@ -48,7 +48,7 @@ class Input extends Component<IProps, IState> { | |||
48 | showPassword: false, | 48 | showPassword: false, |
49 | }; | 49 | }; |
50 | 50 | ||
51 | private inputRef = React.createRef<HTMLInputElement>(); | 51 | private inputRef = createRef<HTMLInputElement>(); |
52 | 52 | ||
53 | componentDidMount() { | 53 | componentDidMount() { |
54 | const { focus } = this.props; | 54 | const { focus } = this.props; |
diff --git a/packages/forms/webpack.config.js b/packages/forms/webpack.config.js new file mode 100644 index 000000000..43deab722 --- /dev/null +++ b/packages/forms/webpack.config.js | |||
@@ -0,0 +1,41 @@ | |||
1 | const path = require('path'); | ||
2 | const TerserPlugin = require('terser-webpack-plugin'); | ||
3 | |||
4 | module.exports = { | ||
5 | entry: path.join(__dirname, '/src/index.ts'), | ||
6 | context: __dirname, | ||
7 | output: { | ||
8 | filename: 'index.js', | ||
9 | path: path.join(__dirname, 'lib'), | ||
10 | libraryTarget: 'commonjs2', | ||
11 | }, | ||
12 | module: { | ||
13 | rules: [{ | ||
14 | test: /\.tsx?$/, | ||
15 | loader: 'ts-loader', | ||
16 | exclude: /node_modules/, | ||
17 | }], | ||
18 | }, | ||
19 | resolve: { | ||
20 | extensions: ['.tsx', '.ts', '.js'], | ||
21 | }, | ||
22 | externals: { | ||
23 | '@meetfranz/theme': '@meetfranz/theme', | ||
24 | lodash: { | ||
25 | commonjs: 'lodash', | ||
26 | commonjs2: 'lodash', | ||
27 | amd: 'lodash', | ||
28 | root: '_', | ||
29 | }, | ||
30 | classnames: 'classnames', | ||
31 | mobx: 'mobx', | ||
32 | mobxReact: 'mobx-react', | ||
33 | react: 'react', | ||
34 | reactJss: 'react-jss', | ||
35 | }, | ||
36 | devtool: 'inline-source-map', | ||
37 | optimization: { | ||
38 | minimizer: [new TerserPlugin()], | ||
39 | }, | ||
40 | mode: process.env.NODE_ENV === 'development' ? 'development' : 'production', | ||
41 | }; | ||
diff --git a/packages/theme/package.json b/packages/theme/package.json index 0bc0423bf..8b4cb8ef6 100644 --- a/packages/theme/package.json +++ b/packages/theme/package.json | |||
@@ -6,9 +6,6 @@ | |||
6 | "homepage": "https://github.com/meetfranz/franz", | 6 | "homepage": "https://github.com/meetfranz/franz", |
7 | "license": "Apache-2.0", | 7 | "license": "Apache-2.0", |
8 | "main": "lib/index.js", | 8 | "main": "lib/index.js", |
9 | "files": [ | ||
10 | "lib/**/*" | ||
11 | ], | ||
12 | "publishConfig": { | 9 | "publishConfig": { |
13 | "access": "public" | 10 | "access": "public" |
14 | }, | 11 | }, |
@@ -17,8 +14,8 @@ | |||
17 | "url": "git+https://github.com/meetfranz/franz.git" | 14 | "url": "git+https://github.com/meetfranz/franz.git" |
18 | }, | 15 | }, |
19 | "scripts": { | 16 | "scripts": { |
20 | "dev": "tsc -w", | 17 | "dev": "NODE_ENV=development ../../node_modules/.bin/webpack -w", |
21 | "prepare": "tsc", | 18 | "prepare": "../../node_modules/.bin/webpack", |
22 | "preprepare": "npm run test", | 19 | "preprepare": "npm run test", |
23 | "test": "npx mocha" | 20 | "test": "npx mocha" |
24 | }, | 21 | }, |
diff --git a/packages/theme/src/themes/dark/index.ts b/packages/theme/src/themes/dark/index.ts index 7eac5a3c3..3c17d03ae 100644 --- a/packages/theme/src/themes/dark/index.ts +++ b/packages/theme/src/themes/dark/index.ts | |||
@@ -1,4 +1,4 @@ | |||
1 | import color from 'color'; | 1 | import * as color from 'color'; |
2 | 2 | ||
3 | import * as legacyStyles from '../legacy'; | 3 | import * as legacyStyles from '../legacy'; |
4 | 4 | ||
diff --git a/packages/theme/src/themes/default/index.ts b/packages/theme/src/themes/default/index.ts index b22730413..f7d58a375 100644 --- a/packages/theme/src/themes/default/index.ts +++ b/packages/theme/src/themes/default/index.ts | |||
@@ -1,4 +1,4 @@ | |||
1 | import color from 'color'; | 1 | import * as color from 'color'; |
2 | 2 | ||
3 | import * as legacyStyles from '../legacy'; | 3 | import * as legacyStyles from '../legacy'; |
4 | 4 | ||
diff --git a/packages/theme/webpack.config.js b/packages/theme/webpack.config.js new file mode 100644 index 000000000..f7311109d --- /dev/null +++ b/packages/theme/webpack.config.js | |||
@@ -0,0 +1,25 @@ | |||
1 | const path = require('path'); | ||
2 | |||
3 | console.log(__dirname); | ||
4 | |||
5 | module.exports = { | ||
6 | context: __dirname, | ||
7 | entry: path.join(__dirname, '/src/index.ts'), | ||
8 | output: { | ||
9 | filename: 'index.js', | ||
10 | path: path.join(__dirname, 'lib'), | ||
11 | libraryTarget: 'commonjs2', | ||
12 | }, | ||
13 | module: { | ||
14 | rules: [{ | ||
15 | test: /\.tsx?$/, | ||
16 | loader: 'ts-loader', | ||
17 | exclude: /node_modules/, | ||
18 | }], | ||
19 | }, | ||
20 | resolve: { | ||
21 | extensions: ['.tsx', '.ts', '.js'], | ||
22 | }, | ||
23 | devtool: 'inline-source-map', | ||
24 | mode: process.env.NODE_ENV === 'development' ? 'development' : 'production', | ||
25 | }; | ||
diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js index 9c9543749..f2d3ca8c0 100644 --- a/src/components/settings/account/AccountDashboard.js +++ b/src/components/settings/account/AccountDashboard.js | |||
@@ -169,15 +169,9 @@ export default @observer class AccountDashboard extends Component { | |||
169 | {user.organization && `${user.organization}, `} | 169 | {user.organization && `${user.organization}, `} |
170 | {user.email} | 170 | {user.email} |
171 | <br /> | 171 | <br /> |
172 | {!user.isEnterprise && !user.isPremium && ( | ||
173 | <span className="badge badge">{intl.formatMessage(messages.accountTypeBasic)}</span> | ||
174 | )} | ||
175 | {user.isPremium && ( | 172 | {user.isPremium && ( |
176 | <span className="badge badge--premium">{intl.formatMessage(messages.accountTypePremium)}</span> | 173 | <span className="badge badge--premium">{intl.formatMessage(messages.accountTypePremium)}</span> |
177 | )} | 174 | )} |
178 | {user.isEnterprise && ( | ||
179 | <span className="badge badge--success">{intl.formatMessage(messages.accountTypeEnterprise)}</span> | ||
180 | )} | ||
181 | </div> | 175 | </div> |
182 | <Link to="/settings/user/edit" className="button"> | 176 | <Link to="/settings/user/edit" className="button"> |
183 | {intl.formatMessage(messages.accountEditButton)} | 177 | {intl.formatMessage(messages.accountEditButton)} |
@@ -235,34 +229,7 @@ export default @observer class AccountDashboard extends Component { | |||
235 | ) | 229 | ) |
236 | )} | 230 | )} |
237 | 231 | ||
238 | {user.isEnterprise && ( | 232 | {!user.isPremium && ( |
239 | <div className="account"> | ||
240 | <div className="account__box"> | ||
241 | <h2>{user.company.name}</h2> | ||
242 | <p> | ||
243 | Technical contact: | ||
244 | <Link | ||
245 | className="link" | ||
246 | target="_blank" | ||
247 | to={`mailto:${user.company.contact.technical}?subject=Franz`} | ||
248 | > | ||
249 | {user.company.contact.technical} | ||
250 | </Link> | ||
251 | <br /> | ||
252 | General contact: | ||
253 | <Link | ||
254 | className="link" | ||
255 | target="_blank" | ||
256 | to={`mailto:${user.company.contact.default}?subject=Franz`} | ||
257 | > | ||
258 | {user.company.contact.default} | ||
259 | </Link> | ||
260 | </p> | ||
261 | </div> | ||
262 | </div> | ||
263 | )} | ||
264 | |||
265 | {!user.isEnterprise && !user.isPremium && ( | ||
266 | isLoadingPlans ? ( | 233 | isLoadingPlans ? ( |
267 | <Loader /> | 234 | <Loader /> |
268 | ) : ( | 235 | ) : ( |
@@ -277,27 +244,25 @@ export default @observer class AccountDashboard extends Component { | |||
277 | ) | 244 | ) |
278 | )} | 245 | )} |
279 | 246 | ||
280 | {!user.isEnterprise && ( | 247 | <div className="account franz-form"> |
281 | <div className="account franz-form"> | 248 | <div className="account__box"> |
282 | <div className="account__box"> | 249 | <h2>{intl.formatMessage(messages.headlineDangerZone)}</h2> |
283 | <h2>{intl.formatMessage(messages.headlineDangerZone)}</h2> | 250 | {!isDeleteAccountSuccessful && ( |
284 | {!isDeleteAccountSuccessful && ( | 251 | <div className="account__subscription"> |
285 | <div className="account__subscription"> | 252 | <p>{intl.formatMessage(messages.deleteInfo)}</p> |
286 | <p>{intl.formatMessage(messages.deleteInfo)}</p> | 253 | <Button |
287 | <Button | 254 | label={intl.formatMessage(messages.deleteAccount)} |
288 | label={intl.formatMessage(messages.deleteAccount)} | 255 | buttonType="danger" |
289 | buttonType="danger" | 256 | onClick={() => deleteAccount()} |
290 | onClick={() => deleteAccount()} | 257 | loaded={!isLoadingDeleteAccount} |
291 | loaded={!isLoadingDeleteAccount} | 258 | /> |
292 | /> | ||
293 | </div> | ||
294 | )} | ||
295 | {isDeleteAccountSuccessful && ( | ||
296 | <p>{intl.formatMessage(messages.deleteEmailSent)}</p> | ||
297 | )} | ||
298 | </div> | 259 | </div> |
260 | )} | ||
261 | {isDeleteAccountSuccessful && ( | ||
262 | <p>{intl.formatMessage(messages.deleteEmailSent)}</p> | ||
263 | )} | ||
299 | </div> | 264 | </div> |
300 | )} | 265 | </div> |
301 | </Fragment> | 266 | </Fragment> |
302 | )} | 267 | )} |
303 | </div> | 268 | </div> |
diff --git a/src/components/settings/user/EditUserForm.js b/src/components/settings/user/EditUserForm.js index 0e3ac6b10..f9b60dc52 100644 --- a/src/components/settings/user/EditUserForm.js +++ b/src/components/settings/user/EditUserForm.js | |||
@@ -3,15 +3,16 @@ import PropTypes from 'prop-types'; | |||
3 | import { observer, PropTypes as MobxPropTypes } from 'mobx-react'; | 3 | import { observer, PropTypes as MobxPropTypes } from 'mobx-react'; |
4 | import { defineMessages, intlShape } from 'react-intl'; | 4 | import { defineMessages, intlShape } from 'react-intl'; |
5 | import { Link } from 'react-router'; | 5 | import { Link } from 'react-router'; |
6 | 6 | import { Input } from '@meetfranz/forms'; | |
7 | // import { Link } from 'react-router'; | ||
8 | 7 | ||
9 | import Form from '../../../lib/Form'; | 8 | import Form from '../../../lib/Form'; |
10 | import Input from '../../ui/Input'; | 9 | // import Input from '../../ui/Input'; |
11 | import Button from '../../ui/Button'; | 10 | import Button from '../../ui/Button'; |
12 | import Radio from '../../ui/Radio'; | 11 | import Radio from '../../ui/Radio'; |
13 | import Infobox from '../../ui/Infobox'; | 12 | import Infobox from '../../ui/Infobox'; |
14 | 13 | ||
14 | console.log('input', Input); | ||
15 | |||
15 | const messages = defineMessages({ | 16 | const messages = defineMessages({ |
16 | headline: { | 17 | headline: { |
17 | id: 'settings.account.headline', | 18 | id: 'settings.account.headline', |
@@ -39,13 +40,12 @@ const messages = defineMessages({ | |||
39 | }, | 40 | }, |
40 | }); | 41 | }); |
41 | 42 | ||
42 | export default @observer class EditServiceForm extends Component { | 43 | export default @observer class EditUserForm extends Component { |
43 | static propTypes = { | 44 | static propTypes = { |
44 | status: MobxPropTypes.observableArray.isRequired, | 45 | status: MobxPropTypes.observableArray.isRequired, |
45 | form: PropTypes.instanceOf(Form).isRequired, | 46 | form: PropTypes.instanceOf(Form).isRequired, |
46 | onSubmit: PropTypes.func.isRequired, | 47 | onSubmit: PropTypes.func.isRequired, |
47 | isSaving: PropTypes.bool.isRequired, | 48 | isSaving: PropTypes.bool.isRequired, |
48 | isEnterprise: PropTypes.bool.isRequired, | ||
49 | }; | 49 | }; |
50 | 50 | ||
51 | static contextTypes = { | 51 | static contextTypes = { |
@@ -68,7 +68,6 @@ export default @observer class EditServiceForm extends Component { | |||
68 | // user, | 68 | // user, |
69 | status, | 69 | status, |
70 | form, | 70 | form, |
71 | isEnterprise, | ||
72 | isSaving, | 71 | isSaving, |
73 | } = this.props; | 72 | } = this.props; |
74 | const { intl } = this.context; | 73 | const { intl } = this.context; |
@@ -98,23 +97,21 @@ export default @observer class EditServiceForm extends Component { | |||
98 | )} | 97 | )} |
99 | <h2>{intl.formatMessage(messages.headlineAccount)}</h2> | 98 | <h2>{intl.formatMessage(messages.headlineAccount)}</h2> |
100 | <div className="grid__row"> | 99 | <div className="grid__row"> |
101 | <Input field={form.$('firstname')} focus /> | 100 | <Input {...form.$('firstname').bind()} focus /> |
102 | <Input field={form.$('lastname')} /> | 101 | <Input {...form.$('lastname').bind()} /> |
103 | </div> | 102 | </div> |
104 | <Input field={form.$('email')} /> | 103 | <Input {...form.$('email').bind()} /> |
105 | {!isEnterprise && ( | 104 | <Radio field={form.$('accountType')} /> |
106 | <Radio field={form.$('accountType')} /> | 105 | {form.$('accountType').value === 'company' && ( |
107 | )} | ||
108 | {!isEnterprise && form.$('accountType').value === 'company' && ( | ||
109 | <Input field={form.$('organization')} /> | 106 | <Input field={form.$('organization')} /> |
110 | )} | 107 | )} |
111 | <h2>{intl.formatMessage(messages.headlinePassword)}</h2> | 108 | <h2>{intl.formatMessage(messages.headlinePassword)}</h2> |
112 | <Input | 109 | <Input |
113 | field={form.$('oldPassword')} | 110 | {...form.$('oldPassword').bind()} |
114 | showPasswordToggle | 111 | showPasswordToggle |
115 | /> | 112 | /> |
116 | <Input | 113 | <Input |
117 | field={form.$('newPassword')} | 114 | {...form.$('newPassword').bind()} |
118 | showPasswordToggle | 115 | showPasswordToggle |
119 | scorePassword | 116 | scorePassword |
120 | /> | 117 | /> |
diff --git a/src/stores/UIStore.js b/src/stores/UIStore.js index 188c2fc44..e3c5103da 100644 --- a/src/stores/UIStore.js +++ b/src/stores/UIStore.js | |||
@@ -1,5 +1,5 @@ | |||
1 | import { action, observable, computed } from 'mobx'; | 1 | import { action, observable, computed } from 'mobx'; |
2 | import theme from '@meetfranz/theme'; | 2 | import * as theme from '@meetfranz/theme'; |
3 | 3 | ||
4 | import Store from './lib/Store'; | 4 | import Store from './lib/Store'; |
5 | 5 | ||
@@ -23,10 +23,10 @@ export default class UIStore extends Store { | |||
23 | 23 | ||
24 | @computed get theme() { | 24 | @computed get theme() { |
25 | if (this.stores.settings.all.app.darkMode) { | 25 | if (this.stores.settings.all.app.darkMode) { |
26 | return theme('dark'); | 26 | return theme.default('dark'); |
27 | } | 27 | } |
28 | 28 | ||
29 | return theme('default'); | 29 | return theme.default('default'); |
30 | } | 30 | } |
31 | 31 | ||
32 | // Actions | 32 | // Actions |
diff --git a/stories/input.stories.tsx b/stories/input.stories.tsx index 59accc99a..86de48f9b 100644 --- a/stories/input.stories.tsx +++ b/stories/input.stories.tsx | |||
@@ -3,7 +3,7 @@ import React from 'react'; | |||
3 | import { storiesOf } from '@storybook/react'; | 3 | import { storiesOf } from '@storybook/react'; |
4 | import { action } from '@storybook/addon-actions'; | 4 | import { action } from '@storybook/addon-actions'; |
5 | 5 | ||
6 | import { Input } from '../packages/forms/src'; | 6 | import { Input } from '@meetfranz/forms'; |
7 | 7 | ||
8 | console.log('stories'); | 8 | console.log('stories'); |
9 | 9 | ||
diff --git a/tsconfig.json b/tsconfig.json index 3095a6367..031df721f 100644 --- a/tsconfig.json +++ b/tsconfig.json | |||
@@ -1,4 +1,7 @@ | |||
1 | { | 1 | { |
2 | "compilerOptions": { | ||
3 | "experimentalDecorators": true | ||
4 | }, | ||
2 | "files": [ | 5 | "files": [ |
3 | "packages/**/*.{ts,tsx}" | 6 | "packages/**/*.{ts,tsx}" |
4 | ], | 7 | ], |