UI: Use login theme everywhere
This commit is contained in:
+5
-1
@@ -3,14 +3,18 @@ import React from 'react'
|
|||||||
import { Admin, Resource } from 'react-admin'
|
import { Admin, Resource } from 'react-admin'
|
||||||
import dataProvider from './dataProvider'
|
import dataProvider from './dataProvider'
|
||||||
import authProvider from './authProvider'
|
import authProvider from './authProvider'
|
||||||
import { Login, Layout } from './layout'
|
import { Login, Layout, LightTheme } from './layout'
|
||||||
import user from './user'
|
import user from './user'
|
||||||
import song from './song'
|
import song from './song'
|
||||||
import album from './album'
|
import album from './album'
|
||||||
import artist from './artist'
|
import artist from './artist'
|
||||||
|
import { createMuiTheme } from '@material-ui/core/styles'
|
||||||
|
|
||||||
|
const theme = createMuiTheme(LightTheme)
|
||||||
|
|
||||||
const App = () => (
|
const App = () => (
|
||||||
<Admin
|
<Admin
|
||||||
|
theme={theme}
|
||||||
dataProvider={dataProvider}
|
dataProvider={dataProvider}
|
||||||
authProvider={authProvider}
|
authProvider={authProvider}
|
||||||
layout={Layout}
|
layout={Layout}
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import LockIcon from '@material-ui/icons/Lock'
|
|||||||
|
|
||||||
import { Notification, useLogin, useNotify, useTranslate } from 'react-admin'
|
import { Notification, useLogin, useNotify, useTranslate } from 'react-admin'
|
||||||
|
|
||||||
import { lightTheme } from './themes'
|
import { LightTheme } from './Themes'
|
||||||
|
|
||||||
const useStyles = makeStyles((theme) => ({
|
const useStyles = makeStyles((theme) => ({
|
||||||
main: {
|
main: {
|
||||||
@@ -171,7 +171,7 @@ Login.propTypes = {
|
|||||||
// Because otherwise the useStyles() hook used in Login won't get
|
// Because otherwise the useStyles() hook used in Login won't get
|
||||||
// the right theme
|
// the right theme
|
||||||
const LoginWithTheme = (props) => (
|
const LoginWithTheme = (props) => (
|
||||||
<ThemeProvider theme={createMuiTheme(lightTheme)}>
|
<ThemeProvider theme={createMuiTheme(LightTheme)}>
|
||||||
<Login {...props} />
|
<Login {...props} />
|
||||||
</ThemeProvider>
|
</ThemeProvider>
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,10 +1,13 @@
|
|||||||
export const darkTheme = {
|
// import purple from '@material-ui/core/colors/purple'
|
||||||
|
|
||||||
|
export const DarkTheme = {
|
||||||
palette: {
|
palette: {
|
||||||
type: 'dark' // Switching the dark mode on is a single property value change.
|
// secondary: purple,
|
||||||
|
type: 'dark'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export const lightTheme = {
|
export const LightTheme = {
|
||||||
palette: {
|
palette: {
|
||||||
secondary: {
|
secondary: {
|
||||||
light: '#5f5fc4',
|
light: '#5f5fc4',
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
import Login from './Login'
|
import Login from './Login'
|
||||||
import Layout from './Layout'
|
import Layout from './Layout'
|
||||||
|
import { DarkTheme, LightTheme } from './Themes'
|
||||||
|
|
||||||
export { Layout, Login }
|
export { Layout, Login, DarkTheme, LightTheme }
|
||||||
|
|||||||
Reference in New Issue
Block a user