솔로랭크 & 자유랭크 구분

김환
Commit 3e4a111e9c107fb19e0a619cdc565db0600fad79 3e4a111e 1 parent 2405bb4c
Showing 2 changed files with 108 additions and 47 deletions
RUTROLL/router/Test.js
RUTROLL/views/index.ejs
--- a/RUTROLL/router/Test.js
View file @3e4a111
+++ b/RUTROLL/router/Test.js
View file @3e4a111
@@ -2,7 +2,7 @@ module.exports = function(app){
 var request = require("request");
 var urlenconde = require('urlencode');
-var apikey = "RGAPI-e4aabf85-2067-48cb-82ab-39bdf7c07325"//api
+var apikey = "RGAPI-82ef5a7a-34a3-428a-bd3c-14cc0d8462f3"//api
 var profileIconId;  //아이콘 번호
@@ -116,35 +116,65 @@ var rotation_champ = new Array();
           request(userLeagueUrl,function(error,response,body){
             var info_user_league_json = JSON.parse(body);
 			//console.log("userLeagueUrl:", userLeagueUrl);
-            if(info_user_league_json[0] != null){
+            if(info_user_league_json[0] != null){ // 자유랭 데이터
-            var leagueId = info_user_league_json[0]["leagueId"];
+            var leagueId_F = info_user_league_json[0]["leagueId"];
-            var wins = info_user_league_json[0]["wins"];
+            var wins_F = info_user_league_json[0]["wins"];
-            var losses = info_user_league_json[0]["losses"];
+            var losses_F = info_user_league_json[0]["losses"];
-            var leagueName = info_user_league_json[0]["leagueName"]
+            var leagueName_F = info_user_league_json[0]["leagueName"]
-            var tier = info_user_league_json[0]["tier"];
+            var tier_F = info_user_league_json[0]["tier"];
-            var rank = info_user_league_json[0]["rank"];
+            var rank_F = info_user_league_json[0]["rank"];
-            var leaguePoints = info_user_league_json[0]["leaguePoints"];
+            var leaguePoints_F = info_user_league_json[0]["leaguePoints"];
-            var img_tier;
+            var img_tier_F;
-            if(tier == "MASTER"){
+            if(tier_F == "MASTER"){
-              img_tier = "https://i.imgur.com/nvQjonh.png";
+              img_tier_F = "https://i.imgur.com/nvQjonh.png";
-            }else if(tier == "CHALLENGER"){
+            }else if(tier_F == "CHALLENGER"){
-              img_tier = "https://i.imgur.com/sbK1Edj.png";
+              img_tier_F = "https://i.imgur.com/sbK1Edj.png";
-            }else if(tier == "DIAMOND"){
+            }else if(tier_F == "DIAMOND"){
-              img_tier = "https://i.imgur.com/5VBu8PF.png"
+              img_tier_F = "https://i.imgur.com/5VBu8PF.png"
-            }else if(tier == "PLATINUM"){
+            }else if(tier_F == "PLATINUM"){
-              img_tier = "https://i.imgur.com/Eqi6858.png"
+              img_tier_F = "https://i.imgur.com/Eqi6858.png"
-            }else if(tier == "GRANDMASTER"){
+            }else if(tier_F == "GRANDMASTER"){
-              img_tier = "https://i.imgur.com/mcEhz1o.png"
+              img_tier_F = "https://i.imgur.com/mcEhz1o.png"
-            }else if(tier == "GOLD"){
+            }else if(tier_F == "GOLD"){
-              img_tier = "https://i.imgur.com/Ec4hPuO.png"
+              img_tier_F = "https://i.imgur.com/Ec4hPuO.png"
-            }else if(tier == "SILVER"){
+            }else if(tier_F == "SILVER"){
-              img_tier = "https://i.imgur.com/GKnPu7s.png"
+              img_tier_F = "https://i.imgur.com/GKnPu7s.png"
-            }else if(tier == "BRONZE"){
+            }else if(tier_F == "BRONZE"){
-              img_tier ="https://i.imgur.com/TPZVXIr.png"
+              img_tier_F ="https://i.imgur.com/TPZVXIr.png"
             }else{
-              img_tier = "https://i.imgur.com/kcdoC4r.png"
+              img_tier_F = "https://i.imgur.com/kcdoC4r.png"
             }
-}
+            }
+            if(info_user_league_json[1] != null){ // 솔랭 데이터
+              var leagueId_S = info_user_league_json[1]["leagueId"];
+              var wins_S = info_user_league_json[1]["wins"];
+              var losses_S = info_user_league_json[1]["losses"];
+              var leagueName_S = info_user_league_json[1]["leagueName"]
+              var tier_S = info_user_league_json[1]["tier"];
+              var rank_S = info_user_league_json[1]["rank"];
+              var leaguePoints_S = info_user_league_json[1]["leaguePoints"];
+              var img_tier_S;
+              if(tier_S == "MASTER"){
+                img_tier_S = "https://i.imgur.com/nvQjonh.png";
+              }else if(tier_S == "CHALLENGER"){
+                img_tier_S = "https://i.imgur.com/sbK1Edj.png";
+              }else if(tier_S == "DIAMOND"){
+                img_tier_S = "https://i.imgur.com/5VBu8PF.png"
+              }else if(tier_S == "PLATINUM"){
+                img_tier_S = "https://i.imgur.com/Eqi6858.png"
+              }else if(tier_S == "GRANDMASTER"){
+                img_tier_S = "https://i.imgur.com/mcEhz1o.png"
+              }else if(tier_S == "GOLD"){
+                img_tier_S = "https://i.imgur.com/Ec4hPuO.png"
+              }else if(tier_S == "SILVER"){
+                img_tier_S = "https://i.imgur.com/GKnPu7s.png"
+              }else if(tier_S == "BRONZE"){
+                img_tier_S ="https://i.imgur.com/TPZVXIr.png"
+              }else{
+                img_tier_S = "https://i.imgur.com/kcdoC4r.png"
+              }
+              }
+
           champ_name[champ_name.length] = "total";
           var temp_id;
           var temp_name;
@@ -205,12 +235,18 @@ var rotation_champ = new Array();
           c_pic: champ_pic,
           c_rotation : rotation_pic,
           c_summoner: summoner,
-          c_wins: wins,
+          c_wins_S: wins_S,
-          c_losses: losses,
+          c_losses_S: losses_S,
-          c_tier: tier,
+          c_tier_S: tier_S,
-          c_imgtier: img_tier,
+          c_imgtier_S: img_tier_S,
-          c_rank: rank,
+          c_rank_S: rank_S,
-          c_leaguePoint: leaguePoints
+          c_leaguePoint_S: leaguePoints_S,
+          c_wins_F: wins_F,
+          c_losses_F: losses_F,
+          c_tier_F: tier_F,
+          c_imgtier_F: img_tier_F,
+          c_rank_F: rank_F,
+          c_leaguePoint_F: leaguePoints_F
           });
         });
       });
