Skip to content
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

fixed #1580 create project script #1593

Merged
merged 1 commit into from
Mar 16, 2017
Merged

fixed #1580 create project script #1593

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
4 changes: 0 additions & 4 deletions project/prod-webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@ var ParallelUglifyPlugin = require("webpack-parallel-uglify-plugin");
var DefinePlugin = require("webpack/lib/DefinePlugin");
var NormalModuleReplacementPlugin = require("webpack/lib/NormalModuleReplacementPlugin");

var assign = require('object-assign');

assign(webpackConfig.entry, require('./examples.js'));

webpackConfig.plugins = [
new LoaderOptionsPlugin({
debug: false
Expand Down
33 changes: 15 additions & 18 deletions project/static/js/pages/Home.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,33 +9,30 @@ const React = require('react');
const Debug = require('../../MapStore2/web/client/components/development/Debug');
const {connect} = require('react-redux');

const Localized = require('../../MapStore2/web/client/components/I18N/Localized');

const {Link} = require('react-router');

const {Glyphicon} = require('react-bootstrap');

const Home = (props) => (
<Localized messages={props.messages} locale={props.locale}>
<div>
<div className="homepage">
<div className="header">
<div className="header-text">
Title
</div>
<div className="header-burger">
<Glyphicon glyph="glyphicon glyphicon-menu-hamburger"/>
</div>
const Home = () => (
(<div>
<div className="homepage">
<div className="header">
<div className="header-text">
Title
</div>
<div className="main-home">
<Link to="/main">
<p><span style={{"color": "#808080", "fontSize": "16px"}}>MAIN</span></p>
</Link>
<div className="header-burger">
<Glyphicon glyph="glyphicon glyphicon-menu-hamburger"/>
</div>
</div>
<Debug/>
<div className="main-home">
<Link to="/main">
<p><span style={{"color": "#808080", "fontSize": "16px"}}>MAIN</span></p>
</Link>
</div>
</div>
</Localized>
<Debug/>
</div>)
);

module.exports = connect((state) => {
Expand Down
1 change: 0 additions & 1 deletion project/static/localConfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"proxyUrl": "/mapstore/proxy/?url=",
"geoStoreUrl": "/mapstore/rest/geostore",
"printUrl": "https://demo.geo-solutions.it/geoserver/pdf/info.json",
"bingApiKey": "AhuXBu7ipR1gNbBfXhtUAyCZ6rkC5PkWpxs2MnMRZ1ZupxQfivjLCch22ozKSCAn",
"translationsPath": "./MapStore2/web/client/translations",
"plugins": {
"desktop": ["Map", "Home"]
Expand Down