🚀 RELEASE: version 0.0.6

pettiboy · pettiboy · commit e05d348597c1 · 2022-01-22T12:42:30.000+05:30
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "cra-template-typescript-firebase",
   "homepage": "http://pettiboy.github.com/cra-template-typescript-firebase",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "license": "MIT",
   "author": "Hussain Pettiwala",
   "engines": {
@@ -21,6 +21,8 @@
     "authentication",
     "SignIn with Google",
     "mui",
+    "deploy",
+    "gh-pages",
     "material-ui"
   ],
   "files": [
diff --git a/template.json b/template.json
@@ -1,4 +1,5 @@
 {
+  "homepage": "/",
   "package": {
     "dependencies": {
       "@emotion/react": "^11.7.1",
@@ -22,10 +23,18 @@
       "web-vitals": "^2.1.2"
     },
     "scripts": {
+      "serve": "serve -s build",
+      "build-and-serve": "npm run build && npm run serve",
       "start": "react-scripts start",
       "build": "react-scripts build",
       "test": "react-scripts test",
-      "eject": "react-scripts eject"
+      "eject": "react-scripts eject",
+      "predeploy": "npm run build",
+      "deploy": "gh-pages -d build",
+      "pull": "git pull && npm i && npm start"
+    },
+    "devDependencies": {
+      "gh-pages": "^3.2.3"
     }
   }
 }
diff --git a/template/README.md b/template/README.md
@@ -1 +1 @@
-# CRA TypeScript Firebase Template
+# React app made using typescript-firebase template
diff --git a/template/public/404.html b/template/public/404.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <title>Single Page Apps for GitHub Pages</title>
+    <script type="text/javascript">
+      // Single Page Apps for GitHub Pages
+      // MIT License
+      // https://github.com/rafgraph/spa-github-pages
+      // This script takes the current url and converts the path and query
+      // string into just a query string, and then redirects the browser
+      // to the new url with only a query string and hash fragment,
+      // e.g. https://www.foo.tld/one/two?a=b&c=d#qwe, becomes
+      // https://www.foo.tld/?/one/two&a=b~and~c=d#qwe
+      // Note: this 404.html file must be at least 512 bytes for it to work
+      // with Internet Explorer (it is currently > 512 bytes)
+
+      // If you're creating a Project Pages site and NOT using a custom domain,
+      // then set pathSegmentsToKeep to 1 (enterprise users may need to set it to > 1).
+      // This way the code will only replace the route part of the path, and not
+      // the real directory in which the app resides, for example:
+      // https://username.github.io/repo-name/one/two?a=b&c=d#qwe becomes
+      // https://username.github.io/repo-name/?/one/two&a=b~and~c=d#qwe
+      // Otherwise, leave pathSegmentsToKeep as 0.
+      var pathSegmentsToKeep = 1;
+
+      var l = window.location;
+      l.replace(
+        l.protocol +
+          "//" +
+          l.hostname +
+          (l.port ? ":" + l.port : "") +
+          l.pathname
+            .split("/")
+            .slice(0, 1 + pathSegmentsToKeep)
+            .join("/") +
+          "/?/" +
+          l.pathname
+            .slice(1)
+            .split("/")
+            .slice(pathSegmentsToKeep)
+            .join("/")
+            .replace(/&/g, "~and~") +
+          (l.search ? "&" + l.search.slice(1).replace(/&/g, "~and~") : "") +
+          l.hash
+      );
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/template/public/index.html b/template/public/index.html
@@ -15,6 +15,38 @@
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
     -->
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+
+    <!-- Start Single Page Apps for GitHub Pages -->
+    <script type="text/javascript">
+      // Single Page Apps for GitHub Pages
+      // MIT License
+      // https://github.com/rafgraph/spa-github-pages
+      // This script checks to see if a redirect is present in the query string,
+      // converts it back into the correct url and adds it to the
+      // browser's history using window.history.replaceState(...),
+      // which won't cause the browser to attempt to load the new url.
+      // When the single page app is loaded further down in this file,
+      // the correct url will be waiting in the browser's history for
+      // the single page app to route accordingly.
+      (function (l) {
+        if (l.search[1] === "/") {
+          var decoded = l.search
+            .slice(1)
+            .split("&")
+            .map(function (s) {
+              return s.replace(/~and~/g, "&");
+            })
+            .join("?");
+          window.history.replaceState(
+            null,
+            null,
+            l.pathname.slice(0, -1) + decoded + l.hash
+          );
+        }
+      })(window.location);
+    </script>
+    <!-- End Single Page Apps for GitHub Pages -->
+
     <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.
diff --git a/template/src/App.tsx b/template/src/App.tsx
@@ -29,7 +29,7 @@ function App() {
 
   return (
     <div>
-      <BrowserRouter>
+      <BrowserRouter basename={process.env.PUBLIC_URL}>
         <Routes>
           {routes.map((route, index) => (
             <Route
diff --git a/template/src/components/auth/Logout.tsx b/template/src/components/auth/Logout.tsx
@@ -16,10 +16,10 @@ const Logout = ({ navigateTo = "/login" }: Props) => {
     signOut(auth)
       .then(() => {
         navigate(navigateTo);
-        setDisabled(false);
       })
       .catch((error) => {
         console.error(error);
+        setDisabled(false);
       });
   };
 

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-# CRA TypeScript Firebase Template`
	`1`	`+# React app made using typescript-firebase template`