-
Notifications
You must be signed in to change notification settings - Fork 2
[Draft]募金ページの実装 #990
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
KazumaSun
wants to merge
6
commits into
develop
Choose a base branch
from
feat/sato/887-add-fund-page
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
[Draft]募金ページの実装 #990
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
33f0695
mysqlの修正
KazumaSun dd72db6
募金ページのデザイン実装
KazumaSun 4ee771e
formatted by workflow
KazumaSun 44013f5
Merge branch 'develop' into feat/sato/887-add-fund-page
KazumaSun 1ae2f2a
[wip]デザイン修正
KazumaSun 4ffb08d
formatted by workflow
KazumaSun File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 29 additions & 0 deletions
29
view/next-project/src/components/campus_fund/OpenEditModalButton.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| import clsx from 'clsx'; | ||
| import * as React from 'react'; | ||
| import { useState } from 'react'; | ||
|
|
||
| import { AddButton } from '../common'; | ||
|
|
||
| interface Props { | ||
| className?: string; | ||
| children?: React.ReactNode; | ||
| } | ||
|
|
||
| const OpenEditModalButton = (props: Props) => { | ||
| const [showModal, setShowModal] = useState(false); | ||
|
|
||
| return ( | ||
| <> | ||
| <AddButton | ||
| className={clsx(props.className)} | ||
| onClick={() => { | ||
| setShowModal(true); | ||
| }} | ||
| > | ||
| {props.children} | ||
| </AddButton> | ||
| </> | ||
| ); | ||
| }; | ||
|
|
||
| export default OpenEditModalButton; | ||
53 changes: 53 additions & 0 deletions
53
view/next-project/src/components/campus_fund/OtherBuildingsCard.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| import { Box, Table, Thead, Tbody, Tr, Th, Td, Text } from '@chakra-ui/react'; | ||
|
|
||
| interface OtherTeacher { | ||
| building: string; | ||
| room: string; | ||
| name: string; | ||
| amount?: number; | ||
| } | ||
|
|
||
| interface Props { | ||
| teachers: OtherTeacher[]; | ||
| } | ||
|
|
||
| const OtherBuildingsCard = ({ teachers }: Props) => ( | ||
| <Box | ||
| p={4} | ||
| border='2px dashed #FF69B4' | ||
| borderRadius='md' | ||
| bg='#FFF0F6' | ||
| minW={0} | ||
| w='100%' | ||
| maxW='100%' | ||
| boxShadow='md' | ||
| > | ||
| <Text fontSize={{ base: 'md', md: 'lg' }} fontWeight='bold' color='#D72660' mb={2}> | ||
| その他 | ||
| </Text> | ||
| <Table variant='simple' size='sm'> | ||
| <Thead> | ||
| <Tr> | ||
| <Th fontSize={{ base: 'xs', md: 'sm' }}>棟名</Th> | ||
| <Th fontSize={{ base: 'xs', md: 'sm' }}>居室</Th> | ||
| <Th fontSize={{ base: 'xs', md: 'sm' }}>教員名</Th> | ||
| <Th fontSize={{ base: 'xs', md: 'sm' }}>金額</Th> | ||
| </Tr> | ||
| </Thead> | ||
| <Tbody> | ||
| {teachers.map((t, i) => ( | ||
| <Tr key={i}> | ||
| <Td fontSize={{ base: 'xs', md: 'sm' }}>{t.building}</Td> | ||
| <Td fontSize={{ base: 'xs', md: 'sm' }}>{t.room}</Td> | ||
| <Td fontSize={{ base: 'xs', md: 'sm' }}>{t.name}</Td> | ||
| <Td fontSize={{ base: 'xs', md: 'sm' }}> | ||
| {t.amount ? `¥${t.amount.toLocaleString()}` : ''} | ||
| </Td> | ||
| </Tr> | ||
| ))} | ||
| </Tbody> | ||
| </Table> | ||
| </Box> | ||
| ); | ||
|
|
||
| export default OtherBuildingsCard; |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The state variable 'showModal' is set but never used in the component; consider removing it or integrating modal toggling logic if it was intended to control visibility.