Skip to content

Main #192

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.

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
wants to merge 36 commits into
base: master
Choose a base branch
from
Open

Main #192

Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
07b6d19
init test
kakichi-yu Mar 9, 2023
0f49686
init commit
kakichi-yu Mar 9, 2023
316ee2d
init
kakichi-yu Mar 11, 2023
794e198
mm
kakichi-yu Mar 11, 2023
f4e5edd
HelloReact
kakichi-yu Mar 12, 2023
f615b05
properties
kakichi-yu Mar 12, 2023
e63d949
state
kakichi-yu Mar 12, 2023
6bb4185
init
kakichi-yu Mar 13, 2023
afd361c
callback
kakichi-yu Mar 13, 2023
7152efd
refactor
kakichi-yu Mar 13, 2023
fda92e3
init
kakichi-yu Mar 13, 2023
a1bb304
enable
kakichi-yu Mar 13, 2023
9788921
init
kakichi-yu Mar 14, 2023
4bdf6bf
colorpicker
kakichi-yu Mar 14, 2023
7a590b9
colorpickerrefactor
kakichi-yu Mar 15, 2023
d026e49
init 途中
kakichi-yu Mar 16, 2023
10f32b3
children is error
kakichi-yu Mar 18, 2023
5e80896
tablemock
kakichi-yu Mar 18, 2023
bf69675
excisize
kakichi-yu Mar 18, 2023
f7a7404
syusei
kakichi-yu Mar 19, 2023
c08b801
table mock end
kakichi-yu Mar 19, 2023
4415b08
table axios
kakichi-yu Mar 19, 2023
e1261ff
react router
kakichi-yu Mar 20, 2023
902d41f
v6 unUsed RouteComponentProps
kakichi-yu Mar 21, 2023
88c870a
history使えるのか問題
kakichi-yu Mar 22, 2023
f9e58a8
refactor
kakichi-yu Mar 24, 2023
833d7d6
implements LoginApi
kakichi-yu Mar 25, 2023
9c42741
残すはスタイル!
kakichi-yu Mar 26, 2023
670c01d
makeStyles -> styled
kakichi-yu Mar 26, 2023
4c86480
end LoginForm
kakichi-yu Mar 27, 2023
4b861b8
FormValidation
kakichi-yu Mar 28, 2023
7e32a2b
残すはリファクタ
kakichi-yu Mar 29, 2023
0d7d519
Context
kakichi-yu Mar 30, 2023
a65782f
context
kakichi-yu Apr 1, 2023
4d7512c
この書き方だとレンダリングはうまくいく
kakichi-yu Apr 2, 2023
ce6c9f1
context end!
kakichi-yu Apr 2, 2023
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
Prev Previous commit
Next Next commit
makeStyles -> styled
  • Loading branch information
kakichi-yu committed Mar 26, 2023
commit 670c01df4736584e60037f485a2e0451796c0ae2
21 changes: 17 additions & 4 deletions hooks/13_LoginForm/src/pages/login.container.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Card, CardContent, CardHeader, createStyles, makeStyles } from "@mui/material";
import { Card, CardContent, CardHeader, createStyles, makeStyles, styled } from "@mui/material";
import * as React from "react";
import { useNavigate } from "react-router-dom";
import { LoginComponent } from "./login.component";
Expand All @@ -8,6 +8,20 @@ import { NotificationComponent } from "../common";

interface Props { }

// const useStyles = makeStyles(theme =>
// createStyles({
// card: {
// maxWidth: 400,
// margin: "0 auto"
// }
// })
// );

const SampleCardStyled = styled(Card)(({ theme }) => ({
maxWidth: 400,
margin: "0 auto"
}))

export const LoginContainer: React.FC<Props> = (props) => {
const [loginInfo, setLoginInfo] = React.useState<LoginEntity>(
createEmptyLogin()
Expand All @@ -29,15 +43,14 @@ export const LoginContainer: React.FC<Props> = (props) => {
isValidLogin(login).then(loginSucceeded);
};


return (
<>
<Card>
<SampleCardStyled>
<CardHeader title='login' />
<CardContent>
<LoginComponent onLogin={handleLogin} />
</CardContent>
</Card>
</SampleCardStyled>
<NotificationComponent
message="Invalid login or password, please type again"
show={isShowAlert}
Expand Down