Skip to content

Commit

Permalink
Merge branch 'main' into feature/websockets
Browse files Browse the repository at this point in the history
  • Loading branch information
rstijerina committed Dec 12, 2024
2 parents 6d80b87 + e879744 commit ddfd9b1
Show file tree
Hide file tree
Showing 239 changed files with 28,350 additions and 38,263 deletions.
6 changes: 1 addition & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,7 @@ speed-measure-plugin.json
*.sublime-workspace

# IDE - VSCode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
.vscode
.history/*

# misc
Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@

## [Unreleased]

## [2.17] - 2024-4-29

### Changed

- WG-212: use updated project create and project update routes (#199)

### Fixed
- WG-161: Update devops documentation (#221)

## [2.16] - 2023-12-19

### Added
Expand Down
22 changes: 9 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,23 @@ Hazmapper is an application for creating, visualizing, and analyzing geospatial

See https://github.com/TACC-Cloud/geoapi which is an associated restful API.

### Getting started
- Get a JWT from someone on WMA-Geospatial subgroup
- GOTO jwt.io and edit that JWT to have your username/details
- Create a file in angular/src/environments called jwt.ts that has this in it:
## Local React Development

export const jwt = "YOUR JWT FROM ABOVE"

## Local React Development (work-in-progress)

`react/` has the React client
`react/` directory contains the React client

To get started, create a local secret file for local development:
```
cp react/src/secret_local.example.ts react/src/secret_local.ts
```

Add the jwt retrieved from [Getting started](###getting-started) to `react/src/secret_local.ts`.
The `geoapiBackend` setting in `react/src/secret_local.ts` ( see the example [react/src/secret_local.example.ts](react/src/secret_local.example.ts) ) controls which backend `GeoAPI` is used by Hazmapper during local development. You can choose from the following:

The `geoapiBackend` in ( see [react/src/secret_local.example.ts](react/src/secret_local.example.ts) ) can be used to select which backend `geoapi` is used by Hazmapper during local development (e.g. `EnvironmentType.Production`, `EnvironmentType.Staging`, `EnvironmentType.Dev`, * `EnvironmentType.Local`
* `EnvironmentType.Production`
* `EnvironmentType.Staging`
* `EnvironmentType.Dev`
* `EnvironmentType.Local`

See https://github.com/TACC-Cloud/geoapi for more details on running geoapi locally.
To run Hazmapper with the GeoAPI backend locally, configure `geoapiBackend` to use `GeoapiBackendEnvironment.Local` and see the [GeoAPI repository](https://github.com/TACC-Cloud/geoapi) for more detailed instructions.

#### Run

Expand All @@ -33,7 +29,7 @@ npm ci
npm run dev
```

Navigate to `http://localhost:4200/` or `http://hazmapper.local:4200/`. (Note that `hazmapper.local` needs to be added to your `/etc/hosts`)
Navigate to `http://localhost:4200/`.

#### Running unit tests

Expand Down
1 change: 1 addition & 0 deletions angular/.stylelintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
src/app/components/modal-questionnaire-viewer/modal-questionnaire-viewer.component.styl
Loading

0 comments on commit ddfd9b1

Please sign in to comment.