From 643693f68baa0e0f57ae396d6444f928bc57bf8a Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Tue, 10 Dec 2019 21:42:08 +0000 Subject: [PATCH] feat: add initial content --- package.json | 1 + postcss.config.js | 31 ++++-- renovate.json | 4 + src/App.vue | 36 +++++-- src/components/HelloWorld.vue | 148 ----------------------------- src/main.ts | 2 + src/views/Home.vue | 22 ++--- src/views/layout/TheSiteFooter.vue | 16 ++++ src/views/layout/TheSiteHeader.vue | 40 ++++++++ tailwind.config.js | 6 +- tsconfig.json | 2 +- yarn.lock | 9 +- 12 files changed, 139 insertions(+), 178 deletions(-) create mode 100644 renovate.json delete mode 100644 src/components/HelloWorld.vue create mode 100644 src/views/layout/TheSiteFooter.vue create mode 100644 src/views/layout/TheSiteHeader.vue diff --git a/package.json b/package.json index 92d6beae..0e770d82 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ }, "dependencies": { "@vapper/core": "^0.16.4", + "@vue/composition-api": "^0.3.4", "core-js": "^3.4.3", "register-service-worker": "^1.6.2", "vue": "^2.6.10", diff --git a/postcss.config.js b/postcss.config.js index 1084e439..29e5b58d 100644 --- a/postcss.config.js +++ b/postcss.config.js @@ -3,16 +3,29 @@ const IN_PRODUCTION = process.env.NODE_ENV === 'production' module.exports = { plugins: [ require('postcss-preset-env')({ stage: 0 }), + require('postcss-nested')({}), require('tailwindcss')(), - IN_PRODUCTION && require('@fullhuman/postcss-purgecss')({ - content: [ `./public/**/*.html`, `./src/**/*.vue` ], - defaultExtractor (content) { - const contentWithoutStyleBlocks = content.replace(//gi, '') - return contentWithoutStyleBlocks.match(/[A-Za-z0-9-_/:]*[A-Za-z0-9-_/]+/g) || [] - }, - whitelist: [], - whitelistPatterns: [ /-(leave|enter|appear)(|-(to|from|active))$/, /^(?!(|.*?:)cursor-move).+-move$/, /^router-link(|-exact)-active$/ ], - }), + IN_PRODUCTION && + require('@fullhuman/postcss-purgecss')({ + content: [`./public/**/*.html`, `./src/**/*.vue`], + defaultExtractor(content) { + const contentWithoutStyleBlocks = content.replace( + //gi, + '', + ) + return ( + contentWithoutStyleBlocks.match( + /[A-Za-z0-9-_/:]*[A-Za-z0-9-_/]+/g, + ) || [] + ) + }, + whitelist: [], + whitelistPatterns: [ + /-(leave|enter|appear)(|-(to|from|active))$/, + /^(?!(|.*?:)cursor-move).+-move$/, + /^router-link(|-exact)-active$/, + ], + }), require('autoprefixer')(), ], } diff --git a/renovate.json b/renovate.json new file mode 100644 index 00000000..b9a90d0c --- /dev/null +++ b/renovate.json @@ -0,0 +1,4 @@ +{ + "extends": ["concision"] +} + diff --git a/src/App.vue b/src/App.vue index ea4c36c0..16df5628 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,19 +1,43 @@ - diff --git a/src/components/HelloWorld.vue b/src/components/HelloWorld.vue deleted file mode 100644 index bdd4c68e..00000000 --- a/src/components/HelloWorld.vue +++ /dev/null @@ -1,148 +0,0 @@ - - - - - - diff --git a/src/main.ts b/src/main.ts index aaf8b475..de46a643 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,7 +1,9 @@ import Vue from 'vue' import App from './App.vue' import createRouter from './router' +import VueCompositionApi from '@vue/composition-api' +Vue.use(VueCompositionApi) Vue.config.productionTip = false export default function createApp() { diff --git a/src/views/Home.vue b/src/views/Home.vue index f9186e1d..75f18b6a 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -1,18 +1,16 @@ - + + diff --git a/src/views/layout/TheSiteFooter.vue b/src/views/layout/TheSiteFooter.vue new file mode 100644 index 00000000..5cf47f6e --- /dev/null +++ b/src/views/layout/TheSiteFooter.vue @@ -0,0 +1,16 @@ + + + + + diff --git a/src/views/layout/TheSiteHeader.vue b/src/views/layout/TheSiteHeader.vue new file mode 100644 index 00000000..e265af4f --- /dev/null +++ b/src/views/layout/TheSiteHeader.vue @@ -0,0 +1,40 @@ + + + + + diff --git a/tailwind.config.js b/tailwind.config.js index 36db1e3b..f6d8363b 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -1,8 +1,12 @@ module.exports = { theme: { + fontFamily: { + sans: ['Barlow'], + serif: ['Vollkorn'], + }, extend: { inset: { - 'full': '100%', + full: '100%', }, opacity: { '10': '0.1', diff --git a/tsconfig.json b/tsconfig.json index 523d2509..de12cae1 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -12,7 +12,7 @@ "baseUrl": ".", "types": ["webpack-env", "jest"], "paths": { - "~/*": ["src/*"] + "@/*": ["src/*"] }, "lib": ["esnext", "dom", "dom.iterable", "scripthost"] }, diff --git a/yarn.lock b/yarn.lock index 2b0f93a0..efc103a9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1462,6 +1462,13 @@ source-map "~0.6.1" vue-template-es2015-compiler "^1.9.0" +"@vue/composition-api@^0.3.4": + version "0.3.4" + resolved "https://registry.yarnpkg.com/@vue/composition-api/-/composition-api-0.3.4.tgz#43d2c3377173cfe1d02e51e3342bcf0fbde9c4b6" + integrity sha512-aMbg/pEk0PSQAIFyWWLqbAmaCCTx1kFq+49KZslIBJH9Wqos7eEPLtMv4gGxd/EcciBIgfbtUXaXGg/O3mheRA== + dependencies: + tslib "^1.9.3" + "@vue/eslint-config-prettier@^5.0.0": version "5.1.0" resolved "https://registry.yarnpkg.com/@vue/eslint-config-prettier/-/eslint-config-prettier-5.1.0.tgz#837241a26ed396976cb8dabd77939303245523cf" @@ -10224,7 +10231,7 @@ tsconfig@^7.0.0: strip-bom "^3.0.0" strip-json-comments "^2.0.0" -tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0: +tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: version "1.10.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a" integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ== -- knotmirror 0.0.1