diff --git a/app.py b/app.py index 43011f5..dfe5d6a 100644 --- a/app.py +++ b/app.py @@ -1,12 +1,32 @@ -from flask import Flask, render_template +from __future__ import division +from flask import Flask #don't forget localhost:5000 +from flask import render_template +app = Flask(__name__) # -app = Flask(__name__) +@app.route('/') +def index(): + return render_template('bootDic.html', name = {'david': 68, 'monicas': 62, 'hector': 100}) -@app.route('/', methods=['GET']) -def main(): - return render_template('index.html') +# @app.route('/') +# def index(): +# return render_template('bootDic.html', name = ["monica","david","hector"]) +@app.route('/add//') +def add(num1, num2): + return '{} + {} = {}'.format(num1, num2, float(num1 + num2)) -if __name__ == '__main__': - app.run() +@app.route('/substract//') +def substract(num1, num2): + return '{} - {} = {}'.format(num1, num2, float(num1 - num2)) + +@app.route('/divide//') +def divide(num1, num2): + return '{} / {} = {}'.format(num1, num2, float(num1 / num2)) + +@app.route('/multiply//') +def multiply(num1, num2): + return '{} x {} = {}'.format(num1, num2, float(num1 * num2)) + +if __name__ == "__main__": + app.run(debug=True) diff --git a/static/EDITED.jpg b/static/EDITED.jpg new file mode 100644 index 0000000..0a11c8a Binary files /dev/null and b/static/EDITED.jpg differ diff --git a/templates/bootDic.html b/templates/bootDic.html new file mode 100644 index 0000000..177d82e --- /dev/null +++ b/templates/bootDic.html @@ -0,0 +1,4 @@ +{% extends "meDic.html" %} +{% block content %} +

hello boot

+{%endblock%} diff --git a/templates/index.html b/templates/index.html deleted file mode 100644 index 179e81f..0000000 --- a/templates/index.html +++ /dev/null @@ -1,217 +0,0 @@ - - - - ADI - Unofficial Website - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - -
- - - - - - - - -
-
-
- - -
-
- -
- - -
-
- -

ADI Labs

-
- -
- -
- -
-
- -
- -
- -
-
- - -
- -
- -
-
- -
- - -
- -
-
- - -
-
- - - - - - - -
- - - - - -
- - - - - - - - - diff --git a/templates/meDic.html b/templates/meDic.html new file mode 100644 index 0000000..e7f445f --- /dev/null +++ b/templates/meDic.html @@ -0,0 +1,42 @@ + + + + Me2 + + + + +

H E C T O R F O R E R O {{ name}}

+ + + /* */ +
+
    + {% for key, value in name.items() %} + {% if value < 65 %} + {{key}} + {% else %} + {{key}} + {% endif %} + {% endfor %} +
+
+ + {% block content %} + {% endblock %} + +

I love this class

+

The members of my team are David and Monica

+
+ + +
+ +