From 34d0452c14b9d95c936975674021bedce449b7ed Mon Sep 17 00:00:00 2001
From: K <k.rev.urtica@gmail.com>
Date: Sat, 9 May 2020 22:24:26 +0900
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20Fix=20code=20format?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .eslintrc.js                             | 10 ++--
 api/news.js                              | 10 ++--
 components/common/TheDrawer.vue          | 54 ++++++++++-----------
 components/common/TheHeader.vue          |  6 +--
 components/common/TheScrollTopButton.vue | 10 ++--
 components/main/NewsCard.vue             | 12 ++---
 components/parts/SnackBar.vue            | 12 ++---
 components/share/ShareButtons.vue        | 26 +++++-----
 components/share/ShareDialog.vue         | 16 +++---
 layouts/default.vue                      |  4 +-
 layouts/error.vue                        |  8 +--
 middleware/redirect.js                   |  2 +-
 nuxt.config.js                           | 62 ++++++++++++------------
 pages/headline/_category.vue             | 20 ++++----
 pages/index.vue                          | 20 ++++----
 pages/world/_source.vue                  | 24 ++++-----
 plugins/aos.js                           |  2 +-
 plugins/axios.js                         |  4 +-
 store/index.js                           |  6 +--
 19 files changed, 154 insertions(+), 154 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 562bc0f..6d83fbd 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -2,20 +2,20 @@ module.exports = {
   root: true,
   env: {
     browser: true,
-    node: true
+    node: true,
   },
   parserOptions: {
-    parser: "babel-eslint"
+    parser: "babel-eslint",
   },
   extends: [
     "@nuxtjs",
     "prettier",
     "prettier/vue",
     "plugin:prettier/recommended",
-    "plugin:nuxt/recommended"
+    "plugin:nuxt/recommended",
   ],
   plugins: ["prettier"],
   rules: {
-    "vue/max-attributes-per-line": "off"
-  }
+    "vue/max-attributes-per-line": "off",
+  },
 };
diff --git a/api/news.js b/api/news.js
index 8433b41..1cb2470 100644
--- a/api/news.js
+++ b/api/news.js
@@ -6,16 +6,16 @@ const app = Express();
 const newsApi = axios.create({
   headers: {
     common: {
-      Authorization: "Bearer " + process.env.API_KEY
-    }
-  }
+      Authorization: "Bearer " + process.env.API_KEY,
+    },
+  },
 });
 
 // 共通ヘッダー
 app.use((req, res, next) => {
   res.set({
     "Cache-Control": "public, max-age=300, s-maxage=7200",
-    "Content-Type": "application/json; charset=utf-8"
+    "Content-Type": "application/json; charset=utf-8",
   });
   next();
 });
