Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GH-23: Market functionality/menu #45

Merged
merged 4 commits into from
Jun 24, 2024
Merged
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
11 changes: 8 additions & 3 deletions backend/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,15 @@ def recruit_troop(self, troop_type: str, amount: str, currency: str = "gold"):
response = self.request(route, query_params=query_params)
return response

def get_market_orders(self):
def get_market_orders(self, item: str, order_type: str) -> list[MarketOrder | None]:
route = Route("/market", "GET")
response = self.request(route)
orders = [MarketOrder.from_data(order) for order in response.json()]
query_params = {
"item_type": item,
"order_type": order_type
}
response = self.request(route, query_params=query_params)
orders = response.json()["orders"]
orders = [MarketOrder.from_data(order) for order in orders.values()]
return orders

def get_outposts(self):
Expand Down
2 changes: 2 additions & 0 deletions gui/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
from gui.frames.api_key import APIKeyFrame
from gui.frames.empty_frame import EmptyFrame
from gui.frames.outposts import OutpostsFrame
from gui.frames.market import MarketFrame


class App(tkinter.Tk):
Expand Down Expand Up @@ -43,6 +44,7 @@ def build_app(self, destroy: bool = False) -> None:
self.settings_frame = SettingsFrame(self)
self.api_key_frame = APIKeyFrame(self)
self.outposts_frame = OutpostsFrame(self)
self.market_frame = MarketFrame(self)
self.sidebar.place(x=0, y=0, height=600, width=150)
self.current_frame = EmptyFrame(self)
self.current_frame.place(x=150, y=0, height=600, width=650)
Expand Down
73 changes: 73 additions & 0 deletions gui/frames/market.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
import tkinter
from ..components import labels, dropdowns, inputs

class MarketFrame(tkinter.Frame):
def __init__(self, parent, bg="gray"):
super().__init__(parent, width=650, height=600, bg=bg)
self.parent = parent
self.bg = bg

self.item_selector = dropdowns.Dropdown(
self, ["IRON_FRAME", "Placeholder Two", "Placeholder Three"]
)
self.item_selector_label = labels.InputLabel(self, "Item", bg="white")

self.buy_offers = tkinter.Listbox(self, bg=self.bg)
self.buy_offers_label = labels.InputLabel(self, "Buy Offers", bg="white")

self.sell_offers = tkinter.Listbox(self, bg=self.bg)
self.sell_offers_label = labels.InputLabel(self, "Sell Offers", bg="white")

self.refresh_button = tkinter.Button(self, bg="green", text="Refresh", command=self.update_offers)

self.amount = inputs.IntergerOnlyEntry(self, 0, 100)
self.amount_label = labels.InputLabel(self, "Amount", bg=self.bg)

self.price_per = inputs.IntergerOnlyEntry(self, 0, 2000)
self.price_per_label = labels.InputLabel(self, "Price Per Item", bg=self.bg)

self.instant_buy_button = tkinter.Button(self, bg="green", text="Buy Instantly")
self.instant_sell_button = tkinter.Button(self, bg="red", text="Sell Instantly")

self.accept_offer_button = tkinter.Button(self, bg="yellow", text="Accept Offer")

self.create_offer_button = tkinter.Button(self, bg="green", text="Create Offer")

self.update_offers()

def render(self):
self.item_selector.place(x=100, y=50)
self.item_selector_label.place(x=100, y=20)

self.buy_offers.place(x=100, y=190)
self.buy_offers_label.place(x=100, y=160)
self.sell_offers.place(x=275, y=190)
self.sell_offers_label.place(x=275, y=160)

self.refresh_button.place(x=500, y=30)

self.amount.place(x=500, y=100)
self.amount_label.place(x=500, y=80)

self.instant_buy_button.place(x=500, y=200)
self.instant_sell_button.place(x=500, y=230)

self.accept_offer_button.place(x=500, y=260)

self.price_per.place(x=350, y=450)
self.price_per_label.place(x=350, y=420)

self.create_offer_button.place(x=500, y=420)

def update_offers(self) -> None:
item = self.item_selector.get_selection().get()
buy_orders = self.parent.backend.get_market_orders(item, "buy")
sell_orders = self.parent.backend.get_market_orders(item, "sell")

self.buy_offers.delete(0, "end")
self.sell_offers.delete(0, "end")
for order in buy_orders:
self.buy_offers.insert("end", f"{order.price} - {order.amount}")

for order in sell_orders:
self.sell_offers.insert("end", f"{order.price} - {order.amount}")
7 changes: 7 additions & 0 deletions gui/sidebar.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,13 @@ def __init__(self, parent):
)
self.outposts_button.pack()

self.market_button = buttons.Sidebarbutton(
self,
text="Market",
command=lambda: self.switch_frame(self.parent.market_frame),
)
self.market_button.pack()

self.apiKey_button = buttons.Sidebarbutton(
self,
text="API Key",
Expand Down
3 changes: 2 additions & 1 deletion models/order.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ class MarketOrder(NamedTuple):
def from_data(data: dict | None):
if data is None:
return None
print(data)
return MarketOrder(
item_id=data["item_id"],
item_id=data["item_type"],
order_type=data["order_type"],
price=data["price"],
amount=data["amount"],
Expand Down
Loading