コードレビュー対応

public/css/chat.css

@@ -705,4 +705,24 @@ a.article:hover {
 
 .chat-list-type-btn {
   width: 30%;
-}
\ No newline at end of file
+}
+#my_info > div > div {
+  padding-left: 5%;
+}
+
+#favorite_list > div > div {
+  padding-left: 5%;
+}
+
+#my_group_list > div > div {
+  padding-left: 5%;
+}
+
+.contact-seperator {
+  width: 100%;
+  background-color: #095395!important;
+  color: white;
+  margin-bottom: 0px;
+}
+
+

public/index.html

@@ -234,15 +234,15 @@
         </div>
         <div id="my_info" class="inbox_user row">
         </div>
-        <div class="collapsible-content">
-          <div id="favorite_list" class="inbox_user row">
-          </div>
+
+        <label class="contact-seperator" id="favorite-seperator">Favorite</label>
+        <div id="favorite_list" class="inbox_user row">
         </div>
-        <div class="collapsible-content">
-          <div id="my_group_list" class="inbox_user row">
-          </div>
+        <label class="contact-seperator" id="mygroup-seperator">MY GROUP</label>
+        <div id="my_group_list" class="inbox_user row">
         </div>
 
+
       </div>
     </div>
 
@@ -458,6 +458,28 @@
     </div>
   </div>
 </script>
+<script id="favorite-user-template" type="text/template">
+  <div class="user_list col-12" data-name="{{name}}">
+    <div class="user_people">
+      <div class="user_img">
+        <img src="{{profileImage}}" alt="">
+      </div>
+      <div class="user_ib">
+        <h5>{{name}}</h5>
+        <p>{{info}}</p>
+      </div>
+      <div class="squareBox userCheckBox" data-name="{{name}}" data-id="{{id}}">
+        <div class="squareBoxContent">
+          <div>
+          <span>
+            <i class="fas fa-check"></i>
+          </span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</script>
 <script src="./socket.io/dist/socket.io.js"></script>
 <script src="./js/libs/socket.io.js"></script>
 <script src="./js/libs/jquery-3.3.1.min.js"></script>

public/js/chat-websocket.js

 var socket;
 
 function getGlobalParam(chatServerUrl, cmsServerUrl, platform, isMobile, isOnline) {
-      CHAT_SERVER_URL = chatServerUrl;
-      CMS_SERVER_URL = cmsServerUrl;
-      PLATFORM = platform;
-      IS_MOBILE = isMobile;
-      IS_ONLINE = isOnline;
-      connectSocket();
-    };
+    CHAT_SERVER_URL = chatServerUrl;
+    CMS_SERVER_URL = cmsServerUrl;
+    PLATFORM = platform;
+    IS_MOBILE = isMobile;
+    IS_ONLINE = isOnline;
+    connectSocket();
+};
 
 android.getGlobalParameter();
 
 function connectSocket() {
     CHAT_UI.dismissLoadingIndicator();
     if (IS_ONLINE == 'true') {
+        console.log('isOnline');
         socket = io(CHAT_SERVER_URL);
-        console.log('insOnline');
         setSocketAction();
         android.updateRoomList();
-        CHAT_UI.refreshRoomList("1");
+        CHAT_UI.refreshRoomList(chatRoomType.DM);
         CHAT_UI.dismissLoadingIndicator();
         $('#createChatRoom').show();
     } else {
-        console.log('insOffline');
+        console.log('isOffline');
         //オフラインの場合、DBからルーム一覧を表示。
         if (CHAT_UTIL.isIOS()) {
              //TODO IOSの場合
         } else if (CHAT_UTIL.isAndroid()) {
-            console.log('insAnd');
             //$('.overlay').removeClass('active undismissable');
             // loadingIndicatorを表示
             CHAT_UI.showLoadingIndicator();
             android.getLoginParameter();
-            console.log('init')
-            CHAT_UI.refreshRoomList("1");
+            CHAT_UI.refreshRoomList(chatRoomType.DM);
             CHAT_UI.dismissLoadingIndicator();
             $('#createChatRoom').show();
         }
@@ -400,7 +398,7 @@ function setSocketAction () {
             } else {
                 if (IS_ONLINE == 'true') {
                     android.updateRoomList();
-                    CHAT_UI.refreshRoomList("1");
+                    CHAT_UI.refreshRoomList(chatRoomType.DM);
                     CHAT_UI.dismissLoadingIndicator();
                 }
             }

public/js/chat.js

@@ -272,7 +272,7 @@ CHAT.leaveRoom = function() {
 CHAT.requestMyinfo = function() {
     jQuery.ajax({
             async: true,
-            url:    CMS_SERVER_URL+"/chatapi/user?sid="+CHAT.globalLoginParameter.sid+"&cmd="+userAPICmd.MYINFO,
+            url: CMS_SERVER_URL+"/chatapi/user?sid="+CHAT.globalLoginParameter.sid+"&cmd="+userAPICmd.MYINFO,
             type: "get",
             processData: false,
             contentType: false

public/js/constant.js

@@ -20,3 +20,8 @@ const messageType = {
 const userAPICmd = {
     MYINFO : 9
 }
+
+const chatRoomType = {
+    DM : "1",
+    GROUP : "0"
+}

public/js/language_en.js

@@ -56,5 +56,7 @@ $.lang.en = {
     "contactListTitle":"Contact",
     "contactSearch":"Contact search",
     "directMessageChatRoom":"DM",
+    "favorite":"Favorite List",
+    "mygroup":"My Group",
     "groupChatRoom":"Group"
 }

public/js/language_ja.js

@@ -56,5 +56,7 @@ $.lang.ja = {
     "contactListTitle":"コンタクト",
     "contactSearch":"コンタクト検索",
     "directMessageChatRoom":"DM",
+    "favorite":"お気に入りリスト",
+    "mygroup":"マイグループ",
     "groupChatRoom":"グループ"
 }

public/js/language_ko.js

@@ -56,5 +56,7 @@ $.lang.ko = {
     "contactListTitle":"연락처",
     "contactSearch":"연락처 검색",
     "directMessageChatRoom":"DM",
+    "favorite":"즐겨찾기리스트",
+    "mygroup":"마이그룹",
     "groupChatRoom":"그룹"
 }

public/js/libs/collapsible.js

@@ -2,13 +2,13 @@ var coll = document.getElementsByClassName("collapsible");
 var i;
 
 for (i = 0; i < coll.length; i++) {
-  coll[i].addEventListener("click", function() {
-    this.classList.toggle("collapsible-active");
-    var content = this.nextElementSibling;
-    if (content.style.display === "block") {
-      content.style.display = "none";
-    } else {
-      content.style.display = "block";
-    }
-  });
+    coll[i].addEventListener("click", function() {
+        this.classList.toggle("collapsible-active");
+        var content = this.nextElementSibling;
+        if (content.style.display === "block") {
+        content.style.display = "none";
+        } else {
+            content.style.display = "block";
+        }
+    });
 }
\ No newline at end of file