@@ -30,7 +30,7 @@ app.get("/api/news", async (req, res, next) => {
     "entertainment",
     "sports",
     "science",
-    "health"
+    "health",
   ];
   const response = [];
   try {
diff --git a/components/common/TheDrawer.vue b/components/common/TheDrawer.vue
index 2a72be8..cdb50ca 100644
--- a/components/common/TheDrawer.vue
+++ b/components/common/TheDrawer.vue
@@ -64,13 +64,13 @@
           <template v-slot:activator="{ on }">
             <v-switch
               v-model="darkMode"
-              v-on="on"
               color="warning"
               class="mx-auto"
               hide-details
               inset
               dense
               validate-on-blur
+              v-on="on"
             />
           </template>
           <span class="caption">テーマ切り替え</span>
@@ -103,23 +103,23 @@ const ShareDialog = () => import("~/components/share/ShareDialog.vue");
 
 export default {
   components: {
-    ShareDialog
+    ShareDialog,
   },
   data: () => ({
     drawerItems: [
       {
         title: "トップニュース",
         icon: "mdi-newspaper-variant-multiple-outline",
-        link: { name: "index" }
+        link: { name: "index" },
       },
       {
         title: "ヘッドライン",
         icon: "mdi-fire",
         link: {
           name: "headline-category",
-          params: { category: "general" }
-        }
-      }
+          params: { category: "general" },
+        },
+      },
     ],
     headlineCategory: [
       {
@@ -127,63 +127,63 @@ export default {
         icon: "mdi-laptop-mac",
         link: {
           name: "headline-category",
-          params: { category: "technology" }
-        }
+          params: { category: "technology" },
+        },
       },
       {
         title: "ビジネス",
         icon: "mdi-domain",
         link: {
           name: "headline-category",
-          params: { category: "business" }
-        }
+          params: { category: "business" },
+        },
       },
       {
         title: "エンターテイメント",
         icon: "mdi-filmstrip",
         link: {
           name: "headline-category",
-          params: { category: "entertainment" }
-        }
+          params: { category: "entertainment" },
+        },
       },
       {
         title: "スポーツ",
         icon: "mdi-soccer",
         link: {
           name: "headline-category",
-          params: { category: "sports" }
-        }
+          params: { category: "sports" },
+        },
       },
       {
         title: "サイエンス",
         icon: "mdi-atom",
         link: {
           name: "headline-category",
-          params: { category: "science" }
-        }
+          params: { category: "science" },
+        },
       },
       {
         title: "ヘルス",
         icon: "mdi-heart-circle-outline",
         link: {
           name: "headline-category",
-          params: { category: "health" }
-        }
-      }
+          params: { category: "health" },
+        },
+      },
     ],
     bottomItems: [
       {
         title: "Twitter",
         link: "https://twitter.com/intent/follow?screen_name=k_urtica",
-        icon: "mdi-twitter"
+        icon: "mdi-twitter",
       },
       {
         title: "GitHub Repo",
         link: "https://github.com/kiysi/nuxt-news-app",
-        icon: "mdi-github-circle"
-      }
+        icon: "mdi-github-circle",
+      },
     ],
-    darkMode: false
+    darkMode: false,
   }),
   computed: {
     drawer: {
@@ -192,13 +192,13 @@ export default {
       },
       set(val) {
         this.$store.commit("setDrawer", val);
-      }
-    }
+      },
+    },
   },
   watch: {
     darkMode() {
       this.$vuetify.theme.dark = !this.$vuetify.theme.dark;
-    }
-  }
+    },
+  },
 };
 </script>
diff --git a/components/common/TheHeader.vue b/components/common/TheHeader.vue
index fb3ee4b..9d57e6d 100644
--- a/components/common/TheHeader.vue
+++ b/components/common/TheHeader.vue
@@ -1,6 +1,6 @@
 <template>
   <v-app-bar class="header-bar" flat dense app clipped-left>
-    <v-app-bar-nav-icon @click.stop="drawer" dark aria-label="drawer" />
+    <v-app-bar-nav-icon dark aria-label="drawer" @click.stop="drawer" />
     <v-toolbar-title>
       <nuxt-link :to="{ name: 'index' }">
         <h1>NUXT×NEWS APP</h1>
@@ -14,8 +14,8 @@ export default {
   methods: {
     drawer() {
       this.$store.commit("setDrawer", !this.$store.state.drawer);
-    }
-  }
+    },
+  },
 };
 </script>
 
diff --git a/components/common/TheScrollTopButton.vue b/components/common/TheScrollTopButton.vue
index f7d31b0..988154c 100644
--- a/components/common/TheScrollTopButton.vue
+++ b/components/common/TheScrollTopButton.vue
@@ -3,13 +3,13 @@
     <v-btn
       v-show="isShow"
       v-scroll="onScroll"
-      @click="$vuetify.goTo(0, options)"
       fixed
       bottom
       fab
       right
       color="indigo lighten-1"
       title="トップにスクロールします"
+      @click="$vuetify.goTo(0, options)"
     >
       <v-icon color="white">mdi-chevron-up</v-icon>
     </v-btn>
@@ -20,9 +20,9 @@
 export default {
   data: () => ({
     options: {
-      duration: 600
+      duration: 600,
     },
-    isShow: false
+    isShow: false,
   }),
   methods: {
     onScroll() {
@@ -31,7 +31,7 @@ export default {
       } else {
         this.isShow = false;
       }
-    }
-  }
+    },
+  },
 };
 </script>
