Cleanup
This commit is contained in:
parent
fa73a4bd7d
commit
aabb9feaea
6 changed files with 27 additions and 29 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -76,3 +76,4 @@ typings/
|
||||||
|
|
||||||
# DS_Store
|
# DS_Store
|
||||||
.DS_Store
|
.DS_Store
|
||||||
|
*.tsbuildinfo
|
||||||
|
|
|
||||||
|
|
@ -44,7 +44,6 @@ const AccountModal = () => {
|
||||||
const privateSelect = React.createRef<HTMLInputElement>()
|
const privateSelect = React.createRef<HTMLInputElement>()
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
console.log(cookies.user)
|
|
||||||
if (cookies.user) setPicture(cookies.user.picture)
|
if (cookies.user) setPicture(cookies.user.picture)
|
||||||
if (cookies.user) setLanguage(cookies.user.language)
|
if (cookies.user) setLanguage(cookies.user.language)
|
||||||
}, [cookies])
|
}, [cookies])
|
||||||
|
|
|
||||||
|
|
@ -117,13 +117,18 @@ const GridRep = (props: Props) => {
|
||||||
<h2 className={titleClass} onClick={navigate}>{ (props.name) ? props.name : t('no_title') }</h2>
|
<h2 className={titleClass} onClick={navigate}>{ (props.name) ? props.name : t('no_title') }</h2>
|
||||||
<div className={raidClass}>{ (props.raid) ? props.raid.name[locale] : t('no_raid') }</div>
|
<div className={raidClass}>{ (props.raid) ? props.raid.name[locale] : t('no_raid') }</div>
|
||||||
</div>
|
</div>
|
||||||
{ (account.authorized && (props.user && account.user && account.user.id !== props.user.id)) ?
|
{
|
||||||
<Button
|
(account.authorized && (
|
||||||
active={props.favorited}
|
(props.user && account.user && account.user.id !== props.user.id)
|
||||||
icon="save"
|
|| (!props.user)
|
||||||
type={ButtonType.IconOnly}
|
)) ?
|
||||||
onClick={sendSaveData}
|
<Button
|
||||||
/> : ''}
|
active={props.favorited}
|
||||||
|
icon="save"
|
||||||
|
type={ButtonType.IconOnly}
|
||||||
|
onClick={sendSaveData} />
|
||||||
|
: ''
|
||||||
|
}
|
||||||
</div>
|
</div>
|
||||||
<div className="bottom">
|
<div className="bottom">
|
||||||
<div className={userClass}>
|
<div className={userClass}>
|
||||||
|
|
|
||||||
|
|
@ -48,7 +48,7 @@ const HeaderMenu = (props: Props) => {
|
||||||
<ul className="Menu auth">
|
<ul className="Menu auth">
|
||||||
<div className="MenuGroup">
|
<div className="MenuGroup">
|
||||||
<li className="MenuItem profile">
|
<li className="MenuItem profile">
|
||||||
<Link href={`/${accountCookies.account.username}` || ''}>
|
<Link href={`/${accountCookies.account.username}` || ''} passHref>
|
||||||
<div>
|
<div>
|
||||||
<span>{accountCookies.account.username}</span>
|
<span>{accountCookies.account.username}</span>
|
||||||
<img
|
<img
|
||||||
|
|
|
||||||
|
|
@ -25,21 +25,21 @@ const RaidDropdown = React.forwardRef<HTMLSelectElement, Props>(function useFiel
|
||||||
const [raids, setRaids] = useState<Raid[]>()
|
const [raids, setRaids] = useState<Raid[]>()
|
||||||
const [sortedRaids, setSortedRaids] = useState<Raid[][]>()
|
const [sortedRaids, setSortedRaids] = useState<Raid[][]>()
|
||||||
|
|
||||||
// Set up empty raid for "All raids"
|
|
||||||
const all = {
|
|
||||||
id: '0',
|
|
||||||
name: {
|
|
||||||
en: 'All raids',
|
|
||||||
ja: '全て'
|
|
||||||
},
|
|
||||||
slug: 'all',
|
|
||||||
level: 0,
|
|
||||||
group: 0,
|
|
||||||
element: 0
|
|
||||||
}
|
|
||||||
|
|
||||||
// Organize raids into groups on mount
|
// Organize raids into groups on mount
|
||||||
const organizeRaids = useCallback((raids: Raid[]) => {
|
const organizeRaids = useCallback((raids: Raid[]) => {
|
||||||
|
// Set up empty raid for "All raids"
|
||||||
|
const all = {
|
||||||
|
id: '0',
|
||||||
|
name: {
|
||||||
|
en: 'All raids',
|
||||||
|
ja: '全て'
|
||||||
|
},
|
||||||
|
slug: 'all',
|
||||||
|
level: 0,
|
||||||
|
group: 0,
|
||||||
|
element: 0
|
||||||
|
}
|
||||||
|
|
||||||
const numGroups = Math.max.apply(Math, raids.map(raid => raid.group))
|
const numGroups = Math.max.apply(Math, raids.map(raid => raid.group))
|
||||||
let groupedRaids = []
|
let groupedRaids = []
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -14,13 +14,6 @@ interface Props {
|
||||||
children: React.ReactNode
|
children: React.ReactNode
|
||||||
}
|
}
|
||||||
|
|
||||||
interface KeyNames {
|
|
||||||
[key: string]: {
|
|
||||||
en: string,
|
|
||||||
jp: string
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const SummonHovercard = (props: Props) => {
|
const SummonHovercard = (props: Props) => {
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
const { t } = useTranslation('common')
|
const { t } = useTranslation('common')
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue