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

code working #20

Open
wants to merge 48 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
23b2e7b
first commit
chencaleb Mar 3, 2016
82b9e08
completed first sprint
chencaleb Mar 3, 2016
b5a5556
sprint 2 step 3
chencaleb Mar 4, 2016
78db5d3
user can create album
chencaleb Mar 4, 2016
27273c1
v1
chencaleb Mar 4, 2016
462b842
Adds ejs
Mar 4, 2016
a8fabb1
Fixes ejs problem
Mar 4, 2016
ca73889
Merge pull request #1 from chencaleb/albumdelete
chencaleb Mar 4, 2016
4c9f859
Adds working delete button
Mar 4, 2016
f5a6a0f
Merge pull request #2 from chencaleb/albumdelete
chencaleb Mar 4, 2016
764328b
creates genre
chencaleb Mar 4, 2016
6cccbd6
creates genre model/view
chencaleb Mar 4, 2016
d0fa9d0
Merge pull request #3 from chencaleb/createGenre
FranchiniMae Mar 4, 2016
1705806
created genre view page
chencaleb Mar 4, 2016
da1bbf6
Merge pull request #4 from chencaleb/createGenre
FranchiniMae Mar 5, 2016
6690941
fix master merge conflicts
chencaleb Mar 5, 2016
1244ed8
Adds working delete button for genres
Mar 5, 2016
e6a9374
Merge pull request #5 from chencaleb/deletegenre
chencaleb Mar 5, 2016
031b137
reordering code
chencaleb Mar 5, 2016
4f72058
fix merge conflict
chencaleb Mar 5, 2016
9385936
user can create genres
chencaleb Mar 5, 2016
ce6dc1e
Merge pull request #6 from chencaleb/createGenreFeature
FranchiniMae Mar 5, 2016
12d465f
editing genre.ejs
chencaleb Mar 5, 2016
97bab47
Merge branch 'master' of https://github.com/chencaleb/tunely
chencaleb Mar 5, 2016
3bfc73f
update albums feature
chencaleb Mar 6, 2016
37ffad4
Merge pull request #8 from chencaleb/updateFeature
chencaleb Mar 6, 2016
08928ea
edit genre
jasminejeane Mar 6, 2016
5d17395
Merge pull request #9 from chencaleb/updateg
chencaleb Mar 6, 2016
dea91f8
working on adding image
jasminejeane Mar 7, 2016
dd0fb5b
fixed typo with genre id
jasminejeane Mar 7, 2016
4155b18
Merge pull request #10 from chencaleb/updateg
FranchiniMae Mar 7, 2016
8a78155
Adds commit after pulling updateg
Mar 7, 2016
b0bcae7
Adds incomplete navbar
Mar 7, 2016
20da889
Merge pull request #11 from chencaleb/navbar
FranchiniMae Mar 7, 2016
5b40f39
css style changes
jasminejeane Mar 7, 2016
80ab397
splash page
chencaleb Mar 7, 2016
64b9421
user can see image on genre page
jasminejeane Mar 7, 2016
202484d
splashpage
chencaleb Mar 7, 2016
1a67948
Adds vinyl icon to navbar
Mar 7, 2016
f4cac51
Merge pull request #12 from chencaleb/navbar
chencaleb Mar 7, 2016
fe58a08
change fade in time
chencaleb Mar 7, 2016
8c984a5
changed fade time
chencaleb Mar 7, 2016
b48b8ed
fix merge conflicts
chencaleb Mar 7, 2016
9e1b163
Merge pull request #13 from chencaleb/splashpage
chencaleb Mar 7, 2016
226f966
vapor font working
jasminejeane Mar 7, 2016
7e2455a
Merge branch 'master' of https://github.com/chencaleb/tunely
jasminejeane Mar 7, 2016
a1d4526
fix merge conflict
chencaleb Mar 7, 2016
ea6069b
Merge pull request #15 from chencaleb/css2
chencaleb Mar 7, 2016
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
Binary file added .DS_Store
Binary file not shown.
12 changes: 12 additions & 0 deletions models/album.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,14 @@
var mongoose = require("mongoose");
var Schema = mongoose.Schema;

var AlbumSchema = new Schema({
artistName: String,
name: String,
releaseDate: String,
coverImage: String,
genres: [String]
});