diff --git a/components/main/NewsCard.vue b/components/main/NewsCard.vue
index f62d791..03a1125 100644
--- a/components/main/NewsCard.vue
+++ b/components/main/NewsCard.vue
@@ -38,17 +38,17 @@ import ShareButtons from "~/components/share/ShareButtons.vue";
 
 export default {
   components: {
-    ShareButtons
+    ShareButtons,
   },
   props: {
     news: {
       type: Object,
       default: null,
-      required: true
-    }
+      required: true,
+    },
   },
   computed: {
-    ...mapState(["headlineNewsList"])
+    ...mapState(["headlineNewsList"]),
   },
   methods: {
     getFormtedDate(date) {
@@ -60,8 +60,8 @@ export default {
       } else {
         return require("@/assets/img/no-image.png");
       }
-    }
-  }
+    },
+  },
 };
 </script>
 
diff --git a/components/parts/SnackBar.vue b/components/parts/SnackBar.vue
index 7878f17..ba0d5cf 100644
--- a/components/parts/SnackBar.vue
+++ b/components/parts/SnackBar.vue
@@ -1,7 +1,7 @@
 <template>
   <v-snackbar v-model="snackBar" :timeout="3000" color="success">
     {{ message }}
-    <v-btn @click="snackBar = false" text>閉じる</v-btn>
+    <v-btn text @click="snackBar = false">閉じる</v-btn>
   </v-snackbar>
 </template>
 
@@ -11,8 +11,8 @@ export default {
     message: {
       type: String,
       default: "",
-      required: true
-    }
+      required: true,
+    },
   },
   computed: {
     snackBar: {
@@ -21,8 +21,8 @@ export default {
       },
       set(val) {
         this.$store.commit("setSnackBar", val);
-      }
-    }
-  }
+      },
+    },
+  },
 };
 </script>
diff --git a/components/share/ShareButtons.vue b/components/share/ShareButtons.vue
index 75112d4..93f5e4a 100644
--- a/components/share/ShareButtons.vue
+++ b/components/share/ShareButtons.vue
@@ -3,16 +3,16 @@
     <v-btn
       v-for="item in itemList"
       :key="item.type"
-      @click.stop="shareNews(item.type)"
       :title="item.title"
       icon
+      @click.stop="shareNews(item.type)"
     >
       <v-icon :color="item.color" small class="share-btn">
         {{ item.icon }}
       </v-icon>
     </v-btn>
 
-    <v-btn @click.stop="copyNewsUrl()" icon title="ニュースリンクをコピー">
+    <v-btn icon title="ニュースリンクをコピー" @click.stop="copyNewsUrl()">
       <v-icon small>mdi-link</v-icon>
     </v-btn>
   </div>
@@ -24,13 +24,13 @@ export default {
     newsTitle: {
       type: String,
       default: "",
-      required: true
+      required: true,
     },
     newsUrl: {
       type: String,
       default: "",
-      required: true
-    }
+      required: true,
+    },
   },
   data: () => ({
     itemList: [
@@ -38,22 +38,22 @@ export default {
         type: "twitter",
         icon: "mdi-twitter",
         color: "#1da1f2",
-        title: "Twitterでシェア"
+        title: "Twitterでシェア",
       },
       {
         type: "facebook",
         icon: "mdi-facebook",
         color: "#3B5998",
-        title: "Facebookでシェア"
+        title: "Facebookでシェア",
       },
       { type: "hatebu", icon: "B!", color: "#008fde", title: "はてブに追加" },
       {
         type: "pocket",
         icon: "mdi-pocket",
         color: "#ee4056",
-        title: "Pocketに追加"
-      }
-    ]
+        title: "Pocketに追加",
+      },
+    ],
   }),
   methods: {
     shareNews(type) {
@@ -88,15 +88,15 @@ export default {
       }
       // URLエンコード
       args = args.map((x) => encodeURI(x));
-      return msg.replace(/\{(\d+)\}/g, function(m, k) {
+      return msg.replace(/\{(\d+)\}/g, function (m, k) {
         return args[k];
       });
     },
     copyNewsUrl() {
       navigator.clipboard.writeText(this.newsUrl);
       this.$store.commit("setSnackBar", true);
-    }
-  }
+    },
+  },
 };
 </script>
 
