Skip to content
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

Make first page #243

Merged
merged 5 commits into from
Sep 24, 2024
Merged

Make first page #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a125aed
初期画面を作成
KaichiManabe Sep 23, 2024
af7242d
Google Buttonを追加した
KaichiManabe Sep 23, 2024
2a6e198
中央配置に
KaichiManabe Sep 23, 2024
aefc177
ログイン画面のUI設計
RRRyoma Sep 24, 2024
885e91c
文字がかくれる問題を解消
RRRyoma Sep 24, 2024
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
138 changes: 110 additions & 28 deletions web/src/routes/login.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,22 @@
import { Box, Button } from "@mui/material";
import EmojiEmotionsIcon from "@mui/icons-material/EmojiEmotions";
import { Box, Button, IconButton, Link, Typography } from "@mui/material";
import { GoogleAuthProvider, signInWithPopup } from "firebase/auth";
import { useSnackbar } from "notistack";
import { useNavigate } from "react-router-dom";
import user, { getByGUID } from "../api/user";
import type { GUID } from "../common/types";
import Header from "../components/Header";
import { auth } from "../firebase/firebaseconfig";
import "../styles/login.css";

const provider = new GoogleAuthProvider();

async function signInWithGoogle() {
try {
const result = await signInWithPopup(auth, provider);
// This gives you a Google Access Token. You can use it to access the Google API.
const credential = GoogleAuthProvider.credentialFromResult(result);
if (credential) {
// const token = credential.accessToken;
// The signed-in user info.
const user = result.user;
// IdP data available using getAdditionalUserInfo(result)
// ...
return user.uid;
}
} catch (error) {
Expand All @@ -39,7 +36,6 @@ export default function Login() {
}

const response = await getByGUID(auth.currentUser.uid as GUID);

if (response.status === 404) {
enqueueSnackbar(
"この Google アカウントは登録されていません。登録画面にリダイレクトしました。",
Expand Down Expand Up @@ -73,7 +69,6 @@ export default function Login() {
}

const userExists = await user.exists(guid as GUID);

if (userExists) {
enqueueSnackbar("この Google アカウントはすでに登録されています", {
variant: "error",
Expand All @@ -90,36 +85,123 @@ export default function Login() {
});
}
}

return (
<Box>
<Header title="Login" />
<>
<Header title="CourseMate" />
<Box
sx={{
position: "absolute",
top: "56px",
bottom: 0,
left: 0,
right: 0,
overflowY: "auto",
display: "flex",
flexDirection: "column",
alignItems: "center",
justifyContent: "space-around",
}}
mt={2}
mx={2}
gap={1}
>
<Button
variant="outlined"
sx={{ textTransform: "none" }}
onClick={logInByGoogle}
>
Login
</Button>
<Button
variant="outlined"
sx={{ textTransform: "none" }}
onClick={singUpByGoogle}
>
Sign Up
</Button>
<Box textAlign="center">
<IconButton
size="large"
edge="start"
color="inherit"
aria-label="menu"
>
<EmojiEmotionsIcon
style={{ color: "#000000", width: "200px", height: "200px" }}
/>
</IconButton>
</Box>
<Box textAlign="left">
<Typography variant="h4">
CourseMateを使って
<br />
同じ授業の人と
<br />
友達になろう
</Typography>
</Box>

<Box sx={{ width: "80%" }} textAlign="center">
<button
className="gsi-material-button"
onClick={logInByGoogle}
type="button"
style={{
width: "100%",
padding: "30px",
lineHeight: "normal",
}}
>
<div className="gsi-material-button-state" />
<div
className="gsi-material-button-content-wrapper"
style={{ display: "flex", alignItems: "center", lineHeight: "1" }}
>
<div
className="gsi-material-button-icon"
style={{
display: "flex",
alignItems: "center",
justifyContent: "center",
marginRight: "8px",
}}
>
<svg
version="1.1"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ここは切り出した方がよい

xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 48 48"
xmlnsXlink="http://www.w3.org/1999/xlink"
style={{
display: "block",
width: "50px",
height: "50px",
margin: "0 auto",
}}
role="img"
aria-label="Sign in with Google"
>
<path
fill="#EA4335"
d="M24 9.5c3.54 0 6.71 1.22 9.21 3.6l6.85-6.85C35.9 2.38 30.47 0 24 0 14.62 0 6.51 5.38 2.56 13.22l7.98 6.19C12.43 13.72 17.74 9.5 24 9.5z"
/>
<path
fill="#4285F4"
d="M46.98 24.55c0-1.57-.15-3.09-.38-4.55H24v9.02h12.94c-.58 2.96-2.26 5.48-4.78 7.18l7.73 6c4.51-4.18 7.09-10.36 7.09-17.65z"
/>
<path
fill="#FBBC05"
d="M10.53 28.59c-.48-1.45-.76-2.99-.76-4.59s.27-3.14.76-4.59l-7.98-6.19C.92 16.46 0 20.12 0 24c0 3.88.92 7.54 2.56 10.78l7.97-6.19z"
/>
<path
fill="#34A853"
d="M24 48c6.48 0 11.93-2.13 15.89-5.81l-7.73-6c-2.15 1.45-4.92 2.3-8.16 2.3-6.26 0-11.57-4.22-13.47-9.91l-7.98 6.19C6.51 42.62 14.62 48 24 48z"
/>
<path fill="none" d="M0 0h48v48H0z" />
</svg>
</div>
<span
className="gsi-material-button-contents"
style={{ height: "30px", fontSize: "25px" }}
>
Sign in with Google
</span>
</div>
</button>
<br />
<Link
component={Button}
onClick={singUpByGoogle}
mt={2}
underline="none"
>
初めての方はこちら
</Link>
</Box>
</Box>
</Box>
</>
);
}
106 changes: 106 additions & 0 deletions web/src/styles/login.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
.gsi-material-button {
-moz-user-select: none;
-webkit-user-select: none;
-ms-user-select: none;
-webkit-appearance: none;
background-color: WHITE;
background-image: none;
border: 1px solid #747775;
-webkit-border-radius: 20px;
border-radius: 20px;
-webkit-box-sizing: border-box;
box-sizing: border-box;
color: #1f1f1f;
cursor: pointer;
font-family: "Roboto", arial, sans-serif;
font-size: 14px;
height: 40px;
letter-spacing: 0.25px;
outline: none;
overflow: hidden;
padding: 0 12px;
position: relative;
text-align: center;
-webkit-transition: background-color .218s, border-color .218s, box-shadow
.218s;
transition: background-color .218s, border-color .218s, box-shadow .218s;
vertical-align: middle;
white-space: nowrap;
width: auto;
max-width: 400px;
min-width: min-content;
}

.gsi-material-button .gsi-material-button-icon {
height: 20px;
margin-right: 12px;
min-width: 20px;
width: 20px;
}

.gsi-material-button .gsi-material-button-content-wrapper {
-webkit-align-items: center;
align-items: center;
display: flex;
-webkit-flex-direction: row;
flex-direction: row;
-webkit-flex-wrap: nowrap;
flex-wrap: nowrap;
height: 100%;
justify-content: space-between;
position: relative;
width: 100%;
}

.gsi-material-button .gsi-material-button-contents {
-webkit-flex-grow: 1;
flex-grow: 1;
font-family: "Roboto", arial, sans-serif;
font-weight: 500;
overflow: hidden;
text-overflow: ellipsis;
vertical-align: top;
}

.gsi-material-button .gsi-material-button-state {
-webkit-transition: opacity .218s;
transition: opacity .218s;
bottom: 0;
left: 0;
opacity: 0;
position: absolute;
right: 0;
top: 0;
}

.gsi-material-button:disabled {
cursor: default;
background-color: #ffffff61;
border-color: #1f1f1f1f;
}

.gsi-material-button:disabled .gsi-material-button-contents {
opacity: 38%;
}

.gsi-material-button:disabled .gsi-material-button-icon {
opacity: 38%;
}

.gsi-material-button:not(:disabled):active .gsi-material-button-state,
.gsi-material-button:not(:disabled):focus .gsi-material-button-state {
background-color: #303030;
opacity: 12%;
}

.gsi-material-button:not(:disabled):hover {
-webkit-box-shadow: 0 1px 2px 0 rgba(60, 64, 67, 0.3), 0 1px 3px 1px
rgba(60, 64, 67, 0.15);
box-shadow: 0 1px 2px 0 rgba(60, 64, 67, 0.3), 0 1px 3px 1px
rgba(60, 64, 67, 0.15);
}

.gsi-material-button:not(:disabled):hover .gsi-material-button-state {
background-color: #303030;
opacity: 8%;
}
Loading