Merge pull request #29 from kingscode/KCI-135

KCI-135 > integrate SVG icons (free and pro)

Author: jvhellemondt

generator/index.js

@@ -1,4 +1,3 @@
-const helpers = require('./tools/helpers');
 const fs = require('fs');
 
 module.exports = (api, options) => {
@@ -17,16 +16,25 @@ module.exports = (api, options) => {
       'lint': 'vue-cli-service lint',
     },
   });
+
+  api.render('./templates/Default', options);
+
   if (options.plugins.includes('fontawesomepro')) {
     api.extendPackage({
       dependencies: {
-        '@fortawesome/fontawesome-pro': '^5.8.1',
+        '@fortawesome/fontawesome-svg-core': '^1.2.32',
+        '@fortawesome/pro-light-svg-icons': '^5.15.1',
+        '@fortawesome/pro-regular-svg-icons': '^5.15.1',
+        '@fortawesome/pro-solid-svg-icons': '^5.15.1',
+        '@fortawesome/vue-fontawesome': '^2.0.0',
       },
     });
   } else {
     api.extendPackage({
       dependencies: {
-        '@fortawesome/fontawesome-free': '^5.14.0',
+        '@fortawesome/fontawesome-svg-core': '^1.2.32',
+        '@fortawesome/vue-fontawesome': '^2.0.0',
+        '@fortawesome/free-solid-svg-icons': '^5.15.1',
       },
     });
   }
@@ -39,8 +47,6 @@ module.exports = (api, options) => {
     api.render('./templates/Robots', options);
   }
 
-  api.render('./templates/Default', options);
-
   if (options.useAuthorisation) {
     api.render('./templates/Authorisation', options);
   }
@@ -74,9 +80,6 @@ module.exports = (api, options) => {
   }
 
   if (options.useBuildAndLintAction) {
-    if (fs.existsSync('./.eslintrc.js')) {
-      fs.unlinkSync(api.resolve('./.eslintrc.js'));
-    }
     api.extendPackage({
       dependencies: {
         '@vue/cli-plugin-eslint': '~4.4.0',
@@ -90,18 +93,13 @@ module.exports = (api, options) => {
   }
 
   api.onCreateComplete(() => {
-    if (fs.existsSync('src/store.js')) {
-      fs.unlinkSync(api.resolve('src/store.js'));
-    }
-    if (fs.existsSync('src/assets/logo.svg')) {
-      fs.unlinkSync(api.resolve('src/assets/logo.svg'));
-    }
-    if (fs.existsSync('src/components/HelloWorld.vue')) {
-      fs.unlinkSync(api.resolve('src/components/HelloWorld.vue'));
-    }
-    if (fs.existsSync('src/main.js')) {
-      fs.unlinkSync(api.resolve('src/main.js'));
-    }
+    if (fs.existsSync('src/plugins/vuetify.js')) fs.unlinkSync(api.resolve('src/plugins/vuetify.js'));
+    if (options.plugins.includes('fontawesomepro') && fs.existsSync('src/plugins/vuetify/FontawesomeFree.js')) fs.unlinkSync(api.resolve('src/plugins/vuetify/FontawesomeFree.js'));
+    if (!options.plugins.includes('fontawesomepro') && fs.existsSync('src/plugins/vuetify/FontawesomePro.js')) fs.unlinkSync(api.resolve('src/plugins/vuetify/FontawesomePro.js'));
+    if (fs.existsSync('src/store.js')) fs.unlinkSync(api.resolve('src/store.js'));
+    if (fs.existsSync('src/assets/logo.svg')) fs.unlinkSync(api.resolve('src/assets/logo.svg'));
+    if (fs.existsSync('src/components/HelloWorld.vue')) fs.unlinkSync(api.resolve('src/components/HelloWorld.vue'));
+    if (fs.existsSync('src/main.js')) fs.unlinkSync(api.resolve('src/main.js'));
     fs.renameSync(api.resolve('src/newmain.js'), api.resolve('src/main.js'));
   });
 };

generator/templates/Authorisation/src/components/authorisation/LoginCard.vue

@@ -17,7 +17,7 @@
                       v-model="form.email"
                       autocomplete="username"
           />
-          <KTextField :append-icon="showPassword ? 'fa-eye-slash' : 'fa-eye'"
+          <KTextField :append-icon="showPassword ? '$invisible' : '$visible'"
                       :type="showPassword ? 'text' : 'password'"
                       @click:append="showPassword = !showPassword"
                       field="password"

generator/templates/Authorisation/src/components/authorisation/PasswordResetCard.vue

@@ -18,15 +18,15 @@
               v-model="form.email"
           />
           <KTextField
-              :append-icon="showPassword ? 'fa-eye-slash' : 'fa-eye'"
+              :append-icon="showPassword ? '$invisible' : '$visible'"
               :type="showPassword ? 'text' : 'password'"
               @click:append="showPassword = !showPassword"
               field="password"
               tabindex="2"
               v-model="form.password"
           />
           <KTextField
-              :append-icon="showPassword ? 'fa-eye-slash' : 'fa-eye'"
+              :append-icon="showPassword ? '$invisible' : '$visible'"
               :type="showPassword ? 'text' : 'password'"
               @click:append="showPassword = !showPassword"
               field="password"

generator/templates/Authorisation/src/views/authorisation/RegistrationVerify.vue

@@ -21,15 +21,15 @@
                   v-model="form.email"
               />
               <KTextField
-                  :append-icon="showPassword ? 'far fa-eye-slash' : 'far fa-eye'"
+                  :append-icon="showPassword ? '$invisible' : '$visible'"
                   :type="showPassword ? 'text' : 'password'"
                   @click:append="showPassword = !showPassword"
                   field="password"
                   tabindex="1"
                   v-model="form.password"
               />
               <KTextField
-                  :append-icon="showPassword ? 'far fa-eye-slash' : 'far fa-eye'"
+                  :append-icon="showPassword ? '$invisible' : '$visible'"
                   :type="showPassword ? 'text' : 'password'"
                   @click:append="showPassword = !showPassword"
                   field="password"

generator/templates/Default/src/components/AppBarMenu.vue

@@ -8,7 +8,7 @@
     <template v-slot:activator="{ on }">
       <v-btn class="mr-6" fab icon v-on="on">
         <v-avatar class="accent" size="48" title>
-          <v-icon>fa-user</v-icon>
+          <v-icon>$user</v-icon>
         </v-avatar>
       </v-btn>
     </template>

generator/templates/Default/src/components/crud/fields/KFileField.vue

@@ -45,7 +45,7 @@ export default {
   computed: {
     icon() {
       if (!this.previewType) {
-        return 'fa-upload';
+        return '$upload';
       }
       return this.getIconByType(this.previewType);
     },
@@ -75,13 +75,13 @@ export default {
     },
     getIconByType(type) {
       if (type.match('video/*')) {
-        return 'fa-file-video';
+        return '$fileVideo';
       } else if (type === 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' || type === 'application/msword') {
-        return 'fa-file-word';
+        return '$fileWord';
       } else if (type === 'application/pdf') {
-        return 'fa-file-pdf';
+        return '$filePdf';
       }
-      return 'fa-file';
+      return '$fileUnkown';
     },
   },
 };

generator/templates/Default/src/components/menu/TheMainMenu.vue

@@ -7,7 +7,7 @@ export default {
   computed: {
     items: () => [
       {
-        icon: 'fa-users',
+        icon: '$users',
         title: 'Gebruikers',
         route: { name: 'users' },
       },