diff --git a/components/share/ShareDialog.vue b/components/share/ShareDialog.vue
index 3c4b079..d4c9e89 100644
--- a/components/share/ShareDialog.vue
+++ b/components/share/ShareDialog.vue
@@ -1,7 +1,7 @@
 <template>
   <v-dialog v-model="isShareDialog" max-width="480">
     <template v-slot:activator="{ on }">
-      <v-btn v-on="on" icon title="SNSでシェア">
+      <v-btn icon title="SNSでシェア" v-on="on">
         <v-icon>
           mdi-share-variant
         </v-icon>
@@ -21,18 +21,18 @@
           >
             <v-btn
               :color="item.color"
-              @click.stop="shareSns(item.type)"
               dark
               block
               rounded
               class="text-none"
+              @click.stop="shareSns(item.type)"
             >
               <v-icon left>{{ item.icon }}</v-icon>
               {{ item.type }}
             </v-btn>
           </v-col>
           <v-col cols="12" class="py-0">
-            <v-btn @click="isShareDialog = false" text block>閉じる</v-btn>
+            <v-btn text block @click="isShareDialog = false">閉じる</v-btn>
           </v-col>
         </v-row>
       </v-container>
@@ -48,8 +48,8 @@ export default {
       { type: "twitter", icon: "mdi-twitter", color: "#1DA1F2" },
       { type: "facebook", icon: "mdi-facebook", color: "#3B5998" },
       { type: "はてブ", icon: "B!", color: "#00A4DE" },
-      { type: "pocket", icon: "mdi-pocket", color: "#ee4056" }
-    ]
+      { type: "pocket", icon: "mdi-pocket", color: "#ee4056" },
+    ],
   }),
   methods: {
     shareSns(type) {
@@ -92,10 +92,10 @@ export default {
         args[i - 1] = arguments[i];
       }
       args = args.map((x) => encodeURI(x));
-      return msg.replace(/\{(\d+)\}/g, function(m, k) {
+      return msg.replace(/\{(\d+)\}/g, function (m, k) {
         return args[k];
       });
-    }
-  }
+    },
+  },
 };
 </script>
diff --git a/layouts/default.vue b/layouts/default.vue
index c780eb4..f8e9b33 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -26,8 +26,8 @@ export default {
     TheHeader,
     TheDrawer,
     TheScrollTopButton,
-    TheFooter
-  }
+    TheFooter,
+  },
 };
 </script>
 
diff --git a/layouts/error.vue b/layouts/error.vue
index ad64287..31e8f33 100644
--- a/layouts/error.vue
+++ b/layouts/error.vue
@@ -33,15 +33,15 @@ export default {
   props: {
     error: {
       type: Object,
-      default: null
-    }
+      default: null,
+    },
   },
   head() {
     const title =
       this.error.statusCode === 404 ? this.pageNotFound : this.otherError;
     return {
-      title
+      title,
     };
-  }
+  },
 };
 </script>
diff --git a/middleware/redirect.js b/middleware/redirect.js
index 4ed92dd..b8d54b3 100644
--- a/middleware/redirect.js
+++ b/middleware/redirect.js
@@ -1,5 +1,5 @@
 // 末尾にスラッシュがなければスラッシュ付きのurlへ301リダイレクトする
