squash old build commits

.gitignore

@@ -7,4 +7,4 @@ npm-debug.log
 # Nuxt build
 .nuxt
 
-*.env
+.env

README.md

@@ -1,6 +1,6 @@
 # What is Congress Doing Today?
 
-[What Is Congress Doing Today?](http://whatiscongressdoing.today) is a site to show the daily activity of the House and the Senate of the U.S. Government.
+[What Did Congress Do Today?](http://whatdidcongressdo.today) is a site to show the daily activity of the House and the Senate of the U.S. Government.
 
 ## About
 
@@ -26,5 +26,3 @@ $ yarn start
 # generate static project
 $ yarn run generate
 ```
-
-For detailed explanation on how things work, checkout the .

assets/styles/mixins.scss

@@ -0,0 +1,4 @@
+@mixin svg-bg {
+  background-color: $blue;
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 56 28' width='56' height='28'%3E%3Cpath fill='%233c424b' fill-opacity='0.4' d='M56 26v2h-7.75c2.3-1.27 4.94-2 7.75-2zm-26 2a2 2 0 1 0-4 0h-4.09A25.98 25.98 0 0 0 0 16v-2c.67 0 1.34.02 2 .07V14a2 2 0 0 0-2-2v-2a4 4 0 0 1 3.98 3.6 28.09 28.09 0 0 1 2.8-3.86A8 8 0 0 0 0 6V4a9.99 9.99 0 0 1 8.17 4.23c.94-.95 1.96-1.83 3.03-2.63A13.98 13.98 0 0 0 0 0h7.75c2 1.1 3.73 2.63 5.1 4.45 1.12-.72 2.3-1.37 3.53-1.93A20.1 20.1 0 0 0 14.28 0h2.7c.45.56.88 1.14 1.29 1.74 1.3-.48 2.63-.87 4-1.15-.11-.2-.23-.4-.36-.59H26v.07a28.4 28.4 0 0 1 4 0V0h4.09l-.37.59c1.38.28 2.72.67 4.01 1.15.4-.6.84-1.18 1.3-1.74h2.69a20.1 20.1 0 0 0-2.1 2.52c1.23.56 2.41 1.2 3.54 1.93A16.08 16.08 0 0 1 48.25 0H56c-4.58 0-8.65 2.2-11.2 5.6 1.07.8 2.09 1.68 3.03 2.63A9.99 9.99 0 0 1 56 4v2a8 8 0 0 0-6.77 3.74c1.03 1.2 1.97 2.5 2.79 3.86A4 4 0 0 1 56 10v2a2 2 0 0 0-2 2.07 28.4 28.4 0 0 1 2-.07v2c-9.2 0-17.3 4.78-21.91 12H30zM7.75 28H0v-2c2.81 0 5.46.73 7.75 2zM56 20v2c-5.6 0-10.65 2.3-14.28 6h-2.7c4.04-4.89 10.15-8 16.98-8zm-39.03 8h-2.69C10.65 24.3 5.6 22 0 22v-2c6.83 0 12.94 3.11 16.97 8zm15.01-.4a28.09 28.09 0 0 1 2.8-3.86 8 8 0 0 0-13.55 0c1.03 1.2 1.97 2.5 2.79 3.86a4 4 0 0 1 7.96 0zm14.29-11.86c1.3-.48 2.63-.87 4-1.15a25.99 25.99 0 0 0-44.55 0c1.38.28 2.72.67 4.01 1.15a21.98 21.98 0 0 1 36.54 0zm-5.43 2.71c1.13-.72 2.3-1.37 3.54-1.93a19.98 19.98 0 0 0-32.76 0c1.23.56 2.41 1.2 3.54 1.93a15.98 15.98 0 0 1 25.68 0zm-4.67 3.78c.94-.95 1.96-1.83 3.03-2.63a13.98 13.98 0 0 0-22.4 0c1.07.8 2.09 1.68 3.03 2.63a9.99 9.99 0 0 1 16.34 0z'%3E%3C/path%3E%3C/svg%3E");
+}

components/FloorAction.vue

@@ -4,12 +4,15 @@
       <span>{{time}}</span>
     </div>
     <div class="action">
-      <span>{{action.description}}</span>
+      <span v-html="action.description"></span>
+      <ul class="sub-actions">
+        <li v-for="sa in action.sub_actions" :key="sa.timestamp" class="sub-action" v-html="sa.description"></li>
+      </ul>
     </div>
   </section>
 </template>
 <script>
-import moment from 'moment'
+import moment from 'moment-timezone'
 
 export default {
   name: 'FloorAction',
@@ -18,7 +21,8 @@ export default {
   },
   computed: {
     time () {
-      let d = new Date(this.action.timestamp)
+      const validStr = this.action.timestamp.substr(0, this.action.timestamp.length - 6)
+      let d = new Date(validStr)
       return moment(d.getTime()).format('h:mm a')
     }
   }
@@ -56,9 +60,16 @@ export default {
 
   &:hover {
     box-shadow: 0 4px 12px -3px rgba(0, 0, 0, 0.8);
-    transform: translateY(-1px);
     border-left: 28px solid $blue;
     margin-left: -28px;
   }
 }
+
+.sub-action {
+  padding: 4px 0;
+  font-size: 14px;
+  list-style-type: square;
+
+  color: $blue;
+}
 </style>

components/Navbar.vue

@@ -1,14 +1,21 @@
 <template>
   <nav class="top-navbar">
-    <a href="#top" class="link-item title-text">Home</a>
-    <a href="#senate" class="link-item title-text">Senate</a>
-    <a href="#house" class="link-item title-text">House</a>
-    <a href="about" class="link-item title-text">About</a>
-    <div @click="fbPopup" class="share--item facebook">
-      <svgicon name="facebook"/>
+    <div class="nav-left">
+      <a href="#top" class="link-item title-text">Home</a>
     </div>
-    <div @click="twitterPopup" class="share--item twitter">
-      <svgicon name="twitter"/>
+
+    <div class="nav-center">
+      <a v-for="link in navLinks" :key="link.name" :href="link.link" class="link-item title-text">{{link.name}}</a>
+    </div>
+
+    <div class="nav-right">
+      <a href="about" class="link-item title-text">About</a>
+      <div @click="fbPopup" class="share--item facebook">
+        <svgicon name="facebook"/>
+      </div>
+      <div @click="twitterPopup" class="share--item twitter">
+        <svgicon name="twitter"/>
+      </div>
     </div>
   </nav>
 </template>
@@ -18,6 +25,11 @@ import '~/assets/icons/twitter'
 
 export default {
   name: 'Navbar',
+  data () {
+    return {
+      navLinks: this.$store.state.navLinks
+    }
+  },
   methods: {
     fbPopup () {
       // eslint-disable-next-line
@@ -38,8 +50,10 @@ export default {
 @import "~assets/styles/colors";
 
 .top-navbar {
-  display: flex;
-  align-items: center;
+  display: grid;
+  grid-template-columns: repeat(3, auto);
+  grid-template-rows: auto;
+  grid-template-areas: "left center right";
   position: fixed;
   z-index: 1000;
   width: 100%;
@@ -50,14 +64,30 @@ export default {
   background-color: $blue;
 }
 
+.nav-left {
+  display: flex;
+  grid-area: left;
+  align-items: center;
+}
+
+.nav-center {
+  display: flex;
+  grid-area: center;
+  justify-content: center;
+  align-items: center;
+}
+
+.nav-right {
+  display: flex;
+  grid-area: right;
+  justify-content: flex-end;
+  align-items: center;
+}
+
 .link-item {
   font-size: 14px;
   padding: 8px 8px;
 
-  &:first-child {
-    margin-right: auto;
-  }
-
   &:hover {
     background-color: $beige-light;
     color: $blue;
@@ -91,16 +121,24 @@ export default {
   fill: $white;
 }
 
-@media (min-width: 979px) {
+@media screen and (min-width: 400px) {
   .top-navbar {
-    padding-left: 32px;
-    padding-right: 32px;
+    grid-template-columns: 1fr 30% 1fr;
   }
+}
 
+@media screen and (min-width: 650px) {
   .link-item {
     font-size: 20px;
     padding: 8px 16px;
   }
+}
+
+@media screen and (min-width: 979px) {
+  .top-navbar {
+    padding-left: 32px;
+    padding-right: 32px;
+  }
 
   .share--item {
     width: 32px;

components/Vote.vue

@@ -102,7 +102,6 @@ export default {
 
   &:hover {
     box-shadow: 0 8px 16px -3px rgba(0, 0, 0, 0.8);
-    transform: translateY(-2px);
   }
 }