Skip to content

Commit

Permalink
Merge pull request #222 from NUTFes/develop
Browse files Browse the repository at this point in the history
メンバー詳細モーダルのリリース
  • Loading branch information
YushiroDodo63 authored Sep 28, 2023
2 parents bb06b56 + ef462a3 commit b25c059
Show file tree
Hide file tree
Showing 9 changed files with 566 additions and 22 deletions.
47 changes: 47 additions & 0 deletions view/next-project/public/MemberModalFooter.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 17 additions & 0 deletions view/next-project/public/MemberModalHeader.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions view/next-project/public/NoUser.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.ButtonContainer {
pointer-events: none;
z-index: 10;
top: 0;
left: 0;
Expand All @@ -17,6 +18,7 @@
}

.ButtonContainer button {
pointer-events: auto;
z-index: 10;
background: radial-gradient(var(--button-primary), var(--button-secondary));
width: 60px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@ interface CurriculumChapters {
}

interface Teacher {
user_id: number | string;
record_id: string;
user_id: string;
}

interface User {
Expand All @@ -72,7 +71,7 @@ const RecordAddModal: FC<ModalProps> = (props) => {
const [curriculumChapter, setCurriculumChapter] = useState<CurriculumChapters>();
const [records, setRecords] = useState<Record[]>([]);
const [users, setUsers] = useState<User[]>([{ id: '', name: '' }]);
const [teacherData, setTeacherData] = useState<Teacher>({ user_id: 1, record_id: '' });
const [teacherData, setTeacherData] = useState<Teacher>({ user_id: '1' });
const [isAnimationOpen, setIsAnimationOpen] = useState(false);
const [newRecordId, setNewRecordId] = useState('');

Expand Down Expand Up @@ -128,8 +127,8 @@ const RecordAddModal: FC<ModalProps> = (props) => {
) => {
setRecordData({ ...recordData, [input]: e.target.value });
};

const handleTeacher = () => (e: React.ChangeEvent<HTMLSelectElement>) => {
const handleTeacher = (e: React.ChangeEvent<HTMLSelectElement>) => {
setTeacherData({ ...teacherData, user_id: e.target.value });
};

Expand Down
Loading

0 comments on commit b25c059

Please sign in to comment.