-export default function({ route, redirect }) {
+export default function ({ route, redirect }) {
   if (route.path.slice(-1) !== "/") {
     redirect(301, route.path + "/");
   }
diff --git a/nuxt.config.js b/nuxt.config.js
index 6569dea..3cb80e3 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -12,93 +12,93 @@ export default {
   mode: "spa",
   head: {
     htmlAttrs: {
-      lang: "ja"
+      lang: "ja",
     },
     titleTemplate: "%s | " + siteTitle,
     title: siteTitle,
     meta: [
       {
         charset: "utf-8",
-        prefix: "og: http://ogp.me/ns#"
+        prefix: "og: http://ogp.me/ns#",
       },
       {
         name: "viewport",
-        content: "width=device-width, initial-scale=1"
+        content: "width=device-width, initial-scale=1",
       },
       {
         hid: "description",
         name: "description",
-        content: description
+        content: description,
       },
       // OGP
       {
         hid: "og:site_name",
         property: "og:site_name",
-        content: siteTitle
+        content: siteTitle,
       },
       {
         hid: "og:type",
         property: "og:type",
-        content: "website"
+        content: "website",
       },
       {
         hid: "og:url",
         property: "og:url",
-        content: basePath
+        content: basePath,
       },
       {
         hid: "og:title",
         property: "og:title",
-        content: siteTitle
+        content: siteTitle,
       },
       {
         hid: "og:description",
         property: "og:description",
-        content: description
+        content: description,
       },
       {
         hid: "og:image",
         property: "og:image",
-        content: baseUrl + "/img/ogp.png"
+        content: baseUrl + "/img/ogp.png",
       },
       // twitter
       {
         name: "twitter:card",
-        content: "summary_large_image"
+        content: "summary_large_image",
       },
       {
         name: "twitter:site",
-        content: "@k_urtica"
-      }
+        content: "@k_urtica",
+      },
     ],
     link: [
       {
         rel: "icon",
         type: "image/x-icon",
-        href: "/favicon.ico"
-      }
-    ]
+        href: "/favicon.ico",
+      },
+    ],
   },
   router: {
     trailingSlash: true,
-    middleware: "redirect"
+    middleware: "redirect",
   },
   loading: {
-    color: "#81D4FA"
+    color: "#81D4FA",
   },
   css: [],
   plugins: [
     "@/plugins/axios",
     { src: "~/plugins/aos", mode: "client" },
-    "~/plugins/dayjs.js"
+    "~/plugins/dayjs.js",
   ],
   buildModules: ["@nuxtjs/eslint-module", "@nuxtjs/vuetify", "@nuxtjs/dotenv"],
   modules: ["@nuxtjs/axios", "@nuxtjs/pwa"],
   axios: {
-    baseURL: process.env.BASE_URL || "http://localhost:3000"
+    baseURL: process.env.BASE_URL || "http://localhost:3000",
   },
   vuetify: {
-    customVariables: ["~/assets/css/vuetify/variables.scss"]
+    customVariables: ["~/assets/css/vuetify/variables.scss"],
   },
   serverMiddleware: ["~/api/news.js"],
   build: {
@@ -109,10 +109,10 @@ export default {
           enforce: "pre",
           test: /\.(js|vue)$/,
           loader: "eslint-loader",
-          exclude: /(node_modules)/
+          exclude: /(node_modules)/,
         });
       }
-    }
+    },
   },
   pwa: {
     manifest: {
@@ -121,22 +121,22 @@ export default {
       short_name: "NUXT×NEWS APP",
       description,
       background_color: "#f0f0f0",
-      display: "standalone"
+      display: "standalone",
     },
     icon: {
-      iconSrc: "static/img/icon.png"
+      iconSrc: "static/img/icon.png",
     },
     workbox: {
       runtimeCaching: [
         {
           urlPattern: "^https://fonts.(?:googleapis|gstatic).com/(.*)",
-          handler: "cacheFirst"
-        }
-      ]
-    }
+          handler: "cacheFirst",
+        },
+      ],
+    },
   },
   env: {
     BASE_URL,
-    API_KEY
-  }
+    API_KEY,
+  },
 };
diff --git a/pages/headline/_category.vue b/pages/headline/_category.vue
index 33a315a..8a28c77 100644
--- a/pages/headline/_category.vue
+++ b/pages/headline/_category.vue
@@ -27,21 +27,16 @@ const NewsCard = () => import("~/components/main/NewsCard.vue");
 const SnackBar = () => import("~/components/parts/SnackBar.vue");
 
 export default {
-  head() {
-    return {
-      title: "ヘッドライン - " + this.getNewsCategory()
-    };
-  },
   components: {
     NewsCard,
-    SnackBar
+    SnackBar,
   },
   async asyncData({ $axios, params }) {
     const res = await $axios.$get("/api/news/headline", {
-      params: { category: params.category }
+      params: { category: params.category },
     });
     return {
-      newsList: res.articles
+      newsList: res.articles,
     };
   },
   methods: {
@@ -64,8 +59,13 @@ export default {
         default:
           return this.$route.params.category;
       }
-    }
-  }
+    },
+  },
+  head() {
+    return {
+      title: "ヘッドライン - " + this.getNewsCategory(),
+    };
+  },
 };
 </script>
 
