Skip to content

Commit

Permalink
tidied up icons
Browse files Browse the repository at this point in the history
  • Loading branch information
TomBrennan91 committed Feb 1, 2019
1 parent bb1b4bc commit df18556
Show file tree
Hide file tree
Showing 5 changed files with 129 additions and 129 deletions.
Binary file modified Rotten_Tomatoes_logo.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified imdb_logo.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified metacritic_logo.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
109 changes: 47 additions & 62 deletions restAccesor.html
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<!DOCTYPE html>
<html>
<center>
<head>
<title>Review Aggregator Aggregator</title>
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css" integrity="sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS" crossorigin="anonymous">
Expand All @@ -12,9 +13,10 @@
<form id="form">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text">Enter Movies<br>or TV series<br>separated by<br>Newline</span>
<span class="input-group-text">Enter Movies<br>or TV series<br>separated by<br>new lines</span>
</div>
<textarea class="form-control" name="title" rows="10" cols="30" >A Star is Born
<textarea class="form-control" name="title" rows="10" cols="30" >
A Star is Born
The Man in the moon
Say anything
Moonstruck
Expand Down Expand Up @@ -42,14 +44,14 @@
</label>
<label class="btn btn-outline-primary active">
<input class="info" type="checkbox" id="imdbVotesBox" checked autocomplete="off">
<i class="far fa-star"></i> IMDb Votes
<i class="fas fa-vote-yea"></i> IMDb Votes
</label>
<label class="btn btn-outline-primary active">
<input class="info" type="checkbox" id="metascoreBox" checked autocomplete="off">
<i class="far fa-star"></i> MetaScore
</label>
<label class="btn btn-outline-primary active">
<input class="info" type="checkbox" id="typeBox" checked autocomplete="off">
<label class="btn btn-outline-primary">
<input class="info" type="checkbox" id="typeBox" autocomplete="off">
<i class="fas fa-film"></i> Type
</label>
<label class="btn btn-outline-primary">
Expand All @@ -65,86 +67,69 @@

<div class="input-group mb-3">
<div class="input-group-prepend">
<label class="input-group-text" for="inputGroupSelect01">Sort By</label>
<label class="input-group-text" for="sorting">Sort By</label>
</div>
<select class="custom-select" id="inputGroupSelect01">
<option selected>No Sorting</option>
<option value="1" class="sorting">Name</option>
<option value="2" class="sorting">IMDB Rating</option>
<option value="3" class="sorting">Year</option>
<option value="4" class="sorting">Runtime</option>
<option value="5" class="sorting">IMDB Votes</option>
<option value="6" class="sorting">MetaScore</option>
<option value="7" class="sorting">Type</option>
<select class="custom-select" id="sorting">
<option value="" selected>No Sorting</option>
<option value="name">Name</option>
<option value="rating">IMDB Rating</option>
<option value="year">Year</option>
<option value="runtime">Runtime</option>
<option value="votes">IMDB Votes</option>
<option value="metascore">MetaScore</option>
<option value="type">Type</option>
</select>
<div class="btn-group btn-group-toggle" data-toggle="buttons">
<label class="btn btn-outline-primary">
<input type="radio" name="options" id="descending" autocomplete="off">
<i class="fas fa-sort-amount-down"></i>Descending
<label class="btn btn-outline-primary active" >
<input type="radio" name="options" id="desc" autocomplete="off" checked>
<i class="fas fa-sort-amount-down"></i> Descending
</label>
<label class="btn btn-outline-primary active">
<input type="radio" name="options" id="ascending" autocomplete="off" checked>
<i class="fas fa-sort-amount-up"></i>Ascending
<label class="btn btn-outline-primary">
<input type="radio" name="options" id="asc" autocomplete="off" >
<i class="fas fa-sort-amount-up"></i> Ascending
</label>
</div>
</div>


<div class="accordion" id="accordionExample">
<div class="card">
<div class="card-header" id="headingOne">
<!--<h5 class="mb-0">-->
<button class="btn btn-link" type="button" data-toggle="collapse" data-target="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
Filtering
</button>
<!--</h5>-->
</div>

