Skip to content

Commit

Permalink
first commit
Browse files Browse the repository at this point in the history
  • Loading branch information
@Kenneth-Brisco
Kenneth-Brisco committed May 10, 2018
0 parents commit 091130a
Show file tree
Hide file tree
Showing 71 changed files with 2,627 additions and 0 deletions.
70 changes: 70 additions & 0 deletions album.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
<?php include("includes/includedFiles.php");
if(isset($_GET['id'])) {
$albumId = $_GET['id'];
} else {
header("Location: index.php");
}

$album = new Album($con, $albumId);

$artist = $album->getArtist();
?>

<div class="entityInfo">
<div class="leftSection">
<img src="<?php echo $album->getArtworkPath() ?>" alt="">
</div>
<div class="rightSection">
<h2><?php echo $album->getTitle(); ?></h2>
<p role='link' tabindex='0' onclick="openPage('artist.php?id=$artistId')">By <?php echo $artist->getName(); ?></p>
<p><?php echo $album->getNumberOfSongs(); ?> songs</p>
</div>

</div>

<div class="tracklistContainer">
<ul class="tracklist">
<?php
$songIdArray = $album->getSongIds();

$i = 1;
foreach($songIdArray as $songId) {
$albumSong = new Song($con, $songId);
$albumArtist = $albumSong->getArtist();

echo "<li class='tracklistRow'>
<div class='trackCount'>
<img class='play' src='assets/images/icons/play-white.png' onclick='setTrack(\"" . $albumSong->getId() . "\", tempPlaylist, true)'>
<span class='trackNumber'>$i</span>
</div>
<div class='trackInfo'>
<span class='trackName'>" . $albumSong->getTitle() . "</span>
<span class='artistName'>" . $albumArtist->getName() . "</span>
</div>
<div class='trackOptions'>
<input type='hidden' class='songId' value='" . $albumSong->getId() . "'>
<img class='optionsButton' src='assets/images/icons/more.png' onclick='showOptionsMenu(this)'>
</div>
<div class='trackDuration'>
<span class='duration'>" . $albumSong->getDuration() . "</span>
</div>
</li>";

$i++;
}
?>

<script>
var tempSongIds = '<?php echo json_encode($songIdArray); ?>';
tempPlaylist = JSON.parse(tempSongIds);
</script>
</ul>
</div>

<nav class="optionsMenu">
<input type="hidden"class="songId">
<?php echo Playlist::getPlaylistsDropdown($con, $userLoggedIn->getUsername()); ?>
</nav>
100 changes: 100 additions & 0 deletions artist.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
<?php
include("includes/includedFiles.php");

if(isset($_GET['id'])) {
$artistId = $_GET['id'];
} else {
header("Location: index.php");
}

$artist = new Artist($con, $artistId);
?>

<div class="entityInfo borderBottom">
<div class="centerSection">
<div class="artistInfo">
<h1 class="artistName"><?php echo $artist->getName(); ?></h1>

<div class="headerButtons">
<button class="button green" onclick='playFirstSong()'>PLAY</button>
</div>
</div>
</div>

</div>


<div class="tracklistContainer borderBottom">
<h2>SONGS</h2>
<ul class="tracklist">
<?php
$songIdArray = $artist->getSongIds();

$i = 1;
foreach($songIdArray as $songId) {
if($i > 5) {
break;
}

$albumSong = new Song($con, $songId);
$albumArtist = $albumSong->getArtist();

echo "<li class='tracklistRow'>
<div class='trackCount'>
<img class='play' src='assets/images/icons/play-white.png' onclick='setTrack(\"" . $albumSong->getId() . "\", tempPlaylist, true)'>
<span class='trackNumber'>$i</span>
</div>
<div class='trackInfo'>
<span class='trackName'>" . $albumSong->getTitle() . "</span>
<span class='artistName'>" . $albumArtist->getName() . "</span>
</div>
<div class='trackOptions'>
<input type='hidden' class='songId' value='" . $albumSong->getId() . "'>
<img class='optionsButton' src='assets/images/icons/more.png' onclick='showOptionsMenu(this)'>
</div>
<div class='trackDuration'>
<span class='duration'>" . $albumSong->getDuration() . "</span>
</div>
</li>";

$i++;
}
?>

