From 6046c6826abb7e23aefc33fbfe6715a91142163d Mon Sep 17 00:00:00 2001 From: Vincent Chen Date: Thu, 1 Sep 2022 17:41:23 +0800 Subject: [PATCH] Patch for https://learn.pixetto.ai/coastal-index/ --- flask/Dockerfile | 7 +- flask/router.py | 4 +- flask/static/css/basic.css | 4 +- flask/templates/(x)test.html | 6 +- flask/templates/404.html | 6 +- flask/templates/aboutUS.html | 22 ++-- flask/templates/action.html | 20 ++-- flask/templates/classified.html | 12 +- flask/templates/intro.html | 18 +-- flask/templates/more.html | 22 ++-- flask/templates/process.html | 174 +++++++++++++++-------------- flask/templates/rank.html | 34 +++--- flask/templates/rank_map.html | 12 +- flask/templates/rule.html | 18 +-- flask/templates/sysintro.html | 18 +-- flask/templates/upload.html | 8 +- flask/templates/upload_result.html | 20 ++-- 17 files changed, 209 insertions(+), 196 deletions(-) diff --git a/flask/Dockerfile b/flask/Dockerfile index 2035074..462cee3 100644 --- a/flask/Dockerfile +++ b/flask/Dockerfile @@ -4,10 +4,13 @@ LABEL maintainer="qooq147852@gmail.com" COPY . /app WORKDIR /app -# ADD . /app +RUN apt-get update -y +RUN apt-get install vim -y +# ADD . /app RUN pip install -r requirements.txt + # RUN pip install tensorflow tensorflow-gpu EXPOSE 8080 ENTRYPOINT ["python"] -CMD ["router.py"] \ No newline at end of file +CMD ["router.py"] diff --git a/flask/router.py b/flask/router.py index 29478f0..91c0e63 100644 --- a/flask/router.py +++ b/flask/router.py @@ -20,6 +20,8 @@ app=Flask(__name__) bootstrap = Bootstrap5(app) +app.config["SERVER_NAME"] = "learn.pixetto.ai" +app.config['APPLICATION_ROOT'] = '/coastal-index' app.config['SECRET_KEY'] = os.urandom(24) # random key app.config['MAX_CONTENT_LENGTH'] = 5 * 1024 * 1024 # 5 Mb limit @@ -263,7 +265,7 @@ def upload(): # stop = timeit.default_timer() # print('Time: ', stop - start) - return redirect(url_for('result')) + return redirect('result') @app.route('/result') def result(): diff --git a/flask/static/css/basic.css b/flask/static/css/basic.css index 9b77b55..7cdc1a6 100644 --- a/flask/static/css/basic.css +++ b/flask/static/css/basic.css @@ -1,7 +1,7 @@ body{ height:100vh; - background-image:url('/static/img/ocean.jpg'); + background-image:url('../img/ocean.jpg'); background-size: cover; background-repeat: no-repeat; background-position:center; @@ -274,4 +274,4 @@ hr{ height: 50px; width: 50px; } -} \ No newline at end of file +} diff --git a/flask/templates/(x)test.html b/flask/templates/(x)test.html index 46ff59b..52a5749 100644 --- a/flask/templates/(x)test.html +++ b/flask/templates/(x)test.html @@ -5,8 +5,8 @@ AI (愛)上淨灘 - - + + @@ -21,4 +21,4 @@ {% endif %} - \ No newline at end of file + diff --git a/flask/templates/404.html b/flask/templates/404.html index c72d4a7..44e500b 100644 --- a/flask/templates/404.html +++ b/flask/templates/404.html @@ -5,8 +5,8 @@ AI (愛)上淨灘 - - + + @@ -17,7 +17,7 @@
- +

回首頁
diff --git a/flask/templates/aboutUS.html b/flask/templates/aboutUS.html index 0e13c58..c612e44 100644 --- a/flask/templates/aboutUS.html +++ b/flask/templates/aboutUS.html @@ -6,8 +6,8 @@ - - + + @@ -21,7 +21,7 @@
- avatar + avatar

VIA Tech.

- + - +
- + @@ -65,4 +65,4 @@
- \ No newline at end of file + diff --git a/flask/templates/upload.html b/flask/templates/upload.html index 6137a9b..ac6f470 100644 --- a/flask/templates/upload.html +++ b/flask/templates/upload.html @@ -6,8 +6,8 @@ - - + + @@ -47,7 +47,7 @@

{{submit}}

- + @@ -69,4 +69,4 @@ } --> - \ No newline at end of file + diff --git a/flask/templates/upload_result.html b/flask/templates/upload_result.html index 9c6068e..ac77fe3 100644 --- a/flask/templates/upload_result.html +++ b/flask/templates/upload_result.html @@ -5,9 +5,9 @@ AI (愛)上淨灘 - + - + @@ -17,14 +17,14 @@
- +
- + @@ -78,7 +78,7 @@

{{result.desc}}

- + @@ -90,12 +90,12 @@
- + - + @@ -121,4 +121,4 @@
- \ No newline at end of file + -- 2.25.1