diff --git a/app/api.py b/app/api.py index 9440290..9f4309c 100644 --- a/app/api.py +++ b/app/api.py @@ -296,108 +296,6 @@ def stats(): return jsonify({"error": "Container not found"}), 404 -# Map -# TODO: OTHER PROXYS ARE JUST A TEMPORARY FIX!!! MAKE SOMETHING PERMANENT INSTEAD -@api.route('/map') -@oidc.require_login -def map_proxy(): - username = oidc.user_getfield('preferred_username') - container_name = f"mc-{username}" - container_ip = client.containers.get(container_name).attrs['NetworkSettings']['IPAddress'] - url = f"http://{container_ip}:8080" - - try: - response = requests.get(url, params=request.args, timeout=5) - return Response( - response.content, - status=response.status_code, - content_type=response.headers.get('Content-Type', 'application/octet-stream') - ) - except requests.exceptions.RequestException as e: - print(f"Error proxying map: {e}") - return jsonify({"message": "Mapa nie działa. Czy zainstalowałeś Squaremap?"}), 500 - - -@api.route('/js/', methods=['GET']) -@oidc.require_login -def proxy_js(filename): - username = oidc.user_getfield('preferred_username') - container_name = f"mc-{username}" - container_ip = client.containers.get(container_name).attrs['NetworkSettings']['IPAddress'] - - url = f"http://{container_ip}:8080/js/{filename}" - - try: - response = requests.get(url, timeout=5) - return Response( - response.content, - status=response.status_code, - content_type=response.headers.get('Content-Type', 'application/javascript') - ) - except requests.exceptions.RequestException as e: - return jsonify({"message": "Błąd ładowania skryptu: " + str(e)}), 500 - - -@api.route('/css/', methods=['GET']) -@oidc.require_login -def proxy_css(filename): - username = oidc.user_getfield('preferred_username') - container_name = f"mc-{username}" - container_ip = client.containers.get(container_name).attrs['NetworkSettings']['IPAddress'] - - url = f"http://{container_ip}:8080/css/{filename}" - - try: - response = requests.get(url, timeout=5) - return Response( - response.content, - status=response.status_code, - content_type=response.headers.get('Content-Type', 'text/css') - ) - except requests.exceptions.RequestException as e: - return jsonify({"message": "Błąd ładowania stylu: " + str(e)}), 500 - - -@api.route('/tiles/', methods=['GET']) -@oidc.require_login -def proxy_tiles_settings(filename): - username = oidc.user_getfield('preferred_username') - container_name = f"mc-{username}" - container_ip = client.containers.get(container_name).attrs['NetworkSettings']['IPAddress'] - - url = f"http://{container_ip}:8080/tiles/{filename}" - - try: - response = requests.get(url, timeout=5) - return Response( - response.content, - status=response.status_code, - content_type=response.headers.get('Content-Type', 'text/json') - ) - except requests.exceptions.RequestException as e: - return jsonify({"message": "Błąd ładowania tiles: " + str(e)}), 500 - - -@api.route('/images/', methods=['GET']) -@oidc.require_login -def proxy_images(filename): - username = oidc.user_getfield('preferred_username') - container_name = f"mc-{username}" - container_ip = client.containers.get(container_name).attrs['NetworkSettings']['IPAddress'] - - url = f"http://{container_ip}:8080/images/{filename}" - - try: - response = requests.get(url, timeout=5) - return Response( - response.content, - status=response.status_code, - content_type=response.headers.get('Content-Type', 'image/png') - ) - except requests.exceptions.RequestException as e: - return jsonify({"message": "Błąd ładowania tiles: " + str(e)}), 500 - - # Modrinth @api.route('/modrinth/search') def modrinth_search(): diff --git a/app/templates/dashboard.html b/app/templates/dashboard.html index 241bfd2..f3a5c4e 100644 --- a/app/templates/dashboard.html +++ b/app/templates/dashboard.html @@ -6,11 +6,10 @@ -
- +
@@ -113,11 +112,6 @@ -
-

Mapa Serwera

- -
-

Zainstaluj mody/pluginy z Modrinth