clean up

pomartel · pomartel · commit 031c9ee0aec5 · 2018-02-08T18:00:56.000-05:00
diff --git a/README.md b/README.md
@@ -2,9 +2,9 @@
 
 > Calendrier des événements CCCP
 
-Site Web affichant le calendrier du Club et les sorties à venir.
+[Site Web](http://calendrier.cyclepop.ca.s3-website.ca-central-1.amazonaws.com/#/) affichant le calendrier du Club et les sorties à venir.
 
-Back-end: Google Spreadsheet
+Back-end: [Google Spreadsheet](https://docs.google.com/spreadsheets/d/e/2PACX-1vQejSOx7I3HI-7rIDeH4VfNLhtA8ct_zmybYiN-4SquKSiGPIEad9bw397o9XKk_euS5-Ddot1G_yHA/pubhtml)
 Front-end: Site statique Vue.js
 
 ## Build Setup
@@ -16,7 +16,7 @@ npm install
 # serve with hot reload at localhost:8080
 npm run dev
 
-# build for production with minification
+# build for production with minification and deploy to S3
 npm run build
 
 # build for production and view the bundle analyzer report
diff --git a/index.html b/index.html
@@ -1,15 +1,10 @@
 <!DOCTYPE html>
 <html lang="fr">
-<style>
-  test {
-    font-size: 10rem;
-  }
-</style>
 
 <head>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-
+  <link href="/static/favicon-32x32.png" rel="icon" sizes="32x32">
   <link href="https://fonts.googleapis.com/css?family=Cuprum" rel="stylesheet">
 
   <title>Calendrier des événements - Club Cycliste Cycle Pop</title>
@@ -18,7 +13,6 @@
 <body>
   <div id="app"></div>
   <script src='https://cdnjs.cloudflare.com/ajax/libs/tabletop.js/1.5.1/tabletop.min.js'></script>
-
 </body>
 
 </html>
diff --git a/package.json b/package.json
@@ -6,10 +6,12 @@
   "license": "MIT",
   "private": true,
   "scripts": {
-    "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
+    "dev":
+      "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
     "start": "npm run dev",
     "lint": "eslint --ext .js,.vue src test/unit",
-    "build": "node build/build.js"
+    "build":
+      "node build/build.js && aws s3 sync dist/ s3://calendrier.cyclepop.ca --acl public-read --delete"
   },
   "dependencies": {
     "node-sass": "^4.7.2",
@@ -77,9 +79,5 @@
     "node": ">= 6.0.0",
     "npm": ">= 3.0.0"
   },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not ie <= 8"
-  ]
+  "browserslist": ["> 1%", "last 2 versions", "not ie <= 8"]
 }
diff --git a/src/App.vue b/src/App.vue
@@ -34,9 +34,6 @@
   </div>
 </template>
 
-<script>
-</script>
-
 <style lang="scss" scoped>
 @import "~bulma/sass/utilities/_all";
 
diff --git a/src/components/calendar/CalendarPage.vue b/src/components/calendar/CalendarPage.vue
@@ -1,7 +1,7 @@
 <template>
   <content>
     <events-table />
-    <!-- <events-info /> -->
+    <events-info />
   </content>
 </template>
 
@@ -18,7 +18,3 @@ export default {
   }
 }
 </script>
-
-<style scoped lang='scss'>
-
-</style>
diff --git a/src/components/calendar/EventTypeFilter.vue b/src/components/calendar/EventTypeFilter.vue
@@ -24,7 +24,3 @@ export default {
   }
 }
 </script>
-
-<style lang="scss" scoped>
-
-</style>
diff --git a/src/components/calendar/EventsInfo.vue b/src/components/calendar/EventsInfo.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <content class="box">
     <p>Le Club Cycliste Cycle Pop propose à ses membres jusqu'à quatre sorties par semaines.</p>
 
     <table class='table'>
@@ -21,7 +21,7 @@
       </tr>
     </table>
     <p>Les sorties en soirée offrent des parcours de 40 à 85 km selon le groupe et la période de l'année. Les sorties du samedi sont un peu plus longues avec des distance variant entre 70 et 140 km. Toutes les sorties hebdomadaires quittent du Clubhouse. Deux points de regroupement seront affichés pour certaines sorties passant par la Rive Sud ou la Rive Nord.</p>
-  </div>
+  </content>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/components/calendar/EventsTable.vue b/src/components/calendar/EventsTable.vue
@@ -3,13 +3,13 @@
     <div class="filters">
       <event-type-filter @change="applyFilter" />
     </div>
-    <div class="box">
+    <content class="box">
       <table class="table is-striped is-fullwidth" :class="{'is-loading': isLoading}">
         <tbody>
           <event-row v-for="event in sortedList" :key="event.id" :event="event" :selected="event === nextUp" />
         </tbody>
       </table>
-    </div>
+    </content>
   </div>
 </template>
 
@@ -62,4 +62,7 @@ export default {
 .filters {
   margin: 2rem 0;
 }
+.calendar-view {
+  margin-bottom: 1.5rem;
+}
 </style>
diff --git a/static/favicon-32x32.png b/static/favicon-32x32.png

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,3 @@ export default {`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`	`</script>`
`27`		`-`
`28`		`-<style lang="scss" scoped>`
`29`		`-`
`30`		`-</style>`