Skip to content

Merge attempt #10

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
floorshark wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Merge attempt #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c2ed75a
for comparison and future merging purposes
Sep 23, 2021
295b8ac
Keep added accessibility features
Sep 23, 2021
60d7016
Forgot to revert this
Sep 23, 2021
2680a98
Using port 1443 here by default since I set that as the port in msf-p…
Sep 29, 2021
e1d794c
Add sample plot to tooltip
Oct 28, 2021
2a7e392
First pass attempt at adding SDAP to tooltip
Nov 6, 2021
d7b7bdb
Show line chart with date labels
Nov 29, 2021
4dcce65
color update
Nov 30, 2021
a8e192e
Add point coloration based on plot and Gridded Emission Layer dates.
Feb 3, 2022
de54550
Color plume chart based on palette specified in layers.json
Mar 7, 2022
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
22 changes: 18 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,21 @@
FROM node:10

FROM nginx
RUN mkdir /home/msf-ui

COPY docker/default.conf /etc/nginx/conf.d/default.conf
COPY dist /usr/share/nginx/html
# Install server
WORKDIR /home/msf-ui

EXPOSE 80/tcp
# Install deps
COPY package.json /home/msf-ui
COPY package-lock.json /home/msf-ui
RUN npm i

# Build msf-ui
COPY . /home/msf-ui
RUN npm run postinstall
RUN npm run build

# Build server
RUN npm i express
CMD node staticServer.js
# CMD npm start
16 changes: 1 addition & 15 deletions LICENSE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,5 @@
COPYRIGHT

Copyright (c) 2017, 2021, California Institute of Technology ("Caltech"). U.S. Government sponsorship acknowledged.

All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
* Redistributions must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
* Neither the name of Caltech nor its operating division, the Jet Propulsion Laboratory, nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


LICENSE
Copyright (c) 2021, California Institute of Technology ("Caltech"). U.S. Government sponsorship acknowledged.All rights reserved.Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.* Redistributions must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.* Neither the name of Caltech nor its operating division, the Jet Propulsion Laboratory, nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.LICENSE

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ services:
ports:
- "3000:3000"
environment:
- REACT_APP_BE_ENDPOINT=10.93.112.44
- REACT_APP_BE_ENDPOINT=13.59.145.54
- REACT_APP_LAYER_FILE=layers_public.json
networks:
- msf
Expand Down
5 changes: 0 additions & 5 deletions docker/default.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@ server {
proxy_pass http://msf-be:9090;
}

location /server {
rewrite ^/server(/.*)$ $1 break;
proxy_pass http://msf-static;
}

location / {
root /usr/share/nginx/html;
index index.html index.htm;
Expand Down
Loading