diff --git a/pages/index.vue b/pages/index.vue
index 928702f..40377d5 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -59,7 +59,7 @@
         <v-btn
           :to="{
             name: 'headline-category',
-            params: { category: newsItems.category }
+            params: { category: newsItems.category },
           }"
           nuxt
           small
@@ -83,19 +83,14 @@ import ShareButtons from "~/components/share/ShareButtons.vue";
 const SnackBar = () => import("~/components/parts/SnackBar.vue");
 
 export default {
-  head() {
-    return {
-      titleTemplate: null
-    };
-  },
   components: {
     ShareButtons,
-    SnackBar
+    SnackBar,
   },
   async asyncData({ $axios }) {
     const res = await $axios.$get("/api/news");
     return {
-      topNewsList: res
+      topNewsList: res,
     };
   },
   methods: {
@@ -135,8 +130,13 @@ export default {
       } else {
         return require("@/assets/img/no-image.png");
       }
-    }
-  }
+    },
+  },
+  head() {
+    return {
+      titleTemplate: null,
+    };
+  },
 };
 </script>
 
diff --git a/pages/world/_source.vue b/pages/world/_source.vue
index eecea9b..3568bd0 100644
--- a/pages/world/_source.vue
+++ b/pages/world/_source.vue
@@ -36,29 +36,29 @@ const SnackBar = () => import("~/components/parts/SnackBar.vue");
 export default {
   components: {
     NewsCard,
-    SnackBar
+    SnackBar,
   },
-  head() {
-    return {
-      title: "ワールド - " + this.sourceDetail.name
-    };
-  },
-  data: () => ({
-    sourceDetail: {}
-  }),
   async asyncData({ $axios, params }) {
     const res = await $axios.$get("/api/news/world", {
-      params: { sources: params.source }
+      params: { sources: params.source },
     });
     return {
-      newsList: res.articles
+      newsList: res.articles,
     };
   },
+  data: () => ({
+    sourceDetail: {},
+  }),
   created() {
     this.sourceDetail = this.$store.getters.getSouceDetail(
       this.$route.params.source
     );
-  }
+  },
+  head() {
+    return {
+      title: "ワールド - " + this.sourceDetail.name,
+    };
+  },
 };
 </script>
 
diff --git a/plugins/aos.js b/plugins/aos.js
index e7ec4a0..896af87 100644
--- a/plugins/aos.js
+++ b/plugins/aos.js
@@ -5,6 +5,6 @@ export default ({ app }) => {
   // eslint-disable-next-line new-cap
   app.AOS = new AOS.init({
     duration: 400,
-    easing: "ease-out"
+    easing: "ease-out",
   });
 };
diff --git a/plugins/axios.js b/plugins/axios.js
index 120c6ad..8dab4b5 100644
--- a/plugins/axios.js
+++ b/plugins/axios.js
@@ -1,8 +1,8 @@
-export default function({ $axios, error }) {
+export default function ({ $axios, error }) {
   $axios.onError((e) => {
     error({
       statusCode: e.response.status,
-      message: e.response.data.message
+      message: e.response.data.message,
     });
   });
 }
diff --git a/store/index.js b/store/index.js
index dbc178c..fc971f8 100644
--- a/store/index.js
+++ b/store/index.js
@@ -6,7 +6,7 @@ export const state = () => ({
   /** スナックバー */
   snackBar: false,
   /** news source list */
-  newsSouceList: newsSource
+  newsSouceList: newsSource,
 });
 
 export const mutations = {
@@ -15,7 +15,7 @@ export const mutations = {
   },
   setSnackBar(state, flag) {
     state.snackBar = flag;
-  }
+  },
 };
 
 export const getters = {
@@ -28,5 +28,5 @@ export const getters = {
         }
       }
     };
-  }
+  },
 };