Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
Binary file not shown.
13 changes: 13 additions & 0 deletions circle.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import math

class Circle:
def __init__(self,radius):
self.radius = radius

def perimeter(self):
return 2 * math.pi * self.radius

def area(self):
return math.pi * (self.radius ** 2)


13 changes: 13 additions & 0 deletions flask_app.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

from helper import perform_calculation, convert_to_float

from circle import Circle

app = Flask(__name__) # create the instance of the flask class


Expand Down Expand Up @@ -38,3 +40,14 @@ def calculate():
return render_template('calculator.html', printed_result="You cannot divide by zero")

return render_template('calculator.html')


@app.route('/circle', methods=['GET', 'POST'])
def calculate_circle():
if request.method == 'POST':
radius = float(request.form['radius'])
circle = Circle(radius)
perimeter = circle.perimeter()
area = circle.area()
return render_template('radius.html', perimeter=perimeter, area=area)
return render_template('radius.html')
1 change: 1 addition & 0 deletions templates/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ <h1 class="logo"><a href="{{ url_for('home') }}">Home</a></h1>
<strong><nav>
<ul class="menu">
<li><a href="{{ url_for('calculate') }}">General Calculator</a></li>
<li><a href="{{ url_for('calculate_circle') }}">Circle Calculator</a></li>
</ul>
</nav></strong>
</div>
Expand Down
19 changes: 19 additions & 0 deletions templates/radius.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{% extends 'layout.html' %}
{% block content %}
<div class="calculator-form">
<h1>Circle Calculator</h1>
<form action="/circle" method="post" class="calc-form">
<div class="form-group">
<label for="radius">Radius:</label>
<input type="number" id="radius" name="radius" required class="form-control">
</div>
<button type="submit" class="btn-calculate">Calculate</button>
</form>
{% if perimeter and area %}
<div class="result">
<p>Perimeter: {{ perimeter }}</p>
<p>Area: {{ area }}</p>
</div>
{% endif %}
</div>
{% endblock %}
22 changes: 22 additions & 0 deletions test_circle.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@

from circle import Circle
import math

def test_circle():
# Test case for perimeter
radius = 5
circle = Circle(radius)

expected_perimeter = 2 * math.pi * radius
assert circle.perimeter() == expected_perimeter, f"Expected perimeter: {expected_perimeter}, but got: {circle.perimeter()}"

# Test case for area
expected_area = math.pi * (radius ** 2)
assert circle.area() == expected_area, f"Expected area: {expected_area}, but got: {circle.area()}"


print("All tests passed!")


if __name__ == "__main__":
test_circle()