diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..5008ddf Binary files /dev/null and b/.DS_Store differ diff --git a/models/genre.js b/models/genre.js index d0dbdb2..313c7b4 100644 --- a/models/genre.js +++ b/models/genre.js @@ -6,11 +6,14 @@ var AlbumSchema = new Schema({ artistName: String, name: String, releaseDate: String, + coverImage: String, genres: [String] }); var GenreSchema = new Schema({ name: String, + coverImage: String, + albums: [AlbumSchema] }); diff --git a/public/css/styles.css b/public/css/styles.css index 6148066..e3f8895 100644 --- a/public/css/styles.css +++ b/public/css/styles.css @@ -1,9 +1,19 @@ +@import url('https://fonts.googleapis.com/css?family=Play'); +/*@import url('vapor.ttf');*/ + +body { + + font-family: 'Play'; +} + + .jumbotron { - background-image: url(/images/vapor1.png); + background-color: #CE869B; background-size: cover; background-repeat: no-repeat; color: #EEE; margin: -20px; + position: relative; } .jumbotron .container { @@ -17,12 +27,13 @@ } @font-face { - font-family: 'vapor'; - src: url('fonts/vapor.ttf'); + font-family: vapor; + src: url('/fonts/vapor.ttf'); } -.vaporfont { - font-family: 'vapor'; + +.btn-color { + background-color: #C5BCB0; } .btn-color { @@ -30,6 +41,30 @@ } +.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; +} + +.aFonts { + + font-size: 20px; + /*---- Splash Style ----*/ .splash-title { @@ -81,6 +116,51 @@ 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; @@ -90,3 +170,4 @@ .navbar-brand > img { height: 32px; } +>>>>>>> master diff --git a/public/fonts/.DS_Store b/public/fonts/.DS_Store new file mode 100644 index 0000000..5008ddf Binary files /dev/null and b/public/fonts/.DS_Store differ diff --git a/public/images/ctapehot.png b/public/images/ctapehot.png new file mode 100644 index 0000000..a1ed166 Binary files /dev/null and b/public/images/ctapehot.png differ diff --git a/public/images/cupcake.jpg b/public/images/cupcake.jpg new file mode 100644 index 0000000..13fc084 Binary files /dev/null and b/public/images/cupcake.jpg differ diff --git a/public/images/tape.jpg b/public/images/tape.jpg new file mode 100644 index 0000000..a050bc6 Binary files /dev/null and b/public/images/tape.jpg differ diff --git a/public/images/vstatue1.png b/public/images/vstatue1.png new file mode 100644 index 0000000..538a7af Binary files /dev/null and b/public/images/vstatue1.png differ diff --git a/public/images/vstatue2.png b/public/images/vstatue2.png new file mode 100644 index 0000000..9059fb5 Binary files /dev/null and b/public/images/vstatue2.png differ diff --git a/public/images/vstatueg.png b/public/images/vstatueg.png new file mode 100644 index 0000000..30d9888 Binary files /dev/null and b/public/images/vstatueg.png differ diff --git a/public/js/app.js b/public/js/app.js index 8ca28e3..ac6e8ed 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -287,10 +287,7 @@ function renderAlbum(album) { "

Released date:

" + " " + album.releaseDate + "" + " " + - // "
  • " + - // "

    Cover Image:

    " + - // " " + album.coverImage + "" + - // "
  • " + + " " + " " + " " + @@ -321,7 +318,7 @@ function renderGenre(genre){ " " + "
    " + "
    " + - " genre image" + + " genre image" + "
    " + "
    " + "
    + + picture +
    diff --git a/views/index.ejs b/views/index.ejs index 6b969e8..c72c4cf 100644 --- a/views/index.ejs +++ b/views/index.ejs @@ -31,6 +31,7 @@
    +
    @@ -40,11 +41,11 @@
    - Add New Album + Add New Album
    - +
    @@ -53,7 +54,7 @@
    - +
    @@ -62,7 +63,7 @@
    - +
    @@ -71,7 +72,7 @@
    - +
    @@ -79,7 +80,7 @@
    - +
    @@ -87,14 +88,11 @@
    - - -
    - +
    - +
    @@ -104,8 +102,8 @@
    -

    Welcome to tunely

    -

    Your music binder!

    +

    Welcome to Tunely

    +

    Not your ordinary music!

    @@ -119,6 +117,8 @@
    + + picture