From 74155a7f6c6306611690ffcbf44a87cc0659fd9b Mon Sep 17 00:00:00 2001 From: HeNine <> Date: Sat, 13 Nov 2021 09:07:22 +0100 Subject: [PATCH] idk what google is doing --- build.sh | 1 + nginx/Dockerfile | 1 + nginx/nginx.conf | 3 +++ professor/professor.html | 25 ++++++++++++++++++-- professor/script.js | 49 +++++++++++++++++++++++++++++++++++----- 5 files changed, 71 insertions(+), 8 deletions(-) diff --git a/build.sh b/build.sh index c17979e..c5b6299 100644 --- a/build.sh +++ b/build.sh @@ -9,5 +9,6 @@ docker build -f buscribe-api/Dockerfile -t buscribe-api:$VERSION . docker build -f docker-less/Dockerfile -t lessc . docker run --rm -v "$(pwd)"/buscribe-web:/buscribe-web lessc /buscribe-web/style.less > buscribe-web/style.css +docker run --rm -v "$(pwd)"/professor:/professor lessc /professor/style.less > professor/style.css docker build -f nginx/Dockerfile -t buscribe-web:$VERSION . diff --git a/nginx/Dockerfile b/nginx/Dockerfile index 24bfe15..5e167c8 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -1,4 +1,5 @@ FROM nginx:latest COPY buscribe-web /usr/share/nginx/html/buscribe +COPY professor /usr/share/nginx/html/professor COPY nginx/nginx.conf /etc/nginx/nginx.conf \ No newline at end of file diff --git a/nginx/nginx.conf b/nginx/nginx.conf index 77dbae2..695c8e0 100644 --- a/nginx/nginx.conf +++ b/nginx/nginx.conf @@ -45,6 +45,9 @@ http { location /buscribe { alias /usr/share/nginx/html/buscribe; } + location /professor { + alias /usr/share/nginx/html/professor; + } location /buscribe/loadingreadyrun/json { proxy_pass http://buscribeapilrr:8010/buscribe/json; } location /buscribe/desertbus/json { proxy_pass http://buscribeapidb:8010/buscribe/json; } diff --git a/professor/professor.html b/professor/professor.html index f5ba3ff..ead92a1 100644 --- a/professor/professor.html +++ b/professor/professor.html @@ -15,7 +15,7 @@ - + @@ -35,6 +35,24 @@ + + + + + + + + + + + + + + + + +
+