Merge pull request #111 from ZendyLim/buglist/summary

Buglist/summary
ZendyLim · Jun 20, 2018 · 88e5bcd · 88e5bcd
2 parents b628e14 + 971a990
commit 88e5bcd
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/app/assets/img/topic/FUKUSHU.jpg b/app/assets/img/topic/FUKUSHU.jpg
diff --git a/app/config/image_list.js b/app/config/image_list.js
@@ -23,6 +23,7 @@ export const ImageData = {
 
     T016 : require('../assets/img/topic/14.jpg'), 
     T017 : require('../assets/img/topic/15.jpg'), 
+    FUKUSHU : require('../assets/img/topic/FUKUSHU.jpg'), 
 
 
 }
diff --git a/app/config/studyList.js b/app/config/studyList.js
@@ -198,7 +198,7 @@ export const StudyList = [{
   },
   {
     title : 'FUKUSHU1_TITLE',
-    img : 'loading',
+    img : 'FUKUSHU',
     lock : false,
     type : 'FUKUSHU',
     topic_id: 'T008',
@@ -383,7 +383,7 @@ export const StudyList = [{
   },
   {
     title : 'FUKUSHU2_TITLE',
-    img : 'loading',
+    img : 'FUKUSHU',
     lock : true,
     type : 'FUKUSHU',
     topic_id: 'T013',

diff --git a/app/screens/Profile/profile.js b/app/screens/Profile/profile.js
@@ -77,14 +77,21 @@ import { studyDays, studyReasonOption, major } from '../../config/data';
           japaneseType: this.props.user.japaneseType,
           dateFrom: this.props.user.dateFrom,
           dateTo: this.props.user.dateTo,
-          image: this.props.user.image,
           studyDay: this.props.user.studyDay,
           studyHours: this.props.user.studyHours,
           studyReason: this.props.user.studyReason,
           finishDate: this.props.user.finishDate,
         });
+        if(this.props.user.image){
+          this.setState({
+            image: this.props.user.image
+          });
+        }
+
       }
 
+
+
     }
 
     getData = () =>{