Skip to content

Commit

Permalink
update package metadata and menu icon
Browse files Browse the repository at this point in the history
  • Loading branch information
macmaster committed May 29, 2018
1 parent 2acc2c5 commit 82ed4ea
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 3,488 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.*.s??
node_modules
package-lock.json
site/videos/*
site/js/main.bundle.js
site/images/*
site/videos/*
1 change: 1 addition & 0 deletions client/Content.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ function Content(props) {
console.log("video: %o", video);
this.setState({ video, autoplay: e });
e && e.preventDefault();
e && window.scrollTo(0, 0);
},
loadRandomVideo: (e) => {
const SEED = Math.floor(Math.random() * this.props.videos.length)
Expand Down
3 changes: 2 additions & 1 deletion client/NavMenu.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import IconButton from "@material-ui/core/IconButton";
import Menu from "@material-ui/core/Menu";
import MenuItem from "@material-ui/core/MenuItem";
import MenuIcon from "@material-ui/icons/Menu";
import HomeIcon from "@material-ui/icons/Home";

Object.setPrototypeOf(NavMenu.prototype, React.Component.prototype);
function NavMenu(props) {
Expand Down Expand Up @@ -47,7 +48,7 @@ NavMenu.prototype.render = function render() {
return (
<div classes={classes.root}>
<IconButton onClick={handleClick} className={classes.menuButton} color="inherit">
<MenuIcon />
<HomeIcon />
</IconButton>
{
// <Menu anchorEl={anchorEl} open={Boolean(anchorEl)} onClose={handleClose.bind(this, null)}>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "swish",
"version": "0.1.0",
"description": "swish.gq website",
"main": "site/js/index.js",
"main": "client/index.js",
"scripts": {
"build": "webpack --config config/webpack.js",
"sass": "node-sass --recursive --output site/css site/scss"
Expand Down
Loading

0 comments on commit 82ed4ea

Please sign in to comment.