Skip to content
Snippets Groups Projects
Commit 1302651f authored by Nathan Bills's avatar Nathan Bills
Browse files

Merge branch 'master' of https://github.com/ndbills/MyMovieLibrary

parents 00b11aa0 b6dcb8fd
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 610 additions and 182 deletions
project/__init__.py
+ 5
− 2
View file @ 1302651f
# -*- coding: utf-8 -*-
__version__ = '0.1'
from functools import wraps
from flask import Flask, session, redirect, url_for, request
from flask import Flask, session, redirect, url_for, request, render_template
from flask_debugtoolbar import DebugToolbarExtension
from flask.ext.mongoengine import MongoEngine
import sys
sys.path.append('../pytmdb3/')
from tmdb3 import set_key
set_key('542606a6ccff81a0337dc370a0cbfc37')
app = Flask('project')
app.config['SECRET_KEY'] = 'random'
app.config['MONGODB_SETTINGS'] = {'DB': 'my_movie_library'}
......@@ -50,5 +54,4 @@ def security(role=None):
return security_check
return wrapper
from project.controllers import *
project/controllers/home.py
+ 0
− 1
View file @ 1302651f
......@@ -35,5 +35,4 @@ def model():
user.addRole('kangaroo').save()
testCollection.addUnit(movie).save()
m = testCollection.getUnit(0)
print m.title
return render_template('printer/index.html')
project/controllers/library.py
+ 93
− 3
View file @ 1302651f
# -*- coding: utf-8 -*-
from project import app, security
from flask import render_template, request, session
from flask import render_template, request, session, redirect, url_for,jsonify
from flask.ext.wtf import Form, TextField, validators
from project.model.Library import Library
from project.model.User import User
......@@ -13,14 +13,104 @@ def libraries(user = None):
libraries = Library.objects(user=user,unit='Movie')
return render_template('library/master.html', libraries=libraries,user=user)
@app.route('/libraries/add', methods=['POST'])
@security('user')
def addLibrary(user = None):
name = request.form['name']
library = Library.objects(user=user,unit='Movie',name=name).first()
if library:
return jsonify(response='error',message='Library with name %s already exists' % library.name),404
library = Library(user=user,unit='Movie',name=name).save()
return jsonify(response='success',type='redirect',path=url_for(endpoint='libraries',_external=True))
@app.route('/libraries/remove', methods=['POST'])
@security('user')
def removeLibrary(user = None):
name = request.form['name']
library = Library.objects(user=user,unit='Movie',name=name).first()
if not library:
return jsonify(response='error',message='Library requested does not exists'),404
if library.name == 'Master' or library.name == 'Borrowed':
return jsonify(response='error',message='Library %s cannot be deleted' % library.name),404
library.delete()
return jsonify(response='success',type='redirect',path=url_for(endpoint='libraries',_external=True))
@app.route('/libraries/<name>')
@security('user')
def library(name,user=None):
from project.model.Movie import Movie
library = Library.objects(user=user,name=name,unit='Movie').first()
return render_template('library/library.html',library=library)
if not library:
return render_template('404.html',message='Unable to find given Library',user=user),404
return render_template('library/library.html',library=library,user=user)
@app.route('/libraries/<name>/<int:index>')
@security('user')
def libraryItem(name, index,user=None):
return render_template('library/libraryItem.html')
from project.model.Movie import Movie
library = Library.objects(user=user,name=name,unit='Movie').first()
if not library:
return render_template('404.html',message='Unable to find given Library',user=user),404
movie = library.hydrateUnit(index-1)
if not movie:
return render_template('404.html',message='Unable to find given Movie',user=user),404
return render_template('library/libraryItem.html',item=movie,user=user)
@app.route('/libraries/<name>/remove', methods=['POST'])
@security('user')
def removelibraryItem(name,user=None):
from project.model.Movie import Movie
library = Library.objects(user=user,name=name,unit='Movie').first()
if not library:
return jsonify(response='error',message='Unable to find the given Library'),404
index = int(request.form['id'])
if not index:
return jsonify(response='error',message='Invalid parameters'),404
movie = library.hydrateUnit(index-1)
if not movie:
return jsonify(response='error',message='Unable to find the given Movie in Library %s' % library.name),404
if library.name == 'Master':
libraries = Library.objects(user=user,unit='Movie')
for library in libraries:
library.removeUnit(movie)
else:
library.removeUnit(movie)
return jsonify(response='success',type='redirect',path=url_for(endpoint='library',name=name,_external=True))
@app.route('/libraries/<name>/add', methods=['POST'])
@security('user')
def addlibraryItem(name,user=None):
from project.model.Movie import Movie
library = Library.objects(user=user,name=name,unit='Movie').first()
if not library:
return jsonify(response='error',message='Unable to find the given Library'),404
movie_id = request.form['id']
if not movie_id:
return jsonify(response='error',message='Invalid Movie given'),404
from project.model.Movie import Movie
movie = Movie.objects(tmdb_id=movie_id).first()
if movie:
if library.name != 'Master':
master = Library.objects(user=user,name="Master",unit='Movie').first()
master.addUnit(movie)
library.addUnit(movie)
return jsonify(response='success',type='redirect',path=url_for(endpoint='library',name=name,_external=True))
from tmdb3 import Movie as tmdbMovie
movie = tmdbMovie(movie_id)
if not movie:
return jsonify(response='error',message='Invalid Movie given'),404
from project.model.Movie import Movie
movie = Movie.convertMovie(movie)
library.addUnit(movie)
if library.name != 'Master':
master = Library(user=user,name="Master",unit='Movie').first()
master.addUnit(movie)
return jsonify(response='success',type='redirect',path=url_for(endpoint='library',name=name,_external=True))
\ No newline at end of file
project/controllers/login.py
+ 19
− 30
View file @ 1302651f
# -*- coding: utf-8 -*-
from project import app
from flask import render_template, request, session, redirect, url_for
from flask import render_template, request, session, redirect, url_for, jsonify
from flask.ext.wtf import Form, TextField, validators
from project.model.User import User
@app.route('/login', methods=['GET', 'POST'])
@app.route('/login-ajax', methods=['POST'])
def login():
if request.method == 'GET':
return render_template('login/master.html')
if request.method == 'POST':
email = request.form['email']
password = request.form['password']
......@@ -16,40 +13,32 @@ def login():
if user is not None:
session['user'] = user.toJSON()
return redirect(url_for('libraries'))
return jsonify(response='success',type='redirect',path=url_for(endpoint='libraries',_external=True))
else:
error = "That email or password is not valid. Please check your credentials and try again."
return render_template('login/master.html', error=error)
return jsonify(response='error',message=error),401
return render_template('login/master.html')
@app.route('/signup', methods=['GET', 'POST'])
@app.route('/signup-ajax', methods=['POST'])
def signup():
if request.method == 'GET':
return render_template('login/signup.html')
if request.method == 'POST':
email = request.form['email']
password = request.form['password']
passwordConfirm = request.form['passwordConfirm']
if password == passwordConfirm:
#check unique user
if len(User.objects(email=email)) == 0:
if password != passwordConfirm:
error = "The passwords you entered did not match. Please try again."
return jsonify(response='error',message=error),400
if len(User.objects(email=email)) > 0:
error = "The email provided is already in use with another account."
return jsonify(response='error',message=error),400
from project.model.Library import Library
#if unique, create user
user = User.createUser(email, password)
user.addRole('user').save()
session['user'] = user.toJSON()
Library(user=user, unit='Movie', name='Master').save()
Library(user=user, unit='Movie', name='Borrowed').save()
return redirect(url_for('libraries'))
else:
error = "The email provided is already in use with another account."
return render_template('login/signup.html', error=error, email=email)
else:
error = "The passwords you entered did not match. Please try again."
return render_template('login/signup.html', error=error, email=email)
return render_template('login/signup.html')
return jsonify(response='success',type='redirect',path=url_for(endpoint='libraries',_external=True))
@app.route('/logout', methods=['GET', 'POST'])
def logout():
......
project/controllers/movies.py
+ 31
− 2
View file @ 1302651f
# -*- coding: utf-8 -*-
from project import app
from flask import render_template, request
from project import app, security
from flask import render_template, request, jsonify
from flask.ext.wtf import Form, TextField, validators
......@@ -11,3 +11,32 @@ def movies():
@app.route('/movies/<movieId>')
def movie_item(movieId):
return render_template('movies/movie.html')
@app.route('/search-movies', methods=['POST'])
@security('user')
def searchMovie(user=None):
term = request.form['term'];
if not term:
return jsonify(response='error',message='Invalid search term'),404
from tmdb3 import searchMovie
movies = searchMovie(term)
if len(movies) == 0:
return jsonify(response='error',message='No results given'),404
results = []
limit = 10
for index in range(len(movies)):
movie = movies[index]
if limit <= 0:
break
result = {}
poster = movie.poster
if poster:
sizes = poster.sizes()
if len(sizes) > 0:
result['poster'] = poster.geturl(sizes[0])
result['title'] = movie.title
result['id'] = movie.id
results.append(result)
limit -= 1;
return jsonify(response='success',movies=results)
\ No newline at end of file
project/model/Library.py
+ 7
− 6
View file @ 1302651f
......@@ -11,9 +11,10 @@ class Library(db.Document):
def addUnit(self,unit):
if self.unit == type(unit).__name__:
value = unit[self.lookup_attribute]
value = str(unit[self.lookup_attribute])
if value is not None and value not in self.collection:
self.collection.append("%s" % value)
self.collection.append(value)
self.save()
else:
return self
else:
......@@ -22,9 +23,10 @@ class Library(db.Document):
def removeUnit(self,unit):
if self.unit == type(unit).__name__:
value = unit[self.lookup_attribute]
value = str(unit[self.lookup_attribute])
if value is not None and value in self.collection:
self.collection.remove("%s" % value)
self.collection.remove(value)
self.save()
else:
return self
else:
......@@ -34,7 +36,7 @@ class Library(db.Document):
# @param index --represents the index in the Library collection of the object
def hydrateUnit(self, index):
if index < 0 or index > self.collection.count:
raise Exception("Invalid index for Library %s" % self.name)
return None
attr = {}
attr[self.lookup_attribute] = self.collection[index]
model = getattr(sys.modules["project.model.%s" % self.unit], self.unit)
......@@ -42,7 +44,6 @@ class Library(db.Document):
def hydrateList(self):
hydratedCollection = []
print sys.modules.keys()
model = getattr(sys.modules["project.model.%s" % self.unit], self.unit)
for index, hash_value in enumerate(self.collection):
attr = {}
......
project/model/Loan.py 0 → 100644
+ 28
− 0
View file @ 1302651f
from project import db
import datetime
from User import User
from Movie import Movie
class Loan(db.Document):
user = db.ReferenceField(User)
movie = db.ReferenceField(Movie, unique_with=['user'])
lent_date = db.DateTimeField(default=datetime.datetime.now, required=True)
expected_return_date = db.DateTimeField(default=datetime.datetime.now, required=True)
borrower_email = db.StringField()
@staticmethod
def create(user,movie,email,expected_return_date=None):
info = Loan(user=user,movie=movie,email=email)
if expected_return_date:
info.expected_return_date = expected_return_date
else:
info.expected_return_date = info.expected_return_date + datetime.timedelta(days=7)
info.save()
return info
def __str__(self):
return "%s due %s" % (self.movie.title, self.expected_return_date.isoformat())
def __repr__(self):
return self.__str__()
\ No newline at end of file
project/model/Movie.py
+ 45
− 19
View file @ 1302651f
......@@ -6,6 +6,10 @@ class Movie(db.Document):
title = db.StringField(max_length=255, required=True)
summary = db.StringField(max_length=10000, required=True)
tags = db.ListField(db.StringField(max_length=50))
tmdb_id = db.IntField()
runtime = db.IntField()
poster = db.StringField()
popularity = db.FloatField()
def addTag(self,tag):
if tag not in self.tags:
......@@ -21,8 +25,30 @@ class Movie(db.Document):
return self.title
def __repr__(self):
return str(self.toJSON())
return self.__str__()
def toJSON(self):
import json
return json.dumps({'created': self.created.isoformat(), 'title': self.title, 'summary': self.summary, 'tags': str(self.tags), 'id':str(self.id)})
@staticmethod
def convertMovie(movie):
result = Movie()
result.tmdb_id = int(movie.id)
result.title = str(movie.title)
result.summary = str(movie.overview.encode('utf-8'))
if movie.poster:
sizes = movie.poster.sizes()
if len(sizes) > 0:
medium = int(len(sizes)/2)
result.poster = str(movie.poster.geturl(sizes[medium]))
result.popularity = float(movie.popularity)
result.runtime = int(movie.runtime)
tags = movie.keywords
for tag in tags:
result.addTag(str(tag))
genres = movie.genres
for genre in genres:
result.addTag(str(genre))
result.save()
return result
project/static/css/style.css
+ 34
− 54
View file @ 1302651f
body {
font-family: sans-serif;
background: #eee;
html,body {
height: 100%;
}
a,h1,h2 {
color: #377BA8;
#wrap {
min-height: 100%;
height: auto !important;
height: 100%;
margin: 0 auto -60px;
}
h1,h2 {
font-family: 'Georgia', serif;
margin: 0;
#push,
#footer {
height: 60px;
}
h1 {
border-bottom: 2px solid #eee;
@media (max-width: 767px) {
#footer {
margin-left: -20px;
margin-right: -20px;
padding-left: 20px;
padding-right: 20px;
}
h2 {
font-size: 1.2em;
}
.page {
margin: 2em auto;
width: 35em;
border: 5px solid #ccc;
padding: 0.8em;
background: white;
}
.entries {
list-style: none;
margin: 0;
padding: 0;
}
.entries li {
margin: 0.8em 1.2em;
}
.entries li h2 {
margin-left: -1em;
}
.add-entry {
font-size: 0.9em;
border-bottom: 1px solid #ccc;
.adjust-left {
padding-right: 5%;
}
.add-entry dl {
font-weight: bold;
.movie-select {
padding: 10px 15px 0px 20px;
border-radius: 15px;
background-color: darkslategray;
margin: 5px;
width: 30%;
height: 200px;
overflow: hidden;
}
.metanav {
text-align: right;
font-size: 0.8em;
padding: 0.3em;
margin-bottom: 1em;
background: #fafafa;
.movie-select.selected {
background-color: slategray;
}
.flash {
background: #CEE5F5;
padding: 0.5em;
border: 1px solid #AACBE2;
.clearfix {
float: none !important;
}
.error {
background: #F0D6D6;
padding: 0.5em;
#results {
max-height: 500px;
overflow-y: scroll;
}
\ No newline at end of file
project/templates/404.html 0 → 100644
+ 14
− 0
View file @ 1302651f
{% extends "usernav.html" if user else 'index.html'%}
{% block title %}Page Not Found{% endblock %}
{% block content %}
<div style="width: 400px;margin: 0 auto;">
<h1>Page Not Found</h1>
<p>
{% if message %}
{{ message }}
{% else %}
What you were looking for is just not there.
{% endif %}
</p>
</div>
{% endblock %}
\ No newline at end of file
project/templates/home/home.html
+ 5
− 0
View file @ 1302651f
......@@ -27,3 +27,8 @@
</div>
</div>
{% endblock %}
{% block modals %}
{% include "home/login_modal.html" %}
{% include "home/signup_modal.html" %}
{% endblock %}
project/templates/home/login_modal.html 0 → 100644
+ 32
− 0
View file @ 1302651f
{% extends "modal_base.html" %}
{% block modal_title %} Login {% endblock %}
{% block modal_content %}
<form class="form-horizontal" id="login" role="form" method="post" action="{{ url_for('login') }}">
<div class="form-group">
<label for="userEmail" class="col-sm-3 control-label">Email</label>
<div class="col-xs-9 col-md-6">
<input type="email" class="form-control" id="userEmail" name="email" placeholder="Email address">
</div>
</div>
<div class="form-group">
<label for="userPassword" class="col-sm-3 control-label">Password</label>
<div class="col-xs-9 col-md-6">
<input type="password" class="form-control" id="userPassword" name="password" placeholder="Password">
</div>
</div>
</form>
{% endblock %}
{% block accept_button_text %}Submit{% endblock %}
{% block ajax_url %}'{{ url_for('login') }}'{% endblock %}
{% block form_id %}login{% endblock %}
{% block validation_rules %}
rules: {
// simple rule, converted to {required:true}
password: "required",
// compound rule
email: {
required: true,
email: true
}
}
{% endblock %}
\ No newline at end of file
project/templates/home/signup_modal.html 0 → 100644
+ 41
− 0
View file @ 1302651f
{% extends "modal_base.html" %}
{% block modal_title %} Sign Up {% endblock %}
{% block modal_content %}
<form class="form-horizontal" id="signup" role="form" method="post" action="{{ url_for('signup') }}">
<div class="form-group">
<label for="userEmail" class="col-sm-3 control-label">Email</label>
<div class="col-xs-9 col-md-6">
<input type="email" class="form-control" id="userEmail" name="email" placeholder="Email address">
</div>
</div>
<div class="form-group">
<label for="userPassword" class="col-sm-3 control-label">Password</label>
<div class="col-xs-9 col-md-6">
<input type="password" class="form-control" id="userPassword" name="password" placeholder="Password">
</div>
</div>
<div class="form-group">
<label for="userPasswordConfirm" class="col-sm-3 control-label">Confirm Password</label>
<div class="col-xs-9 col-md-6">
<input type="password" class="form-control" id="userPasswordConfirm" name="passwordConfirm" placeholder="Password">
</div>
</div>
</form>
{% endblock %}
{% block accept_button_text %}Submit{% endblock %}
{% block ajax_url %}'{{ url_for('signup') }}'{% endblock %}
{% block form_id %}signup{% endblock %}
{% block validation_rules %}
rules: {
password: "required",
passwordConfirm: {
required: true,
minlength: 5,
equalTo: "#userPassword"
},
email: {
required: true,
email: true
}
}
{% endblock %}
\ No newline at end of file
project/templates/index.html
+ 23
− 15
View file @ 1302651f
......@@ -5,16 +5,17 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>My Movie Library</title>
<title>{% block title %}My Movie Library{% endblock %}</title>
<link rel="shortcut icon" href="{{ url_for('static', filename='images/favicon.ico') }}">
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/bootstrap-slate.min.css') }}">
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/style.css') }}">
<!-- holderJS -->
<script src="{{ url_for('static', filename='lib/holder.js') }}"></script>
</head>
<body>
<div class="page">
<div id="wrap" class="page">
<div class="container">
<!-- Begin the navbar -->
<nav class="navbar navbar-default" role="navigation">
......@@ -38,8 +39,8 @@
{% block usernav %}
<ul class="nav navbar-nav navbar-right">
<li><a href="{{ url_for('login') }}">Login</a></li>
<li><a href="{{ url_for('signup') }}">Sign-up</a></li>
<li><a data-target="#login-form" data-toggle="modal" >Login</a></li>
<li><a data-target="#signup-form" data-toggle="modal" >Sign-up</a></li>
</ul>
{% endblock %}
</div><!-- /.navbar-collapse -->
......@@ -50,21 +51,28 @@
{% block content %}{% endblock %}
</div>
<div id="push"></div>
</div>
</div>
<div id="footer">
<div class="content">
<div class="panel panel-default">
<div class="panel-body">
Open Source by Brian Wood & Nathan Bills, 2014
</div>
</div>
</div>
</div>
<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
<script src="http://ajax.aspnetcdn.com/ajax/jquery.validate/1.12.0/jquery.validate.min.js"></script>
<!-- Include all compiled plugins (below), or include individual files as needed -->
<script src="{{ url_for('static', filename='lib/bootstrap.min.js') }}"></script>
{% block javascript %}
{% endblock %}
</div>
{% block modals %}
{% endblock %}
</body>
</html>
project/templates/library/addlibrary_modal.html 0 → 100644
+ 20
− 0
View file @ 1302651f
{% extends "modal_base.html" %}
{% block modal_title %} Add Library {% endblock %}
{% block modal_content %}
<form class="form-horizontal" id="addLibrary" role="form" method="post" action="{{ url_for('addLibrary') }}">
<div class="form-group">
<label for="name" class="col-sm-3 control-label">Name</label>
<div class="col-xs-9 col-md-6">
<input type="text" class="form-control" name="name" placeholder="New Library Name">
</div>
</div>
</form>
{% endblock %}
{% block accept_button_text %}Submit{% endblock %}
{% block ajax_url %}'{{ url_for('addLibrary') }}'{% endblock %}
{% block form_id %}addLibrary{% endblock %}
{% block validation_rules %}
rules: {
name: "required",
}
{% endblock %}
\ No newline at end of file
project/templates/library/addmovie_modal.html 0 → 100644
+ 83
− 0
View file @ 1302651f
{% extends "modal_base.html" %}
{% block modal_title %} Add Movie {% endblock %}
{% block modal_content %}
<div class="row">
<div class="pull-right adjust-left">
<form id="movieSearch "class="navbar-form" role="search" method="post" action="{{ url_for('searchMovie') }}">
<div class="form-group">
<input type="text" name="term" class="form-control" placeholder="Title, keyword, etc.">
</div>
<button type="submit" id="search-accept" class="btn btn-default">Search</button>
</form>
</div>
</div>
<div id="results" class="clearfix well col-md-10 col-md-offset-1">
Search for your movie!
</div>
<div class="hidden">
<form class="hidden" id="addMovie" method="post" action="{{ url_for('addlibraryItem',name=library.name) }}">
<div class="form-group">
<div class="col-xs-9 col-md-6">
<input type="hidden" name="id">
</div>
</div>
</form>
</div>
{% endblock %}
{% block accept_button_text %}Submit{% endblock %}
{% block ajax_url %}'{{ url_for('addlibraryItem',name=library.name) }}'{% endblock %}
{% block form_id %}addMovie{% endblock %}
{% block additional_javascripts %}
<script type="text/javascript">
$(function(){
var $addForm = $(document.getElementById("addMovie"));
var $acceptButton = $(document.getElementById("search-accept"));
var $form = $acceptButton.parent();
var $results = $(document.getElementById("results"));
$acceptButton.on('click',function(event){
event.preventDefault();
$.ajax({
url: "{{ url_for('searchMovie') }}",
data: $form.serialize(),
method: 'POST',
success: function(data,status,jqXHR){
movies = data['movies'];
listMovies($results,movies);
$results.on('click','.movie-select',function(){
var id = $(this).data('id');
$('.selected').removeClass('selected');
$(this).addClass('selected');
$addForm.find('input').val(id);
});
},
error: function(jqXHR, textStatus, errorThrown){
$results.html('There was an error with your search please try again')
}
});
});
$("#search input").keyup(function(event){
if(event.keyCode == 13){
$acceptButton.click();
}
});
});
function listMovies(list,movies){
var html = "";
for (var i = movies.length - 1; i >= 0; i--) {
movie = movies[i];
html += "<div title='"+movie['title']+"' class='col-md-4 movie-select' data-id='"+movie['id']+"'>";
html += "<img class='img-thumbnail' src='"+movie['poster']+"'/>";
html += "<h6>"+movie['title']+"</h6>";
html += "</div>";
};
list.html(html);
};
</script>
{% endblock %}
{% block validation_rules %}
rules: {
id: "required",
errorLabelContainer: "#addMovie-error"
}
{% endblock %}
\ No newline at end of file
project/templates/library/library.html
+ 57
− 6
View file @ 1302651f
......@@ -5,7 +5,7 @@
<h3>{{ library.name ~ ' ' ~ library.unit }} Library </h3>
</div>
<div class="btn-group pull-right">
<button type="button" class="btn btn-default add-movie" data-id='{{ library.name }}'>Add Movie</button>
<button type="button" class="btn btn-default add-movie" data-toggle="modal" data-target="#addMovie-form">Add Movie</button>
</div>
<table class="table table-striped table-hover">
<thead>
......@@ -23,9 +23,9 @@
</tr>
{% else %}
{% for movie in library.hydrateList() %}
<tr>
<tr class='clickable' data-id='{{ loop.index }}'>
<td>
<img src="{{ movie.image|default('') }}" style="max-width: 200px;" alt="{{ movie.title }}">
<img src="{{ movie.poster|default('') }}" style="max-width: 200px;" alt="{{ movie.title }}">
<p>{{ movie.title }}</p>
</td>
<td>
......@@ -36,9 +36,9 @@
</td>
<td>
<div class="btn-group-vertical">
<button type="button" class="btn btn-default btn-small lend-movie" data-id='{{ movie.id }}'>Lend</button>
<button type="button" class="btn btn-default btn-small borrow-movie" data-id='{{ movie.id }}'>Edit</button>
<button type="button" class="btn btn-default btn-small remove-movie" data-id='{{ movie.id }}'>Remove</button>
<button type="button" class="btn btn-default btn-small lend-movie" data-id='{{ loop.index }}'>Lend</button>
<button type="button" class="btn btn-default btn-small borrow-movie" data-id='{{ loop.index }}'>Edit</button>
<button type="button" class="btn btn-default btn-small remove-movie" data-id='{{ loop.index }}'>Remove</button>
</div>
</td>
</tr>
......@@ -49,3 +49,54 @@
</table>
</div>
{% endblock %}
{% block javascript %}
<script>
$(function(){
var libraryPath = '{{ url_for("libraryItem", name=library.name, index="999") }}';
$('.clickable').on('click',function(){
var movie_id = $(this).data('id');
window.document.location = libraryPath.replace('999',movie_id);
});
var removePath = '{{ url_for("removelibraryItem", name=library.name) }}';
$('.remove-movie').on('click',function(event){
var movie_id = $(this).data('id');
{% if library.name == 'Master' %}
var message = "Removing a movie from your Master list will remove it from all other lists. Are you sure you want remove this movie? ";
{% else %}
var message = "Are you sure you want remove this movie? ";
{% endif %}
if(confirm(message)){
event.stopPropagation();
event.preventDefault();
$.ajax({
url: removePath,
data: {id:movie_id},
method: 'POST',
success: function(data,status,jqXHR){
if(data['response'] == 'success'){
if(data['type'] == 'redirect'){
window.document.location = data['path'];
} else if (data['type'] == 'reload') {
window.document.location.reload();
}
}
},
error: function(jqXHR, textStatus, errorThrown){
response = jqXHR.responseJSON;
if('message' in response){
alert(response['message']);
}
}
});
}
});
});
</script>
{% endblock %}
{% block modals %}
{% include 'library/addmovie_modal.html' %}
{% endblock %}
\ No newline at end of file
project/templates/library/master.html
+ 50
− 6
View file @ 1302651f
{% extends "usernav.html" %}
{% block content %}
<div class="col-sm-12">
<div class="col-md-4">
<h3>My Libraries</h3>
</div>
<div class="btn-group pull-right">
<button type="button" class="btn btn-default add-movie" data-toggle="modal" data-target="#addLibrary-form">Add Library</button>
</div>
<table class="table table-striped table-hover">
<thead>
<tr>
......@@ -24,9 +29,9 @@
{{ library.collection|length }}
</td>
<td>
<button class="btn btn-default btn-sm">
<span class="glyphicon glyphicon-pencil"></span> Edit
</button>
{% if library.name != 'Master' and library.name != 'Borrowed' %}
<button type="button" class="btn btn-default btn-small remove-library" data-name='{{ library.name }}'>Delete</button>
{% endif %}
</td>
</tr>
{% endfor %}
......@@ -35,6 +40,10 @@
</div>
{% endblock %}
{% block modals %}
{% include 'library/addlibrary_modal.html' %}
{% endblock %}
{% block javascript %}
<script>
$(function(){
......@@ -42,7 +51,42 @@
$('.clickable').on('click',function(){
var libname = $(this).data('name');
window.document.location = libraryPath.replace('__lib__',libname);
})
})(jQuery);
});
var removePath = '{{ url_for("removeLibrary") }}';
$('.remove-library').on('click',function(event){
event.stopPropagation();
event.preventDefault();
var library_name = $(this).data('name');
var message = "Are you sure you want to delete this Library?";
if(library_name == "Master" || library_name == "Borrowed"){
alert("You cannot delete the "+library_name+" library.");
return false;
}
if(confirm(message)){
$.ajax({
url: removePath,
data: {name:library_name},
method: 'POST',
success: function(data,status,jqXHR){
if(data['response'] == 'success'){
if(data['type'] == 'redirect'){
window.document.location = data['path'];
} else if (data['type'] == 'reload') {
window.document.location.reload();
}
}
},
error: function(jqXHR, textStatus, errorThrown){
response = jqXHR.responseJSON;
if('message' in response){
alert(response['message']);
}
}
});
}
});
});
</script>
{% endblock %}
\ No newline at end of file
project/templates/loan/master.html
+ 23
− 2
View file @ 1302651f
......@@ -18,10 +18,11 @@
<p>The Bourne Identity</p>
</td>
<td>
<p>Brian Wood</p>
<!-- Maybe this can link to a modal that shows more information about the borrower??? -->
<p><a href="#">Brian Wood</a></p>
</td>
<td>
<p>Thur, April 17, 2014/p>
<p>Thur, April 17, 2014</p>
</td>
<td>
<p>Thur, May 1, 2014</p>
......@@ -32,6 +33,26 @@
</button>
</td>
</tr>
<tr>
<td>
<p>Frozen</p>
</td>
<td>
<!-- Maybe this can link to a modal that shows more information about the borrower??? -->
<p><a href="#">Grandma Bills</a></p>
</td>
<td>
<p>Sun, April 20, 2014</p>
</td>
<td>
<p>Sun, May 4, 2014</p>
</td>
<td>
<button class="btn btn-default btn-sm">
<span class="glyphicon glyphicon-hand-down"></span> Return
</button>
</td>
</tr>
</tbody>
</table>
</div>
......
project/templates/login/master.html deleted 100644 → 0
+ 0
− 36
View file @ 00b11aa0
{% extends "index.html" %}
{% block content %}
<!-- Login -->
<div class="col-sm-12">
<div class="col-xs-6 col-md-6">
{% if error %}
<div class="alert alert-danger">
{{ error }}
</div>
{% endif %}
<div class="col-sm-offset-3 col-sm-12">
<h3>Login</h3>
</div>
<form class="form-horizontal" role="form" method="post" action="{{ url_for('login') }}">
<div class="form-group">
<label for="userEmail" class="col-sm-3 control-label">Email</label>
<div class="col-xs-9 col-md-6">
<input type="email" class="form-control" id="userEmail" name="email" placeholder="Email address">
</div>
</div>
<div class="form-group">
<label for="userPassword" class="col-sm-3 control-label">Password</label>
<div class="col-xs-9 col-md-6">
<input type="password" class="form-control" id="userPassword" name="password" placeholder="Password">
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-3 col-sm-10">
<button type="submit" class="btn btn-default">Login</button>
</div>
</div>
</form>
</div>
</div>
{% endblock %}
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment