From 0c3b2cf042c84666138bc60e9aabd79844684e25 Mon Sep 17 00:00:00 2001 From: ajatgithub <64965487+ajatgithub@users.noreply.github.com> Date: Thu, 7 May 2020 19:08:24 +0530 Subject: [PATCH 01/11] Create app.yaml --- app.yaml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 app.yaml diff --git a/app.yaml b/app.yaml new file mode 100644 index 0000000..b26a652 --- /dev/null +++ b/app.yaml @@ -0,0 +1,4 @@ +entrypoint: "gunicorn -b :$PORT main:app" +runtime: python +runtime_config: + python_version: 3 From 13af2180f4df661d20985f7b4cb429bf1f436480 Mon Sep 17 00:00:00 2001 From: ajatgithub <64965487+ajatgithub@users.noreply.github.com> Date: Thu, 7 May 2020 19:10:42 +0530 Subject: [PATCH 02/11] Create cloudbuild.yaml --- cloudbuild.yaml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 cloudbuild.yaml diff --git a/cloudbuild.yaml b/cloudbuild.yaml new file mode 100644 index 0000000..e4a1483 --- /dev/null +++ b/cloudbuild.yaml @@ -0,0 +1,4 @@ +steps: +- name: "gcr.io/cloud-builders/gcloud" + args: ["app", "deploy"] +timeout: "1600s" From 09ecc9d98194030e816afd2b9cd93652d6f16193 Mon Sep 17 00:00:00 2001 From: ajatgithub <64965487+ajatgithub@users.noreply.github.com> Date: Thu, 7 May 2020 19:12:31 +0530 Subject: [PATCH 03/11] Create main.py --- main.py | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 main.py diff --git a/main.py b/main.py new file mode 100644 index 0000000..cfc58cc --- /dev/null +++ b/main.py @@ -0,0 +1,50 @@ +from flask import Flask, request, render_template + + +app = Flask(__name__) + +@app.route('/') +def index(): + return render_template("index.html") + + +@app.route('/', methods=['POST']) +def calculate(): + + # Validating blank inputs + try: + h = float(request.form['h']) + m = float(request.form['m']) + + hours = h + minutes = m + + # Validation for hours and minutes values + if 0 < h <= 12 and 0 <= m < 60: + + if (h == 12): + h = 0 + + # Calculating angles generated by movement of clock hands from 12 + hour_angle = 0.5 * (h * 60 + m) + minute_angle = 6 * m + + # Calculating difference between two angles of hours and minutes + angle = abs(hour_angle - minute_angle) + + # Finding smaller angle + angle = min(360 - angle, angle) + + return render_template("pass.html", h=hours, m=minutes, a=angle) + else: + w = "Oops.. Wrong Input !" + return render_template("pass.html", h=hours, m=minutes, w=w) + + except: + w = "Oops.. You submitted blank inputs !" + return render_template("pass.html", w=w) + + +if __name__ == '__main__': + app.run(debug=True) + From 86e41366201dac337cd11c0bf2411b7c9c77f227 Mon Sep 17 00:00:00 2001 From: ajatgithub <64965487+ajatgithub@users.noreply.github.com> Date: Thu, 7 May 2020 19:15:31 +0530 Subject: [PATCH 04/11] Create requirement.txt --- requirements.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 requirements.txt diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..bf04841 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,2 @@ +Flask==1.1.0 +gunicorn==19.6.0 From d673fed91b6b5fcb75ff53804bf8c9830d5a4c85 Mon Sep 17 00:00:00 2001 From: ajatgithub <64965487+ajatgithub@users.noreply.github.com> Date: Thu, 7 May 2020 19:20:08 +0530 Subject: [PATCH 05/11] Create index.html --- templates/index.html | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 templates/index.html diff --git a/templates/index.html b/templates/index.html new file mode 100644 index 0000000..8c45656 --- /dev/null +++ b/templates/index.html @@ -0,0 +1,19 @@ + + + + Home + + +

Calculate Angle

+ +
+ + + + + +
+ + + + From 6ec0674fece80ff32a8ce0f323607171a3e504d3 Mon Sep 17 00:00:00 2001 From: ajatgithub <64965487+ajatgithub@users.noreply.github.com> Date: Thu, 7 May 2020 19:21:35 +0530 Subject: [PATCH 06/11] Create pass.html --- templates/pass.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 templates/pass.html diff --git a/templates/pass.html b/templates/pass.html new file mode 100644 index 0000000..81dc9bb --- /dev/null +++ b/templates/pass.html @@ -0,0 +1,12 @@ + + + + Pass + + +

Hours: {{h}}

+

Minutes: {{m}}

+

Angle between clock hands (in Degrees): {{a}}

+

{{w}}

+ + From 38bc696d4c5923c938e3d685c84f0a201b88db62 Mon Sep 17 00:00:00 2001 From: ajatgithub Date: Thu, 7 May 2020 21:57:05 +0530 Subject: [PATCH 07/11] Updated app.yaml file --- app.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/app.yaml b/app.yaml index b26a652..8a45112 100644 --- a/app.yaml +++ b/app.yaml @@ -1,4 +1,5 @@ entrypoint: "gunicorn -b :$PORT main:app" runtime: python +env: flex runtime_config: python_version: 3 From 276fbadaf9880b424254864b3879ff4593b92346 Mon Sep 17 00:00:00 2001 From: ajatgithub Date: Thu, 7 May 2020 22:12:15 +0530 Subject: [PATCH 08/11] Updated main.yaml file --- main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.py b/main.py index cfc58cc..0c35254 100644 --- a/main.py +++ b/main.py @@ -41,7 +41,7 @@ def calculate(): return render_template("pass.html", h=hours, m=minutes, w=w) except: - w = "Oops.. You submitted blank inputs !" + w = "Invalid input. You submitted blank values !" return render_template("pass.html", w=w) From 56cea121c3433f9799e254d149318bbff4fc12fc Mon Sep 17 00:00:00 2001 From: ajatgithub Date: Fri, 8 May 2020 01:18:07 +0530 Subject: [PATCH 09/11] Updated main.py file --- main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.py b/main.py index 0c35254..5258dcb 100644 --- a/main.py +++ b/main.py @@ -37,7 +37,7 @@ def calculate(): return render_template("pass.html", h=hours, m=minutes, a=angle) else: - w = "Oops.. Wrong Input !" + w = "Oops. Wrong Input !" return render_template("pass.html", h=hours, m=minutes, w=w) except: From 401e22768f23b78c29eee29be7589f5eda4b7f17 Mon Sep 17 00:00:00 2001 From: ajatgithub Date: Fri, 8 May 2020 07:07:44 +0530 Subject: [PATCH 10/11] Update main.py file --- main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.py b/main.py index 5258dcb..0c35254 100644 --- a/main.py +++ b/main.py @@ -37,7 +37,7 @@ def calculate(): return render_template("pass.html", h=hours, m=minutes, a=angle) else: - w = "Oops. Wrong Input !" + w = "Oops.. Wrong Input !" return render_template("pass.html", h=hours, m=minutes, w=w) except: From 7c7c8dbaf14d2726cd8a886a49398c74f2e5b673 Mon Sep 17 00:00:00 2001 From: ajatgithub Date: Fri, 8 May 2020 08:48:32 +0530 Subject: [PATCH 11/11] Updated main.py file with warning --- main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.py b/main.py index 0c35254..ca502a0 100644 --- a/main.py +++ b/main.py @@ -41,7 +41,7 @@ def calculate(): return render_template("pass.html", h=hours, m=minutes, w=w) except: - w = "Invalid input. You submitted blank values !" + w = "Sorry.. You submitted blank values !" return render_template("pass.html", w=w)