Skip to content

Commit b766812

Browse files
committed
Merge pull request #151 from Chicago/dev
Merging with fixes to isse #135 and doc changes
2 parents 51d82c2 + 281d37e commit b766812

15 files changed

Lines changed: 526 additions & 685 deletions

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
dist
22
node_modules
3+
.idea
4+
debug

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ Download OpenGrid Code:
3232
git clone https://github.com/Chicago/opengrid.git
3333
```
3434

35-
After the initiate OpenGrid Code has been downloaded install the dependencies [Phantom JS](http://phantomjs.org/download.html) and [npm](https://www.npmjs.com/package/npm).
35+
After the initial OpenGrid Code has been downloaded install the dependencies [Phantom JS](http://phantomjs.org/download.html) and [npm](https://www.npmjs.com/package/npm).
3636

37-
After the release package has been built deploy the files under the ./dist folder to your web server. For complete instructions on the entire process reference the [build procedures](https://github.com/Chicago/opengrid/blob/master/docs/Build%20Procedures.md) document.
37+
After the release package has been built deploy the files under the ./dist folder to your web server. For complete instructions on the entire process reference the [build procedures](./Build%20Procedures/) document.
3838

3939
## Submit a bug
4040

docs/Installation and Setup.md

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,14 @@
22
Once the application sources are downloaded and built, the distributable packages can be deployed to your web server (in case of the OpenGrid user interface) and application server (service layer).
33

44
Instructions for building the release packages can be found below:
5-
* [User Interface Build Procedures](https://github.com/Chicago/opengrid/blob/master/docs/Build%20Procedures.md)
6-
* [Service Layer Build Procedures](https://github.com/Chicago/opengrid-svc-template/blob/master/docs/Build%20Procedures.md)
5+
<ul>
6+
<li>
7+
<a href="https://github.com/Chicago/opengrid/blob/master/docs/Build%20Procedures.md"> User Interface Build Procedures</a>
8+
</li>
9+
<li>
10+
<a href="https://github.com/Chicago/opengrid-svc-template/blob/master/docs/Build%20Procedures.md">Service Layer Build Procedures</a>
11+
</li>
12+
</ul>
713

814
### Overview
915
#### Technical Requirements
@@ -34,8 +40,9 @@ By default, an admin user is created with user id 'admin' and password 'admin123
3440
* Follow the steps described in the Service Layer Build Procedures above making sure that the application.properties file is updated with the appropriate MongoDB connection string. A war file is generated after the build process which can be deployed to an application server of your choice.
3541

3642
#### User Interface
37-
* Update service URL to point to service URL configured above.
43+
* Configure various application settings as required by your application by editing `src/js/custom/Config.js`. The settings include session timeout, area to limit address quick searches, to name a few. See [OpenGrid Configuration](./OpenGrid%20Configuration/) for more details
44+
* Update service URL to point to service URL configured above by editing `config/EnvSettings.js`. `EnvSettings.js` is meant to contain settings that are environment-specific e.g. Dev, Qa or Production, etc. and overrides any settings as specified in `Config.js` mentioned above.
3845

39-
After a successful build as documented on the [User Interface Build Procedures](https://github.com/Chicago/opengrid/blob/master/docs/Build%20Procedures.md), a `/dist` folder is created with the files necessary for deployment to a web server. Copy all the files from the `/dist` folder, including sub-folders, to your application's root folder on the web server.
46+
After a successful build as documented on the [User Interface Build Procedures](./Build%20Procedures/), a `/dist` folder is created with the files necessary for deployment to a web server. Copy all the files from the `/dist` folder, including sub-folders, to your application's root folder on the web server.
4047

4148

0 commit comments

Comments
 (0)