From ac87ff3734edf591f024c15d9e82dfde38440a01 Mon Sep 17 00:00:00 2001 From: nl_0 Date: Wed, 8 May 2019 23:02:09 +0500 Subject: [PATCH 01/19] webpack: dont use image loader --- .../internals/webpack/webpack.base.babel.js | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/catalog/internals/webpack/webpack.base.babel.js b/catalog/internals/webpack/webpack.base.babel.js index 0d6fc4bf..b37ff323 100644 --- a/catalog/internals/webpack/webpack.base.babel.js +++ b/catalog/internals/webpack/webpack.base.babel.js @@ -72,28 +72,6 @@ module.exports = (options) => ({ limit: 10 * 1024, }, }, - { - loader: 'image-webpack-loader', - options: { - mozjpeg: { - enabled: false, - // NOTE: mozjpeg is disabled as it causes errors in some Linux environments - // Try enabling it in your environment by switching the config to: - // enabled: true, - // progressive: true, - }, - gifsicle: { - interlaced: false, - }, - optipng: { - optimizationLevel: 7, - }, - pngquant: { - quality: '65-90', - speed: 4, - }, - }, - }, ], }, { From 5574bde7735ddd4583e2ecf0d0d09322405767ca Mon Sep 17 00:00:00 2001 From: nl_0 Date: Wed, 8 May 2019 23:02:51 +0500 Subject: [PATCH 02/19] utils/styledBy --- catalog/app/utils/styledBy.js | 1 + 1 file changed, 1 insertion(+) create mode 100644 catalog/app/utils/styledBy.js diff --git a/catalog/app/utils/styledBy.js b/catalog/app/utils/styledBy.js new file mode 100644 index 00000000..fee3aa56 --- /dev/null +++ b/catalog/app/utils/styledBy.js @@ -0,0 +1 @@ +export default (property, mapping) => (props) => mapping[props[property]] From ca28bcaaf7bd82207b050eca9adc790f86ee10f1 Mon Sep 17 00:00:00 2001 From: nl_0 Date: Wed, 8 May 2019 23:03:37 +0500 Subject: [PATCH 03/19] Layout: expose Root and Container components --- catalog/app/components/Layout/Layout.js | 35 +++++++++++++++++++------ catalog/app/components/Layout/index.js | 3 ++- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/catalog/app/components/Layout/Layout.js b/catalog/app/components/Layout/Layout.js index 768a4205..55004087 100644 --- a/catalog/app/components/Layout/Layout.js +++ b/catalog/app/components/Layout/Layout.js @@ -2,11 +2,35 @@ import PT from 'prop-types' import * as React from 'react' import * as RC from 'recompose' import { unstable_Box as Box } from '@material-ui/core/Box' +import { useTheme } from '@material-ui/styles' import Footer from 'components/Footer' import * as NavBar from 'containers/NavBar' import { composeComponent } from 'utils/reactTools' +export const Root = ({ dark = false, ...props }) => ( + +) + +export const Container = (props) => { + const t = useTheme() + return ( + + ) +} + export default composeComponent( 'Layout', RC.setPropTypes({ @@ -16,17 +40,12 @@ export default composeComponent( dark: PT.bool, }), ({ bare = false, dark = false, children, pre }) => ( - + {bare ? : } {!!pre && pre} - {children} + {!!children && {children}}