diff --git a/couchdb/data/_dbs.couch b/couchdb/data/_dbs.couch
index b1727a5..bdea1b2 100644
Binary files a/couchdb/data/_dbs.couch and b/couchdb/data/_dbs.couch differ
diff --git a/couchdb/data/shards/00000000-7fffffff/denver_fr.1648095983.couch b/couchdb/data/shards/00000000-7fffffff/denver_fr.1648095983.couch
new file mode 100644
index 0000000..5243623
Binary files /dev/null and b/couchdb/data/shards/00000000-7fffffff/denver_fr.1648095983.couch differ
diff --git a/couchdb/data/shards/00000000-7fffffff/denver_practice.1648095935.couch b/couchdb/data/shards/00000000-7fffffff/denver_practice.1648095935.couch
new file mode 100644
index 0000000..b932b2d
Binary files /dev/null and b/couchdb/data/shards/00000000-7fffffff/denver_practice.1648095935.couch differ
diff --git a/couchdb/data/shards/00000000-7fffffff/testdata.1643440069.couch b/couchdb/data/shards/00000000-7fffffff/testdata.1643440069.couch
index bcf3032..c7238f2 100644
Binary files a/couchdb/data/shards/00000000-7fffffff/testdata.1643440069.couch and b/couchdb/data/shards/00000000-7fffffff/testdata.1643440069.couch differ
diff --git a/couchdb/data/shards/00000000-7fffffff/utah_fr.1648095988.couch b/couchdb/data/shards/00000000-7fffffff/utah_fr.1648095988.couch
new file mode 100644
index 0000000..f9de361
Binary files /dev/null and b/couchdb/data/shards/00000000-7fffffff/utah_fr.1648095988.couch differ
diff --git a/couchdb/data/shards/00000000-7fffffff/utah_practice.1648095948.couch b/couchdb/data/shards/00000000-7fffffff/utah_practice.1648095948.couch
new file mode 100644
index 0000000..930f44a
Binary files /dev/null and b/couchdb/data/shards/00000000-7fffffff/utah_practice.1648095948.couch differ
diff --git a/couchdb/data/shards/80000000-ffffffff/denver_fr.1648095983.couch b/couchdb/data/shards/80000000-ffffffff/denver_fr.1648095983.couch
new file mode 100644
index 0000000..0a16adf
Binary files /dev/null and b/couchdb/data/shards/80000000-ffffffff/denver_fr.1648095983.couch differ
diff --git a/couchdb/data/shards/80000000-ffffffff/denver_practice.1648095935.couch b/couchdb/data/shards/80000000-ffffffff/denver_practice.1648095935.couch
new file mode 100644
index 0000000..381af33
Binary files /dev/null and b/couchdb/data/shards/80000000-ffffffff/denver_practice.1648095935.couch differ
diff --git a/couchdb/data/shards/80000000-ffffffff/testdata.1643440069.couch b/couchdb/data/shards/80000000-ffffffff/testdata.1643440069.couch
index 518d6fa..2b62d57 100644
Binary files a/couchdb/data/shards/80000000-ffffffff/testdata.1643440069.couch and b/couchdb/data/shards/80000000-ffffffff/testdata.1643440069.couch differ
diff --git a/couchdb/data/shards/80000000-ffffffff/utah_fr.1648095988.couch b/couchdb/data/shards/80000000-ffffffff/utah_fr.1648095988.couch
new file mode 100644
index 0000000..85c44d9
Binary files /dev/null and b/couchdb/data/shards/80000000-ffffffff/utah_fr.1648095988.couch differ
diff --git a/couchdb/data/shards/80000000-ffffffff/utah_practice.1648095948.couch b/couchdb/data/shards/80000000-ffffffff/utah_practice.1648095948.couch
new file mode 100644
index 0000000..fa67cdc
Binary files /dev/null and b/couchdb/data/shards/80000000-ffffffff/utah_practice.1648095948.couch differ
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 94bd312..f933946 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -10,23 +10,23 @@ services:
context: ./webserver
dockerfile: ./Dockerfile.prod
expose:
- - 8080
+ - 80
ports:
- - "8080:8080/tcp"
+ - "80:80/tcp"
# - "80:80/tcp"
# - "443:443/tcp"
volumes:
- ./webserver/nginx:/etc/nginx/:ro
- ssl-proxy:
- image: fsouza/docker-ssl-proxy
- ports:
- - "80:80"
- - "443:443"
- environment:
- - DOMAIN=10.43.88.1
- - TARGET_PORT=8080
- - TARGET_HOST=scouting-webserver-prod
- - SSL_PORT:443
+ # ssl-proxy:
+ # image: fsouza/docker-ssl-proxy
+ # ports:
+ # - "80:80"
+ # - "443:443"
+ # environment:
+ # - DOMAIN=10.43.88.1
+ # - TARGET_PORT=8080
+ # - TARGET_HOST=scouting-webserver-prod
+ # - SSL_PORT:443
couchdb:
container_name: "scouting-couchdb"
restart: unless-stopped
@@ -47,12 +47,12 @@ services:
volumes:
- ./couchdb/db.local.ini:/opt/couchdb/etc/local.ini
- ./couchdb/data:/opt/couchdb/data
- couch-ssl-proxy:
- image: fsouza/docker-ssl-proxy
- ports:
- - "5985:5985"
- environment:
- - DOMAIN=10.43.88.1
- - TARGET_PORT=5984
- - TARGET_HOST=scouting-couchdb
- - SSL_PORT:5985
+ # couch-ssl-proxy:
+ # image: fsouza/docker-ssl-proxy
+ # ports:
+ # - "5985:5985"
+ # environment:
+ # - DOMAIN=10.43.88.1
+ # - TARGET_PORT=5984
+ # - TARGET_HOST=scouting-couchdb
+ # - SSL_PORT:5985
diff --git a/webserver/Dockerfile.prod b/webserver/Dockerfile.prod
index d13177c..24a4975 100644
--- a/webserver/Dockerfile.prod
+++ b/webserver/Dockerfile.prod
@@ -16,6 +16,6 @@ FROM nginx:1-alpine
COPY --from=build-step /app/build /usr/share/nginx/html
RUN rm /etc/nginx/conf.d/default.conf
# COPY nginx/nginx.conf /etc/nginx/conf.d
-EXPOSE 8080
+EXPOSE 80
# EXPOSE 443
CMD ["nginx", "-g", "daemon off;"]
diff --git a/webserver/nginx/mime.types b/webserver/nginx/mime.types
new file mode 100644
index 0000000..8a2348a
--- /dev/null
+++ b/webserver/nginx/mime.types
@@ -0,0 +1,95 @@
+
+types {
+ text/html html htm shtml;
+ text/css css;
+ text/xml xml;
+ image/gif gif;
+ image/jpeg jpeg jpg;
+ application/javascript js;
+ application/atom+xml atom;
+ application/rss+xml rss;
+
+ text/mathml mml;
+ text/plain txt;
+ text/vnd.sun.j2me.app-descriptor jad;
+ text/vnd.wap.wml wml;
+ text/x-component htc;
+
+ image/png png;
+ image/svg+xml svg svgz;
+ image/tiff tif tiff;
+ image/vnd.wap.wbmp wbmp;
+ image/webp webp;
+ image/x-icon ico;
+ image/x-jng jng;
+ image/x-ms-bmp bmp;
+
+ application/font-woff woff;
+ application/java-archive jar war ear;
+ application/json json;
+ application/mac-binhex40 hqx;
+ application/msword doc;
+ application/pdf pdf;
+ application/postscript ps eps ai;
+ application/rtf rtf;
+ application/vnd.apple.mpegurl m3u8;
+ application/vnd.google-earth.kml+xml kml;
+ application/vnd.google-earth.kmz kmz;
+ application/vnd.ms-excel xls;
+ application/vnd.ms-fontobject eot;
+ application/vnd.ms-powerpoint ppt;
+ application/vnd.oasis.opendocument.graphics odg;
+ application/vnd.oasis.opendocument.presentation odp;
+ application/vnd.oasis.opendocument.spreadsheet ods;
+ application/vnd.oasis.opendocument.text odt;
+ application/vnd.openxmlformats-officedocument.presentationml.presentation
+ pptx;
+ application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
+ xlsx;
+ application/vnd.openxmlformats-officedocument.wordprocessingml.document
+ docx;
+ application/vnd.wap.wmlc wmlc;
+ application/x-7z-compressed 7z;
+ application/x-cocoa cco;
+ application/x-java-archive-diff jardiff;
+ application/x-java-jnlp-file jnlp;
+ application/x-makeself run;
+ application/x-perl pl pm;
+ application/x-pilot prc pdb;
+ application/x-rar-compressed rar;
+ application/x-redhat-package-manager rpm;
+ application/x-sea sea;
+ application/x-shockwave-flash swf;
+ application/x-stuffit sit;
+ application/x-tcl tcl tk;
+ application/x-x509-ca-cert der pem crt;
+ application/x-xpinstall xpi;
+ application/xhtml+xml xhtml;
+ application/xspf+xml xspf;
+ application/zip zip;
+
+ application/octet-stream bin exe dll;
+ application/octet-stream deb;
+ application/octet-stream dmg;
+ application/octet-stream iso img;
+ application/octet-stream msi msp msm;
+
+ audio/midi mid midi kar;
+ audio/mpeg mp3;
+ audio/ogg ogg;
+ audio/x-m4a m4a;
+ audio/x-realaudio ra;
+
+ video/3gpp 3gpp 3gp;
+ video/mp2t ts;
+ video/mp4 mp4;
+ video/mpeg mpeg mpg;
+ video/quicktime mov;
+ video/webm webm;
+ video/x-flv flv;
+ video/x-m4v m4v;
+ video/x-mng mng;
+ video/x-ms-asf asx asf;
+ video/x-ms-wmv wmv;
+ video/x-msvideo avi;
+}
diff --git a/webserver/nginx/nginx.conf b/webserver/nginx/nginx.conf
index 713eb15..3a75d8b 100644
--- a/webserver/nginx/nginx.conf
+++ b/webserver/nginx/nginx.conf
@@ -2,9 +2,10 @@ events {
worker_connections 4096; ## Default: 1024
}
http {
+ include /etc/nginx/mime.types;
server {
- listen 8080;
- listen [::]:8080;
+ listen 80;
+ listen [::]:80;
location / {
root /usr/share/nginx/html/;
index index.html index.htm;
diff --git a/webserver/package.json b/webserver/package.json
index 9e1b72a..11b9a55 100644
--- a/webserver/package.json
+++ b/webserver/package.json
@@ -10,6 +10,8 @@
"@testing-library/react": "^12.1.2",
"@testing-library/user-event": "^13.5.0",
"react-apexcharts": "^1.3.9",
+ "ag-grid-community": "^26.2.1",
+ "ag-grid-react": "^26.2.0",
"formik": "^2.2.9",
"pouchdb": "^7.2.2",
"react": "^17.0.2",
diff --git a/webserver/public/index.html b/webserver/public/index.html
index b5bb0e9..2683ebb 100644
--- a/webserver/public/index.html
+++ b/webserver/public/index.html
@@ -7,6 +7,8 @@
+
+