Merge branch 'master' into fixes

team-alarm-clock · Dec 21, 2018 · 7404900 · 7404900
2 parents 1ca9369 + 2018103
commit 7404900
Show file tree

Hide file tree

Showing 8 changed files with 187 additions and 31 deletions.
diff --git a/src/components/App.vue b/src/components/App.vue
@@ -92,5 +92,116 @@ export default {
   position: absolute;
   top: 0;
   right: 0;
+  margin-right:20px;
+  background-color:#2c3e50;
 }
+#logout a{
+  color:white;
+  font-weight:600;
+  text-decoration: none;
+  letter-spacing: 2px;
+  padding:5px;
+ }
+  #logout a:hover{
+  color:white;
+  font-weight:600;
+  text-decoration: none;
+  background-color: #74b5e0;
+  padding:5px;
+ }
+ .halftone {  
+  margin: 0;
+  padding: 0;
+  height:100%;
+  position: relative;
+  box-sizing: border-box;
+  background-image:
+    radial-gradient(
+      circle,
+      dodgerblue 85%,
+      transparent 0
+      ),
+    radial-gradient(
+      circle,
+      dodgerblue 80%,
+      transparent 0
+      ),
+    radial-gradient(
+      circle,
+      dodgerblue 75%,
+      transparent 0
+      ),
+    radial-gradient(
+      circle,
+      dodgerblue 70%,
+      transparent 0
+      ),
+    radial-gradient(
+      circle,
+      dodgerblue 65%,
+      transparent 0
+      ),
+    radial-gradient(
+      circle,
+      dodgerblue 60%,
+      transparent 0
+      ),
+    radial-gradient(
+      circle,
+      dodgerblue 55%,
+      transparent 0
+      ),
+    radial-gradient(
+      circle,
+      dodgerblue 50%,
+      transparent 0
+      ),
+    radial-gradient(
+      circle,
+      dodgerblue 45%,
+      transparent 0
+      ),
+    radial-gradient(
+      circle,
+      dodgerblue 40%,
+      transparent 0
+      ),
+    radial-gradient(
+      circle,
+      dodgerblue 35%,
+      transparent 0
+      ),
+    radial-gradient(
+      circle,
+      dodgerblue 30%,
+      transparent 0
+      ),
+    radial-gradient(
+      circle,
+      dodgerblue 25%,
+      transparent 0
+      ),
+    radial-gradient(
+      circle,
+      dodgerblue 20%,
+      transparent 0
+      );  
+  background-size: 1em 1em;
+  background-repeat: repeat-x;
+  background-position:
+    0 13em, 
+    0 12em, 
+    0 11em, 
+    0 10em, 
+    0 9em, 
+    0 8em,
+    0 7em,
+    0 6em,
+    0 5em,
+    0 4em,
+    0 3em,
+    0 2em,
+    0 1em,
+    0 0;
+  }
 </style>
diff --git a/src/components/about/About.vue b/src/components/about/About.vue
@@ -1,15 +1,6 @@
 <template>
   <div class="team-div">
-     <h2>This is About US</h2>
-    <section class="bio-body">
-      <img src="https://ca.slack-edge.com/T6FCZF1HR-UDGGR59BN-acc07133bac4-72" alt="profile photo">
-      <section class="bio-col">
-        <h3>Michael Elliot</h3>
-          <p>
-             S-DiT (Software Developer In Training), Musician, Recovering Art School Student, Chef, Father, Miscreant, KJiT ( KJ In Training )
-          </p>
-      </section>  
-    </section> 
+    <h2>ABOUT US</h2>
     <section class="bio-body">
       <img src="https://ca.slack-edge.com/T6FCZF1HR-UDFV35JF7-50e310923778-72" alt="profile photo">
       <section class="bio-col">
@@ -19,6 +10,15 @@
           </p>
       </section> 
     </section>   
+    <section class="bio-body">
+      <img src="https://avatars2.githubusercontent.com/u/38193198?s=400&v=4" class="carmen" alt="profile photo">
+      <section class="bio-col">
+        <h3>Carmen Ramos</h3>
+          <p>
+              Mother,  student,  software developer, food and nutrition enthusiast
+          </p>
+      </section>  
+    </section> 
     <section class="bio-body">
       <img src="https://ca.slack-edge.com/T6FCZF1HR-UDGTMUUFR-a84f193cf11f-72" alt="profile photo">
       <section class="bio-col">
@@ -29,11 +29,11 @@
       </section>  
     </section>  
     <section class="bio-body">
-      <img src="https://avatars2.githubusercontent.com/u/38193198?s=400&v=4" class="carmen" alt="profile photo">
+      <img src="https://ca.slack-edge.com/T6FCZF1HR-UDGGR59BN-acc07133bac4-72" alt="profile photo">
       <section class="bio-col">
-        <h3>Carmen Ramos</h3>
+        <h3>Michael Elliot</h3>
           <p>
-              Mother,  student,  software developer, food and nutrition enthusiast
+             S-DiT (Software Developer In Training), Musician, Recovering Art School Student, Chef, Father, Miscreant, KJiT ( KJ In Training )
           </p>
       </section>  
     </section>  

