Skip to content

Commit

Permalink
Merge pull request #10 from HUSTLE-APP/feat/#5
Browse files Browse the repository at this point in the history
Docs : 리스트수정
  • Loading branch information
Yeonsu00-12 authored Dec 1, 2023
2 parents 6d334ad + 681cba5 commit e6bc754
Show file tree
Hide file tree
Showing 9 changed files with 79 additions and 24 deletions.
File renamed without changes
Binary file added asset/image/map/map2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added asset/image/map/map3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added asset/image/map/map4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added asset/image/map/map5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added asset/image/map/map6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added asset/image/map/map7.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
91 changes: 72 additions & 19 deletions lib/modules/friendlyMatch/calendar/event/event.dart
Original file line number Diff line number Diff line change
Expand Up @@ -26,35 +26,88 @@ class Event {
}

Map<DateTime, List<Event>> eventSource = {
DateTime.utc(2023, 11, 30): [
DateTime.utc(2023, 12, 1): [
Event('연습 상대 구합니다!', '가톨릭대 체육관 / 가톨릭대 바스타즈 ',
postId: 1,
date: DateTime.utc(2023, 11, 30),
place: '가톨릭대학교 체육관',
clubName: '가톨릭대 바스타즈',
phone: '010-0000-0000',
imagePath: imgDir + "map1.png"),
Event('농구할 사람 ~', '명지대 체육관 / 명지대 농구부',
phone: 'cuk_bastards',
imagePath: imgDir + "map/map1.png"),
Event('농구할 사람 ~', '명지대 체육관 / 명지대 자연캠퍼스 농구부',
postId: 2,
date: DateTime.utc(2023, 12, 1),
place: '명지대학교 체육관',
clubName: '명지대 농구부',
phone: '010-0000-0000',
imagePath: imgDir + "map1.png"),
Event('농구하기', '농구 할 사람 모여모여',
place: '명지대학교 자연캠퍼스 체육관',
clubName: '명지대 돌핀스',
phone: '',
imagePath: imgDir + "map/map2.png"),
Event('농구하기', '장충 체육관 / 동국대 바구니',
postId: 3,
date: DateTime.utc(2023, 12, 1),
place: '가톨릭대학교 체육관',
clubName: '가톨릭대 바스타즈',
phone: '010-0000-0000',
imagePath: imgDir + "map1.png"),
date: DateTime.utc(2023, 12, 5),
place: '장충체육관',
clubName: '동국대 바구니',
phone: 'baguni_dongguk',
imagePath: imgDir + "map/map3.png"),
Event('아마추어 대회 연습할 사람 구해요', '토모짐 / 서울시립대 SCUBA',
postId: 4,
date: DateTime.utc(2023, 12, 10),
place: '토모짐',
clubName: '서울시립대 SCUBA',
phone: 'uos.scuba_official',
imagePath: imgDir + "map/map3.png"),
Event('아마추어 대회 연습할 사람 구해요', '토모짐 / 숭실대 SSBC',
postId: 5,
date: DateTime.utc(2023, 12, 6),
place: '토모짐 - 서울특별시 동대문구 사가정로 148',
clubName: '숭실대 SSBC',
phone: 'ssbs_1979_ssu',
imagePath: imgDir + "map/map4.png"),
Event('아마추어 대회 연습할 사람 구함', '플레이존 스포츠센터 / 국민대 TAB',
postId: 6,
date: DateTime.utc(2023, 12, 10),
place: '플레이존 스포츠센터 - 서울특별시 강남구 논현로 742',
clubName: '국민대 TAB',
phone: 'tab_kookmin_basketball',
imagePath: imgDir + "map/map5.png"),
],
DateTime.utc(2023, 11, 31): [
Event('5분 기도하기', '하루에 5분 동안 기도하기'),
DateTime.utc(2023, 12, 5): [
Event('심심풀이 농구 할 사람', '가톨릭대 체육관 / 가톨릭대 라온',
postId: 7,
date: DateTime.utc(2023, 12, 15),
place: '가톨릭대학교 체육관',
clubName: '가톨릭대 라온',
phone: '',
imagePath: imgDir + "map/map1.png"),
Event('경희대에서 농구 구함', ' / 경희대 농쿠',
postId: 8,
date: DateTime.utc(2023, 12, 7),
place: '경희대 선승관',
clubName: '경희대 농쿠',
phone: 'khu_basketball',
imagePath: imgDir + "map/map6.png"),
Event('농구 할 팀 구합니다', '한서대 체육관 / 한서대 히바',
postId: 9,
date: DateTime.utc(2023, 12, 9),
place: '한서대 체육관 - 충청남도 서산시 해미면 한서1로 46',
clubName: '한서대 리바',
phone: 'hanseo_h1ba',
imagePath: imgDir + "map/map7.png"),
],
DateTime.utc(2023, 11, 9): [
Event('5분 기도하기', '하루에 5분 동안 기도하기'),
Event('교회 가서 인증샷 찍기', '교회에 가서 사진 찍기'),
DateTime.utc(2023, 12, 3): [
Event('연습 상대 구합니다!', '가톨릭대 체육관 / 가톨릭대 바스타즈 ',
postId: 10,
date: DateTime.utc(2023, 11, 30),
place: '가톨릭대학교 체육관',
clubName: '가톨릭대 바스타즈',
phone: 'cuk_bastards',
imagePath: imgDir + "map/map1.png"),
Event('연습 상대 구합니다!', '가톨릭대 체육관 / 가톨릭대 바스타즈 ',
postId: 11,
date: DateTime.utc(2023, 11, 30),
place: '가톨릭대학교 체육관',
clubName: '가톨릭대 바스타즈',
phone: 'cuk_bastards',
imagePath: imgDir + "map/map1.png"),
],
};

Expand Down
12 changes: 7 additions & 5 deletions lib/modules/friendlyMatch/viewDetails/veiw_details.dart
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,15 @@ class ViewDetails extends StatelessWidget {
style: TextStyle(fontSize: 24.0, fontWeight: FontWeight.bold),
),
SizedBox(height: 16.0),
buildDetailRow('일시',
event.date != null ? DateFormat('yyyy-MM-dd').format(
event.date!) : '날짜 미정'),
buildDetailRow(
'일시',
event.date != null
? DateFormat('yyyy-MM-dd').format(event.date!)
: '날짜 미정'),
buildDetailRow('장소', event.place ?? '장소 미정'),
buildDetailRow('동아리명', event.clubName ?? '동아리 미지정'),
buildDetailRow('연락처', event.phone ?? '연락처 미정'),
SizedBox(height: 16.0),
buildDetailRow('문의', event.phone ?? '연락처 미정'),
Spacer(),
ElevatedButton(
onPressed: () {
Get.to(() => ApplyFormScreen());
Expand Down

0 comments on commit e6bc754

Please sign in to comment.