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

Jump to bottom

ボイボ寮の各キャラ紹介にaタグで遷移するように #103

Merged
merged 6 commits into from
Oct 24, 2022
Merged

ボイボ寮の各キャラ紹介にaタグで遷移するように #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
eb75d0b
一覧と個別ページ両方で使うのでキャラクター情報をカスタムフックに切り出す
k-chop Oct 23, 2022
4f1438d
個別ページをモーダルのみの表示にする
k-chop Oct 23, 2022
662ea5b
寮生個別ページをモーダルではなくリンクに変更
k-chop Oct 23, 2022
3267bd2
aタグではなくLinkとnavigateを使う
k-chop Oct 23, 2022
c71c438
ボイボ寮から個別ページへ遷移時、スクロール位置が保持されていなかったのを修正
k-chop Oct 23, 2022
fe1f302
ロード時にちらつくのでスクロールバーを消さない
k-chop Oct 23, 2022
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
9 changes: 4 additions & 5 deletions src/components/dormitoryCharacterCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,27 @@
import { Link } from "gatsby"
import { GatsbyImage } from "gatsby-plugin-image"
import React from "react"
import { CharacterInfo } from "../types/dormitoryCharacter"

export default ({
characterInfo,
onClick,
className = "",
}: {
characterInfo: CharacterInfo | undefined
onClick?: () => void
className?: string
}) => {
const color = characterInfo?.color || "black"
const href = characterInfo?.id ? `/dormitory/${characterInfo.id}` : "#"

return (
<>
<div className={"column is-3 " + className}>
<div
className="card character-card"
style={{ borderColor: color, height: "100%" }}
onClick={onClick}
>
{characterInfo ? (
<>
<Link to={href} state={{ fromDormitory: true }}>
<GatsbyImage
className="card-image"
image={characterInfo.bustupImage}
Expand All @@ -32,7 +31,7 @@ export default ({
<div className="card-content has-text-centered">
<h3 className="title is-5">{characterInfo.name}</h3>
</div>
</>
</Link>
) : (
<div className="card-content has-text-centered">Coming Soon...</div>
)}
Expand Down
Loading