remove interior-header

canvasxyz · Apr 27, 2023 · 31193f8 · 31193f8
1 parent 376087d
commit 31193f8
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 47 deletions.
diff --git a/client-admin/src/app.js b/client-admin/src/app.js
@@ -30,8 +30,7 @@ import Account from './pages/manage/account'
 
 /* participate */
 import Survey from './pages/survey'
-
-import InteriorHeader from './pages/interior-header'
+import Logomark from './pages/widgets/logomark'
 
 const PrivateRoute = ({ component: Component, isLoading, authed, ...rest }) => {
   if (isLoading) {
@@ -168,7 +167,30 @@ class App extends React.Component {
           <Route exact path="/tos" component={TOS} />
           <Route exact path="/privacy" component={Privacy} />
 
-          <InteriorHeader>
+          <Box>
+            <Box
+              sx={{
+                width: '100%',
+                backgroundColor: 'primary',
+                color: 'background',
+                zIndex: 1000,
+                py: [3],
+                px: [4],
+                display: 'flex',
+                alignItems: 'center',
+                justifyContent: 'space-between'
+              }}>
+              <Link sx={{ variant: 'links.header' }} to="/">
+                <Logomark
+                  style={{ marginRight: 10, position: 'relative', top: 6 }}
+                  fill={'white'}
+                />
+                Polis
+              </Link>
+              <Link id="signoutLink" sx={{ variant: 'links.header' }} to="/signout">
+                sign out
+              </Link>
+            </Box>
             <Route
               render={(routeProps) => {
                 if (routeProps.location.pathname.split('/')[1] === 'm') {
@@ -246,7 +268,7 @@ class App extends React.Component {
               authed={this.isAuthed()}
               component={ConversationAdmin}
             />
-          </InteriorHeader>
+          </Box>
         </Switch>
       </>
     )

diff --git a/client-admin/src/index.js b/client-admin/src/index.js
@@ -12,11 +12,10 @@ import thunk from 'redux-thunk'
 import { ThemeProvider } from 'theme-ui'
 import theme from './theme'
 import App from './app'
-import rootReducer from '../reducers'
+import rootReducer from './reducers'
 
 const middleware = [thunk]
-const createStore = compose(applyMiddleware(...middleware))(createStore)
-const store = createStore(rootReducer)
+const store = compose(applyMiddleware(...middleware))(createStore)(rootReducer)
 
 class Root extends React.Component {
   render() {

diff --git a/client-admin/src/pages/interior-header.js b/client-admin/src/pages/interior-header.js