Skip to content

Commit dd078db

Browse files
author
Tania Allard
committed
Templates improvements
1 parent 1c0eafe commit dd078db

File tree

9 files changed

+52
-16
lines changed

9 files changed

+52
-16
lines changed

session5/CFG_app/templates/header.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
text-align: center;
2727
width: 100%;
2828
margin: auto;
29-
padding: 20px;
3029
}
3130

3231

session5/CFG_app/templates/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<h4> What API do you want to query today?</h4>
99
</div>
1010

11-
<div class="card-content">
11+
<div class="card-content icons">
1212
<ul class="nav nav-pills" role="tablist">
1313
<li>
1414
<a href="{{ url_for('twitter_handler') }}">

session5/CFG_app/templates/partials/albums.html

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<div class="col-md-4 col-sm-4">
66
<div class="card card-profile">
77
<div class="card-image">
8-
<a href="{{album.uri"}}
8+
<a href="{{album.uri}}">
99
<img class="img" src="{{album.images[0].url}}" alt="{{artist.name}}" />
1010
</a>
1111
</div>
@@ -15,7 +15,8 @@
1515

1616
<div class="card-content text-center">
1717
<p class="'card-category"> {{album.artists | join(',')}} </p>
18-
<p class="card-description"> {{ album.genres | join(', ')}} </p>
18+
<p class="card-description">Genre: {{ album.genres | join(', ')}} |
19+
Type: {{album.album_type}}</p>
1920
<a href="{{album.uri}}"> Check in Spotify </a>
2021
</div>
2122
</div>
@@ -27,15 +28,12 @@
2728
<div class='card-body content-info'>
2829
<h5>{{artist.name}}</h5>
2930
<p class="'card-category"> {{album.artists | join(',')}} </p>
30-
<p class="card-description">{{ artist.genres | join(', ')}}</p>
31+
<p class="card-description">Genre: {{ album.genres | join(', ')}} |
32+
Type: {{album.album_type}}</p>
3133
<a href="{{album.uri}}"> Check in Spotify </a>
3234
</div>
3335
</div>
3436
</div>
3537
{% endif %}
3638
{% endfor %}
3739
</div>
38-
39-
40-
41-
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<div class="row">
2+
{% for list in data %}
3+
<!--If the search returned an image for the list-->
4+
{% if list.images %}
5+
<div class="col-md-4 col-sm-4">
6+
<div class="card card-profile">
7+
<div class="card-image">
8+
<a href="{{list.uri}}">
9+
<img class="img" src="{{list.images[0].url}}" alt="{{list.name}}" />
10+
</a>
11+
</div>
12+
<div class="card-title text-center text-primary">
13+
{{list.name}}
14+
</div>
15+
16+
<div class="card-content text-center">
17+
<p class="card-description">Public: {{ list.public }} |
18+
Owner: {list.owner.name}}</p>
19+
<a href="{{list.uri}}"> Check in Spotify </a>
20+
</div>
21+
</div>
22+
</div>
23+
{% else %}
24+
<!--If no images were returned for the list-->
25+
<div class="col-sm-4">
26+
<div class="card">
27+
<div class='card-body content-info'>
28+
<h5>{{list.name}}</h5>
29+
<p class="'card-category"> {{list.lists | join(',')}} </p>
30+
<p class="card-description">Genre: {{ list.genres | join(', ')}} |
31+
Type: {{list.list_type}}</p>
32+
<a href="{{list.uri}}"> Check in Spotify </a>
33+
</div>
34+
</div>
35+
</div>
36+
{% endif %}
37+
{% endfor %}
38+
</div>

session5/CFG_app/templates/partials/search_albums.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</div>
1010
{% endif %}
1111
<div class="card-block">
12-
<h4 class="title text-danger">{{ album.name }} </h4>
12+
<h4 class="title text-primary">{{ album.name }} </h4>
1313
<p class="card-text">{{ album.artists | join(', ')}}</p>
1414
</div>
1515
</div>

session5/CFG_app/templates/partials/search_artist.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</div>
1111
{% endif %}
1212
<div class="card-block">
13-
<h4 class="title text-danger">{{ artist.name }} </h4>
13+
<h4 class="title text-primary">{{ artist.name }} </h4>
1414
<p class="card-text">{{ artist.genres | join(', ')}}</p>
1515
</div>
1616
</div>

session5/CFG_app/templates/spotify.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{% include "header.html" %}
22
<div class="wrapper">
33

4-
<div class="container">
4+
<div class="container" style="top: 100px; position:relative;">
55
<div class="row">
66
<div class="col-md-4 col-md-offset-4 col-sm-6 col-sm-offset-3">
77
<div class="card card-signup">

session5/CFG_app/templates/spotify_show.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ <h1 class="text-center">Results from search: {{query}}</h1>
1414
{% elif search_type == ["album"] %}
1515
{% include 'partials/search_albums.html' %}
1616

17-
{% elif search_type == "playlist" %}
17+
{% elif search_type == ["playlist"] %}
1818
{% include 'partials/search_play.html' %}
1919

20-
{% elif search_type == "track" %}
20+
{% elif search_type == ["track"] %}
2121
{% include 'partials/search_track.html' %}
2222

2323
{% endif %}

session5/CFG_app/templates/tweets_show.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
<div class="card card-signup">
1515

1616
<div class="header header-primary text-center">
17-
<h4> Results from search: {{search_string}}</h4>
17+
<h4> Results from search:
18+
<p class='text-primary'>{{search_string}}</p></h4>
1819
</div>
1920

2021
<!-- START TABLE -->
@@ -30,7 +31,7 @@ <h4> Results from search: {{search_string}}</h4>
3031
displaying specific content of each tweet -->
3132
{% for tweet in tweets %}
3233
<tr>
33-
<td> {{ tweet.user.name }}</td>
34+
<td> {{ tweet.user.name }}</td>
3435
<td> @{{ tweet.user.screen_name }} </td>
3536
<td> {{ tweet.text }} </td>
3637
</tr>

0 commit comments

Comments
 (0)