Skip to content

Commit 6ea5e26

Browse files
committed
add main menu to execute projects
1 parent a24d626 commit 6ea5e26

3 files changed

Lines changed: 43 additions & 21 deletions

File tree

CoffeeMachine/main.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from data import MENU, resources
1+
from CoffeeMachine.data import MENU, resources
22
from time import sleep
33

44

@@ -85,4 +85,5 @@ def run_machine(resources_machine: dict, money: float):
8585
check_option(user_input, resources_machine, money)
8686

8787

88-
run_machine(resources, 0)
88+
def start():
89+
run_machine(resources, 0)

CoffeeMachineOOP/main.py

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,35 @@
1-
from menu import Menu, MenuItem
2-
from coffee_maker import CoffeeMaker
3-
from money_machine import MoneyMachine
1+
from CoffeeMachineOOP.menu import Menu, MenuItem
2+
from CoffeeMachineOOP.coffee_maker import CoffeeMaker
3+
from CoffeeMachineOOP.money_machine import MoneyMachine
44

55

66
coffe_machine = CoffeeMaker()
77
money_process = MoneyMachine()
88
menu = Menu()
99

10-
machine_status = True
1110

12-
while machine_status:
11+
def run_machine():
12+
machine_status = True
1313

14-
user_input = input("What would you like? (latte / espresso / cappuccino) ")
14+
while machine_status:
1515

16-
if user_input == "report":
17-
coffe_machine.report()
18-
money_process.report()
19-
elif user_input in menu.get_items():
20-
menu_selected: MenuItem = menu.find_drink(user_input)
21-
is_resource_sufficient = coffe_machine.is_resource_sufficient(menu_selected)
16+
user_input = input("What would you like? (latte / espresso / cappuccino) ")
2217

23-
if is_resource_sufficient:
24-
is_payment_successful = money_process.make_payment(menu_selected.cost)
25-
if is_payment_successful:
26-
coffe_machine.make_coffee(menu_selected)
27-
elif user_input == "off":
28-
machine_status = False
29-
print("Turning off Coffee Machine")
18+
if user_input == "report":
19+
coffe_machine.report()
20+
money_process.report()
21+
elif user_input in menu.get_items():
22+
menu_selected: MenuItem = menu.find_drink(user_input)
23+
is_resource_sufficient = coffe_machine.is_resource_sufficient(menu_selected)
24+
25+
if is_resource_sufficient:
26+
is_payment_successful = money_process.make_payment(menu_selected.cost)
27+
if is_payment_successful:
28+
coffe_machine.make_coffee(menu_selected)
29+
elif user_input == "off":
30+
machine_status = False
31+
print("Turning off Coffee Machine")
32+
33+
34+
def start():
35+
run_machine()

main.py

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
from CoffeeMachine.main import start as coffee_machine
2+
from CoffeeMachineOOP.main import start as coffee_machine_oop
3+
4+
print("1. CoffeeMachine")
5+
print("2. CoffeeMachineOOP")
6+
7+
user_option = input("What project do you want to test? (Insert number) ")
8+
9+
match user_option:
10+
case "1":
11+
coffee_machine()
12+
case "2":
13+
coffee_machine_oop()
14+
case _:
15+
print("Bye!")

0 commit comments

Comments
 (0)