minor fix

moeoverflow · Sep 27, 2018 · a8cb34a · a8cb34a
1 parent c67250e
commit a8cb34a
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 45 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -52,6 +52,7 @@ module.exports = {
     // allow debugger during development
     'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
     'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
+    'no-else-return': 'off',
 
     // jsdoc
     'jsdoc/check-param-names': 1,

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-8.11.3
+v10.11.0
diff --git a/components/Auth/FormTab.vue b/components/Auth/FormTab.vue
@@ -17,7 +17,7 @@
           type="text"
         >
         <span class="icon is-small is-left">
-          <FontAwesomeIcon :icon="icon.faUser"/>
+          <FontAwesomeIcon icon="user"/>
         </span>
       </div>
     </div>
@@ -34,7 +34,7 @@
           type="email"
         >
         <span class="icon is-small is-left">
-          <FontAwesomeIcon :icon="icon.faEnvelope"/>
+          <FontAwesomeIcon icon="envelope"/>
         </span>
       </p>
     </div>
@@ -51,7 +51,7 @@
           type="password"
         >
         <span class="icon is-small is-left">
-          <FontAwesomeIcon :icon="icon.faLock"/>
+          <FontAwesomeIcon icon="lock"/>
         </span>
       </p>
     </div>
@@ -94,15 +94,12 @@
  */
 import remote from '~/assets/js/api/fetch';
 import VueRecaptcha from 'vue-recaptcha';
-import FontAwesomeIcon from '@fortawesome/vue-fontawesome';
-import { faUser, faLock, faCheck, faEnvelope } from '@fortawesome/fontawesome-free-solid';
 import FormMessage from './FormMessage';
 
 export default {
   name: 'LoginTab',
   components: {
     VueRecaptcha,
-    FontAwesomeIcon,
     FormMessage,
   },
   props: {
@@ -145,14 +142,6 @@ export default {
     isSubmiting() {
       return this.submiting ? 'is-loading' : '';
     },
-    icon() {
-      return {
-        faUser,
-        faLock,
-        faCheck,
-        faEnvelope,
-      };
-    },
     isLoginAvaliable() {
       const validUsername = /^[a-zA-Z0-9_-]{5,15}$/.test(this.formData.username);
       const validEmail = /^([A-Za-z0-9_\-.])+@([A-Za-z0-9_\-.])+\.([A-Za-z]{2,4})$/.test(this.formData.email);
@@ -163,8 +152,9 @@ export default {
         return validgRecaptchaResponse && validUsername && validPassword;
       } else if (this.formType === 'signup') {
         return validgRecaptchaResponse && validUsername && validEmail && validPassword;
+      } else {
+        return false;
       }
-      return false;
     },
   },
   methods: {

diff --git a/components/Auth/LoginModal.vue b/components/Auth/LoginModal.vue
@@ -21,7 +21,7 @@
               >
                 <a>
                   <span class="icon is-small">
-                    <FontAwesomeIcon :icon="icon.faUser"/>
+                    <FontAwesomeIcon icon="user"/>
                   </span>
                   <span>{{ $t('login') }}</span>
                 </a>
@@ -33,7 +33,7 @@
                 <a>
                   <span class="icon is-small">
                     <FontAwesomeIcon
-                      :icon="icon.faPencilAlt"
+                      icon="pencil-alt"
                       aria-hidden="true"
                     />
                   </span>
@@ -63,15 +63,11 @@
    * Login of the Navbar.
    */
 
-import FontAwesomeIcon from '@fortawesome/vue-fontawesome';
-import { faUser, faPencilAlt } from '@fortawesome/fontawesome-free-solid';
-
 import FormTab from './FormTab';
 
 export default {
   name: 'LoginModal',
   components: {
-    FontAwesomeIcon,
     FormTab,
   },
   props: {
@@ -81,12 +77,6 @@ export default {
     },
   },
   computed: {
-    icon() {
-      return {
-        faUser,
-        faPencilAlt,
-      };
-    },
     navStates() {
       return this.$store.state.navbar;
     },

diff --git a/components/Auth/ProfilePanel.vue b/components/Auth/ProfilePanel.vue
@@ -6,14 +6,14 @@
     </div>
     <hr class="dropdown-divider">
     <a class="dropdown-item">
-      <FontAwesomeIcon :icon="icon.faTachometerAlt"/>
+      <FontAwesomeIcon icon="tachometer-alt"/>
       {{ $t('dashboard') }}
     </a>
     <a
       class="dropdown-item"
       @click="logout"
     >
-      <FontAwesomeIcon :icon="icon.faSignOutAlt"/>
+      <FontAwesomeIcon icon="sign-out-alt"/>
       {{ $t('logout') }}
     </a>
   </div>
@@ -23,24 +23,14 @@
 /**
  * Profile panel of the Navbar.
  */
-import FontAwesomeIcon from '@fortawesome/vue-fontawesome';
-import { faTachometerAlt, faSignOutAlt } from '@fortawesome/fontawesome-free-solid';
-
 export default {
   name: 'NavbarProfilePanel',
   components: {
-    FontAwesomeIcon,
   },
   data() {
     return {};
   },
   computed: {
-    icon() {
-      return {
-        faTachometerAlt,
-        faSignOutAlt,
-      };
-    },
     navStates() {
       return this.$store.state.navbar;
     },

diff --git a/package.json b/package.json
@@ -27,21 +27,23 @@
     "@fortawesome/free-regular-svg-icons": "^5.3.1",
     "@fortawesome/free-solid-svg-icons": "^5.3.1",
     "@fortawesome/vue-fontawesome": "^0.1.1",
-    "@nuxtjs/google-analytics": "^2.0.2",
     "@nuxtjs/bulma": "^1.1.0",
+    "@nuxtjs/google-analytics": "^2.0.2",
     "@nuxtjs/pwa": "^2.6.0",
     "body-parser": "^1.18.2",
     "bulma": "^0.7.1",
     "connect-redis": "^3.3.3",
     "cookie": "^0.3.1",
-    "express-session": "^1.15.6",
     "eslint-plugin-jsdoc": "^3.8.0",
+    "express-session": "^1.15.6",
     "isomorphic-fetch": "^2.2.1",
     "js-cookie": "^2.2.0",
     "nuxt": "^2.0.0",
     "v-click-outside": "^2.0.1",
+    "vue-gravatar": "^1.2.1",
     "vue-i18n": "^8.1.0",
-    "vue-i18n-extensions": "^0.2.0"
+    "vue-i18n-extensions": "^0.2.0",
+    "vue-recaptcha": "^1.1.1"
   },
   "devDependencies": {
     "babel-eslint": "^10.0.0",

diff --git a/plugins/font-awesome.js b/plugins/font-awesome.js
@@ -23,6 +23,13 @@ import {
   faStopwatch,
   faFilter,
   faTerminal,
+  faUser,
+  faLock,
+  faCheck,
+  faEnvelope,
+  faPencilAlt,
+  faTachometerAlt,
+  faSignOutAlt,
 } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
 
@@ -31,6 +38,6 @@ import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
 // };
 
 // eslint-disable-next-line max-len
-library.add(faThList, faTags, faQuestionCircle, faInfo, faArrowRight, faLanguage, faBars, faTimes, faSearch, faAngleDown, faPlay, faPlayCircle, faPause, faPauseCircle, faCircleNotch, faChevronRight, faChevronLeft, faLongArrowAltRight, faLongArrowAltLeft, faStopwatch, faFilter, faTerminal);
+library.add(faThList, faTags, faQuestionCircle, faInfo, faArrowRight, faLanguage, faBars, faTimes, faSearch, faAngleDown, faPlay, faPlayCircle, faPause, faPauseCircle, faCircleNotch, faChevronRight, faChevronLeft, faLongArrowAltRight, faLongArrowAltLeft, faStopwatch, faFilter, faTerminal, faUser, faLock, faCheck, faEnvelope, faUser, faPencilAlt, faTachometerAlt, faSignOutAlt);
 
 Vue.component('FontAwesomeIcon', FontAwesomeIcon);
diff --git a/yarn.lock b/yarn.lock
@@ -2666,6 +2666,10 @@ chardet@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
 
+charenc@~0.0.1:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
+
 check-types@^7.3.0:
   version "7.4.0"
   resolved "https://registry.yarnpkg.com/check-types/-/check-types-7.4.0.tgz#0378ec1b9616ec71f774931a3c6516fad8c152f4"
@@ -3209,6 +3213,10 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
+crypt@~0.0.1:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
+
 crypto-browserify@^3.11.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
@@ -5598,7 +5606,7 @@ is-binary-path@^1.0.0:
   dependencies:
     binary-extensions "^1.0.0"
 
-is-buffer@^1.1.4, is-buffer@^1.1.5:
+is-buffer@^1.1.4, is-buffer@^1.1.5, is-buffer@~1.1.1:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
 
@@ -6509,6 +6517,14 @@ md5.js@^1.3.4:
     hash-base "^3.0.0"
     inherits "^2.0.1"
 
+md5@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/md5/-/md5-2.2.1.tgz#53ab38d5fe3c8891ba465329ea23fac0540126f9"
+  dependencies:
+    charenc "~0.0.1"
+    crypt "~0.0.1"
+    is-buffer "~1.1.1"
+
 mdast-util-compact@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/mdast-util-compact/-/mdast-util-compact-1.0.2.tgz#c12ebe16fffc84573d3e19767726de226e95f649"
@@ -11092,6 +11108,12 @@ vue-eslint-parser@^2.0.3:
     esquery "^1.0.0"
     lodash "^4.17.4"
 
+vue-gravatar@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/vue-gravatar/-/vue-gravatar-1.2.1.tgz#b430fca925606c96b004d8aeb7894b8afd07bba0"
+  dependencies:
+    md5 "^2.2.1"
+
 vue-hot-reload-api@^2.3.0:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.1.tgz#b2d3d95402a811602380783ea4f566eb875569a2"
@@ -11128,6 +11150,10 @@ vue-no-ssr@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/vue-no-ssr/-/vue-no-ssr-1.0.0.tgz#169bdabfa2ca170c8979d94062d877a0479c3f10"
 
+vue-recaptcha@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/vue-recaptcha/-/vue-recaptcha-1.1.1.tgz#be38f4ffab500e7f4775f149a279bb962cf91f07"
+
 vue-router@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.0.1.tgz#d9b05ad9c7420ba0f626d6500d693e60092cc1e9"