Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Checkpoint 4 templates #16

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions app/index.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html>
<html ng-app="blocJams">
<head>
<title>Bloc Jams</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
Expand All @@ -8,17 +8,23 @@
<link rel="stylesheet" type="text/css" href="styles/normalize.css">
<link rel="stylesheet" type="text/css" href="styles/main.css">
<link rel="stylesheet" type="text/css" href="styles/landing.css">
<link rel="stylesheet" type="text/css" href="styles/collection.css">
<link rel="stylesheet" type="text/css" href="styles/player_bar.css">
<link rel="stylesheet" type="text/css" href="styles/album.css">
</head>
<body class="landing">
<nav class="navbar">
<a href="index.html" class="logo">
<a ui-sref="index.html" class="logo">
<img src="assets/images/bloc_jams_logo.png" alt="bloc jams logo">
</a>
<div class="links-container">
<a href="collection.html" class="navbar-link">Collection</a>
<a ui-sref="collection.html" class="navbar-link">Collection</a>
</div>
</nav>

<ui-view></ui-view>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.4/angular.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/angular-ui-router/0.4.2/angular-ui-router.min.js"></script>
<script src="scripts/app.js"></script>
</body>
</html>
27 changes: 27 additions & 0 deletions app/scripts/app.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
(function() {
function config($stateProvider, $locationProvider) {
$locationProvider
.html5Mode({
enable: true,
requirebase: false
});

$stateProvider
.state('landing', {
url:'/',
templateUrl: '/templates/landing.html'
})
.state('album', {
url:'/album',
templateUrl:'/templates/album.html'
})
.state('collection', {
url:'/collection',
templateUrl:'/templates/collection.html'
});
}
angular
.module('blocJams', ['ui.router'])
.config(config);

})();
25 changes: 25 additions & 0 deletions app/templates/album.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<main class="album-view container narrow">
<section class="clearfix">
<div class="column half">
<img src="/assets/images/album_covers/01.png" class="album-cover-art">
</div>
<div class="album-view-details column half">
<h2 class="album-view-title">The Colors</h2>
<h3 class="album-view-artist">Pablo Picasso</h3>
<h5 class="album-view-release-info">1909 Spanish Records</h5>
</div>
</section>
<table class="album-view-song-list">
<tr class="album-view-song-item" ng-mouseover="hovered = true" ng-mouseleave="hovered = false">
<td class="song-item-number">
<span ng-show="!playing && !hovered">1</span>
<a class="album-song-button" ng-show="!playing && hovered"><span class="ion-play"></span></a>
<a class="album-song-button" ng-show="playing"><span class="ion-pause"></span></a>
</td>
<td class="song-item-title">Blue</td>
<td class="song-item-duration">3:31</td>
</tr>
</table>
</main>

<ng-include src="'/templates/player_bar.html'"></ng-include>
15 changes: 15 additions & 0 deletions app/templates/collection.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<section class="album-covers container clearfix">
<div class="collection-album-container column fourth">
<img src="/assets/images/album_covers/01.png"/>
<div class="collection-album-info caption">
<p>
<a class="album-name" ui-sref="album">The Colors</a>
<br/>
<a ui-sref="album">Pablo Picasso</a>
<br/>
X songs
<br/>
</p>
</div>
</div>
</section>
21 changes: 21 additions & 0 deletions app/templates/landing.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<section class="hero-content">
<h1 class="hero-title">Turn the music up!</h1>
</section>

<section class="selling-points container clearfix">
<div class="point column third">
<span class="ion-music-note"></span>
<h5 class="point-title">Choose your music</h5>
<p class="point-description">The world is full of music; why should you have to listen to music that someone else chose?</p>
</div>
<div class="point column third">
<span class="ion-radio-waves"></span>
<h5 class="point-title">Unlimited, streaming, ad-free</h5>
<p class="point-description">No arbitrary limits. No distractions.</p>
</div>
<div class="point column third">
<span class="ion-iphone"></span>
<h5 class="point-title">Mobile enabled</h5>
<p class="point-description">Listen to your music on the go. This streaming service is available on all mobile platforms.</p>
</div>
</section>
35 changes: 35 additions & 0 deletions app/templates/player_bar.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<section class="player-bar">
<div class="container">
<div class="control-group main-controls">
<a class="previous">
<span class="ion-skip-backward"></span>
</a>
<a class="play-pause">
<span class="ion-play"></span>
</a>
<a class="next">
<span class="ion-skip-forward"></span>
</a>
</div>
<div class="control-group currently-playing">
<h2 class="song-name"></h2>
<h2 class="artist-song-mobile"></h2>
<h3 class="artist-name"></h3>
<div class="seek-control">
<div class="seek-bar">
<div class="fill"></div>
<div class="thumb"></div>
</div>
<div class="current-time"></div>
<div class="total-time"></div>
</div>
</div>
<div class="control-group volume">
<span class="icon ion-volume-high"></span>
<div class="seek-bar">
<div class="fill"></div>
<div class="thumb"></div>
</div>
</div>
</div>
</section>
File renamed without changes.