mirror
/
photoview
mirror of https://github.com/photoview/photoview.git
1
Fork 0
Code

Remove error messages when visiting share without being logged in

This commit is contained in:
viktorstrate 2020-10-26 11:22:42 +01:00
parent a3eab5db74
commit 1386c8d91d
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ui/src/Layout.js
View File

@ -1,14 +1,15 @@
import React from 'react' import React, { useEffect } from 'react'
import PropTypes from 'prop-types' import PropTypes from 'prop-types'
import styled from 'styled-components' import styled from 'styled-components'
import { NavLink } from 'react-router-dom' import { NavLink } from 'react-router-dom'
import { Icon } from 'semantic-ui-react' import { Icon } from 'semantic-ui-react'
import Sidebar from './components/sidebar/Sidebar' import Sidebar from './components/sidebar/Sidebar'
import { useQuery } from 'react-apollo' import { useQuery, useLazyQuery } from 'react-apollo'
import gql from 'graphql-tag' import gql from 'graphql-tag'
import { Authorized } from './AuthorizedRoute' import { Authorized } from './AuthorizedRoute'
import { Helmet } from 'react-helmet' import { Helmet } from 'react-helmet'
import Header from './components/header/Header' import Header from './components/header/Header'
import { authToken } from './authentication'
const ADMIN_QUERY = gql` const ADMIN_QUERY = gql`
query adminQuery { query adminQuery {
@ -95,9 +96,15 @@ const SideButtonLabel = styled.div`
` `
const Layout = ({ children, title }) => { const Layout = ({ children, title }) => {
const adminQuery = useQuery(ADMIN_QUERY) const [loadAdminQuery, adminQuery] = useLazyQuery(ADMIN_QUERY)
const mapboxQuery = useQuery(MAPBOX_QUERY) const mapboxQuery = useQuery(MAPBOX_QUERY)
useEffect(() => {
if (authToken()) {
loadAdminQuery()
}
}, [])
const isAdmin = const isAdmin =
adminQuery.data && adminQuery.data.myUser && adminQuery.data.myUser.admin adminQuery.data && adminQuery.data.myUser && adminQuery.data.myUser.admin

4
ui/src/components/photoGallery/MediaThumbnail.js
View File

@ -156,7 +156,7 @@ export const MediaThumbnail = ({
}, },
}, },
}) })
onFavorite() onFavorite && onFavorite()
}} }}
/> />
) )
@ -200,7 +200,7 @@ MediaThumbnail.propTypes = {
index: PropTypes.number.isRequired, index: PropTypes.number.isRequired,
active: PropTypes.bool.isRequired, active: PropTypes.bool.isRequired,
setPresenting: PropTypes.func.isRequired, setPresenting: PropTypes.func.isRequired,
onFavorite: PropTypes.func.isRequired, onFavorite: PropTypes.func,
} }
export const PhotoThumbnail = styled.div` export const PhotoThumbnail = styled.div`