roleypoly/v1
1
0
Fork 0
mirror of https://github.com/roleypoly/roleypoly-v1.git synced 2025-04-25 20:19:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[ui/header]: fix auth having flow types still

Browse source
This commit is contained in:
41666 2019-06-05 10:22:37 -05:00
parent 88959c59fe
commit 1c00a15c55
No known key found for this signature in database
GPG key ID: DE08FAA8925DC747
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
packages/roleypoly-ui/components/header/auth.tsx
View file

@ -1,13 +1,14 @@
// @flow
import * as React from 'react' import * as React from 'react'
import HeaderBarCommon, { Logomark } from './common' import HeaderBarCommon, { Logomark } from './common'
import { type User } from '../../stores/user'
import DiscordIcon from '../discord-guild-pic' import DiscordIcon from '../discord-guild-pic'
import styled from 'styled-components' import styled from 'styled-components'
import { Hide } from '../../kit/media' import { Hide } from '../../kit/media'
import Link from 'next/link' import Link from 'next/link'
import { connect } from 'react-redux' import { connect } from 'react-redux'
import { getCurrentServerState } from '../../stores/currentServer' import { UserPartial as User } from '@roleypoly/types'
// import { User } from '../../stores/user'
// import { getCurrentServerState } from '../../stores/currentServer'
const temporaryServer = { const temporaryServer = {
id: '423497622876061707', id: '423497622876061707',
@ -78,7 +79,13 @@ const Spacer = styled.div`
flex: 1; flex: 1;
` `
const HeaderBarAuth: React.StatelessFunctionalComponent<{ user: User, isOnServer: boolean, currentServer: * }> = ({ user, isOnServer, currentServer = temporaryServer }) => ( type Props = {
user: User
isOnServer: boolean
currentServer: typeof temporaryServer
}
const HeaderBarAuth: React.FunctionComponent<Props> = ({ user, isOnServer, currentServer = temporaryServer }) => (
<HeaderBarCommon noBackground={false}> <HeaderBarCommon noBackground={false}>
<> <>
<Link href='/'> <Link href='/'>
@ -94,7 +101,7 @@ const HeaderBarAuth: React.StatelessFunctionalComponent<{ user: User, isOnServer
const mapStateToProps = (state, { router }) => ({ const mapStateToProps = (state, { router }) => ({
isOnServer: router.pathname === '/_internal/_server', isOnServer: router.pathname === '/_internal/_server',
currentServer: router.pathname === '/_internal/_server' ? getCurrentServerState(state, router.query.id).server : {} currentServer: router.pathname === '/_internal/_server' ? {} : {} // TODO: true state is state getter
}) })
export default connect(mapStateToProps)(HeaderBarAuth) export default connect(mapStateToProps)(HeaderBarAuth)