Skip to content

Develop #7

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

Merged
merged 3 commits into from
Dec 9, 2017
Merged

Develop #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0dbf792
Optimizing index.html import
Dec 9, 2017
de8250a
Optimizing App.js for API v3 and v4
Dec 9, 2017
018bb6a
Updating documentation
Dec 9, 2017
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: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Goal of Create ESRI React App is to connect ESRI and React application with mini
A prerequisite for this application is Create React App already installed in your development environment. If Create React App is not installed on your system run:

```
npm install -g create-react-app
npm install create-react-app -g
```


Expand Down Expand Up @@ -50,7 +50,7 @@ You can specify version of ESRI ArcGIS JS api during creation process. If you do
```
$ create-esri-react-app esri_app_v4
- or -
$ create-esri-react-app esri_app_v3 -v 3
$ create-esri-react-app esri_app_v3 -a 3
```

### Information's related to Create React App
Expand Down
18 changes: 9 additions & 9 deletions build/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,19 @@ var fs = require('fs');
var path = require('path');
var program = require('commander');

var colorGreen = '\x1b[32m';
var colorReset = '\x1b[0m';

var bootstrapAppJs3 = __dirname + '/resources/App3.js';
var bootstrapAppJs4 = __dirname + '/resources/App4.js';
var bootstrapAppHtml3 = __dirname + '/resources/index-api-3.html';
var bootstrapAppHtml4 = __dirname + '/resources/index-api-4.html';
var bootstrapAppCss3 = __dirname + '/resources/App3.css';

var bootstrapAppJs4 = __dirname + '/resources/App4.js';
var bootstrapAppCss4 = __dirname + '/resources/App4.css';
var colorGreen = '\x1b[32m';
var colorReset = '\x1b[0m';

var bootstrapAppHtml = __dirname + '/resources/index.html';

var currentWorkingDirectory = path.resolve('./');
var bootstrapAppJs;
var bootstrapAppHtml;
var bootstrapAppCss;

program.version('0.1.0').option('-a, --api [number]', 'Add API version ' + colorGreen + '-v 3' + colorReset + ' or ' + colorGreen + '-v 4' + colorReset + '. Default version of ESRI API is v4', 4).parse(process.argv);
Expand All @@ -27,11 +29,9 @@ var appName = program.args[0];

if (program.api === '3') {
bootstrapAppJs = bootstrapAppJs3;
bootstrapAppHtml = bootstrapAppHtml3;
bootstrapAppCss = bootstrapAppCss3;
} else {
bootstrapAppJs = bootstrapAppJs4;
bootstrapAppHtml = bootstrapAppHtml4;
bootstrapAppCss = bootstrapAppCss4;
}