<div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordionExample">
<div class="card-body">
<form id ="filters"> Filter by:<br>
<input type="checkbox" id="ratingFilterBox" onclick="toggleRatingFilter()"> IMDb Rating<br>
<div id="ratingFilters">from:<input type="text" id="ratingLB"> to:<input type="text" id="ratingUB"><br></div>
<input type="checkbox" id="votesFilterBox" onclick="toggleVotesFilter()"> IMDb Votes<br>
<div id="votesFilters">from:<input type="text" id="votesLB"> to:<input type="text" id="votesUB"><br></div>
<input type="checkbox" id="yearFilterBox" onclick="toggleYearFilter()"> Year<br>
<div id="yearFilters">from:<input type="text" id="yearLB"> to:<input type="text" id="yearUB"><br></div>
<input type="checkbox" id="runtimeFilterBox" onclick="toggleRuntimeFilter()"> Runtime<br>
<div id="runtimeFilters">from:<input type="text" id="runtimeLB"> to:<input type="text" id="runtimeUB"><br></div>
</form>
</div>
</div>
<div class="input-group mb-3">
<div class="input-group-prepend">
<label class="input-group-text" for="filtering">Filter By</label>
</div>
<select class="custom-select" id="filtering">
<option value="" selected>No Filtering</option>
<option value="rating">IMDB Rating</option>
<option value="year">Year</option>
<option value="runtime">Runtime</option>
<option value="votes">IMDB Votes</option>
</select>
<div class="btn-group btn-group-toggle" data-toggle="buttons">
<label class="btn btn-outline-primary active" >
<input type="radio" name="options" id="greaterThan" autocomplete="off" checked>
<i class="fas fa-greater-than"></i> Greater Than
</label>
<label class="btn btn-outline-primary">
<input type="radio" name="options" id="lessThan" autocomplete="off">
<i class="fas fa-less-than"></i> Less Than
</label>
</div>
<input type="text" class="form-control" >
</div>

<span class="border">
<form action="" id="sorting"> Sort By:
<input class="sorting" type="radio" name="sorting" id="name"> Name
<input class="sorting" type="radio" name="sorting" id="rating"> IMDB Rating
<input class="sorting" type="radio" name="sorting" id="year"> Year
<input class="sorting" type="radio" name="sorting" id="runtime"> Runtime
<input class="sorting" type="radio" name="sorting" id="votes"> IMDb Votes
<input class="sorting" type="radio" name="sorting" id="metascore"> MetaScore
<input type="radio" name="sorting" id="type"> Type
</form>
</span>

<br>

<button type="button" class="btn btn-primary" onclick="postAndUpdate()">
<button type="button" class="btn btn-primary btn-lg" onclick="postAndUpdate()">
<i class="fas fa-sync-alt"></i>
Get Reviews
</button>
<br>
<div class="spinner-border text-primary" role="status" id="spinner">
<span class="sr-only">Loading...</span>
</div>

<br><br>
<table class="table table-bordered" id="outputTable"></table>

<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.6/umd/popper.min.js" integrity="sha384-wHAiFfRlMFy6i5SRaxvfOCifBUQy1xHdJ/yoi7FRNXMRBu5WHdZYu1hA6ZOblgut" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/js/bootstrap.min.js" integrity="sha384-B0UglyR+jN6CkvvICOB2joaf5I4l3gm9GU6Hc1og6Ls7i6U/mkkaduKaBhlAXv9k" crossorigin="anonymous"></script>
<script src="restAccessor.js"></script>
</body>
</center>
</html>
149 changes: 82 additions & 67 deletions restAccessor.js
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
function postAndUpdate(){
var titles = document.forms["form"].elements[0].value;
titles = titles.replace(/\n/g,"~");
postAjax('http://localhost:8080/review?sort=' + getSortingParameter() + getRatingFilter() + getVoteFilter() + getRuntimeFilter() + getYearFilter(), titles , function (data){updateOutput(data);});
postAjax('http://localhost:8080/review?sort=' + getSortingParameter(), titles , function (data){updateOutput(data);});
}
// + getRatingFilter() + getVoteFilter() + getRuntimeFilter() + getYearFilter()

