first docker commit

makeopensource · Mar 29, 2022 · 0363b03 · 0363b03
1 parent ea5553e
commit 0363b03
Show file tree

Hide file tree

Showing 21 changed files with 193 additions and 57 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 **/.*
 **/__pycache__/
+venv
 !.gitignore
diff --git a/views/api.py → .gitmodules b/views/api.py → .gitmodules
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,8 +2,8 @@ version: '3.3'
 services:
   mongo:
     image: mongo:4.2.5
-  app:
-    build: .
+  web:
+    build: web
     environment:
       WAIT_HOSTS: mongo:27017
     ports:

diff --git a/Dockerfile → web/Dockerfile b/Dockerfile → web/Dockerfile
diff --git a/README.md → web/README.md b/README.md → web/README.md
diff --git a/announcements.html → web/announcements.html b/announcements.html → web/announcements.html
diff --git a/db/projects.py → web/db/projects.py b/db/projects.py → web/db/projects.py
diff --git a/requirements.txt → web/requirements.txt b/requirements.txt → web/requirements.txt
@@ -2,4 +2,5 @@ uvicorn==0.16.0
 starlette==0.17.1
 Jinja2==3.0.3
 requests==2.27.1
-pymongo==4.0.1
+pymongo==4.0.1
+pyyaml
diff --git a/routes.py → web/routes.py b/routes.py → web/routes.py
diff --git a/server.py → web/server.py b/server.py → web/server.py
diff --git a/static/yaml/about.yml → web/static/yaml/about.yml b/static/yaml/about.yml → web/static/yaml/about.yml
diff --git a/static/yaml/ledger.yml → web/static/yaml/ledger.yml b/static/yaml/ledger.yml → web/static/yaml/ledger.yml
diff --git a/templates/_nav.html → web/templates/_nav.html b/templates/_nav.html → web/templates/_nav.html
diff --git a/templates/about.html → web/templates/about.html b/templates/about.html → web/templates/about.html
diff --git a/templates/announcements.html → web/templates/announcements.html b/templates/announcements.html → web/templates/announcements.html
@@ -4,17 +4,21 @@
 <h1>Announcements</h1>
 {% for ann in announcements %}
     <p>
-        {{ ann['createdAt'] | to_date }}<br>
+        {{ ann['createdAt']}}<br>
         <b>{{ ann['author'] }}</b><br>
         {{ ann['message'] | discordify }}
         <br>
+        {% for url in ann['attachments'] %}
+            <img style="max-width: 300px;" src="{{ url }}">
+        {% endfor %}
+        <br>
         {% for reaction in ann['reactions'] %}
             {% if reaction['type'] == 'emoji' %}
                 {{ reaction['content'] }} {{ reaction['count'] }}
             {% else %}
                 <img src="{{ reaction['content'] }}" width="15" height="15"> {{ reaction['count'] }}
             {% endif %}
-        {% endfor %}
+        {% endfor %}<br>
     </p>
 {% endfor %}
 

diff --git a/templates/index.html → web/templates/index.html b/templates/index.html → web/templates/index.html
diff --git a/templates/ledger.html → web/templates/ledger.html b/templates/ledger.html → web/templates/ledger.html
diff --git a/templates/projects.html → web/templates/projects.html b/templates/projects.html → web/templates/projects.html
diff --git a/web/views/api.py b/web/views/api.py
diff --git a/views/jinja_filters.py → web/views/jinja_filters.py b/views/jinja_filters.py → web/views/jinja_filters.py
diff --git a/views/main.py → web/views/main.py b/views/main.py → web/views/main.py