Skip to content

Commit

Permalink
fix(express): Fix express dist script (#20)
Browse files Browse the repository at this point in the history
- Remove unused socket.io dependency
  • Loading branch information
gupta-utkarsh committed Aug 7, 2017
1 parent f547e36 commit aec7f87
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 57 deletions.
2 changes: 1 addition & 1 deletion frontend/server/buildHTML.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ fs.readFile("src/index.html", "utf8", (err, markup) => {
}

const $ = cheerio.load(markup);
$("head").prepend('<link rel="stylesheet" href="style.css">');
$("head").prepend('<link rel="stylesheet" href="/style.css">');

fs.writeFile("dist/index.html", $.html(), "utf8", err => {
if (err) {
Expand Down
9 changes: 1 addition & 8 deletions frontend/server/distServer.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,14 @@ const clientIP = appConfig.CLIENT_IP || "0.0.0.0";
const app = express();

const http = require("http").Server(app);
const io = require("socket.io")(http);

app.use(bodyParser.urlencoded({ limit: "500mb", extended: true }));
app.use(bodyParser.json({ limit: "500mb" }));
app.use(compression());
app.use(express.static("dist"));

app.get("*", (req, res) => {
res.sendFile(path.resolve(__dirname, "../src/index.html"));
});

io.on("connection", socket => {
socket.on("hello", () => {
socket.emit("world");
});
res.sendFile(path.resolve(__dirname, "../dist/index.html"));
});

http.listen(port, err => {
Expand Down
7 changes: 0 additions & 7 deletions frontend/server/srcServer.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ const app = express();
const compiler = webpack(config);

const http = require("http").Server(app);
const io = require("socket.io")(http);

app.use(bodyParser.urlencoded({ limit: "500mb", extended: true }));
app.use(bodyParser.json({ limit: "500mb" }));
Expand All @@ -32,12 +31,6 @@ app.get("*", (req, res) => {
res.sendFile(path.resolve(__dirname, "../src/index.html"));
});

io.on("connection", socket => {
socket.on("hello", () => {
socket.emit("world");
});
});

http.listen(port, err => {
if (err) {
console.log(err);
Expand Down
56 changes: 15 additions & 41 deletions frontend/src/components/App.js
Original file line number Diff line number Diff line change
@@ -1,53 +1,27 @@
import React from "react";
import { PropTypes } from "prop-types";
import { Link, Route, Switch, Miss } from "react-router-dom";
import io from "socket.io-client";
import style from "../styles/main.scss";
import HomePageComponent from "./home";
import TeamPageComponent from "./team";
import ProjectPageComponent from "./projects";
import PageNotFoundHandler from "./PageNotFoundHandler";
import Navbar from "./navbar";

class App extends React.Component {
constructor(props, context) {
super(props, context);
this.socket = io();
this.socket.on("connect", () => {
this.socket.emit("hello");
});
}

getChildContext() {
return {
socket: this.socket
};
}

componentWillMount() {
this.socket.on("world", data => {});
}

render() {
return (
<div className="cv-root-container">
<Navbar />
<main className="cv-main">
<Switch>
<Route exact path="/" component={HomePageComponent} />
<Route path="/news" component={HomePageComponent} />
<Route path="/team" component={TeamPageComponent} />
<Route path="/projects" component={ProjectPageComponent} />
<Route component={PageNotFoundHandler} />
</Switch>
</main>
</div>
);
}
}

App.childContextTypes = {
socket: PropTypes.object.isRequired
const App = props => {
return (
<div className="cv-root-container">
<Navbar />
<main className="cv-main">
<Switch>
<Route exact path="/" component={HomePageComponent} />
<Route path="/news" component={HomePageComponent} />
<Route path="/team" component={TeamPageComponent} />
<Route path="/projects" component={ProjectPageComponent} />
<Route component={PageNotFoundHandler} />
</Switch>
</main>
</div>
);
};

export default App;
1 change: 1 addition & 0 deletions frontend/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { render } from "react-dom";
import { Provider } from "react-redux";
import { BrowserRouter as Router } from "react-router-dom";
import injectTapEventPlugin from "react-tap-event-plugin";
import style from "./styles/main.scss";

import App from "./components/App";
import configureStore from "./store/configureStore";
Expand Down

0 comments on commit aec7f87

Please sign in to comment.