[merge] dev and cfpMain

src/pages/CFP.vue

@@ -0,0 +1,29 @@
+<template>
+  <div id="cfp" class="cfp cfp-background">
+    <!-- CfpHeader id="cfp-header"/ -->
+    <IntrodContainer></IntrodContainer>
+    
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Vue } from 'vue-property-decorator';
+// components
+import CfpHeader from '@/components/CFP/Header.vue';
+import IntrodContainer from '@/components/CFP/IntrodContainer.vue';
+
+@Component({
+  components: {
+    CfpHeader,
+    IntrodContainer
+  }
+})
+export default class CFP extends Vue {
+  @Prop() private msg!: string;
+}
+</script>
+
+<style lang="scss">
+
+</style>
+

src/pages/News.vue

@@ -0,0 +1,29 @@
+<template>
+  <div class="news">
+      <NewsHeader id="news-header" />
+      <Schedule/>
+      <Agenda/>
+    <!-- <Footer></Footer> should be put at App.vue (?) -->
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Vue } from 'vue-property-decorator';
+import NewsHeader from '@/components/NewsHeader.vue';
+import Schedule from '../components/CFP/Schedule.vue';
+import Agenda from '../components/CFP/Agenda.vue';
+
+@Component({
+  components: {
+    NewsHeader,
+    Schedule,
+    Agenda
+  }
+})
+export default class News extends Vue {
+  @Prop() private msg!: string;
+}
+</script>
+
+<style lang="scss">
+</style>