diff --git a/src/components/auth/Auth.vue b/src/components/auth/Auth.vue
@@ -1,13 +1,15 @@
 <template>
     <section>
         <div v-if="method === 'signin'">
-            <h2>SIGN IN</h2>
+            <h1>POSTER CHILD APP</h1>
+            <h3>SIGN IN</h3>
             <p>NEED TO REGISTER?
                 <button @click="method = 'signup'">SIGN UP</button>
             </p>
             <CredentialsForm prompt="Sign In" :onSubmit="handleSignIn" />
         </div>
         <div v-if="method === 'signup'">
+            <h1>POSTER CHILD APP</h1>
             <h2>SIGN UP</h2>
             <p>ALREADY HAVE AN ACCOUNT?
                 <button @click="method = 'signin'">SIGN UP</button>
@@ -89,19 +91,24 @@ export default {
 </script>
 
 <style scoped>
+@import url('https://fonts.googleapis.com/css?family=Audiowide');
+h1{font-family:'Audiowide'}
 p {
     margin: 0 auto;
     margin-bottom: 19px;
     width: 330px;
     padding:10px;
-    background-color: rgba(182, 182, 182, 0.4);
+    color:white;
+    font-weight:600;
+    background-color: #74b5e0;
     }
  form {
     padding:10px;
     margin: 0 auto;
     align-content: center;
     width:330px;
-    background-color: rgba(182, 182, 182, 0.4);
+    background-color:#74b5e0;
+    color:white;
     }
 
 h3 {

diff --git a/src/components/auth/CredentialsForm.vue b/src/components/auth/CredentialsForm.vue
@@ -48,14 +48,18 @@ p {
     margin-bottom: 19px;
     width: 330px;
     padding:10px;
-    background-color: rgba(182, 182, 182, 0.4);
+    background-color: #74b5e0;
+    color:white;
+    font-weight:600;
     }
 form {
     padding:10px;
     margin: 0 auto;
     align-content: center;
     width:330px;
-    background-color: rgba(182, 182, 182, 0.4);
+    background-color:  #74b5e0;
+    color:white;
+    font-weight:600;
     }
 
 h3 {

diff --git a/src/components/profiles/Profile.vue b/src/components/profiles/Profile.vue
@@ -5,8 +5,8 @@
       <h2>MY FAVORITE ALBUM &amp; ARTISTS</h2>
       <ul>
         <FavoriteArtists v-for="favorite in favorites"
-          :key="favorite.album"
           :favorite="favorite"
+          :key="favorite.album"
           :onSelect="handleSelect"
          />
       </ul>

diff --git a/src/components/shared/Footer.vue b/src/components/shared/Footer.vue
@@ -0,0 +1,14 @@
+<template>
+    <div></div>
+</template>
+
+<script>
+export default {
+
+};
+</script>
+
+<style>
+
+
+</style>
diff --git a/src/components/shared/Header.vue b/src/components/shared/Header.vue
@@ -1,22 +1,48 @@
 <template>
     <header>
-        <RouterLink to="/">Home</RouterLink>
-        <RouterLink to="/search">Search</RouterLink>
-        <RouterLink to="/profile">Profile</RouterLink>
-        <RouterLink to="/about-us">About Us</RouterLink>
+        <div class="logo">
+            <h1>POSTER CHILD APP</h1>
+            <h4>YOUR FAVORITE ARTISTS ALBUMS</h4>
+        </div>
+            <RouterLink to="/">HOME</RouterLink>
+            <RouterLink to="/search">SEARCH</RouterLink>
+            <RouterLink to="/profile">PROFILE</RouterLink>
+            <RouterLink to="/about-us">ABOUT US</RouterLink>
     </header>
 </template>
 
 <script>
 export default {
 
 };
-</script>
+</script>git
 
 <style scoped>
+@import url('https://fonts.googleapis.com/css?family=Audiowide');
+
+h1{font-family:'Audiowide'}
+
 header {
-    padding: 20px;
+    padding: 15px;
     display: flex;
     justify-content: space-around;
+    background-color: #74b5e0;
+
+    
 }
+a {
+    color:white;
+    margin:40px;
+    font-weight:900;
+    text-decoration: none;
+    letter-spacing: 2px;}
+a:hover {
+    color:#2c3e50;
+    font-weight:900;
+    text-decoration: none;
+    letter-spacing: 2px;
+    }
+.logo{
+    display:block;
+    }
 </style>
diff --git a/src/main.js b/src/main.js
@@ -3,13 +3,7 @@ import VueRouter from 'vue-router';
 import App from './components/App.vue';
 import router from './router';
 import './main.css';
-import { library } from '@fortawesome/fontawesome-svg-core'
-import { faUserSecret } from '@fortawesome/free-solid-svg-icons'
-import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
 
-library.add(faUserSecret);
-
-Vue.component('font-awesome-icon', FontAwesomeIcon);
 
 
 Vue.config.productionTip = false;