diff options
author | 2018-11-24 20:15:39 +0100 | |
---|---|---|
committer | 2018-11-24 20:15:39 +0100 | |
commit | 4ea044ae6b2e27e48d45bc3be1c366f4882bbda5 (patch) | |
tree | d19064b7370cb66ef66407de082bedad4c3128d4 /src/containers | |
parent | disable import/prefer-default-export (diff) | |
download | ferdium-app-4ea044ae6b2e27e48d45bc3be1c366f4882bbda5.tar.gz ferdium-app-4ea044ae6b2e27e48d45bc3be1c366f4882bbda5.tar.zst ferdium-app-4ea044ae6b2e27e48d45bc3be1c366f4882bbda5.zip |
feat(App): Lay groundwork for general themeing support
Diffstat (limited to 'src/containers')
-rw-r--r-- | src/containers/layout/AppLayoutContainer.js | 43 |
1 files changed, 23 insertions, 20 deletions
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js index affc1a0a2..c5c9c6850 100644 --- a/src/containers/layout/AppLayoutContainer.js +++ b/src/containers/layout/AppLayoutContainer.js | |||
@@ -1,6 +1,7 @@ | |||
1 | import React, { Component } from 'react'; | 1 | import React, { Component } from 'react'; |
2 | import PropTypes from 'prop-types'; | 2 | import PropTypes from 'prop-types'; |
3 | import { inject, observer } from 'mobx-react'; | 3 | import { inject, observer } from 'mobx-react'; |
4 | import { ThemeProvider } from 'react-jss'; | ||
4 | 5 | ||
5 | import AppStore from '../../stores/AppStore'; | 6 | import AppStore from '../../stores/AppStore'; |
6 | import RecipesStore from '../../stores/RecipesStore'; | 7 | import RecipesStore from '../../stores/RecipesStore'; |
@@ -109,26 +110,28 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e | |||
109 | ); | 110 | ); |
110 | 111 | ||
111 | return ( | 112 | return ( |
112 | <AppLayout | 113 | <ThemeProvider theme={ui.theme}> |
113 | isFullScreen={app.isFullScreen} | 114 | <AppLayout |
114 | isOnline={app.isOnline} | 115 | isFullScreen={app.isFullScreen} |
115 | showServicesUpdatedInfoBar={ui.showServicesUpdatedInfoBar} | 116 | isOnline={app.isOnline} |
116 | appUpdateIsDownloaded={app.updateStatus === app.updateStatusTypes.DOWNLOADED} | 117 | showServicesUpdatedInfoBar={ui.showServicesUpdatedInfoBar} |
117 | sidebar={sidebar} | 118 | appUpdateIsDownloaded={app.updateStatus === app.updateStatusTypes.DOWNLOADED} |
118 | services={servicesContainer} | 119 | sidebar={sidebar} |
119 | news={news.latest} | 120 | services={servicesContainer} |
120 | removeNewsItem={hide} | 121 | news={news.latest} |
121 | reloadServicesAfterUpdate={reloadUpdatedServices} | 122 | removeNewsItem={hide} |
122 | installAppUpdate={installUpdate} | 123 | reloadServicesAfterUpdate={reloadUpdatedServices} |
123 | globalError={globalError.error} | 124 | installAppUpdate={installUpdate} |
124 | showRequiredRequestsError={requests.showRequiredRequestsError} | 125 | globalError={globalError.error} |
125 | areRequiredRequestsSuccessful={requests.areRequiredRequestsSuccessful} | 126 | showRequiredRequestsError={requests.showRequiredRequestsError} |
126 | retryRequiredRequests={retryRequiredRequests} | 127 | areRequiredRequestsSuccessful={requests.areRequiredRequestsSuccessful} |
127 | areRequiredRequestsLoading={requests.areRequiredRequestsLoading} | 128 | retryRequiredRequests={retryRequiredRequests} |
128 | darkMode={settings.all.app.darkMode} | 129 | areRequiredRequestsLoading={requests.areRequiredRequestsLoading} |
129 | > | 130 | darkMode={settings.all.app.darkMode} |
130 | {React.Children.count(children) > 0 ? children : null} | 131 | > |
131 | </AppLayout> | 132 | {React.Children.count(children) > 0 ? children : null} |
133 | </AppLayout> | ||
134 | </ThemeProvider> | ||
132 | ); | 135 | ); |
133 | } | 136 | } |
134 | } | 137 | } |