Restructure to use full URLs on Netlify, move static assets into public

shengslogar · shengslogar · commit c59810a9f523 · 2020-03-21T00:13:44.000-06:00
diff --git a/README.md b/README.md
@@ -21,3 +21,8 @@ Thanks for considering contributing! Please open an issue prior to submitting an
 ## License
 
 This project is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT).
+
+---
+
+*Cross-Device Testing Provided By* <br>
+[<img src="https://www.browserstack.com/images/layout/browserstack-logo-600x315.png" width="128" alt="BrowserStack logo">](http://browserstack.com)
diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js
@@ -115,9 +115,9 @@ const webpackConfig = merge(baseWebpackConfig, {
     // copy custom static assets
     new CopyWebpackPlugin([
       {
-        from: path.resolve(__dirname, '../static'),
+        from: path.resolve(__dirname, '../public'),
         to: config.build.assetsSubDirectory,
-        ignore: ['.*']
+        ignore: ['index.html']
       }
     ])
   ]
diff --git a/config/index.js b/config/index.js
@@ -44,11 +44,11 @@ module.exports = {
   },
   build: {
     // Template for index.html
-    index: path.resolve(__dirname, '../../canitext911.us-dist/index.html'),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../../canitext911.us-dist'),
-    assetsSubDirectory: 'assets',
+    assetsRoot: path.resolve(__dirname, '../dist/'),
+    assetsSubDirectory: '',
     assetsPublicPath: '/',
 
     /**
diff --git a/package.json b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "canitext911.us",
   "version": "1.0.0",
-  "description": "A Vue.js project",
-  "author": "Sheng-Liang Slogar <slogar.sheng@gmail.com>",
+  "description": "",
+  "author": "Sheng-Liang Slogar <sheng@diglactic.com>",
   "private": true,
   "scripts": {
     "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
@@ -13,12 +13,6 @@
     "fix": "eslint --ext .js,.vue src test/unit --fix",
     "build": "node build/build.js"
   },
-  "dependencies": {
-    "date-fns": "^1.29.0",
-    "vue": "^2.6.11",
-    "vue-meta": "^1.5.6",
-    "vue-router": "^3.1.6"
-  },
   "devDependencies": {
     "autoprefixer": "^7.1.2",
     "babel-core": "^6.22.1",
@@ -36,6 +30,7 @@
     "chalk": "^2.0.1",
     "copy-webpack-plugin": "^4.0.1",
     "css-loader": "^0.28.0",
+    "date-fns": "^1.29.0",
     "eslint": "^4.15.0",
     "eslint-config-airbnb-base": "^11.3.0",
     "eslint-friendly-formatter": "^3.0.0",
@@ -63,10 +58,13 @@
     "shelljs": "^0.7.6",
     "uglifyjs-webpack-plugin": "^1.1.1",
     "url-loader": "^0.5.8",
+    "vue": "^2.6.11",
     "vue-jest": "^1.0.2",
     "vue-loader": "^13.3.0",
+    "vue-meta": "^1.5.6",
     "vue-style-loader": "^3.0.1",
     "vue-template-compiler": "^2.6.11",
+    "vue-router": "^3.1.6",
     "webpack": "^3.6.0",
     "webpack-bundle-analyzer": "^2.9.0",
     "webpack-dev-server": "^2.9.1",
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/img/og-img.png b/public/img/og-img.png
diff --git a/public/index.html b/public/index.html
@@ -6,18 +6,19 @@
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <title>Can I Text 911 - United States</title>
     <link rel="shortcut icon" href="/assets/favicon.ico">
+    <meta property="description" content="Find out if text-to-911 is supported in your area.">
     <meta name="og:title" content="Can I Text 911?">
     <meta name="twitter:card" content="summary_large_image">
     <meta property="og:title" content="Text 911 - United States">
     <meta property="og:description" content="Find out if text-to-911 is supported in your area.">
-    <meta property="og:image" content="https://canitext911.us/assets/og-img.png">
-    <link href="https://fonts.googleapis.com/css?family=Oxygen|Material+Icons" rel="stylesheet">
+    <meta property="og:image" content="https://canitext911.us/img/og-img.png">
+    <link href="//fonts.googleapis.com/css?family=Oxygen|Material+Icons" rel="stylesheet">
   </head>
   <body>
     <noscript>
       <strong>Please enable JavaScript to use this site.</strong>
     </noscript>
     <div id="app"></div>
-    <script async src="https://www.googletagmanager.com/gtag/js?id=UA-130662794-1"></script>
+    <script async src="//googletagmanager.com/gtag/js?id=UA-130662794-1"></script>
   </body>
 </html>
diff --git a/public/netlify.toml b/public/netlify.toml
@@ -0,0 +1,4 @@
+[[redirects]]
+  from = "/*"
+  to = "/index.html"
+  status = 200
diff --git a/src/router/index.js b/src/router/index.js
@@ -16,6 +16,7 @@ Vue.use(Meta);
 
 const router = new Router({
   linkActiveClass: 'cit-link--active',
+  mode: 'history',
   routes: [
     {
       path: '/',
diff --git a/src/views/Faq/FaqIndex.vue b/src/views/Faq/FaqIndex.vue
@@ -51,7 +51,8 @@
          target="_blank">
         Diglactic
       </a>
-      and is not affiliated with any government entity. Our hope is to raise awareness and increase public safety.
+      and is not affiliated with any government entity. Our hope is to raise awareness and increase
+      public safety.
     </p>
     <p>
       We're open-source!
diff --git a/static/.gitkeep b/static/.gitkeep

Original file line number	Diff line number	Diff line change
`@@ -115,9 +115,9 @@ const webpackConfig = merge(baseWebpackConfig, {`
`115`	`115`	`// copy custom static assets`
`116`	`116`	`new CopyWebpackPlugin([`
`117`	`117`	`{`
`118`		`- from: path.resolve(__dirname, '../static'),`
	`118`	`+ from: path.resolve(__dirname, '../public'),`
`119`	`119`	`to: config.build.assetsSubDirectory,`
`120`		`- ignore: ['.*']`
	`120`	`+ ignore: ['index.html']`
`121`	`121`	`}`
`122`	`122`	`])`
`123`	`123`	`]`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ Vue.use(Meta);`
`16`	`16`
`17`	`17`	`const router = new Router({`
`18`	`18`	`linkActiveClass: 'cit-link--active',`
	`19`	`+ mode: 'history',`
`19`	`20`	`routes: [`
`20`	`21`	`{`
`21`	`22`	`path: '/',`