Skip to content

Commit

Permalink
Nicer search bar
Browse files Browse the repository at this point in the history
  • Loading branch information
hcaseyal committed Dec 3, 2017
1 parent 201ae7b commit 1980b74
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 15 deletions.
8 changes: 0 additions & 8 deletions index.css
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
.summoner-name {

}

.enter-btn {

}

.timeSliderWrapper {
width: 500px;
}
Expand Down
15 changes: 11 additions & 4 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<link rel="stylesheet" href="jquery-ui.css">
<script src="DataTables/datatables.min.js"></script>
<link rel="stylesheet" href="DataTables/datatables.css">
<link rel="stylesheet" href="node_modules/@blueprintjs/core/dist/blueprint.css">
<!-- <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>-->
<!--<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script> -->
<script src="jquery-ui.min.js"></script>
Expand All @@ -16,9 +17,11 @@
<body>
<div class="layout">
<div class="interactive-area">
<div class="summoner-name-wrapper">Summoner:
<input class="summoner-name"></input>
<input type="button" class="enter-btn" value="Enter" onclick="searchSummoner()"></input>
<div class="summoner-name-wrapper search-bar">
<div class="pt-input-group">
<span class="pt-icon pt-icon-search" onclick="searchSummoner()"></span>
<input class="pt-input summoner-name" type="search" placeholder="Search for a Summoner" dir="auto" />
</div>
</div>

<div class="filters">
Expand Down Expand Up @@ -48,8 +51,12 @@
<input type="radio" name="outcomeSelect" id="lossOutcome" value="lossOutcome" onclick="lossOutcomeSelected()" />Loss
<input type="radio" name="outcomeSelect" id="bothOutcomes" value="bothOutcomes" onclick="bothOutcomesSelected()" checked />Both
<br/>
Enable area filter <input type="checkbox" class="areaFilter-checkbox">

<label class="pt-control pt-switch .modifier">
<input type="checkbox" class="areaFilter-checkbox" />
<span class="pt-control-indicator"></span>
Area Filter
</label>
</div>
<div class="vis-area">
<div class="summmoner-name-display"></div>
Expand Down
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ loadStaticData();

$(".summoner-name").keyup(function(event) {
if (event.keyCode === 13) {
$(".enter-btn").click();
searchSummoner();
}
});

Expand Down
4 changes: 2 additions & 2 deletions server.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ let express = require('express');
let app = express();
let fs = require('fs');

const port = 8080;
const port = 8082;
let baseURL = 'https://na1.api.riotgames.com/lol/';
let apiKey = 'RGAPI-dce505ed-21a4-4809-89c8-1ccc16ac1bfb';

Expand Down Expand Up @@ -50,7 +50,7 @@ app.get('/all-match-data', function (req, res) {
app.listen(port, function () {
//TODO: remove prefetchData
//prefetchFavoritesMatchData(); // YO don't call
prefetchFavoritesTimelinesData(); // these at same time because asynchronous
//prefetchFavoritesTimelinesData(); // these at same time because asynchronous

//prefetchMasterLeagueMatchListData();
//prefetchTimelinesAndDetailsData();
Expand Down

0 comments on commit 1980b74

Please sign in to comment.