var Album = mongoose.model('Album', AlbumSchema);

module.exports = Album;
22 changes: 22 additions & 0 deletions models/genre.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
var mongoose = require("mongoose");
var Album = require("../models/album");
var Schema = mongoose.Schema;

var AlbumSchema = new Schema({
artistName: String,
name: String,
releaseDate: String,
coverImage: String,
genres: [String]
});

var GenreSchema = new Schema({
name: String,
coverImage: String,

albums: [AlbumSchema]
});

var Genre = mongoose.model('Genre', GenreSchema);

module.exports = Genre;
6 changes: 6 additions & 0 deletions models/index.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,8 @@
var mongoose = require("mongoose");
mongoose.connect("mongodb://localhost/tunely");

var Album = require('./album.js');
var Genre = require('./genre.js');

module.exports.Album = Album;
module.exports.Genre = Genre;
7 changes: 6 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@
},
"homepage": "https://github.com/tgaff/tunely#readme",
"dependencies": {
"express": "^4.13.3"
"body-parser": "^1.15.0",
"ejs": "^2.4.1",
"express": "^4.13.4",
"method-override": "^2.3.4",
"mongoose": "^4.4.6",
"path": "^0.12.7"
}
}
136 changes: 135 additions & 1 deletion public/css/styles.css
Original file line number Diff line number Diff line change
@@ -1,9 +1,21 @@
@import url('https://fonts.googleapis.com/css?family=Play');
/*@import url('vapor.ttf');*/

body {

font-family: 'Play';
}


.jumbotron {
background-image: url(/images/background1.jpg);
background-color: #CE869B;
background-size: cover;
background-repeat: no-repeat;
color: #EEE;
margin: -20px;
position: relative;
}

.jumbotron .container {
height: 350px;
}
Expand All @@ -14,3 +26,125 @@
margin-right: 12px;
}

@font-face {
font-family: vapor;
src: url('/fonts/vapor.ttf');
}

.btn-color {

background-color: #C5BCB0;
}
.vaporfont {
font-family: 'vapor';
}

.btn-color {
background-color: #C5BCB0;
}

.legend2 {
font-family: vapor;
font-size: 40px;
font-weight: bold;

}

.vaporfont {
margin-top: 70px;
font-size: 50px;
font-weight: bold;
font-family: vapor;

}

.aFonts {

font-size: 20px;
}
/*---- Splash Style ----*/

.splash-title {
color: white;
font-size: 3em;
margin-top: 100px;
text-shadow: 0 2px 10px #000;
-webkit-animation-delay: 1s;
-moz-animation-delay: 1s;
animation-delay: 1s;
}

.splash{
position:absolute;
top:0;
left:0;
height:100%;
width:100%;
background-color:#252525;
background-repeat:no-repeat;
text-align:center;
z-index: 100;
}

#vinyl {
width: 300px;
margin-top: 50px;
}

@-webkit-keyframes rotate {
from {
-webkit-transform: rotate(0deg);
}
to {
-webkit-transform: rotate(360deg);
}
}

.rotate:hover {
-webkit-animation-name: rotate;
-webkit-animation-duration: 1.3s;
-webkit-animation-iteration-count: infinite;
-webkit-animation-timing-function: linear;
cursor: pointer;
}

.container-fluid {
background-color: #5AFFF7;
border-color: #5AFFF7;
}

.statue {

top: 166px;
left: 815px;
position: absolute;
}

.statue2{

top: -55px;
left: 946px;
position: absolute;
}

.mainbtn {
background-color: limegreen;
font-size: 20px;
/*
background-image: url('/images/tape.jpg');
background-size: 80px 60px;*/
/* padding: 19px 17px;
*/
}


.navbar-brand {
padding: 0px;
padding-left: 10px;
padding-top: 8px;
}

.navbar-brand > img {
height: 32px;
}

Binary file added public/fonts/.DS_Store
Binary file not shown.
Binary file added public/fonts/vapor.ttf
Binary file not shown.
Binary file added public/images/.DS_Store
Binary file not shown.
Binary file added public/images/ctapehot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/cupcake.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/tape.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/vapor1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/vaporimg2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/vinyl.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/vstatue1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/vstatue2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/vstatueg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading