diff --git a/src/components/Button/Button.js b/src/components/Button/Button.js index 4a03e052..3d3a2a37 100644 --- a/src/components/Button/Button.js +++ b/src/components/Button/Button.js @@ -2,9 +2,9 @@ import React from 'react'; import styled from 'styled-components/macro'; export default function Button(props) { - const { color, type, onClick, disabled, style, icon, children } = props; + const { color, type, onClick, disabled, style, icon, children, className } = props; return ( - + {icon && diff --git a/src/views/Admin/components.js b/src/views/Admin/components.js index d78b1257..e0cf2027 100644 --- a/src/views/Admin/components.js +++ b/src/views/Admin/components.js @@ -37,9 +37,7 @@ export const LeaderCard = styled.div` `; export const AdminNavButton = styled(Button)` - width: 140px; - height: 35px; - font-size: 14px; + margin-bottom: 20px; `; export const SidebarList = styled.ul` @@ -89,13 +87,7 @@ export const LeaderPhoto = styled.img` border-radius: 50%; `; -export const AdminNavigation = styled(Link)` - grid-column: 2/2; - position: absolute; - left: 0; - top: 15px; - grid-row: 1/1; -`; +export const AdminNavigation = styled(Link)``; export const SidebarListHead = styled.div` padding: 0 20px; diff --git a/src/views/Admin/index.js b/src/views/Admin/index.js index 514d5652..7df3700b 100644 --- a/src/views/Admin/index.js +++ b/src/views/Admin/index.js @@ -4,7 +4,7 @@ import { Button } from '../../components'; import { AdminWrapper, AdminNavigation, AdminNavButton } from './components'; import LeaderAdmin from './LeaderAdmin'; import ProtestAdmin from './ProtestAdmin'; -import EditsAdmin from "./EditsAdmin"; +import EditsAdmin from './EditsAdmin'; import { handleSignIn } from '../../api'; import { isAdmin } from '../../utils'; @@ -17,6 +17,21 @@ const Admin = ({ user }) => {
טוען...
) : user ? ( <> +
+ + אישור הפגנות + + + אישור מובילים + + + אישור עריכות + +
{!isAdmin(user) && } @@ -31,17 +46,7 @@ const Admin = ({ user }) => { - - {['/admin/protest-requests/', '/admin/protest-requests'].includes(location.pathname) ? ( - - אישור מובילים - - ) : ( - - אישור הפגנות - - )} ) : (