Expand Down Expand Up @@ -96,7 +96,7 @@ if (process.argv.length <= 2) {
console.log(' - ESRI api v%s', program.api);
var createEsriApp = 'create-react-app ' + appName;
exec(createEsriApp, function (error, stdout, stderr) {
var addModule = 'cd ' + appName + ' && npm install esri-loader';
var addModule = 'cd ' + appName + ' && npm install esri-loader --save';
exec(addModule, function (error, stdout, stderr) {
console.log('');
console.log('Success! ESRI React App ' + colorGreen + appName + colorReset + ' is created at ' + colorGreen + currentWorkingDirectory + colorReset + ' ');
Expand Down
61 changes: 24 additions & 37 deletions build/resources/App3.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,46 +1,35 @@
import React, {Component} from 'react';
import esriLoader from 'esri-loader';
import './App.css';
import * as esriLoader from 'esri-loader';

class App extends Component {
const options = {
url: `https://js.arcgis.com/3.22/`
};

export default class App extends Component {
constructor() {
super();

if (!esriLoader.isLoaded()) {
esriLoader.bootstrap((err) => {
if (err) {
console.error(err);
} else {
this.createMap();
}
}, {
url: 'https://js.arcgis.com/3.22/' // Here you can change API version
});
} else {
this.createMap();
}

this.state = {
map: null
}
}

createMap = () => {
esriLoader.dojoRequire([
esriLoader.loadModules([
'esri/map'
], (Map) => {
let map = new Map('mapContainer', {
center: [-100, 30],
zoom: 3,
basemap: 'gray-vector'
});
window.map = map;
], options)
.then(([Map]) => {
let map = new Map('mapContainer', {
basemap: 'gray-vector',
center: [-100, 30],
zoom: 3
});

this.setState({
map
})
});
};
window.map = map;

this.setState({
map
})
})
.catch(err => {
console.error(err);
});
}

render() {
return (
Expand All @@ -53,5 +42,3 @@ class App extends Component {
);
}
}

export default App;
77 changes: 31 additions & 46 deletions build/resources/App4.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,65 +1,50 @@
import React, {Component} from 'react';
import * as esriLoader from 'esri-loader';
import esriLoader from 'esri-loader';
import './App.css';

class App extends Component {
const options = {
url: 'https://js.arcgis.com/4.5'
};

export default class App extends Component {
constructor() {
super();

if (!esriLoader.isLoaded()) {
esriLoader.bootstrap((err) => {
if (err) {
console.error(err);
} else {
this.createMap();
}
}, {
// url: 'https://js.arcgis.com/4.4/' // Here you can change API version
});
} else {
this.createMap();
}

this.state = {
map: null,
view: null
}
}
esriLoader.loadModules([
'esri/Map',
'esri/views/MapView'
], options)
.then(([Map, MapView]) => {
let map = new Map({
basemap: "gray-vector"
});

createMap = () => {
esriLoader.dojoRequire([
"esri/Map",
"esri/views/MapView"
], (Map, MapView) => {
let map = new Map({
basemap: "gray-vector"
});
window.map = map;
let view = new MapView({
map: map,
container: "mapContainer",
basemap: 'gray-vector',
center: [-100, 30],
zoom: 3
});
let view = new MapView({
map: map,
container: "mapContainer",
basemap: 'gray-vector',
center: [-100, 30],
zoom: 5
});

this.setState({
map,
view
})
});
};
this.setState({
map,
view
})
})
.catch(err => {
console.error(err);
});
}

render() {
return (
<div className="App">
<div className="App-header">
<h1>Welcome to ESRI React App</h1>
</div>
<div id="mapContainer" />
<div id="mapContainer"/>
</div>
);
}
}

export default App;
40 changes: 0 additions & 40 deletions build/resources/index-api-4.html
View file
Open in desktop

This file was deleted.

0 build/resources/index-api-3.html → build/resources/index.html
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "create-esri-react-app",
"version": "0.2.1",
"version": "0.2.4",
"description": "Creating ESRI applications with React included",
"main": "./src/index.js",
"bin": {
Expand Down
18 changes: 9 additions & 9 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,19 @@ var fs = require('fs');
var path = require('path');
var program = require('commander');

var colorGreen = '\x1b[32m';
var colorReset = '\x1b[0m';

var bootstrapAppJs3 = __dirname + '/resources/App3.js';
var bootstrapAppJs4 = __dirname + '/resources/App4.js';
var bootstrapAppHtml3 = __dirname + '/resources/index-api-3.html';
var bootstrapAppHtml4 = __dirname + '/resources/index-api-4.html';
var bootstrapAppCss3 = __dirname + '/resources/App3.css';

var bootstrapAppJs4 = __dirname + '/resources/App4.js';
var bootstrapAppCss4 = __dirname + '/resources/App4.css';
var colorGreen = '\x1b[32m';
var colorReset = '\x1b[0m';

var bootstrapAppHtml = __dirname + '/resources/index.html';

var currentWorkingDirectory = path.resolve('./');
var bootstrapAppJs;
var bootstrapAppHtml;
var bootstrapAppCss;

program
Expand All @@ -29,11 +31,9 @@ var appName = program.args[0];

if (program.api === '3') {
bootstrapAppJs = bootstrapAppJs3;
bootstrapAppHtml = bootstrapAppHtml3;
bootstrapAppCss = bootstrapAppCss3;
} else {
bootstrapAppJs = bootstrapAppJs4;
bootstrapAppHtml = bootstrapAppHtml4;
bootstrapAppCss = bootstrapAppCss4;
}

Expand Down Expand Up @@ -98,7 +98,7 @@ if (process.argv.length <= 2) {
console.log(' - ESRI api v%s', program.api);
var createEsriApp = 'create-react-app ' + appName;
exec(createEsriApp, function (error, stdout, stderr) {
var addModule = 'cd ' + appName + ' && npm install esri-loader';
var addModule = 'cd ' + appName + ' && npm install esri-loader --save';
exec(addModule, function (error, stdout, stderr) {
console.log('');
console.log('Success! ESRI React App ' + colorGreen + appName + colorReset + ' is created at ' + colorGreen + currentWorkingDirectory + colorReset + ' ');
Expand Down