Merge pull request #2 from ne-peer/feature/update-201811

Update 2018.10 history & Migrate to yarn

components/ClanHistory.vue

@@ -12,11 +12,11 @@ export default {
     return {
       showLine: true,
       lineData: {
-        labels: ["3月", "4月", "5月", "6月", "7月", "8月", "9月"],
+        labels: ["3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月"],
         datasets: [
           {
             label: "総ダメージ",
-            data: [12512937, 44816863, 63819535, 107432030, 161533666, 327817745, 452078196],
+            data: [12512937, 44816863, 63819535, 107432030, 161533666, 327817745, 452078196, 440643945],
             borderColor: "rgba(255,214,0,1)",
             backgroundColor: "rgba(255,214,0,0.2)",
             pointRadius: [7, 7, 7, 7, 7, 7, 7],
@@ -26,7 +26,7 @@ export default {
           },
           {
             label: "人数",
-            data: [8, 8, 18, 19, 20, 23, 24],
+            data: [8, 8, 18, 19, 20, 23, 24, 24],
             borderColor: "rgba(250,112,154,0.8)",
             backgroundColor: "rgba(0,0,0,0)",
             lineTension: 0,

components/ClanRank.vue

@@ -31,6 +31,7 @@ export default {
   data() {
     return {
       transitions: [
+        { month: "'18/10", rank: "2412", trans: "trending_down", note: "(↓354)" },
         { month: "'18/09", rank: "2058", trans: "trending_up", note: "(↑452)" },
         { month: "'18/08", rank: "2510", trans: "trending_up", note: "(↑10)" },
         { month: "'18/07", rank: "2528", trans: "trending_up", note: "(↑434)" },

components/ClanSummary.vue

@@ -24,8 +24,8 @@
           <div class="uk-card-header">
             <div class="summary uk-text-center uk-padding-small">
               <p class="title uk-margin-remove">
-                <span class="size-l uk-visible@s">2058</span>
-                <span class="size-s uk-hidden@s">2058</span>
+                <span class="size-l uk-visible@s">2412</span>
+                <span class="size-s uk-hidden@s">2412</span>
               </p>
               <p class="desc uk-margin-remove">
                 <span class="size-l uk-visible@s">CURRENT PLACE</span>

nuxt.config.js

@@ -43,10 +43,9 @@ module.exports = {
   },
   css: ["assets/main.css", { src: "~assets/uikit.scss", lang: "scss" }],
   plugins: [
-    { src: "~plugins/uikit.bundle", ssr: false },
-    { src: "~plugins/chartjs", ssr: false },
-    { src: "~plugins/vue-lazyload", ssr: false }
-    // { src: '~plugins/vuetify', ssr: false }
+    { src: "~plugins/uikit.bundle.js", ssr: false },
+    { src: "~plugins/chartjs.js", ssr: false },
+    { src: "~plugins/vue-lazyload.js", ssr: false }
   ],
   modules: [
     "nuxt-material-design-icons",

package.json

@@ -17,17 +17,17 @@
     "@nuxtjs/google-analytics": "^2.0.2",
     "@nuxtjs/pwa": "^2.0.8",
     "chart.js": "^2.7.2",
-    "nuxt": "^1.0.0",
+    "nuxt": "^2.2.0",
     "nuxt-material-design-icons": "^1.0.4",
     "uikit": "^3.0.0-rc.5",
     "vue-chartjs": "^3.3.2",
     "vue-lazyload": "^1.2.6"
   },
   "devDependencies": {
-    "babel-eslint": "^8.2.1",
-    "eslint": "^4.15.0",
-    "eslint-friendly-formatter": "^3.0.0",
-    "eslint-loader": "^1.7.1",
+    "babel-eslint": "^10.0.1",
+    "eslint": "^5.8.0",
+    "eslint-friendly-formatter": "^4.0.1",
+    "eslint-loader": "^2.1.1",
     "eslint-plugin-vue": "^4.0.0",
     "node-sass": "^4.9.0",
     "sass-loader": "^7.0.3"