From 05ca25548ee490eaff0bc43faa7b8d95abda32f1 Mon Sep 17 00:00:00 2001 From: aerain Date: Sat, 24 Aug 2019 16:48:36 +0900 Subject: [PATCH 01/16] =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/jedaeroService.js | 1 - 1 file changed, 1 deletion(-) diff --git a/service/jedaeroService.js b/service/jedaeroService.js index 38fff11..c983eeb 100644 --- a/service/jedaeroService.js +++ b/service/jedaeroService.js @@ -16,7 +16,6 @@ const getTimeTable = async (year,month,day) => { } finally { // undefined라면? 그 밖의 문제를 의미하므로 빈 오브젝트 반환. if(!res) return {}; - const week = ['mon', 'tue', 'wed', 'thu', 'fri', 'sat']; const data = { day: { From 732edfb9e89abd2e1e19418fae11e717df19941f Mon Sep 17 00:00:00 2001 From: aerain Date: Sat, 24 Aug 2019 16:49:08 +0900 Subject: [PATCH 02/16] =?UTF-8?q?=EB=91=90=EB=B2=88=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/jedaeroService.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/service/jedaeroService.js b/service/jedaeroService.js index c983eeb..7517c6c 100644 --- a/service/jedaeroService.js +++ b/service/jedaeroService.js @@ -319,10 +319,8 @@ const getLecturePlanList = async data => { })); } } - const checkLogin = async () => { const credentials = await Keychain.getGenericPassword(); return !!credentials; } - export { getTimeTable, getCreditData, getCreditDetailData, getBaseInfo, getLectureBoardData, getLectureItemBoardData, getLecturePostData, downloadLecturePostFile, logoutDreamy, isPassDormitory, checkLogin, getLecturePlanList } \ No newline at end of file From 3a175d0dcd7c9ead5891e9891824bd001ab94045 Mon Sep 17 00:00:00 2001 From: aerain Date: Sat, 24 Aug 2019 16:48:36 +0900 Subject: [PATCH 03/16] =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/jedaeroService.js | 1 - 1 file changed, 1 deletion(-) diff --git a/service/jedaeroService.js b/service/jedaeroService.js index 38fff11..c983eeb 100644 --- a/service/jedaeroService.js +++ b/service/jedaeroService.js @@ -16,7 +16,6 @@ const getTimeTable = async (year,month,day) => { } finally { // undefined라면? 그 밖의 문제를 의미하므로 빈 오브젝트 반환. if(!res) return {}; - const week = ['mon', 'tue', 'wed', 'thu', 'fri', 'sat']; const data = { day: { From 3accb4d786547b686a82ecce3fc6c109e615687d Mon Sep 17 00:00:00 2001 From: aerain Date: Sat, 24 Aug 2019 16:49:08 +0900 Subject: [PATCH 04/16] =?UTF-8?q?=EB=91=90=EB=B2=88=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/jedaeroService.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/service/jedaeroService.js b/service/jedaeroService.js index c983eeb..7517c6c 100644 --- a/service/jedaeroService.js +++ b/service/jedaeroService.js @@ -319,10 +319,8 @@ const getLecturePlanList = async data => { })); } } - const checkLogin = async () => { const credentials = await Keychain.getGenericPassword(); return !!credentials; } - export { getTimeTable, getCreditData, getCreditDetailData, getBaseInfo, getLectureBoardData, getLectureItemBoardData, getLecturePostData, downloadLecturePostFile, logoutDreamy, isPassDormitory, checkLogin, getLecturePlanList } \ No newline at end of file From 41a9b01563fa8221ef2417cad733667a1aecf33e Mon Sep 17 00:00:00 2001 From: aerain Date: Sat, 24 Aug 2019 18:23:58 +0900 Subject: [PATCH 05/16] =?UTF-8?q?=EA=B5=90=EC=88=98=EA=B3=84=ED=9A=8D?= =?UTF-8?q?=EC=84=9C=20=EB=B0=B1=EB=8B=A8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawer/jnuservice/dreamy/DreamyHome.js | 4 +- .../drawer/jnuservice/dreamy/LecturePlan.js | 31 +++---- .../jnuservice/dreamy/LecturePlanDetail.js | 9 +- service/jedaeroService.js | 85 ++++++++++++++++++- tool/jedaero/lib/dreamy.js | 6 +- 5 files changed, 111 insertions(+), 24 deletions(-) diff --git a/components/drawer/jnuservice/dreamy/DreamyHome.js b/components/drawer/jnuservice/dreamy/DreamyHome.js index f8d857e..bd6fa20 100644 --- a/components/drawer/jnuservice/dreamy/DreamyHome.js +++ b/components/drawer/jnuservice/dreamy/DreamyHome.js @@ -74,7 +74,7 @@ const DreamyHome = ({navigation, isFocused}) => { afterLogin(() => navigation.navigate("Credit"))}> 전체 성적을 조회하실 수 있습니다. - {/* {isLogin && */} + {isLogin && { renderItem={MenuItem} contentContainerStyle={styles.totalMenuContainer} /> - {/* } */} + } ) } diff --git a/components/drawer/jnuservice/dreamy/LecturePlan.js b/components/drawer/jnuservice/dreamy/LecturePlan.js index a6d3780..6e7e56d 100644 --- a/components/drawer/jnuservice/dreamy/LecturePlan.js +++ b/components/drawer/jnuservice/dreamy/LecturePlan.js @@ -13,7 +13,7 @@ const LecturePlan = ({navigation}) => { const [semester, setSemester] = useState([21, 10, 10, 10, 10, 10, 11, 20, 20, 20, 20, 20][date.getMonth()]); const [classCode, setClassCode] = useState(''); const [professorName, setProfessorName] = useState(''); - const [lectureName, setLectureName] = useState('보안시스템개론'); + const [lectureName, setLectureName] = useState('기초공학수학'); const [data, setData] = useState([]); const [isLoading, setLoading] = useState(false); @@ -74,27 +74,28 @@ const LecturePlan = ({navigation}) => { Icon={() => ()} /> - { - isLoading ? ( - - - - ) : ( - - setClassCode(classCode)} labelStyle={styles.label} containerStyle={styles.searchContainer} inputStyle={styles.searchInput}/> - setProfessorName(professorName)} labelStyle={styles.label} containerStyle={styles.searchContainer} inputStyle={styles.searchInput}/> - setLectureName(lectureName)} labelStyle={styles.label} containerStyle={styles.searchContainer} inputStyle={styles.searchInput}/> -