Skip to content
This repository has been archived by the owner on Jan 8, 2020. It is now read-only.

Commit

Permalink
feat: massive restructure
Browse files Browse the repository at this point in the history
reduced scope of project, matched component structure with CLI output, clean-up multiple files,
changed language.
  • Loading branch information
johnleider committed Nov 2, 2019
1 parent e43e721 commit 0f4fc59
Show file tree
Hide file tree
Showing 59 changed files with 412 additions and 338 deletions.
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Released under MIT License

Copyright (c) 2016-present Vuetify LLC
Copyright (c) 2016-present Vuetify, LLC

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ This should not be installed stand-a-lone.
### 📑 License
[MIT](http://opensource.org/licenses/MIT)

Copyright (c) 2016-present Vuetify LLC
Copyright (c) 2016-present Vuetify, LLC
1 change: 1 addition & 0 deletions generator/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ module.exports = api => {
"lodash": "*",
},
eslintConfig: {
env: { jest: true },
extends: 'vuetify'
},
jest: {
Expand Down
Binary file modified generator/template/public/favicon.ico
Binary file not shown.
13 changes: 4 additions & 9 deletions generator/template/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,10 @@
metaInfo () {
return {
title: 'Boilerplate',
titleTemplate: '%s — Vuetify',
htmlAttrs: {
lang: 'en',
amp: true,
},
meta: [
{ charset: 'utf-8' },
],
title: 'Vuetify',
titleTemplate: '%s — Vuetify Essentials',
htmlAttrs: { lang: 'en' },
meta: [{ charset: 'utf-8' }],
}
},
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// Component
import PageJumbotron from './index'

// Utilities
import { shallow, createLocalVue } from '@vue/test-utils'

// Bootstrap
const localVue = createLocalVue()

describe('PageJumbotron', () => {
function mountFunction(options = {}) {
return shallow(PageJumbotron, {
localVue,
...options,
})
}

it('should work', () => {
const wrapper = mountFunction()

expect(wrapper.html()).toMatchSnapshot()
})
})
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
justify="center"
>
<v-icon
size="128"
:size="$vuetify.breakpoint.smAndDown ? 128 : 368"
v-text="icon"
/>

Expand Down
3 changes: 3 additions & 0 deletions generator/template/src/components/PageJumbotron/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import PageJumbotron from './PageJumbotron'

export default PageJumbotron
20 changes: 0 additions & 20 deletions generator/template/src/components/base/Boilerplate.vue

This file was deleted.

23 changes: 23 additions & 0 deletions generator/template/src/components/base/Btn/Btn.spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// Component
import Btn from './index'

// Utilities
import { shallow, createLocalVue } from '@vue/test-utils'

// Bootstrap
const localVue = createLocalVue()

describe('Btn', () => {
function mountFunction(options = {}) {
return shallow(Btn, {
localVue,
...options,
})
}

it('should work', () => {
const wrapper = mountFunction()

expect(wrapper.html()).toMatchSnapshot()
})
})
3 changes: 3 additions & 0 deletions generator/template/src/components/base/Btn/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import Btn from './Btn'

export default Btn
23 changes: 23 additions & 0 deletions generator/template/src/components/base/Card/Card.spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// Component
import Card from './index'

// Utilities
import { shallow, createLocalVue } from '@vue/test-utils'

// Bootstrap
const localVue = createLocalVue()

describe('Card', () => {
function mountFunction(options = {}) {
return shallow(Card, {
localVue,
...options,
})
}

it('should work', () => {
const wrapper = mountFunction()

expect(wrapper.html()).toMatchSnapshot()
})
})
3 changes: 3 additions & 0 deletions generator/template/src/components/base/Card/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import Card from './Card'

export default Card
23 changes: 23 additions & 0 deletions generator/template/src/components/base/Heading/Heading.spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// Component
import Heading from './index'

// Utilities
import { shallow, createLocalVue } from '@vue/test-utils'

// Bootstrap
const localVue = createLocalVue()

describe('Heading', () => {
function mountFunction(options = {}) {
return shallow(Heading, {
localVue,
...options,
})
}

it('should work', () => {
const wrapper = mountFunction()

expect(wrapper.html()).toMatchSnapshot()
})
})
3 changes: 3 additions & 0 deletions generator/template/src/components/base/Heading/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import Heading from './Heading'

export default Heading
23 changes: 23 additions & 0 deletions generator/template/src/components/base/Section/Section.spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// Component
import Section from './index'

// Utilities
import { shallow, createLocalVue } from '@vue/test-utils'

// Bootstrap
const localVue = createLocalVue()

describe('Section', () => {
function mountFunction(options = {}) {
return shallow(Section, {
localVue,
...options,
})
}

it('should work', () => {
const wrapper = mountFunction()

expect(wrapper.html()).toMatchSnapshot()
})
})
3 changes: 3 additions & 0 deletions generator/template/src/components/base/Section/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import Section from './Section'

export default Section
23 changes: 23 additions & 0 deletions generator/template/src/layouts/admin/AppBar/AppBar.spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// Component
import AppBar from './index'

// Utilities
import { shallow, createLocalVue } from '@vue/test-utils'

// Bootstrap
const localVue = createLocalVue()

describe('AppBar', () => {
function mountFunction(options = {}) {
return shallow(AppBar, {
localVue,
...options,
})
}

it('should work', () => {
const wrapper = mountFunction()

expect(wrapper.html()).toMatchSnapshot()
})
})
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,11 @@
<v-spacer />

<v-btn
:to="{ name: 'Profile' }"
depressed
fab
small
:to="{ name: 'Home' }"
exact
icon
>
<v-icon v-text="mdiAccountCircle" />
<v-icon v-text="mdiVuetify" />
</v-btn>
</v-app-bar>
</template>
Expand All @@ -31,22 +30,22 @@
// Icons
import {
mdiAccountCircle,
mdiClose,
mdiMenu,
mdiVuetify,
} from '@mdi/js'
export default {
name: 'BackendAppBar',
data: () => ({
mdiAccountCircle,
mdiClose,
mdiMenu,
mdiVuetify,
}),
computed: {
drawer: sync('backend/drawer'),
drawer: sync('admin/drawer'),
},
}
</script>
3 changes: 3 additions & 0 deletions generator/template/src/layouts/admin/AppBar/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import AppBar from './AppBar'

export default AppBar
23 changes: 23 additions & 0 deletions generator/template/src/layouts/admin/Drawer/Drawer.spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// Component
import Drawer from './index'

// Utilities
import { shallow, createLocalVue } from '@vue/test-utils'

// Bootstrap
const localVue = createLocalVue()

describe('Drawer', () => {
function mountFunction(options = {}) {
return shallow(Drawer, {
localVue,
...options,
})
}

it('should work', () => {
const wrapper = mountFunction()

expect(wrapper.html()).toMatchSnapshot()
})
})
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,7 @@
>
<template v-slot:prepend>
<v-toolbar flat>
<v-icon
large
left
v-text="mdiVuetify"
/>

<v-toolbar-title>
Backend
</v-toolbar-title>

<v-spacer />

<v-btn
:to="{ name: 'Home' }"
exact
icon
>
<v-icon v-text="mdiMonitorCellphone" />
</v-btn>
<v-toolbar-title>Application</v-toolbar-title>
</v-toolbar>
</template>

Expand All @@ -43,18 +25,6 @@
</v-list-item-content>
</v-list-item>
</v-list>

<template v-slot:append>
<v-list nav>
<v-list-item :to="{ name: 'Settings' }">
<v-list-item-icon>
<v-icon v-text="mdiCogs" />
</v-list-item-icon>

<v-list-item-title>Settings</v-list-item-title>
</v-list-item>
</v-list>
</template>
</v-navigation-drawer>
</template>

Expand All @@ -66,22 +36,18 @@
// Icons
import {
mdiCogs,
mdiMonitorCellphone,
mdiVuetify,
} from '@mdi/js'
export default {
name: 'BackendDrawer',
data: () => ({
mdiCogs,
mdiMonitorCellphone,
mdiVuetify,
}),
computed: {
...sync('backend/*'),
...sync('admin/*'),
},
}
</script>
3 changes: 3 additions & 0 deletions generator/template/src/layouts/admin/Drawer/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import Drawer from './Drawer'

export default Drawer
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
name: 'LayoutBackend',
components: {
BackendDrawer: () => import('./Drawer'),
BackendAppBar: () => import('./AppBar'),
BackendDrawer: () => import('./Drawer'),
BackendView: () => import('./View'),
},
computed: {
drawer: sync('backend/drawer'),
drawer: sync('admin/drawer'),
},
beforeDestroy () {
Expand Down
Loading

0 comments on commit 0f4fc59

Please sign in to comment.