Skip to content

ヘッダーのコードをリファクタリング #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
OHMORIYUSUKE wants to merge 1 commit into
base: main
Choose a base branch
from
Open

ヘッダーのコードをリファクタリング #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 0 additions & 35 deletions components/UserIconImage.tsx
View file
Open in desktop

This file was deleted.

87 changes: 75 additions & 12 deletions components/UserName.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,21 @@ import { firebaseConfig } from '../utils/firebaseConfig';
import axios from '../utils/axios';
import firebase from 'firebase/app';
import React from 'react';
import { Link, Typography, useTheme, useMediaQuery } from '@material-ui/core';
import {
Link,
Typography,
useTheme,
useMediaQuery,
Button,
} from '@material-ui/core';

import AccountCircle from '@material-ui/icons/AccountCircle';

export function UserName(): JSX.Element {
const theme = useTheme();
const showName = useMediaQuery(theme.breakpoints.up('md'));
if (!showName) {
return <></>;
}

const userIconImage = localStorage.getItem('userIconImage');
const userName = localStorage.getItem('userName');
const userId = localStorage.getItem('userId');
const refreshToken = localStorage.getItem('refreshToken');
Expand Down Expand Up @@ -55,21 +62,77 @@ export function UserName(): JSX.Element {
}

if (userName) {
// 画面幅狭い
if (!showName) {
return (
<>
<Button
variant="contained"
href="/post/new"
style={{
fontSize: 24,
fontWeight: 'bold',
backgroundColor: '#e9f6fe',
borderRadius: 20,
margin: 5,
}}>
投稿
</Button>
<Link href={'/user/' + userId}>
<img
src={userIconImage}
alt="画像"
style={{ marginRight: '10px', borderRadius: '50%' }}
/>
</Link>
</>
);
}
return (
<Link href={'/user/' + userId}>
<Typography
<>
<Button
variant="contained"
href="/post/new"
style={{
fontSize: 'medium',
textDecoration: 'none !important',
color: '#ffffff',
fontSize: 24,
fontWeight: 'bold',
backgroundColor: '#e9f6fe',
borderRadius: 20,
margin: 7,
}}>
{userName}
</Typography>
</Link>
投稿
</Button>
<Link href={'/user/' + userId}>
<Typography
style={{
fontSize: 'medium',
textDecoration: 'none !important',
color: '#ffffff',
}}>
<img
src={userIconImage}
alt="画像"
style={{ marginRight: '10px', borderRadius: '50%' }}
/>
{userName}
</Typography>
</Link>
</>
);
} else {
// 画面幅狭い
if (!showName) {
return (
<>
<Link href="/login">
<AccountCircle fontSize="large" style={{ marginRight: '10px' }} />
</Link>
</>
);
}
return (
<Link href="/login">
<AccountCircle fontSize="large" style={{ marginRight: '10px' }} />
<Typography style={{ fontSize: 'medium', color: '#ffffff' }}>
ログイン
</Typography>
Expand Down
5 changes: 0 additions & 5 deletions pages/_app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@ const MyApp: FC<AppProps> = ({ Component, pageProps }: AppProps) => {
const DynamicComponentUserName = dynamic(() =>
import('../components/UserName').then((mod) => mod.UserName)
);
const DynamicComponentUserIconImage = dynamic(() =>
import('../components/UserIconImage').then((mod) => mod.UserIconImage)
);

const theme2 = useTheme();
const showTitle = useMediaQuery(theme2.breakpoints.up('sm'));
Expand Down Expand Up @@ -58,8 +55,6 @@ const MyApp: FC<AppProps> = ({ Component, pageProps }: AppProps) => {
aria-controls="menu-appbar"
aria-haspopup="true"
color="inherit">
{/* ログイン済みならtwitterアイコンを表示 / ログインしていなかったら人アイコン*/}
<DynamicComponentUserIconImage />
{/* ログイン済みならtwitterの名前を表示 / ログインしていなかったらゲストユーザー*/}
<DynamicComponentUserName />
</IconButton>
Expand Down