fix: update opts parameter syntax

options were not being properly applied to templates
vuetifyjs · Nov 3, 2019 · ca0a0b4 · ca0a0b4
1 parent 2c02520
commit ca0a0b4
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 21 deletions.
diff --git a/generator/index.js b/generator/index.js
@@ -25,7 +25,7 @@ module.exports = (api, opts) => {
   if (opts.installFonts) fonts.addDependencies(api, opts.iconFont)
 
   // Update templates
-  vuetify.renderFiles(api, opts)
+  vuetify.renderFiles(api, { opts })
 
   // adapted from https://github.com/Akryum/vue-cli-plugin-apollo/blob/master/generator/index.js#L68-L91
   api.onCreateComplete(() => {

diff --git a/generator/templates/default/src/App.js.vue b/generator/templates/default/src/App.js.vue
@@ -1,31 +1,52 @@
 <template>
   <v-app>
-    <v-app-bar app>
-      <v-toolbar-title class="headline text-uppercase">
-        <span>Vuetify</span>
-        <span class="font-weight-light">MATERIAL DESIGN</span>
-      </v-toolbar-title>
+    <v-app-bar
+      app
+      color="primary"
+      dark
+    >
+      <div class="d-flex align-center">
+        <v-img
+          alt="Vuetify Logo"
+          class="shrink mr-2"
+          contain
+          src="https://cdn.vuetifyjs.com/images/logos/vuetify-logo-dark.png"
+          transition="scale-transition"
+          width="40"
+        />
+
+        <v-img
+          alt="Vuetify Name"
+          class="shrink mt-1 hidden-sm-and-down"
+          contain
+          min-width="100"
+          src="https://cdn.vuetifyjs.com/images/logos/vuetify-name-dark.png"
+          width="100"
+        />
+      </div>
+
       <v-spacer></v-spacer>
+
       <v-btn
-        text
         href="https://github.com/vuetifyjs/vuetify/releases/latest"
         target="_blank"
+        text
       >
         <span class="mr-2">Latest Release</span>
-        <%_ if (options.iconFont === 'mdi') { _%>
+        <%_ if (opts.iconFont === 'mdi') { _%>
         <v-icon>mdi-open-in-new</v-icon>
-        <%_ } else if (options.iconFont === 'md') { _%>
+        <%_ } else if (opts.iconFont === 'md') { _%>
         <v-icon>open_in_new</v-icon>
-        <%_ } else if (options.iconFont === 'fa') { _%>
+        <%_ } else if (opts.iconFont === 'fa') { _%>
         <v-icon>fas fa-external-link-alt</v-icon>
-        <%_ } else if (options.iconFont === 'fa4') { _%>
+        <%_ } else if (opts.iconFont === 'fa4') { _%>
         <v-icon>fa-external-link</v-icon>
         <%_ } _%>
       </v-btn>
     </v-app-bar>
 
     <v-content>
-      <%_ if (options.router) { _%>
+      <%_ if (opts.router) { _%>
       <router-view/>
       <%_ } else { _%>
       <HelloWorld/>
@@ -35,13 +56,13 @@
 </template>
 
 <script>
-<%_ if (!options.router) { _%>
+<%_ if (!opts.router) { _%>
 import HelloWorld from './components/HelloWorld';
 <%_ } _%>
 
 export default {
   name: 'App',
-  <%_ if (!options.router) { _%>
+  <%_ if (!opts.router) { _%>
   components: {
     HelloWorld,
   },

diff --git a/generator/templates/default/src/plugins/vuetify.js b/generator/templates/default/src/plugins/vuetify.js
@@ -1,20 +1,20 @@
 import Vue from 'vue';
-<%_ if (useAlaCarte) { _%>
+<%_ if (opts.useAlaCarte) { _%>
 import Vuetify from 'vuetify/lib';
 <%_ } else { _%>
 import Vuetify from 'vuetify';
 import 'vuetify/dist/vuetify.min.css';
 <%_ } _%>
-<%_ if (locale !== 'en') { _%>
+<%_ if (opts.locale !== 'en') { _%>
 import <%= locale.replace(/-/g, '') %> from 'vuetify/<%= typescript ? 'src' : 'es5' %>/locale/<%= locale %>';
 <%_ } _%>
 
 Vue.use(Vuetify);
 
 export default new Vuetify({
-  <%_ if (useTheme) { _%>
+  <%_ if (opts.useTheme) { _%>
   theme: {
-    <%_ if (useCustomProperties) { _%>
+    <%_ if (opts.useCustomProperties) { _%>
       options: {
         customProperties: true,
       },
@@ -32,13 +32,13 @@ export default new Vuetify({
     },
   },
   <%_ } _%>
-  <%_ if (locale !== 'en') { _%>
+  <%_ if (opts.locale !== 'en') { _%>
     lang: {
-      locales: { <%= locale.replace(/-/g, '') %> },
+      locales: { <%= opts.locale.replace(/-/g, '') %> },
       current: '<%= locale %>',
     },
   <%_ } _%>
   icons: {
-    iconfont: '<%= iconFont %>',
+    iconfont: '<%= opts.iconFont %>',
   },
 });