Merge branch 'master' into dev

Corporation-of-Doom · Nov 9, 2018 · be9fe85 · be9fe85
2 parents 55c377c + e055c53
commit be9fe85
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/frontend/src/views/apps/Timeline.vue b/frontend/src/views/apps/Timeline.vue
@@ -41,6 +41,7 @@ import * as moment from 'moment'
 import { createApolloFetch } from "apollo-fetch"
 const fetch = createApolloFetch({ uri: "http://localhost:4000/graphql" });
 console.clear()
+
 export default {
 	name: 'TimelinePage',
 	components: {
@@ -55,6 +56,7 @@ export default {
 		return {
 			user: this.$store.state.user,
 			news: []
+
 		}
 	},
 
@@ -93,6 +95,8 @@ export default {
 			} else {
 				console.log(res.errors)
 			}
+	
+
 		}).catch(err => {
 			console.log(err);
 		});
@@ -102,6 +106,7 @@ export default {
 	// methods: {
 
 	// }
+
 }
 </script>
 

diff --git a/frontend/src/views/pages/CreateEvent.vue b/frontend/src/views/pages/CreateEvent.vue
@@ -126,6 +126,7 @@ export default {
 				startTime: '',
 				endTime: '',
 				capacityType: 'FFA',
+
 				capacityNum: 1,
 				countryInput: '',
 				cityInput: '',

diff --git a/frontend/src/views/pages/CreateSeminar.vue b/frontend/src/views/pages/CreateSeminar.vue
@@ -64,6 +64,7 @@
 					disabled
 					v-model="capacityNum" 
 					:precision="0"
+
 					:min="1" 
 					:max="9999">
 				</el-input-number>
@@ -133,6 +134,7 @@ export default {
 				startTime: '',
 				endTime: '',
 				capacityType: 'FFA',
+
 				capacityNum: 1,
 				countryInput: '',
 				cityInput: '',