diff --git a/__pycache__/app.cpython-311.pyc b/__pycache__/app.cpython-311.pyc index 72a25e6..b8b9c91 100644 Binary files a/__pycache__/app.cpython-311.pyc and b/__pycache__/app.cpython-311.pyc differ diff --git a/docker-compose.yml b/docker-compose.yml index 3abb56b..9648734 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ services: web: - image: digi_signage:latest + image: digi_serverdocker :latest ports: - "7100:5000" environment: diff --git a/instance/dashboard.db b/instance/dashboard.db index 3c4e49b..f76ba52 100644 Binary files a/instance/dashboard.db and b/instance/dashboard.db differ diff --git a/static/uploads/cropped-cropped-main-picture-scaled-1.jpeg b/static/uploads/cropped-cropped-main-picture-scaled-1.jpeg new file mode 100644 index 0000000..8a15a16 Binary files /dev/null and b/static/uploads/cropped-cropped-main-picture-scaled-1.jpeg differ diff --git a/templates/admin.html b/templates/admin.html index da3d4a6..c360939 100644 --- a/templates/admin.html +++ b/templates/admin.html @@ -19,11 +19,33 @@ max-width: 100px; max-height: 100px; } + .popup-message { + position: fixed; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + background-color: rgba(0, 0, 0, 0.8); + color: white; + padding: 20px; + border-radius: 10px; + display: none; + z-index: 1000; + } + .logo { + max-height: 100px; + margin-right: 20px; + }
-

Admin Panel

+
+ {% if logo_exists %} + + {% endif %} +

Admin Panel

+
+

Manage Users

@@ -125,13 +147,13 @@
- +

Change Theme

-
+
- -
- Fullscreen Link -
-
+
  • +
    + {{ player.username }}
    +
    + View + + + +
    +
    • {% endfor %} -
    + + + + + +
    +
    +

    Add Player

    +
    +
    +
    +
    + + +
    +
    + + +
    + +
    diff --git a/templates/manage_group.html b/templates/manage_group.html index e46ccfa..435b111 100644 --- a/templates/manage_group.html +++ b/templates/manage_group.html @@ -15,24 +15,33 @@ .dark-mode label, .dark-mode th, .dark-mode td { color: #ffffff; } + .logo { + max-height: 100px; + margin-right: 20px; + }
    -

    Manage Group: {{ group.name }}

    +
    + {% if logo_exists %} + + {% endif %} +

    Manage Group: {{ group.name }}

    +
    -
    +

    Add Players to Group

    - {% for player in available_players %} - + {% endfor %}
    @@ -41,32 +50,29 @@
    - +
    -
    -

    Players in Group

    +
    +

    Group Players

      {% for player in group.players %} -
    • - {{ player.username }} ({{ player.ip }}) - - +
    • +
      + {{ player.username }} +
      +
      + + -
      • +
    + {% endfor %}
    - - {% if current_user.role == 'admin' %} -
    - Upload Content -
    - {% endif %} - Back to Dashboard
    diff --git a/templates/player_fullscreen.html b/templates/player_fullscreen.html index ea843ee..d920b15 100644 --- a/templates/player_fullscreen.html +++ b/templates/player_fullscreen.html @@ -11,9 +11,11 @@ align-items: center; background-color: black; } - img, video { + img, video, embed, object { max-width: 100%; max-height: 100%; + width: 100%; + height: 100%; display: none; } .active { @@ -29,6 +31,10 @@ Your browser does not support the video tag. + {% elif item.file_name.endswith('.pdf') %} + + + {% else %} Content Image {% endif %} diff --git a/templates/upload_content.html b/templates/upload_content.html index 93bcac4..d2dfb15 100644 --- a/templates/upload_content.html +++ b/templates/upload_content.html @@ -15,12 +15,33 @@ .dark-mode label, .dark-mode th, .dark-mode td { color: #ffffff; } + .popup-message { + position: fixed; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + background-color: rgba(0, 0, 0, 0.8); + color: white; + padding: 20px; + border-radius: 10px; + display: none; + z-index: 1000; + } + .logo { + max-height: 100px; + margin-right: 20px; + }
    -

    Upload Content

    -
    +
    + {% if logo_exists %} + + {% endif %} +

    Upload Content

    +
    +
    @@ -55,6 +76,8 @@
    @@ -70,6 +93,9 @@ Back Back to Dashboard
    + + +