Skip to content

Commit

Permalink
Improvise Dynamic Routing (#320)
Browse files Browse the repository at this point in the history 
* Implement Dynamic Routing
* wref: vjspranav/StagBin@efb6317

Signed-off-by: vjspranav <pranavasri@live.in>

* Improve isSplash conditional rendering

Signed-off-by: vjspranav <pranavasri@live.in>

* Fix deploy preview

---------

Signed-off-by: vjspranav <pranavasri@live.in>
  • Loading branch information
@vjspranav
vjspranav authored Nov 5, 2023
1 parent 45d929a commit bdd220d
Show file tree
Hide file tree
Showing 3 changed files with 139 additions and 123 deletions.
50 changes: 50 additions & 0 deletions public/404.html
View file
Original file line number Diff line number Diff line change
@@ -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 = 0;

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>
28 changes: 28 additions & 0 deletions public/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,34 @@
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>Ashutosh's Portfolio</title>
<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>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
Expand Down
184 changes: 61 additions & 123 deletions src/containers/Main.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { Component } from "react";
import { Route, Switch, HashRouter } from "react-router-dom";
import { Route, Switch, BrowserRouter } from "react-router-dom";
import Home from "../pages/home/HomeComponent";
import Splash from "../pages/splash/Splash";
import Education from "../pages/education/EducationComponent";
Expand All @@ -12,127 +12,65 @@ import Error404 from "../pages/errors/error404/Error";

export default class Main extends Component {
render() {
if (settings.isSplash) {
return (
<div>
<HashRouter basename="/">
<Switch>
<Route
path="/"
exact
render={(props) => (
<Splash {...props} theme={this.props.theme} />
)}
/>
<Route
path="/home"
render={(props) => <Home {...props} theme={this.props.theme} />}
/>
<Route
path="/experience"
exact
render={(props) => (
<Experience {...props} theme={this.props.theme} />
)}
/>
<Route
path="/education"
render={(props) => (
<Education {...props} theme={this.props.theme} />
)}
/>
<Route
path="/opensource"
render={(props) => (
<Opensource {...props} theme={this.props.theme} />
)}
/>
<Route
path="/contact"
render={(props) => (
<Contact {...props} theme={this.props.theme} />
)}
/>
<Route
path="/splash"
render={(props) => (
<Splash {...props} theme={this.props.theme} />
)}
/>
<Route
path="/projects"
render={(props) => (
<Projects {...props} theme={this.props.theme} />
)}
/>
<Route
path="*"
render={(props) => (
<Error404 {...props} theme={this.props.theme} />
)}
/>
</Switch>
</HashRouter>
</div>
);
} else {
return (
<div>
<HashRouter basename="/">
<Switch>
<Route
path="/"
exact
render={(props) => <Home {...props} theme={this.props.theme} />}
/>
<Route
path="/home"
render={(props) => <Home {...props} theme={this.props.theme} />}
/>
<Route
path="/experience"
exact
render={(props) => (
<Experience {...props} theme={this.props.theme} />
)}
/>
<Route
path="/education"
render={(props) => (
<Education {...props} theme={this.props.theme} />
)}
/>
<Route
path="/opensource"
render={(props) => (
<Opensource {...props} theme={this.props.theme} />
)}
/>
<Route
path="/contact"
render={(props) => (
<Contact {...props} theme={this.props.theme} />
)}
/>
{/* <Route
path="/splash"
render={(props) => (
<Splash
{...props}
theme={this.props.theme}
/>
)}
/> */}
<Route
path="/projects"
render={(props) => (
<Projects {...props} theme={this.props.theme} />
)}
/>
</Switch>
</HashRouter>
</div>
);
}
return (
<BrowserRouter basename="/">
<Switch>
<Route
path="/"
exact
render={(props) =>
settings.isSplash ? (
<Splash {...props} theme={this.props.theme} />
) : (
<Home {...props} theme={this.props.theme} />
)
}
/>
<Route
path="/home"
render={(props) => <Home {...props} theme={this.props.theme} />}
/>
<Route
path="/experience"
exact
render={(props) => (
<Experience {...props} theme={this.props.theme} />
)}
/>
<Route
path="/education"
render={(props) => (
<Education {...props} theme={this.props.theme} />
)}
/>
<Route
path="/opensource"
render={(props) => (
<Opensource {...props} theme={this.props.theme} />
)}
/>
<Route
path="/contact"
render={(props) => <Contact {...props} theme={this.props.theme} />}
/>

{settings.isSplash && (
<Route
path="/splash"
render={(props) => <Splash {...props} theme={this.props.theme} />}
/>
)}

<Route
path="/projects"
render={(props) => <Projects {...props} theme={this.props.theme} />}
/>
<Route
path="*"
render={(props) => <Error404 {...props} theme={this.props.theme} />}
/>
</Switch>
</BrowserRouter>
);
}
}

0 comments on commit bdd220d

Please sign in to comment.