From 8f91674a95fa29096b5a87fda7d46a4f9e39c39c Mon Sep 17 00:00:00 2001 From: Kalaneee Date: Mon, 3 Dec 2018 22:11:52 +0100 Subject: [PATCH] Use post instead of get --- index.html | 2 +- package.json | 1 + public/client.js | 60 ++++++++++++++++++++++++++++-------------------- public/style.css | 15 ++++++++++++ server.js | 31 ++++++++++++++++++++++--- 5 files changed, 80 insertions(+), 29 deletions(-) diff --git a/index.html b/index.html index 4b5ae11..84fc979 100644 --- a/index.html +++ b/index.html @@ -15,7 +15,7 @@
-
+
diff --git a/package.json b/package.json index 28dbce5..032e58b 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ "author": "kalane", "license": "ISC", "dependencies": { + "body-parser": "^1.18.3", "express": "^4.16.4", "request": "^2.88.0" } diff --git a/public/client.js b/public/client.js index c8ca4d3..ff969cf 100644 --- a/public/client.js +++ b/public/client.js @@ -1,48 +1,40 @@ -var championsId={266:"Aatrox",103:"Ahri",84:"Akali",12:"Alistar",32:"Amumu",34:"Anivia",1:"Annie",22:"Ashe",136:"AurelionSol",268:"Azir",432:"Bard",53:"Blitzcrank",63:"Brand",201:"Braum",51:"Caitlyn",164:"Camille",69:"Cassiopeia",31:"Chogath",42:"Corki",122:"Darius",131:"Diana",119:"Draven",36:"DrMundo",245:"Ekko",60:"Elise",28:"Evelynn",81:"Ezreal",9:"Fiddlesticks",114:"Fiora",105:"Fizz",3:"Galio",41:"Gangplank",86:"Garen",150:"Gnar",79:"Gragas",104:"Graves",120:"Hecarim",74:"Heimerdinger",420:"Illaoi",39:"Irelia",427:"Ivern",40:"Janna",59:"JarvanIV",24:"Jax",126:"Jayce",202:"Jhin",222:"Jinx",145:"Kaisa",429:"Kalista",43:"Karma",30:"Karthus",38:"Kassadin",55:"Katarina",10:"Kayle",141:"Kayn",85:"Kennen",121:"Khazix",203:"Kindred",240:"Kled",96:"KogMaw",7:"Leblanc",64:"LeeSin",89:"Leona",127:"Lissandra",236:"Lucian",117:"Lulu",99:"Lux",54:"Malphite",90:"Malzahar",57:"Maokai",11:"MasterYi",21:"MissFortune",62:"MonkeyKing",82:"Mordekaiser",25:"Morgana",267:"Nami",75:"Nasus",111:"Nautilus",76:"Nidalee",56:"Nocturne",20:"Nunu",2:"Olaf",61:"Orianna",516:"Ornn",80:"Pantheon",78:"Poppy",555:"Pyke",133:"Quinn",497:"Rakan",33:"Rammus",421:"RekSai",58:"Renekton",107:"Rengar",92:"Riven",68:"Rumble",13:"Ryze",113:"Sejuani",35:"Shaco",98:"Shen",102:"Shyvana",27:"Singed",14:"Sion",15:"Sivir",72:"Skarner",37:"Sona",16:"Soraka",50:"Swain",134:"Syndra",223:"TahmKench",163:"Taliyah",91:"Talon",44:"Taric",17:"Teemo",412:"Thresh",18:"Tristana",48:"Trundle",23:"Tryndamere",4:"TwistedFate",29:"Twitch",77:"Udyr",6:"Urgot",110:"Varus",67:"Vayne",45:"Veigar",161:"Velkoz",254:"Vi",112:"Viktor",8:"Vladimir",106:"Volibear",19:"Warwick",498:"Xayah",101:"Xerath",5:"XinZhao",157:"Yasuo",83:"Yorick",154:"Zac",238:"Zed",115:"Ziggs",26:"Zilean",142:"Zoe",143:"Zyra"}; +var championsId = { 266: "Aatrox", 103: "Ahri", 84: "Akali", 12: "Alistar", 32: "Amumu", 34: "Anivia", 1: "Annie", 22: "Ashe", 136: "AurelionSol", 268: "Azir", 432: "Bard", 53: "Blitzcrank", 63: "Brand", 201: "Braum", 51: "Caitlyn", 164: "Camille", 69: "Cassiopeia", 31: "Chogath", 42: "Corki", 122: "Darius", 131: "Diana", 119: "Draven", 36: "DrMundo", 245: "Ekko", 60: "Elise", 28: "Evelynn", 81: "Ezreal", 9: "Fiddlesticks", 114: "Fiora", 105: "Fizz", 3: "Galio", 41: "Gangplank", 86: "Garen", 150: "Gnar", 79: "Gragas", 104: "Graves", 120: "Hecarim", 74: "Heimerdinger", 420: "Illaoi", 39: "Irelia", 427: "Ivern", 40: "Janna", 59: "JarvanIV", 24: "Jax", 126: "Jayce", 202: "Jhin", 222: "Jinx", 145: "Kaisa", 429: "Kalista", 43: "Karma", 30: "Karthus", 38: "Kassadin", 55: "Katarina", 10: "Kayle", 141: "Kayn", 85: "Kennen", 121: "Khazix", 203: "Kindred", 240: "Kled", 96: "KogMaw", 7: "Leblanc", 64: "LeeSin", 89: "Leona", 127: "Lissandra", 236: "Lucian", 117: "Lulu", 99: "Lux", 54: "Malphite", 90: "Malzahar", 57: "Maokai", 11: "MasterYi", 21: "MissFortune", 62: "MonkeyKing", 82: "Mordekaiser", 25: "Morgana", 267: "Nami", 75: "Nasus", 111: "Nautilus", 76: "Nidalee", 56: "Nocturne", 20: "Nunu", 2: "Olaf", 61: "Orianna", 516: "Ornn", 80: "Pantheon", 78: "Poppy", 555: "Pyke", 133: "Quinn", 497: "Rakan", 33: "Rammus", 421: "RekSai", 58: "Renekton", 107: "Rengar", 92: "Riven", 68: "Rumble", 13: "Ryze", 113: "Sejuani", 35: "Shaco", 98: "Shen", 102: "Shyvana", 27: "Singed", 14: "Sion", 15: "Sivir", 72: "Skarner", 37: "Sona", 16: "Soraka", 50: "Swain", 134: "Syndra", 223: "TahmKench", 163: "Taliyah", 91: "Talon", 44: "Taric", 17: "Teemo", 412: "Thresh", 18: "Tristana", 48: "Trundle", 23: "Tryndamere", 4: "TwistedFate", 29: "Twitch", 77: "Udyr", 6: "Urgot", 110: "Varus", 67: "Vayne", 45: "Veigar", 161: "Velkoz", 254: "Vi", 112: "Viktor", 8: "Vladimir", 106: "Volibear", 19: "Warwick", 498: "Xayah", 101: "Xerath", 5: "XinZhao", 157: "Yasuo", 83: "Yorick", 154: "Zac", 238: "Zed", 115: "Ziggs", 26: "Zilean", 142: "Zoe", 143: "Zyra" }; var req = new XMLHttpRequest(); var url = '/api'; +var params = 'playerName=Chil'; -req.open('GET', url, true); // set this to POST if you would like +req.open('POST', url, true); // set this to POST if you would like req.addEventListener('load', onLoad); req.addEventListener('error', onError); -req.send(); +req.setRequestHeader('Content-type', 'application/x-www-form-urlencoded'); +req.send(params); function onLoad() { var response = this.responseText; var parsedEntireResponse = JSON.parse(response); - //console.log(parsedEntireResponse); var userStats = parsedEntireResponse[0]; var rankedStats = JSON.parse(parsedEntireResponse[1]); + var soloQStats = rankedStats.length !== 0 ? (rankedStats[0].queueType == 'RANKED_SOLO_5x5' ? rankedStats[0] : rankedStats[1]) : false; var matches = parsedEntireResponse[2]; - console.log(userStats); - console.log(rankedStats); + //console.log(userStats); + //console.log(rankedStats); console.log(matches); - //console.log(rankedStats[0].playerOrTeamName); + console.log(soloQStats); document.querySelector('.player__pp').style.background = 'url(https://cdn.valentinkaelin.ch/riot/profileicon/' + userStats.profileIconId + '.png) center/cover'; document.querySelector('.player__name').innerHTML = userStats.name; document.querySelector('.player__level').innerHTML = userStats.summonerLevel; - document.querySelector('.player__rank').innerHTML = rankedStats.length !== 0 ? rankedStats[0].tier + ' ' + rankedStats[0].rank : "Joueur non classé"; + document.querySelector('.player__rank').innerHTML = soloQStats ? soloQStats.tier + ' ' + soloQStats.rank : "Joueur non classé"; - var rankImgLink; - if (rankedStats.length !== 0) { - if (rankedStats[0].tier != 'MASTER' && rankedStats[0].tier != 'CHALLENGER') { - rankImgLink = '/public/img/tier-icons/' + rankedStats[0].tier.toLowerCase() + '_' + rankedStats[0].rank.toLowerCase() + '.png'; - } else { - rankImgLink = '/public/img/tier-icons/' + rankedStats[0].tier.toLowerCase() + '.png'; - } - } else { - rankImgLink = '/public/img/tier-icons/provisional.png'; - } + var rankImgLink = getRankImg(soloQStats); document.querySelector('.player__rank-img').style.background = 'url(' + rankImgLink + ') center/cover'; - - document.querySelector('.player__ratio').innerHTML = rankedStats.length !== 0 ? rankedStats[0].wins + ' wins / ' + rankedStats[0].losses + ' losses' : "Joueur non classé"; + document.querySelector('.player__ratio').innerHTML = soloQStats ? soloQStats.wins + ' wins / ' + soloQStats.losses + ' losses' : "Joueur non classé"; var playerContainer = document.querySelector('.player'); var oldList = document.querySelector('.list-matches'); - if(oldList) + if (oldList) oldList.parentNode.removeChild(oldList); var matchesList = document.createElement('ul'); matchesList.className = 'list-matches'; @@ -69,7 +61,25 @@ var changeName = document.querySelector('#changeName'); var nameToPick = document.querySelector('#name') changeName.addEventListener('submit', function (e) { e.preventDefault(); - url = '/api?' + nameToPick.value; - req.open('GET', url, true); - req.send(); -}); \ No newline at end of file + //url = '/api?' + nameToPick.value; + url = '/api'; + req.open('POST', url, true); + req.setRequestHeader('Content-type', 'application/x-www-form-urlencoded'); + req.send('playerName=' + nameToPick.value); +}); + +/** + * Return the link of the rank image + * @param soloQStats : stats in soloQ of the player + */ +function getRankImg(soloQStats) { + if (soloQStats) { + if (soloQStats.tier != 'MASTER' && soloQStats.tier != 'CHALLENGER') { + return '/public/img/tier-icons/' + soloQStats.tier.toLowerCase() + '_' + soloQStats.rank.toLowerCase() + '.png'; + } else { + return '/public/img/tier-icons/' + soloQStats.tier.toLowerCase() + '.png'; + } + } else { + return '/public/img/tier-icons/provisional.png'; + } +} \ No newline at end of file diff --git a/public/style.css b/public/style.css index 7941e08..1156225 100644 --- a/public/style.css +++ b/public/style.css @@ -32,7 +32,22 @@ margin: 0 auto; } +.list-matches { + list-style-type: none; + padding: 0; +} + +.list-matches li { + padding: 10px 0; + background: #F1F5F8; +} + +.list-matches li:nth-child(2n) { + background: #DAE1E7; +} + .champion-icon { width: 48px; height: 48px; + margin-left: 5px; } \ No newline at end of file diff --git a/server.js b/server.js index b9b9e5a..42e6b57 100644 --- a/server.js +++ b/server.js @@ -1,16 +1,22 @@ const express = require('express') const request = require('request'); const path = require('path'); +const bodyParser = require('body-parser'); const app = express() app.set('port', (process.env.PORT || 5000)) -const key = 'RGAPI-79f2b14e-a46e-4520-b7d8-475b8b89b9bc'; -//var id = 65362306; +const key = 'RGAPI-5be8ff59-ab0b-48a8-a924-10984670a571'; var summonerID = 'HMOiIUvzYtfgPk5X53zWTeOZo52T-HYJQhwvhkPNh0BWxZ0'; var accountID = 'V1xNS14bjVeP54hg03JeMxkXJB29K4TfUMvijDB85nxbD4Y'; var pseudo = 'Chil'; +/* To retrieve data of post request */ +app.use( bodyParser.json() ); // to support JSON-encoded bodies +app.use(bodyParser.urlencoded({ // to support URL-encoded bodies + extended: true +})); + /* Homepage */ app.get('/', function (request, response) { response.sendFile(path.join(__dirname, 'index.html')); @@ -53,6 +59,25 @@ app.get('/api', function (req, res) { }); +app.post('/api', function(req, res) { + console.log(req.body.playerName); + pseudo = req.body.playerName; + + getAccountInfos(function (account) { + getRanked(function (ranked) { + getMatches(function(matches) { + var finalJSON = new Array(); + finalJSON.push(account); + finalJSON.push(ranked); + finalJSON.push(matches); + res.send(finalJSON); + }); + }); + }); + +}); + + /* app.get('/api', function (req, res) { var name = req.url.split('?')[1]; @@ -95,4 +120,4 @@ function getMatches(callback) { callback(JSONMatches); } }); -} +} \ No newline at end of file