--- a/RUTROLL/views/index.ejs
View file @3e4a111
+++ b/RUTROLL/views/index.ejs
View file @3e4a111
@@ -9,6 +9,7 @@
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap-theme.min.css">
     <script src="https://code.jquery.com/jquery-3.2.1.min.js" integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous"></script>
     <style> @import url("http://fonts.googleapis.com/earlyaccess/nanumgothic.css");</style>
+
     <script>
     $(document).ready(function(){
@@ -45,16 +46,40 @@
         </strong>
       </font>
+      <br></br>
+      <br></br>
+
       <table class="basic">
             <tbody>
-              <tr><td> <img src= <%=c_imgtier%> width=120, height=120></td></tr>
+              <font size = 5em>
-              <tr><td><%= "Tier : " + c_tier + " " + c_rank + " / " + c_leaguePoint + "점"%></td></tr>
+                <strong>
-              <tr><td><%= "Win : " + c_wins + "   /   Lose : " + c_losses%></td></tr>
+                  <%= "솔로 랭크"%>
-              <tr><td><%= "승률 : " + ((c_wins/(c_wins+c_losses))*100).toFixed(2) + "%" %></td></tr>
+                </strong>
-              <tr><td><%= "캐리력 : " + (c_wins/c_losses*2).toFixed(2) %></td></tr>
+              </font>
+              <tr><td> <img src= <%=c_imgtier_S%> width=120, height=120></td></tr>
+              <tr><td><%= "Tier : " + c_tier_S + " " + c_rank_S + " / " + c_leaguePoint_S + "점"%></td></tr>
+              <tr><td><%= "Win : " + c_wins_S + "   /   Lose : " + c_losses_S%></td></tr>
+              <tr><td><%= "승률 : " + ((c_wins_S/(c_wins_S+c_losses_S))*100).toFixed(2) + "%" %></td></tr>
+              <tr><td><%= "캐리력 : " + (c_wins_S/c_losses_S*2).toFixed(2) %></td></tr>
             </tbody>
         </table>
+        <br></br>
+
+        <table class="basic">
+          <tbody>
+            <font size = 5em>
+              <strong>
+                <%= "자유 랭크"%>
+              </strong>
+            </font>
+            <tr><td> <img src= <%=c_imgtier_F%> width=120, height=120></td></tr>
+            <tr><td><%= "Tier : " + c_tier_F + " " + c_rank_F + " / " + c_leaguePoint_F + "점"%></td></tr>
+            <tr><td><%= "Win : " + c_wins_F + "   /   Lose : " + c_losses_F%></td></tr>
+            <tr><td><%= "승률 : " + ((c_wins_F/(c_wins_F+c_losses_F))*100).toFixed(2) + "%" %></td></tr>
+            <tr><td><%= "캐리력 : " + (c_wins_F/c_losses_S*2).toFixed(2) %></td></tr>
+          </tbody>
+      </table>
         <br></br>
@@ -72,26 +97,26 @@
         </div>
         <div class="center">
           <strong>
-        <%= "추측 MMR:"  %>
+        <%= "추측 MMR(솔로랭크):"  %>
-        <%if (c_tier=="SILVER") {%>
+        <%if (c_tier_S=="SILVER") {%>
           <%="1200~1500"%>
           <%}%>
-        <%if (c_tier=="GOLD") {%>
+        <%if (c_tier_S=="GOLD") {%>
           <%="1500~1800"%>
           <%}%>
-        <%if (c_tier=="PLATINUM") {%>
+        <%if (c_tier_S=="PLATINUM") {%>
           <%="1800~2100"%>
           <%}%>
-        <%if (c_tier=="DIAMOND") {%>
+        <%if (c_tier_S=="DIAMOND") {%>
           <%="2100~2400"%>
           <%}%>
-        <%if (c_tier=="MASTER") {%>
+        <%if (c_tier_S=="MASTER") {%>
             <%="2400~2600"%>
             <%}%>
-        <%if (c_tier=="GRANDMASTER") {%>
+        <%if (c_tier_S=="GRANDMASTER") {%>
             <%="2600~2800"%>
             <%}%>
-        <%if (c_tier=="CHALLENGER") {%>
+        <%if (c_tier_S=="CHALLENGER") {%>
             <%=">3000"%>
             <%}%>
       </strong>