AlisProject · keillera · Jul 12, 2022
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -15,6 +15,7 @@ module.exports = {
   // add your custom rules here
   rules: {
     'arrow-parens': 'off',
+    'import/no-named-as-default-member': 'off',
     'no-console': 'off',
     'no-irregular-whitespace': 'off',
     'prefer-promise-reject-errors': 'off',

diff --git a/app/app.html b/app/app.html
@@ -3,10 +3,6 @@
 
 <head prefix="og: http://ogp.me/ns# fb: http://ogp.me/ns/fb# article: http://ogp.me/ns/article#">
     <% if (process.env.ALIS_APP_ID === 'alis') { %>
-      <!-- Google AdSense -->
-      <script data-ad-client="ca-pub-6184356842528918" async
-              src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
-      <!-- End Google AdSense -->
       <script src="https://www.googleoptimize.com/optimize.js?id=OPT-5FJ3HPK"></script>
     <% } else { %>
       <script src="https://www.googleoptimize.com/optimize.js?id=OPT-P9KC4QC"></script>

diff --git a/app/assets/stylesheets/fontAwesome/css/all.min.css b/app/assets/stylesheets/fontAwesome/css/all.min.css
diff --git a/app/assets/stylesheets/fontAwesome/webfonts/fa-brands-400.eot b/app/assets/stylesheets/fontAwesome/webfonts/fa-brands-400.eot
diff --git a/app/assets/stylesheets/fontAwesome/webfonts/fa-brands-400.svg b/app/assets/stylesheets/fontAwesome/webfonts/fa-brands-400.svg
diff --git a/app/assets/stylesheets/fontAwesome/webfonts/fa-brands-400.ttf b/app/assets/stylesheets/fontAwesome/webfonts/fa-brands-400.ttf
diff --git a/app/assets/stylesheets/fontAwesome/webfonts/fa-brands-400.woff b/app/assets/stylesheets/fontAwesome/webfonts/fa-brands-400.woff
diff --git a/app/assets/stylesheets/fontAwesome/webfonts/fa-brands-400.woff2 b/app/assets/stylesheets/fontAwesome/webfonts/fa-brands-400.woff2
diff --git a/app/assets/stylesheets/fontAwesome/webfonts/fa-regular-400.eot b/app/assets/stylesheets/fontAwesome/webfonts/fa-regular-400.eot
diff --git a/app/assets/stylesheets/fontAwesome/webfonts/fa-regular-400.svg b/app/assets/stylesheets/fontAwesome/webfonts/fa-regular-400.svg
diff --git a/app/assets/stylesheets/fontAwesome/webfonts/fa-regular-400.ttf b/app/assets/stylesheets/fontAwesome/webfonts/fa-regular-400.ttf
diff --git a/app/assets/stylesheets/fontAwesome/webfonts/fa-regular-400.woff b/app/assets/stylesheets/fontAwesome/webfonts/fa-regular-400.woff
diff --git a/app/assets/stylesheets/fontAwesome/webfonts/fa-regular-400.woff2 b/app/assets/stylesheets/fontAwesome/webfonts/fa-regular-400.woff2
diff --git a/app/assets/stylesheets/fontAwesome/webfonts/fa-solid-900.eot b/app/assets/stylesheets/fontAwesome/webfonts/fa-solid-900.eot
diff --git a/app/assets/stylesheets/fontAwesome/webfonts/fa-solid-900.svg b/app/assets/stylesheets/fontAwesome/webfonts/fa-solid-900.svg
diff --git a/app/assets/stylesheets/fontAwesome/webfonts/fa-solid-900.ttf b/app/assets/stylesheets/fontAwesome/webfonts/fa-solid-900.ttf
diff --git a/app/assets/stylesheets/fontAwesome/webfonts/fa-solid-900.woff b/app/assets/stylesheets/fontAwesome/webfonts/fa-solid-900.woff
diff --git a/app/assets/stylesheets/fontAwesome/webfonts/fa-solid-900.woff2 b/app/assets/stylesheets/fontAwesome/webfonts/fa-solid-900.woff2
diff --git a/app/components/molecules/LaboNLicenseTokenCertificateModalContent.vue b/app/components/molecules/LaboNLicenseTokenCertificateModalContent.vue
@@ -33,8 +33,8 @@
 </template>
 
 <script>
-/* global Web3 */
 import { mapGetters, mapActions } from 'vuex'
+import Web3 from 'web3'
 import AppButton from '../atoms/AppButton'
 
 export default {

diff --git a/app/components/molecules/LaboNLicenseTokenTransferModalContent.vue b/app/components/molecules/LaboNLicenseTokenTransferModalContent.vue
@@ -34,9 +34,9 @@
 </template>
 
 <script>
-/* global Web3 */
 import { mapGetters, mapActions } from 'vuex'
 import { ADD_TOAST_MESSAGE } from 'vuex-toast'
+import Web3 from 'web3'
 import AppButton from '../atoms/AppButton'
 
 export default {

diff --git a/app/components/organisms/ArticleHeader.vue b/app/components/organisms/ArticleHeader.vue
@@ -51,12 +51,12 @@
 </template>
 
 <script>
-/* global Web3 */
 import { mapActions, mapGetters } from 'vuex'
 import { BigNumber } from 'bignumber.js'
 import { ADD_TOAST_MESSAGE } from 'vuex-toast'
 import { isV2 } from '~/utils/article'
 import { isMobile } from '~/utils/device'
+import Web3 from 'web3'
 
 export default {
   props: {

diff --git a/app/components/organisms/LaboNLicenseTokenDropzone.vue b/app/components/organisms/LaboNLicenseTokenDropzone.vue
@@ -14,11 +14,11 @@
 </template>
 
 <script>
-/* global Web3 */
 import { mapActions, mapGetters } from 'vuex'
 import Dropzone from 'nuxt-dropzone'
 import 'nuxt-dropzone/dropzone.css'
 import { ADD_TOAST_MESSAGE } from 'vuex-toast'
+import Web3 from 'web3'
 
 export default {
   components: {

diff --git a/app/components/organisms/LaboNLicenseTokenList.vue b/app/components/organisms/LaboNLicenseTokenList.vue
@@ -21,8 +21,8 @@
 </template>
 
 <script>
-/* global Web3 */
 import { mapActions, mapGetters } from 'vuex'
+import Web3 from 'web3'
 
 const LaboNLicenseTokenCertificateModal = () =>
   import('../organisms/LaboNLicenseTokenCertificateModal')

diff --git a/app/components/pages/DepositToken.vue b/app/components/pages/DepositToken.vue
@@ -74,7 +74,6 @@
 </template>
 
 <script>
-/* global Web3 */
 import { mapGetters, mapActions } from 'vuex'
 import { ADD_TOAST_MESSAGE } from 'vuex-toast'
 import { BigNumber } from 'bignumber.js'
@@ -83,6 +82,7 @@ import WalletNav from '../organisms/WalletNav'
 import TheLoader from '../atoms/TheLoader'
 import AppButton from '../atoms/AppButton'
 import AppFooter from '../organisms/AppFooter'
+import Web3 from 'web3'
 import { addDigitSeparator, isOverDecimalPoint } from '~/utils/wallet'
 
 const formatNumber = 10 ** 18

diff --git a/app/components/pages/LaboNLicenseToken.vue b/app/components/pages/LaboNLicenseToken.vue
@@ -59,14 +59,14 @@
 </template>
 
 <script>
-/* global Web3 */
 import AppHeader from '~/components/organisms/AppHeader'
 import AppFooter from '~/components/organisms/AppFooter'
 import LaboNLicenseTokenDropzone from '~/components/organisms/LaboNLicenseTokenDropzone'
 import LaboNLicenseTokenList from '~/components/organisms/LaboNLicenseTokenList'
 import TheLoader from '../atoms/TheLoader'
 import AppButton from '../atoms/AppButton'
 import { isMobile } from '~/utils/device'
+import Web3 from 'web3'
 
 export default {
   components: {

diff --git a/app/components/pages/WithdrawalDetails.vue b/app/components/pages/WithdrawalDetails.vue
@@ -45,14 +45,14 @@
 </template>
 
 <script>
-/* global Web3 */
 import { mapGetters, mapActions } from 'vuex'
 import { ADD_TOAST_MESSAGE } from 'vuex-toast'
 import { BigNumber } from 'bignumber.js'
 import AppHeader from '../organisms/AppHeader'
 import WalletNav from '../organisms/WalletNav'
 import AppFooter from '../organisms/AppFooter'
 import TheLoader from '../atoms/TheLoader'
+import Web3 from 'web3'
 import { formatDateWithTime } from '~/utils/format'
 import { showPaymentType, showProcessType, showFormattedAmount } from '~/utils/wallet'
 

diff --git a/app/pages/_userId/articles/_articleId/index.vue b/app/pages/_userId/articles/_articleId/index.vue
@@ -44,7 +44,8 @@ export default {
       }
       await Promise.all([
         store.dispatch(`article/${getArticleType}`, { articleId }),
-        store.dispatch('article/getArticleSupporters', { articleId })
+        store.dispatch('article/getArticleSupporters', { articleId }),
+        store.dispatch('article/getTopics')
       ])
       await Promise.all([
         store.dispatch('user/getTopUserPopularArticles', {
@@ -63,7 +64,6 @@ export default {
           }`
         )
       }
-      await store.dispatch('article/getTopics')
       store.dispatch('article/setTopicDisplayName', {
         topicName: store.state.article.article.topic
       })
@@ -83,13 +83,15 @@ export default {
     const { articleId } = this.$route.params
     if (this.loggedIn) {
       if (this.currentUser.phoneNumberVerified) await this.postPv({ articleId })
-      await this.getIsLikedArticle({ articleId })
-      await this.updateArticleCommentsByCommentIds({ articleId })
-
       // 自分の記事の場合は getPublicArticleDetail より記事情報を取得する。
       // 但し、fetch 時に取得済みの場合は実施しない
       if (this.isCurrentUser && !this.$store.state.article.isFetchedPublicArticle) {
-        await this.$store.dispatch('article/getPublicArticleDetail', { articleId })
+        await Promise.all([
+          this.getIsLikedArticle({ articleId }),
+          this.updateArticleCommentsByCommentIds({ articleId }),
+          this.$store.dispatch('article/getPublicArticleDetail', { articleId }),
+          await this.setArticleComments({ articleId })
+        ])
         this.$store.dispatch('article/setIsFetchedPublicArticle', { isFetched: true })
         const paywallLine = document.querySelector('.paywall-line')
         if (paywallLine) {
@@ -99,7 +101,12 @@ export default {
         // 記事を購入していた場合は getPurchaedArticleDetail より記事情報を取得する。
         // 但し、fetch 時に取得済みの場合は実施しない
       } else if (!this.isCurrentUser && !this.$store.state.article.isFetchedPurchasedArticle) {
-        await this.$store.dispatch('article/setPurchasedArticleIds')
+        await Promise.all([
+          this.getIsLikedArticle({ articleId }),
+          this.updateArticleCommentsByCommentIds({ articleId }),
+          await this.$store.dispatch('article/setPurchasedArticleIds'),
+          await this.setArticleComments({ articleId })
+        ])
         const isPurchased =
           this.loggedIn && this.$store.state.article.purchasedArticleIds.includes(articleId)
         if (isPurchased) {
@@ -111,9 +118,8 @@ export default {
       }
     } else {
       this.setIsLikedArticle({ liked: false })
+      await this.setArticleComments({ articleId })
     }
-    // コメント取得
-    await this.setArticleComments({ articleId })
   },
   computed: {
     isCurrentUser() {
@@ -138,15 +144,8 @@ export default {
     const decodedArticleOverview = htmlDecode(article.overview)
     const eyeCatchUrl = article.eye_catch_url ? `${article.eye_catch_url}?d=1200x630` : null
 
-    return {
+    const headValue = {
       title: decodedArticleTitle,
-      link: [
-        {
-          rel: 'stylesheet',
-          href:
-            'https://cdnjs.cloudflare.com/ajax/libs/medium-editor-insert-plugin/2.4.1/css/medium-editor-insert-plugin.min.css'
-        }
-      ],
       meta: [
         {
           hid: `og:title`,
@@ -177,6 +176,16 @@ export default {
         }
       ]
     }
+    if (!isV2(this.article)) {
+      headValue.link = [
+        {
+          rel: 'stylesheet',
+          href:
+            'https://cdnjs.cloudflare.com/ajax/libs/medium-editor-insert-plugin/2.4.1/css/medium-editor-insert-plugin.min.css'
+        }
+      ]
+    }
+    return headValue
   }
 }
 </script>
diff --git a/app/utils/web3.js b/app/utils/web3.js
@@ -1,4 +1,4 @@
-/* global Web3 */
+import Web3 from 'web3'
 const Common = require('ethereumjs-common').default
 const Tx = require('ethereumjs-tx').Transaction
 

diff --git a/nuxt.config.js b/nuxt.config.js
@@ -15,11 +15,6 @@ module.exports = {
       {
         src: `//cdn.iframe.ly/embed.js?api_key=${process.env.IFRAMELY_API_KEY}&omit_script=1`,
         async: true
-      },
-      {
-        // web3 を npm から追加すると、インポート時に SSR で落ちるようになってしまうため、CDN から読み込んでいる。
-        src: '//cdn.jsdelivr.net/gh/ethereum/web3.js@1.0.0-beta.34/dist/web3.min.js',
-        defer: true
       }
     ],
     __dangerouslyDisableSanitizersByTagID: {
@@ -75,10 +70,6 @@ module.exports = {
       {
         rel: 'shortcut icon',
         href: `https://${process.env.ALIS_APP_DOMAIN}/d/nuxt/dist/touch-icon.png`
-      },
-      {
-        rel: 'stylesheet',
-        href: 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.9.0/css/all.min.css'
       }
     ]
   },
@@ -175,7 +166,8 @@ module.exports = {
     '~assets/stylesheets/vuex-toast.scss',
     '@alisproject/alis-editor/dist/AlisEditor.css',
     '~/assets/stylesheets/gruvbox-dark-modified.css',
-    '~assets/stylesheets/ckeditor-view.scss'
+    '~assets/stylesheets/ckeditor-view.scss',
+    '~assets/stylesheets/fontAwesome/css/all.min.css'
   ],
   env: {
     IFRAMELY_API_KEY: process.env.IFRAMELY_API_KEY,

diff --git a/package.json b/package.json
@@ -58,7 +58,8 @@
     "url-regex": "^4.1.1",
     "vue-numeric-input": "^1.0.6",
     "vuelidate": "^0.7.5",
-    "vuex-toast": "^0.1.3"
+    "vuex-toast": "^0.1.3",
+    "web3": "^1.7.4"
   },
   "devDependencies": {
     "@babel/core": "^7.11.6",