Skip to content

Commit

Permalink
Merge pull request #63 from adipai/ui-branch
Browse files Browse the repository at this point in the history
UI improvements and fixes
  • Loading branch information
rishi2019194 authored Oct 19, 2023
2 parents eb492e8 + 75020ea commit 415b511
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 13 deletions.
Binary file added src/recommenderapp/static/Popcorn-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions src/recommenderapp/static/script.js
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,8 @@ $(document).ready(function () {
setTimeout(function () {
$("#emailSentSuccess").fadeOut("slow");
}, 2000);
$('#area1').attr('placeholder', 'Email');
$('#emailField').val('');
},
error: function (error) {
$("#loaderSuccess").attr("class", "d-none");
Expand Down
8 changes: 7 additions & 1 deletion src/recommenderapp/static/stylesheet.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@

.table {
color: white !important;
width: 60% !important;
margin-bottom: 0rem !important;
}

.tipHeader {
text-align: center;
}

.highlighted-section {
Expand All @@ -28,7 +34,7 @@ body {

:root {
--borderSize: 0.5vw;
--baseSize: 5rem;
--baseSize: 2rem;
--icon: "🙂";
}
* {
Expand Down
3 changes: 2 additions & 1 deletion src/recommenderapp/templates/landing_page.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
<html>
<head>
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='stylesheet.css') }}">
<title>PopcornPicks🍿</title>
<title>PopcornPicks</title>
<link rel="icon" href="{{ url_for('static', filename='Popcorn-icon.png') }}" />
<script src="{{ url_for('static', filename='script.js') }}"></script>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
Expand Down
24 changes: 14 additions & 10 deletions src/recommenderapp/templates/search_page.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
<head>
<!-- Include stylesheets and scripts -->
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='stylesheet.css') }}">
<title>PopcornPicks🍿</title>
<title>PopcornPicks</title>
<link rel="icon" href="{{ url_for('static', filename='Popcorn-icon.png') }}" />
<script src="{{ url_for('static', filename='script.js') }}"></script>
<meta charset="utf-8" />
<meta name="viewport" content="width device-width, initial-scale=1" />
Expand All @@ -25,22 +26,25 @@
<div class="heading1">
<!-- Heading for picking a movie -->
<h2><center>🎬 Pick a Movie! 🎬</center></h2>
<h6 class="tipHeader">✨Tip: Select Upto 5 movies to get a tailored watchlist✨</h6>
</div>


<div class="row" style="margin-top: 25px;">
<div class="col-md-6">
<!-- Left Column (Selected Movie(s) and Search) -->
<div class="row">
<div class="col-md-10">
<!-- Selected Movie(s) section -->
<h2>Selected Movie(s):</h2>
<input class="form-control mr-sm-2" type="search" placeholder="Search for a Movie" aria-label="Search" id="searchBox" />
<ul class="list-group" id="selectedMovies"></ul>
</div>
<div class="col-md-2">
<!-- Predict button -->
<input type="button" class="btn btn-primary" name="predict" id="predict" value="Predict" style="margin-top: 47.5px;" />
<h3>Selected Movie(s):</h3>
<div class="d-flex justify-content-between">
<div class="col-md-9">
<!-- Selected Movie(s) section -->
<input class="form-control mr-sm-2" type="search" placeholder="Search for a Movie" aria-label="Search" id="searchBox" />
<ul class="list-group" id="selectedMovies"></ul>
</div>
<div class="col-md-2">
<!-- Predict button -->
<input type="button" class="btn btn-primary" name="predict" id="predict" value="Predict" />
</div>
</div>
</div>
</div>
Expand Down
3 changes: 2 additions & 1 deletion src/recommenderapp/templates/success.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<!DOCTYPE html>
<html>
<head>
<title>What movies do you like?</title>
<title>PopcornPicks</title>
<link rel="icon" href="{{ url_for('static', filename='Popcorn-icon.png') }}" />
<link
rel="stylesheet"
type="text/css"
Expand Down

0 comments on commit 415b511

Please sign in to comment.