From 034ece5ae0d7f641c0e941ab3c88c328bfab343a Mon Sep 17 00:00:00 2001
From: Chelsea Grimmett
Date: Fri, 24 Aug 2018 13:12:07 -0700
Subject: [PATCH 1/5] html and css started
---
apps.js | 0
index.html | 35 ++++++++++++++++++++++--
style.css | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 113 insertions(+), 2 deletions(-)
create mode 100644 apps.js
create mode 100644 style.css
diff --git a/apps.js b/apps.js
new file mode 100644
index 0000000..e69de29
diff --git a/index.html b/index.html
index 8e0abfd..d404d17 100644
--- a/index.html
+++ b/index.html
@@ -2,10 +2,41 @@
-
+ Music Playlist
+
+
+
+
-
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Click an album to add its tracks to the bin
+
+
+
+
diff --git a/style.css b/style.css
new file mode 100644
index 0000000..fe00094
--- /dev/null
+++ b/style.css
@@ -0,0 +1,80 @@
+header{
+ display:block;
+ margin:3rem;
+ background-color:grey;
+ color:white;
+ width:100%;
+ font-size: 1.5rem
+}
+
+body {
+ align-items: center;
+ justify-content: center;
+ font-family: "Avenir";
+ margin: 1rem;
+}
+
+
+button {
+ background-color:#68a276;
+ padding: 1rem;
+ border:10;
+}
+ label{
+ color:purple;
+ display:block;
+ z-index:auto;
+}
+
+.album5{
+ /* z-index:inherit; */
+
+ width:20%;
+ height:inherit;
+ margin:3rem;
+
+}
+.album1{
+ /* z-index:auto; */
+ width:20%;
+ height:inherit
+ margin:3rem;
+}
+.choose{
+ margin:3rem;
+ border:14;
+ background-color:#68a276;
+ color:white;
+ height:15%;
+ width:19%;
+ font-weight: 700;
+}
+.albums{
+ z-index:auto;
+ margin:15rem;
+ width:20%;
+ height:20%;
+
+}
+.clear{
+ z-index: inherit;
+ margin:3rem;
+ background-color:#68a276;
+ color: white;
+ width:19%;
+}
+.submit{
+ z-index: inherit;
+ background-color:#68a276;
+ color:white;
+ width:19%;
+}
+
+footer{
+ margin:3rem;
+ display:block;
+ background-color:#68a276;
+ color:white;
+ width:100%;
+ font-size: 1.5rem
+}
From 3d40b9786469f32d406846b6940fb5dd3446cbd2 Mon Sep 17 00:00:00 2001
From: Chelsea Grimmett
Date: Fri, 24 Aug 2018 14:05:26 -0700
Subject: [PATCH 2/5] button and albums changed
---
index.html | 14 ++++++++++---
style.css | 59 ++++++++++++++++++++++++++++++++++--------------------
2 files changed, 48 insertions(+), 25 deletions(-)
diff --git a/index.html b/index.html
index d404d17..73ab8bf 100644
--- a/index.html
+++ b/index.html
@@ -12,10 +12,12 @@
- 
-
-
Click an album to add its tracks to the bin
+
+
+
+
+
+
diff --git a/style.css b/style.css
index fe00094..26d08e4 100644
--- a/style.css
+++ b/style.css
@@ -8,72 +8,87 @@ header{
}
body {
+ background: url(/images/fadedTrack.jpg);
align-items: center;
justify-content: center;
font-family: "Avenir";
margin: 1rem;
}
-
-button {
- background-color:#68a276;
+ button {
+ background-color:black;
padding: 1rem;
border:10;
}
label{
+ font-size: 2rem;
color:purple;
display:block;
z-index:auto;
}
-
-.album5{
- /* z-index:inherit; */
-
+.album1{
+ align-items: flex-end;
width:20%;
- height:inherit;
+ height:19%;
margin:3rem;
-
}
-.album1{
- /* z-index:auto; */
+.album2{
+ background:url(/images/fadedTrack.jpg);
+ width:10%;
+ height:19%;
+ margin:3rem;
+}
+.album4{
+ background: url(/images/fadedTrack.jpg);
width:20%;
- height:inherit
+ height:inherit;
margin:3rem;
+
+}
+
+.railroad{
+ opacity:19%;
+ display:right;
+
+ margin:10rem;
+ height:100%;
}
.choose{
margin:3rem;
- border:14;
- background-color:#68a276;
+ background-color:black;
color:white;
- height:15%;
- width:19%;
+ height:10%;
+ width:20%;
font-weight: 700;
}
-.albums{
+ .albums{
z-index:auto;
margin:15rem;
- width:20%;
- height:20%;
+ width:10%;
+ border-style:10rem;
+ height:10%;
}
.clear{
z-index: inherit;
margin:3rem;
- background-color:#68a276;
+ background-color:black;
color: white;
width:19%;
+ height: auto;
}
.submit{
z-index: inherit;
- background-color:#68a276;
+ background-color:black;
color:white;
width:19%;
+ height: 19%;
}
footer{
margin:3rem;
display:block;
- background-color:#68a276;
+ background-color:grey;
color:white;
width:100%;
font-size: 1.5rem
From ad87bb1f96b1abce126939ef3cd57c7b44141143 Mon Sep 17 00:00:00 2001
From: Chelsea Grimmett
Date: Sat, 25 Aug 2018 21:13:36 -0700
Subject: [PATCH 3/5] button centered and axios started
---
apps.js | 24 +++++++++++++
index.html | 27 +++++++-------
style.css | 104 +++++++++++++++++++++++++++++++----------------------
3 files changed, 101 insertions(+), 54 deletions(-)
diff --git a/apps.js b/apps.js
index e69de29..4210f81 100644
--- a/apps.js
+++ b/apps.js
@@ -0,0 +1,24 @@
+const baseURL ="https://lit-fortress-6467.herokuapp.com/object";
+document.querySelector('#choose').addEventListener('click',function(event){
+
+
+
+
+
+
+
+
+
+axios.get(baseURL)
+.then(function(event){
+ event.preventDefualt()
+ alert('sup')
+ })
+
+
+
+
+
+
+
+})
diff --git a/index.html b/index.html
index 73ab8bf..f70c1c4 100644
--- a/index.html
+++ b/index.html
@@ -1,28 +1,30 @@
+
Music Playlist
-
-
+
+
+
-
+
+
-
-
-
+
Track Bin
-