implement imprint service properly (#71)

* chore: updated gh-actions * chore: fix test * added proper imprint page
acdh-oeaw · Jun 3, 2024 · 4a34fc8 · 4a34fc8
1 parent 8e2d0df
commit 4a34fc8
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 34 deletions.
diff --git a/.flake8 b/.flake8
@@ -7,3 +7,4 @@ exclude =
     .git,
     build,
     env
+    venv
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -17,26 +17,26 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
 
       - name: Log in to the Container registry
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v5
         with:
           context: .
           push: true

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -8,10 +8,10 @@ jobs:
     name: Lint
     steps:
       - name: Check out source repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Set up Python environment
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v5
         with:
-          python-version: "3.8"
+          python-version: "3.10"
       - name: flake8 Lint
-        uses: py-actions/flake8@v1
+        uses: py-actions/flake8@v2
diff --git a/.github/workflows/test-app.yml b/.github/workflows/test-app.yml
@@ -2,8 +2,6 @@ name: Test
 
 on:
   push:
-    branches: 
-      - master
 
 jobs:
   test:
@@ -12,13 +10,13 @@ jobs:
     env:
       SQLITE: True
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
-        python-version: 3.8
+        python-version: "3.10"
     - name: Cache pip
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: ${{ env.pythonLocation }}
         key: ${{ env.pythonLocation }}-${{ hashFiles('requirements.txt') }}

diff --git a/webpage/templates/webpage/base.html b/webpage/templates/webpage/base.html
@@ -53,7 +53,7 @@
 <body class="d-flex flex-column h-100">
     {% include 'webpage/partials/navbar.html' %}
     <main class="flex-shrink-0">
-        <div id="content" class="pt-5">
+        <div id="content" class="pt-5 mb-5">
             {% block content %}{% endblock %}
         </div>
     </main>

diff --git a/webpage/templates/webpage/imprint.html b/webpage/templates/webpage/imprint.html
@@ -6,10 +6,12 @@
 <div class="container">
 <div class="card imprint">
 <div class="card-header">
-    <h1>Imprint | Impressum</h1>
+    <h1>Imprint</h1>
 </div>
 <div class="card-body">
-<div id="imprint-content"></div>
+<div id="imprint-content">
+    {{ imprint_body|safe }}
+</div>
 </div>
 </div>
 </div>

diff --git a/webpage/templates/webpage/partials/footer.html b/webpage/templates/webpage/partials/footer.html
@@ -40,7 +40,7 @@ <h3>HELPDESK</h3>
                 </div>
             </div>
             <div class="d-flex justify-content-center pb-3">
-                <a href="https://github.com/acdh-oeaw/vocabseditor" title="link to code repo"><i class="bi bi-github pe-2"></i></a><a class="ps-2" href="#">Imprint</a>
+                <a href="https://github.com/acdh-oeaw/vocabseditor" title="link to code repo"><i class="bi bi-github pe-2"></i></a><a class="ps-2" href="{% url 'webpage:imprint' %}">Imprint</a>
             </div>
         </div>
     </div>

diff --git a/webpage/templates/webpage/partials/navbar.html b/webpage/templates/webpage/partials/navbar.html
@@ -30,7 +30,7 @@
                 </li>
             </ul>
             {% if user.is_authenticated %}
-            <a href="{% url 'webpage:user_logout' %}"><i class="bi bi-person-check"></i></a>
+            <a href="{% url 'webpage:user_logout' %}" title="Hi {{ user.username }}! Click here to log out"><i class="bi bi-person-check"></i></a>
             {% else %}
             <a href="{% url 'webpage:user_login' %}"><i class="bi bi-box-arrow-in-right"></i></a>
             {% endif %}

diff --git a/webpage/urls.py b/webpage/urls.py
@@ -12,6 +12,7 @@
     path('project-info/', views.project_info, name='project_info'),
     path('accounts/login/', views.user_login, name='user_login'),
     path('logout/', views.user_logout, name='user_logout'),
+    path('imprint/', views.ImprintView.as_view(), name='imprint'),
     path('<slug:template>', views.GenericWebpageView.as_view(), name='staticpage'),
     path('user/<int:pk>', views.UserDetailView.as_view(), name='user_detail'),
 ]
diff --git a/webpage/views.py b/webpage/views.py
@@ -18,25 +18,12 @@
 from copy import deepcopy
 
 
-def get_imprint_url():
-    try:
-        base_url = settings.ACDH_IMPRINT_URL
-    except AttributeError:
-        base_url = "https://provide-an-acdh-imprint-url/"
-    try:
-        redmine_id = settings.REDMINE_ID
-    except AttributeError:
-        redmine_id = "go-register-a-redmine-service-issue"
-    return "{}{}".format(base_url, redmine_id)
-
-
 class ImprintView(TemplateView):
     template_name = 'webpage/imprint.html'
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        r = requests.get(get_imprint_url())
-
+        r = requests.get("https://imprint.acdh.oeaw.ac.at/12305")
         if r.status_code == 200:
             context['imprint_body'] = "{}".format(r.text)
         else: