Doing a bit more css and bit more visuals

enowars · Jun 23, 2024 · 09dc8ab · 09dc8ab
1 parent 740f211
commit 09dc8ab
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 29 deletions.
diff --git a/service/Dockerfile b/service/Dockerfile
@@ -2,20 +2,22 @@
 FROM python:3.10.9-slim
 
 # Copy our service
-COPY src/ /src/
-COPY main.py /
-COPY gunicorn.conf.py /
-COPY entrypoint.sh /
-RUN chmod +x /entrypoint.sh
-
-RUN pip install -r src/requirements.txt
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
         gcc \
         libc-dev \
         libgmp-dev && \
     rm -rf /var/lib/apt/lists/*
 
+COPY requirements.txt /
+RUN pip install -r requirements.txt
+
+COPY src/ /src/
+COPY main.py /
+COPY gunicorn.conf.py /
+COPY entrypoint.sh /
+RUN chmod +x /entrypoint.sh
+
 RUN gcc -o src/key_gen src/key_gen.c -lgmp
 
 #CMD gunicorn --bind 0.0.0.0:9696 main:app

diff --git a/service/src/requirements.txt → service/requirements.txt b/service/src/requirements.txt → service/requirements.txt
diff --git a/service/src/templates/backup.html b/service/src/templates/backup.html
@@ -15,7 +15,7 @@ <h1>Backup</h1>
       </div>
     </form>
     {% if user %}
-      <h3>Backup your data</h3>
+      <h3>Your data</h3>
       <div style="word-wrap: break-word;">
       <ul class="list-group list-group-flush" id="userlist">
         <li class="list-group-item">Your Status: {{ user.status }}</li>

diff --git a/service/src/templates/group_page.html b/service/src/templates/group_page.html
@@ -3,8 +3,8 @@
 {% block content %}
     <h1 align="center">Group Messages</h1>
     <div style="word-wrap: break-word;">
-    <ul class="list-group list-group-flush" id="messages">
-      {% for message in messages %}
+    <ul class="list-group list-group-flush" id="messages" style="overflow-y: scroll; height: 60vh;">
+      {% for message in messages %} 
       <li class="list-group-item {% if message.owner_id == user.id %}sent-message{% else %}received-message{% endif %}">
         {{ message.data }}
         {{ message.time }}
@@ -21,7 +21,7 @@ <h1 align="center">Group Messages</h1>
       <textarea name="message_of_group" id="message_of_group" class="form-control"></textarea>
       <br />
       <div align="center">
-        <button type="submit" class="btn btn-primary">Add message</button>
+        <button type="submit" class="btn btn-primary">Send message</button>
       </div>
     </form>
 {% endblock %}
diff --git a/service/src/templates/home.html b/service/src/templates/home.html
@@ -7,29 +7,30 @@
 
 {% block content%}
   <h1 align="center">Private Messages</h1>
-  <ul class="list-group list-group-flush" id="messages">
+  <ul class="list-group list-group-flush" id="messages" style="overflow-y: scroll; height: 60vh;">
     {% for message in messages %}
-    <li class="list-group-item {% if message.owner_id == user.id %}sent-message{% elif message.destination_id == user.id and message.owner_id != message.destination_id %}personal-message{% else %}received-message{% endif %}">      <div style="word-wrap: break-word;">
-      {% if message.owner_id == user.id %}
-        {{ message.data }}
-        {{ message.time }}
-        <button type="button" class="close" onClick="deletemessage({{ message.id }})">
-          <span aria-hidden="true">&times;</span>
-        </button>
-      {% else %}
-        {% if message.destination_id == user.id and message.owner_id != message.destination_id %}
-        {{ message.data}}
-        {{ message.time }}
-        {% else %}
-        {% if message.encrypted_data %}
-          {{ message.encrypted_data }}
+    <li class="list-group-item {% if message.owner_id == user.id %}sent-message{% elif message.destination_id == user.id and message.owner_id != message.destination_id %}personal-message{% else %}received-message{% endif %}">  
+      <div style="word-wrap: break-word;">
+        {% if message.owner_id == user.id %}
+          {{ message.data }}
           {{ message.time }}
+          <button type="button" class="close" onClick="deletemessage({{ message.id }})">
+            <span aria-hidden="true">&times;</span>
+          </button>
         {% else %}
-          {{ message.data }}
+          {% if message.destination_id == user.id and message.owner_id != message.destination_id %}
+          {{ message.data}}
           {{ message.time }}
+          {% else %}
+          {% if message.encrypted_data %}
+            {{ message.encrypted_data }}
+            {{ message.time }}
+          {% else %}
+            {{ message.data }}
+            {{ message.time }}
+          {% endif %}
+          {% endif %}
         {% endif %}
-        {% endif %}
-      {% endif %}
       </div>
     </li>
     {% endfor %}