<script>
var tempSongIds = '<?php echo json_encode($songIdArray); ?>';
tempPlaylist = JSON.parse(tempSongIds);
</script>
</ul>
</div>


<div class="gridViewContainer">
<h2>ALBUMS</h2>
<?php
$albumQuery = mysqli_query($con, "SELECT * FROM albums WHERE artist='$artistId'");

while($row = mysqli_fetch_array($albumQuery)) {


echo "<div class='gridViewItem'>
<span role='link' tabindex='0' onclick='openPage(\"album.php?id=" . $row['id'] . "\")' >
<img src='" . $row['artworkPath'] . "'>
<div class='gridViewInfo'>"
. $row['title'] .
"</div>
</span>
</div>";
}
?>
</div>

<nav class="optionsMenu">
<input type="hidden"class="songId">
<?php echo Playlist::getPlaylistsDropdown($con, $userLoggedIn->getUsername()); ?>
</nav>
152 changes: 152 additions & 0 deletions assets/css/register.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
html,
body {
padding: 0;
margin: 0;
height: 100%;
}

#background {
background-image: url(../images/bg.jpg);
background-size: cover;
background-position: center;
display: table;
height: 100%;
width: 100%;
}

#loginContainer * {
color: #fff;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: normal;
line-height: 1em;
box-sizing: border-box;
}

#loginContainer {
width: 80%;
margin: 0 auto;
position: relative;
max-width: 1024px;
}

::-webkit-input-placeholder {
/* WebKit, Blink, Edge */
color: #fff;
}
:-moz-placeholder {
/* Mozilla Firefox 4 to 18 */
color: #fff;
opacity: 1;
}
::-moz-placeholder {
/* Mozilla Firefox 19+ */
color: #fff;
opacity: 1;
}
:-ms-input-placeholder {
/* Internet Explorer 10-11 */
color: #fff;
}
::-ms-input-placeholder {
/* Microsoft Edge */
color: #fff;
}

::placeholder {
/* Most modern browsers support this now. */
color: #fff;
}

#inputContainer {
width: 400px;
padding: 45px;
float: left;
border-right: 1px solid #999;
}

#inputContainer h2 {
text-align: center;
}

#inputContainer input[type="text"],
#inputContainer input[type="email"],
#inputContainer input[type="password"] {
display: block;
background-color: transparent;
border: 0;
border-bottom: 1px solid #fff;
height: 27px;
line-height: 27px;
width: 100%;
}

#inputContainer label {
color: #a0a0a0;
font-size: 13px;
margin-top: 15px;
display: block;
}

#inputContainer button {
background-color: transparent;
border: 2px solid #fff;
border-radius: 250px;
color: #fff;
display: block;
font-size: 14px;
letter-spacing: 1px;
margin: 20px auto;
height: 41px;
width: 100%;
}

#inputContainer button:hover {
cursor: pointer;
}

.hasAccountText span {
font-weight: bold;
font-size: 12px;
cursor: pointer;
}

.hasAccountText {
text-align: center;
}

#registerForm,
#loginForm {
display: none;
}

#loginText {
padding: 45px;
display: table-cell;
}

#loginText h1 {
color: #07d159;
font-size: 60px;
font-weight: bold;
}

#loginText h2 {
margin: 35px 0;
}

#loginText ul {
padding: 0;
}

#loginText li {
font-size: 20px;
list-style-type: none;
padding: 5px 30px;
background: url(../images/icons/checkmark.png) no-repeat 0 0;
}

#inputContainer .errorMessage {
color: #07d159;
font-size: 12px;
display: block;
}
Loading

0 comments on commit 091130a

Please sign in to comment.