Skip to content

Remove hash from url. Fix routing to page. Fix sass. #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
joeframbach wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove hash from url. Fix routing to page. Fix sass. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/node_modules
/.idea
/.sass-cache
/_projectfiles
/_projectfiles
npm-debug.log
2 changes: 1 addition & 1 deletion gulp/tasks/styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ var autoprefixerCompatibility =

gulp.task('styles', function() {
return gulp.src('src/sass/styles.scss')
.pipe(sass({ style: 'expanded', "sourcemap=none": true }))
.pipe(sass({ style: 'expanded', sourcemap: false }))
.pipe(autoprefixer({browsers: autoprefixerCompatibility, cascade: false}))
.pipe(gulp.dest('public/stylesheets'))
.pipe(rename({suffix: '.min'}))
Expand Down
3 changes: 2 additions & 1 deletion gulp/tasks/webserver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ var connect = require('gulp-connect');

var webserverOptions = {
livereload : true,
root : [__dirname+"/../../"]
root : [__dirname+"/../../public/"],
fallback: __dirname+"/../../index.html"
};

gulp.task('webserver', function() {
Expand Down
4 changes: 2 additions & 2 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<title>alt react-router example</title>
<link rel="stylesheet" href="public/stylesheets/styles.css"/>
<link rel="stylesheet" href="/stylesheets/styles.css"/>
</head>
<body>
</body>
<script type="text/javascript" src="public/js/bundle.js"></script>
<script type="text/javascript" src="/js/bundle.js"></script>
</html>
37 changes: 0 additions & 37 deletions npm-debug.log
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/js/react/components/BeanProfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ var BeanProfile = React.createClass({

return (
<div>
<img style={imgStyle} className="beanImage" src="public/image/bean_stencil.png" />
<img style={imgStyle} className="beanImage" src="/image/bean_stencil.png" />
<h2>The <span style={spanStyle}>{this.props.beanItem.bean_name}</span> bean</h2>
<div className="bean-description">{this.props.beanItem.bean_description}</div>
<div className="bean-powers">
Expand Down
2 changes: 1 addition & 1 deletion src/js/react/router.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var ReactRouter = require('react-router');
var routes = require('./routes');

var router = ReactRouter.create({
location : ReactRouter.HashLocation,
location : ReactRouter.HistoryLocation,
routes : routes
});

Expand Down