Server now works and compiles
This commit is contained in:
@ -27,7 +27,7 @@ import { connect } from 'react-redux';
|
||||
import Background from './background/Background';
|
||||
import Header from './header/Header';
|
||||
import Footer from './footer/Footer';
|
||||
import { HashRouter } from 'react-router-dom';
|
||||
import { HashRouter, BrowserRouter } from 'react-router-dom';
|
||||
import Routes from './page/Routes';
|
||||
|
||||
class App extends React.Component {
|
||||
@ -50,12 +50,12 @@ class App extends React.Component {
|
||||
if(this.props.menuOpen) clazz += " is-menu-open "
|
||||
|
||||
return (
|
||||
<HashRouter>
|
||||
<BrowserRouter>
|
||||
<div className={clazz} ref="app">
|
||||
<Header />
|
||||
<Routes onEntering={this.onEnteringBound} />
|
||||
</div>
|
||||
</HashRouter>
|
||||
</BrowserRouter>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
@ -57,6 +57,7 @@ class ElementScrollFader extends React.Component {
|
||||
}
|
||||
|
||||
checkEffect() {
|
||||
if(typeof window === typeof undefined) return;
|
||||
if(!this.refs || !this.refs.fader) return;
|
||||
//Get bounds
|
||||
var rect = this.refs.fader.getBoundingClientRect();
|
||||
|
@ -41,7 +41,7 @@ import Window95, {
|
||||
|
||||
const ExistingWorkFrame = (props) => {
|
||||
let fakeURL = props.href;
|
||||
if(!fakeURL.startsWith("http")) {
|
||||
if(!fakeURL.startsWith("http") && typeof window !== typeof undefined) {
|
||||
fakeURL = window.location.protocol + fakeURL;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user