Merge pull request #27 from danielkellyio/bug/updates

Bug/updates
danielkellyio · Apr 14, 2020 · 1dd1922 · 1dd1922
2 parents 02c6da8 + 7536bbb
commit 1dd1922
Show file tree

Hide file tree

Showing 128 changed files with 6,562 additions and 4,793 deletions.
diff --git a/.eslintignore b/.eslintignore
diff --git a/.eslintrc.js b/.eslintrc.js
diff --git a/.gitignore b/.gitignore
@@ -89,3 +89,4 @@ sw.*
 
 #Awake CMS
 static/api
+static/admin
diff --git a/.prettierrc b/.prettierrc
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/assets/README.md b/assets/README.md
diff --git a/assets/buefy.png b/assets/buefy.png
diff --git a/assets/scss/_animations.scss b/assets/scss/_animations.scss
diff --git a/assets/scss/_layout.scss b/assets/scss/_layout.scss
diff --git a/assets/scss/_transitions.scss b/assets/scss/_transitions.scss
diff --git a/assets/scss/_util.scss b/assets/scss/_util.scss
diff --git a/assets/scss/_vars.scss b/assets/scss/_vars.scss
diff --git a/assets/scss/styles.scss b/assets/scss/styles.scss
diff --git a/assets/uploads/about-hero.jpg b/assets/uploads/about-hero.jpg
diff --git a/assets/uploads/cat-1045782_1920.jpg b/assets/uploads/cat-1045782_1920.jpg
diff --git a/assets/uploads/contact-hero.jpg b/assets/uploads/contact-hero.jpg
diff --git a/assets/uploads/contact-person.jpg b/assets/uploads/contact-person.jpg
diff --git a/assets/uploads/disqus-add-to-website.jpg b/assets/uploads/disqus-add-to-website.jpg
diff --git a/assets/uploads/disqus-get-started.jpg b/assets/uploads/disqus-get-started.jpg
diff --git a/assets/uploads/disqus-hero.jpg b/assets/uploads/disqus-hero.jpg
diff --git a/assets/uploads/disqus-platform-button.jpg b/assets/uploads/disqus-platform-button.jpg
diff --git a/assets/uploads/disqus-site-short-name.jpg b/assets/uploads/disqus-site-short-name.jpg
diff --git a/assets/uploads/getting-started-hero.jpg b/assets/uploads/getting-started-hero.jpg
diff --git a/assets/uploads/home-hero.jpg b/assets/uploads/home-hero.jpg
diff --git a/assets/uploads/inside-glacier-cave-2.jpg b/assets/uploads/inside-glacier-cave-2.jpg
diff --git a/assets/uploads/logo.png b/assets/uploads/logo.png
diff --git a/assets/uploads/mailchimp.jpg b/assets/uploads/mailchimp.jpg
diff --git a/assets/uploads/marc-olivier-jodoin-nqoinj-ttqm-unsplash.jpg b/assets/uploads/marc-olivier-jodoin-nqoinj-ttqm-unsplash.jpg
diff --git a/assets/uploads/markup-hero.jpg b/assets/uploads/markup-hero.jpg
diff --git a/assets/uploads/page-speed-insights.jpg b/assets/uploads/page-speed-insights.jpg
diff --git a/assets/uploads/purge-css-hero.jpg b/assets/uploads/purge-css-hero.jpg
diff --git a/assets/uploads/resource-grid-hero.jpg b/assets/uploads/resource-grid-hero.jpg
diff --git a/assets/uploads/screen-shot-2019-08-01-at-1.03.08-pm.png b/assets/uploads/screen-shot-2019-08-01-at-1.03.08-pm.png
diff --git a/assets/uploads/screen-shot-2019-08-01-at-1.05.09-pm.png b/assets/uploads/screen-shot-2019-08-01-at-1.05.09-pm.png
diff --git a/build-tools/afterBuild.js b/build-tools/afterBuild.js
diff --git a/build-tools/beforeBuild.js b/build-tools/beforeBuild.js
diff --git a/cms/netlify/build/copy-static-to-dist.js b/cms/netlify/build/copy-static-to-dist.js
@@ -3,7 +3,7 @@ const ncp = require('ncp').ncp
 ncp.limit = 16
 
 export default () => {
-  ncp(`${__dirname}/../static`, `${__dirname}/../../../dist`, (err) => {
+  ncp(`${__dirname}/../static`, `${__dirname}/../../../static`, (err) => {
     if (err) {
       return console.error(err)
     }

diff --git a/cms/netlify/build/generate-category-api.js b/cms/netlify/build/generate-category-api.js
diff --git a/cms/netlify/build/generate-post-api.js b/cms/netlify/build/generate-post-api.js
diff --git a/cms/netlify/build/helper.js b/cms/netlify/build/helper.js
diff --git a/cms/netlify/category.js b/cms/netlify/category.js
diff --git a/cms/netlify/cms.js b/cms/netlify/cms.js
diff --git a/cms/netlify/helper.js b/cms/netlify/helper.js
diff --git a/cms/netlify/hooks/afterBuild.js b/cms/netlify/hooks/afterBuild.js
diff --git a/cms/netlify/hooks/beforeBuild.js b/cms/netlify/hooks/beforeBuild.js
@@ -1,7 +1,9 @@
 import generatePostApi from '../build/generate-post-api'
 import generateCategoryApi from '../build/generate-category-api'
+import copyStaticToDist from '../build/copy-static-to-dist'
 
 export default () => {
   generatePostApi()
   generateCategoryApi()
+  copyStaticToDist()
 }
diff --git a/cms/netlify/hooks/lifeCycle.js b/cms/netlify/hooks/lifeCycle.js
diff --git a/cms/netlify/mixins.js b/cms/netlify/mixins.js
diff --git a/cms/netlify/post.js b/cms/netlify/post.js
diff --git a/cms/netlify/static/admin/config.yml b/cms/netlify/static/admin/config.yml
diff --git a/cms/netlify/static/admin/index.html b/cms/netlify/static/admin/index.html
diff --git a/components/ContactForm.vue b/components/ContactForm.vue
diff --git a/components/DisqusComments.vue b/components/DisqusComments.vue
diff --git a/components/HamburgerButton.vue b/components/HamburgerButton.vue
diff --git a/components/IntersectionObserver.vue b/components/IntersectionObserver.vue
diff --git a/components/LoadingSpinner.vue b/components/LoadingSpinner.vue
diff --git a/components/MainSection.vue b/components/MainSection.vue
diff --git a/components/Markdown.vue b/components/Markdown.vue
diff --git a/components/ModalOverlay.vue b/components/ModalOverlay.vue
diff --git a/components/NewsLetterForm.vue b/components/NewsLetterForm.vue
diff --git a/components/NewsLetterFormModal.vue b/components/NewsLetterFormModal.vue
diff --git a/components/NewsLetterSlideOut.vue b/components/NewsLetterSlideOut.vue
diff --git a/components/PostSidebar.vue b/components/PostSidebar.vue
diff --git a/components/README.md b/components/README.md
diff --git a/components/SiteFooter.vue b/components/SiteFooter.vue
diff --git a/components/SiteHero.vue b/components/SiteHero.vue
diff --git a/components/SiteLogo.vue b/components/SiteLogo.vue
diff --git a/components/SiteNav.vue b/components/SiteNav.vue
diff --git a/components/SiteSearch.vue b/components/SiteSearch.vue
diff --git a/components/cards/CategoryCard.vue b/components/cards/CategoryCard.vue
diff --git a/components/cards/GenericCard.vue b/components/cards/GenericCard.vue
diff --git a/components/cards/PostCard.vue b/components/cards/PostCard.vue
diff --git a/components/cards/QuoteCard.vue b/components/cards/QuoteCard.vue
diff --git a/components/grids/CategoriesGrid.vue b/components/grids/CategoriesGrid.vue
diff --git a/components/grids/PostsGrid.vue b/components/grids/PostsGrid.vue
diff --git a/components/grids/PresentationalGrid.vue b/components/grids/PresentationalGrid.vue
diff --git a/components/grids/ResourceGrid.vue b/components/grids/ResourceGrid.vue
diff --git a/config/_siteConfig.js b/config/_siteConfig.js
diff --git a/config/build.js b/config/build.js
diff --git a/config/css.js b/config/css.js
diff --git a/config/generate.js b/config/generate.js
diff --git a/config/head.js b/config/head.js
diff --git a/config/modules.js b/config/modules.js
diff --git a/config/plugins.js b/config/plugins.js
diff --git a/content/categories/about-awake.md b/content/categories/about-awake.md
diff --git a/content/categories/third-party-integrations.md b/content/categories/third-party-integrations.md
diff --git a/content/posts/built-for-speed.md b/content/posts/built-for-speed.md
diff --git a/content/posts/comments-support.md b/content/posts/comments-support.md
diff --git a/content/posts/getting-started-with-awake.md b/content/posts/getting-started-with-awake.md
diff --git a/content/posts/light-css-footprint.md b/content/posts/light-css-footprint.md
diff --git a/content/posts/newsletter-signup.md b/content/posts/newsletter-signup.md
diff --git a/content/posts/post-markup-and-formatting.md b/content/posts/post-markup-and-formatting.md
diff --git a/content/posts/resourcegrid-vue.md b/content/posts/resourcegrid-vue.md
diff --git a/helper.js b/helper.js
diff --git a/layouts/README.md b/layouts/README.md
diff --git a/layouts/default.vue b/layouts/default.vue
diff --git a/layouts/full.vue b/layouts/full.vue
diff --git a/middleware/README.md b/middleware/README.md
diff --git a/netlify.toml b/netlify.toml
diff --git a/nuxt.config.js b/nuxt.config.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -36,12 +36,12 @@
     "md5": "^2.2.1",
     "ncp": "^2.0.0",
     "netlify-cms": "^2.9.5",
-    "nuxt": "^2.0.0",
+    "nuxt": "^2.12.2",
     "nuxt-buefy": "^0.3.2",
     "nuxt-fontawesome": "^0.4.0",
     "opti-image": "^0.10.0",
     "react": "^16.8.6",
-    "showdown": "^1.9.0",
+    "showdown": "^1.9.1",
     "url-parse": "^1.4.7",
     "v-runtime-template": "^1.10.0",
     "vue-disqus": "^3.0.5"
@@ -64,12 +64,15 @@
     "eslint-plugin-standard": ">=4.0.0",
     "eslint-plugin-vue": "^5.2.2",
     "gray-matter-loader": "0.0.10",
-    "node-sass": "^4.12.0",
+    "node-sass": "^4.13.1",
     "nodemon": "^1.18.9",
     "nuxt-responsive-loader": "^1.0.3",
     "prettier": "^1.16.4",
     "rimraf": "^2.6.3",
     "sass-loader": "^7.1.0",
-    "sharp": "^0.22.1"
+    "sharp": "^0.22.1",
+    "vue": "^2.6.11",
+    "vue-server-renderer": "^2.6.11",
+    "vue-template-compiler": "^2.6.11"
   }
 }
diff --git a/pages/README.md b/pages/README.md
diff --git a/pages/_singlePost.vue b/pages/_singlePost.vue
diff --git a/pages/about.vue b/pages/about.vue
diff --git a/pages/categories/_single.vue b/pages/categories/_single.vue
diff --git a/pages/categories/index.vue b/pages/categories/index.vue
diff --git a/pages/contact.vue b/pages/contact.vue
diff --git a/pages/index.vue b/pages/index.vue
diff --git a/plugins/Components.js b/plugins/Components.js
diff --git a/plugins/Disqus.js b/plugins/Disqus.js
diff --git a/plugins/EventBus.js b/plugins/EventBus.js
diff --git a/plugins/Globals.js b/plugins/Globals.js
diff --git a/plugins/OptiImage.js b/plugins/OptiImage.js
diff --git a/plugins/README.md b/plugins/README.md
diff --git a/screenshot.jpg b/screenshot.jpg
diff --git a/static/README.md b/static/README.md
diff --git a/static/favicon.ico b/static/favicon.ico
diff --git a/static/icon.png b/static/icon.png
diff --git a/static/logo-frames/logo-f0.svg b/static/logo-frames/logo-f0.svg
diff --git a/static/logo-frames/logo-f1.svg b/static/logo-frames/logo-f1.svg
diff --git a/static/logo-frames/logo-f2.svg b/static/logo-frames/logo-f2.svg
diff --git a/static/logo-frames/logo-f3.svg b/static/logo-frames/logo-f3.svg
diff --git a/static/logo-frames/logo-f4.svg b/static/logo-frames/logo-f4.svg
diff --git a/static/logo.png b/static/logo.png
diff --git a/static/logo.svg b/static/logo.svg
diff --git a/store/README.md b/store/README.md
diff --git a/store/index.js b/store/index.js
Original file line number	Diff line number	Diff line change
Expand Up		@@ -89,3 +89,4 @@ sw.*

		#Awake CMS
		static/api
		static/admin