Skip to content

Commit a4c2ce1

Browse files
added fontawesome icons, refined some graphics, going to add searchbar
1 parent bec2649 commit a4c2ce1

3 files changed

Lines changed: 60 additions & 55 deletions

File tree

db.sqlite3

0 Bytes
Binary file not shown.

movieapp/templates/movie_detail.html

Lines changed: 52 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -74,55 +74,7 @@ <h1 class="mt-3">{{ movie.title }}</h1>
7474
{% endif %}
7575
</p>
7676

77-
<script>
78-
$(document).ready(function() {
79-
$('#request-movie-button').click(function() {
80-
$.ajax({
81-
type: 'POST',
82-
url: "{% url 'movieapp:create_request_ajax' object.pk %}",
83-
data: {
84-
'csrfmiddlewaretoken': '{{ csrf_token }}'
85-
},
86-
success: function(response) {
87-
if (response.status === 'success') {
88-
$('#request-status').text(response.message).css('color', 'green');
89-
$('#request-movie-button').prop('disabled', true);
90-
$('#remove-request-button').show();
91-
$('#requests-count').load(location.href + ' #requests-count');
92-
} else {
93-
$('#request-status').text(response.message).css('color', 'red');
94-
}
95-
},
96-
error: function(response) {
97-
$('#request-status').text('An error occurred. Please try again.').css('color', 'red');
98-
}
99-
});
100-
});
101-
102-
$('#remove-request-button').click(function() {
103-
$.ajax({
104-
type: 'POST',
105-
url: "{% url 'movieapp:remove_request_ajax' object.pk %}",
106-
data: {
107-
'csrfmiddlewaretoken': '{{ csrf_token }}'
108-
},
109-
success: function(response) {
110-
if (response.status === 'success') {
111-
$('#request-status').text(response.message).css('color', 'green');
112-
$('#remove-request-button').hide();
113-
$('#requests-count').load(location.href + ' #requests-count');
114-
} else {
115-
$('#request-status').text(response.message).css('color', 'red');
116-
}
117-
},
118-
error: function(response) {
119-
$('#request-status').text('An error occurred. Please try again.').css('color', 'red');
120-
}
121-
});
122-
});
123-
124-
});
125-
</script>
77+
12678

12779
{% else %}
12880
<p><a href="{% url 'login' %}">Log in</a> to request this movie or to see its status.</p>
@@ -156,4 +108,55 @@ <h5 class="card-title text-truncate">{{ movie.title }} - {{ movie.year }}</h5>
156108
</div>
157109
</div>
158110

111+
112+
113+
<script>
114+
$(document).ready(function() {
115+
$('#request-movie-button').click(function() {
116+
$.ajax({
117+
type: 'POST',
118+
url: "{% url 'movieapp:create_request_ajax' object.pk %}",
119+
data: {
120+
'csrfmiddlewaretoken': '{{ csrf_token }}'
121+
},
122+
success: function(response) {
123+
if (response.status === 'success') {
124+
$('#request-status').text(response.message).css('color', 'green');
125+
$('#request-movie-button').prop('disabled', true);
126+
$('#remove-request-button').show();
127+
$('#requests-count').load(location.href + ' #requests-count');
128+
} else {
129+
$('#request-status').text(response.message).css('color', 'red');
130+
}
131+
},
132+
error: function(response) {
133+
$('#request-status').text('An error occurred. Please try again.').css('color', 'red');
134+
}
135+
});
136+
});
137+
138+
$('#remove-request-button').click(function() {
139+
$.ajax({
140+
type: 'POST',
141+
url: "{% url 'movieapp:remove_request_ajax' object.pk %}",
142+
data: {
143+
'csrfmiddlewaretoken': '{{ csrf_token }}'
144+
},
145+
success: function(response) {
146+
if (response.status === 'success') {
147+
$('#request-status').text(response.message).css('color', 'green');
148+
$('#remove-request-button').hide();
149+
$('#requests-count').load(location.href + ' #requests-count');
150+
} else {
151+
$('#request-status').text(response.message).css('color', 'red');
152+
}
153+
},
154+
error: function(response) {
155+
$('#request-status').text('An error occurred. Please try again.').css('color', 'red');
156+
}
157+
});
158+
});
159+
160+
});
161+
</script>
159162
{% endblock %}

movieapp/views.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from django.contrib.auth.forms import UserChangeForm
66
from django.http import JsonResponse
77
from django.shortcuts import redirect, render, get_object_or_404
8-
from django.urls import reverse_lazy, reverse
8+
from django.urls import reverse_lazy, reverse, resolve
99
from django.views.decorators.http import require_POST, require_GET
1010
from django.views.generic import ListView, UpdateView, DetailView
1111

@@ -34,21 +34,23 @@ def get_context_data(self, **kwargs):
3434
if parsed_url.path == '/':
3535
context['back_btn'] = True
3636
else:
37+
if parsed_url.path.strip('/').split('/')[0] == 'movie':
38+
context['prev_page'] = reverse('movieapp:home')
39+
else:
40+
context['prev_page'] = self.request.META.get('HTTP_REFERER')
3741
context['back_btn'] = False
38-
context['prev_page'] = self.request.META.get('HTTP_REFERER')
3942
user = self.request.user
43+
movie = self.get_object()
44+
# movie recommendation system is called, results added to context
45+
context['recommended_movies'] = title_recommendation(movie)
4046
if user.is_authenticated:
4147
user_profile = get_object_or_404(Profile, user=user)
42-
movie = self.get_object()
4348
existing_request = Request.objects.filter(profile=user_profile, movie=movie).exists()
4449
context['existing_request'] = existing_request
4550
request_count = Request.objects.filter(movie=movie).count()
4651
context['request_count'] = request_count
4752
context['movie_request'] = Request.objects.filter(profile=user_profile, movie=movie).first()
4853

49-
#movie recommendation system is called, results added to context
50-
context['recommended_movies'] = title_recommendation(movie)
51-
5254
else:
5355
context['existing_request'] = False
5456
return context

0 commit comments

Comments
 (0)