function postAjax(url, data, success) {
var params = typeof data == 'string' ? data : Object.keys(data).map(
Expand All @@ -23,10 +24,11 @@ function postAjax(url, data, success) {
function updateOutput(data){
var spinner = document.getElementById("spinner");
spinner.style.display = "block";
console.log(ascOrDesc());
getColumnHeaders();
console.log(getRatingFilter())
clearOutputTable();
printColumnHeaders();

var responseObj = JSON.parse(data);
var columnHeaders = getColumnHeaders();
for (var i = 0 ; i < responseObj.length ; i++){
Expand All @@ -47,55 +49,65 @@ function getAdditionalInfo(parameterName, review){
}

function getSortingParameter(){
var sortingParameters = document.getElementsByClassName("sorting");
for (let item of sortingParameters){
if(item.checked){
return item.id;
}
}
return "";
return document.getElementById("sorting").value;
}

function getRatingFilter(){
if (document.getElementById("ratingFilterBox").checked){
var lowerBound = document.getElementById("ratingLB").value;
if (!empty(lowerBound)) return "&ratingFilter=gt:" + lowerBound;
var upperBound = document.getElementById("ratingUB").value;
if (!empty(upperBound)) return "&ratingFilter=lt:" + upperBound;
}
return ""
function getFilterParameter(){
return document.getElementById("filtering").value
}

function getVoteFilter(){
if (document.getElementById("votesFilterBox").checked){
var lowerBound = document.getElementById("votesLB").value;
if (!empty(lowerBound)) return "&votesFilter=gt:" + lowerBound;
var upperBound = document.getElementById("votesUB").value;
if (!empty(upperBound)) return "&votesFilter=lt:" + upperBound;
}
return ""
}
function getFilter(){

function getRuntimeFilter(){
if (document.getElementById("runtimeFilterBox").checked){
var lowerBound = document.getElementById("runtimeLB").value;
if (!empty(lowerBound)) return "&runtimeFilter=gt:" + lowerBound;
var upperBound = document.getElementById("runtimeUB").value;
if (!empty(upperBound)) return "&runtimeFilter=lt:" + upperBound;
}
return ""
}

function getYearFilter(){
if (document.getElementById("yearFilterBox").checked){
var lowerBound = document.getElementById("yearLB").value;
if (!empty(lowerBound)) return "&yearFilter=gt:" + lowerBound;
var upperBound = document.getElementById("yearUB").value;
if (!empty(upperBound)) return "&yearFilter=lt:" + upperBound;
function ascOrDesc(){
if (document.getElementById("asc").checked){
return "asc";
} else {
return "desc";
}
return ""
}

//function getRatingFilter(){
// if (document.getElementById("ratingFilterBox").checked){
// var lowerBound = document.getElementById("ratingLB").value;
// if (!empty(lowerBound)) return "&ratingFilter=gt:" + lowerBound;
// var upperBound = document.getElementById("ratingUB").value;
// if (!empty(upperBound)) return "&ratingFilter=lt:" + upperBound;
// }
// return ""
//}
//
//function getVoteFilter(){
// if (document.getElementById("votesFilterBox").checked){
// var lowerBound = document.getElementById("votesLB").value;
// if (!empty(lowerBound)) return "&votesFilter=gt:" + lowerBound;
// var upperBound = document.getElementById("votesUB").value;
// if (!empty(upperBound)) return "&votesFilter=lt:" + upperBound;
// }
// return ""
//}
//
//function getRuntimeFilter(){
// if (document.getElementById("runtimeFilterBox").checked){
// var lowerBound = document.getElementById("runtimeLB").value;
// if (!empty(lowerBound)) return "&runtimeFilter=gt:" + lowerBound;
// var upperBound = document.getElementById("runtimeUB").value;
// if (!empty(upperBound)) return "&runtimeFilter=lt:" + upperBound;
// }
// return ""
//}
//
//function getYearFilter(){
// if (document.getElementById("yearFilterBox").checked){
// var lowerBound = document.getElementById("yearLB").value;
// if (!empty(lowerBound)) return "&yearFilter=gt:" + lowerBound;
// var upperBound = document.getElementById("yearUB").value;
// if (!empty(upperBound)) return "&yearFilter=lt:" + upperBound;
// }
// return ""
//}

function getColumnHeaders(){
var columnHeaders = ["title", "imdbRating"];
var optionalHeaders = document.getElementsByClassName("info");
Expand Down Expand Up @@ -148,31 +160,34 @@ function empty(data){
return count == 0;
}

function toggleRatingFilter(){
toggleFilter("rating");
}

function toggleYearFilter(){
toggleFilter("year");
}

function toggleRuntimeFilter(){
toggleFilter("runtime");
}
//function toggleRatingFilter(){
// toggleFilter("rating");
//}
//
//function toggleYearFilter(){
// toggleFilter("year");
//}
//
//function toggleRuntimeFilter(){
// toggleFilter("runtime");
//}
//
//function toggleVotesFilter(){
// toggleFilter("votes");
//}
//
//function toggleFilter(filterName){
// var x = document.getElementById(filterName + "Filters");
// if (document.getElementById(filterName + "FilterBox").checked) x.style.display = "block";
// else x.style.display = "none";
//}
//
//toggleRatingFilter();
//toggleVotesFilter();
//toggleRuntimeFilter();
//toggleYearFilter();

function toggleVotesFilter(){
toggleFilter("votes");
}

function toggleFilter(filterName){
var x = document.getElementById(filterName + "Filters");
if (document.getElementById(filterName + "FilterBox").checked) x.style.display = "block";
else x.style.display = "none";
}

toggleRatingFilter();
toggleVotesFilter();
toggleRuntimeFilter();
toggleYearFilter();
var spinner = document.getElementById("spinner");
spinner.style.display = "none";
spinner.style.display = "none";

document.getElementById("desc").checked = true;

0 comments on commit df18556

Please sign in to comment.