From 8c17d730eff3bb59313a2f9f7aa469fe6fff95b2 Mon Sep 17 00:00:00 2001
From: Sascha <GlancingMind@outlook.com>
Date: Tue, 23 Feb 2021 16:03:07 +0100
Subject: Add button to toggle between light- and dark-mode

---
 webui/src/index.tsx | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'webui/src/index.tsx')

diff --git a/webui/src/index.tsx b/webui/src/index.tsx
index f07b869d..a7f52448 100644
--- a/webui/src/index.tsx
+++ b/webui/src/index.tsx
@@ -1,21 +1,13 @@
 import { ApolloProvider } from '@apollo/client';
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { BrowserRouter } from 'react-router-dom';
-
-import ThemeProvider from '@material-ui/styles/ThemeProvider';
 
 import App from './App';
 import apolloClient from './apollo';
-import theme from './theme';
 
 ReactDOM.render(
   <ApolloProvider client={apolloClient}>
-    <BrowserRouter>
-      <ThemeProvider theme={theme}>
-        <App />
-      </ThemeProvider>
-    </BrowserRouter>
+    <App />
   </ApolloProvider>,
   document.getElementById('root')
 );
-- 
cgit 


From b918c9facd157d1dfb24282f6309782a10e02123 Mon Sep 17 00:00:00 2001
From: Sascha <GlancingMind@outlook.com>
Date: Wed, 3 Mar 2021 14:28:45 +0100
Subject: Revert restructuring between App.tsx and index.tsx

This should prevent unnecessary merge conflicts.
---
 webui/src/index.tsx | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'webui/src/index.tsx')

diff --git a/webui/src/index.tsx b/webui/src/index.tsx
index a7f52448..d3591e1a 100644
--- a/webui/src/index.tsx
+++ b/webui/src/index.tsx
@@ -1,13 +1,20 @@
 import { ApolloProvider } from '@apollo/client';
 import React from 'react';
 import ReactDOM from 'react-dom';
+import { BrowserRouter } from 'react-router-dom';
 
 import App from './App';
 import apolloClient from './apollo';
+import Themer from './components/Themer';
+import { defaultLightTheme, defaultDarkTheme } from './themes/index';
 
 ReactDOM.render(
   <ApolloProvider client={apolloClient}>
-    <App />
+    <BrowserRouter>
+      <Themer lightTheme={defaultLightTheme} darkTheme={defaultDarkTheme}>
+        <App />
+      </Themer>
+    </BrowserRouter>
   </ApolloProvider>,
   document.getElementById('root')
 );
-- 
cgit