added prefix for about

fix sqlachemy to 1.4
2023-02-22 18:07:11 +01:00 · 2023-02-21 20:33:50 +01:00
6 changed files with 7 additions and 6 deletions
--- a/4
+++ b/4
@@ -1,4 +1,4 @@
-FROM python:3.8
+FROM python:3.9

 COPY entrypoint.sh /usr/src/portal-webapp/
 COPY app.py /usr/src/portal-webapp/
@@ -13,5 +13,5 @@ WORKDIR /usr/src/portal-webapp
 RUN apt-get update && apt-get -y install wkhtmltopdf && \
    rm -rf /var/lib/apt/lists/*

-RUN pip3 install --no-cache-dir pdfkit markupsafe==2.0.1 flask==1.1.4 flask-dropzone flask-log-request-id flask-login Flask-SQLAlchemy==2.5.1 alembic flask-migrate==2.7.0 Flask-script psycopg2 gunicorn pdfkit Werkzeug==1.0.1 PyJWT 
+RUN pip3 install --no-cache-dir pdfkit markupsafe==2.0.1 flask==1.1.4 flask-dropzone flask-log-request-id flask-login SQLAlchemy==1.4 Flask-SQLAlchemy==2.5.1 alembic flask-migrate==2.7.0 Flask-script psycopg2 gunicorn pdfkit Werkzeug==1.0.1 PyJWT 
 ENTRYPOINT ["./entrypoint.sh"]
--- a/templates/solar-admin.html
+++ b/templates/solar-admin.html
@@ -47,6 +47,7 @@
        <a href="{{ROUTE_PREFIX}}/admin">Administracijski meni</a>
        {% endif %}
        <a href="https://rsdo.slovenscina.eu/zbiranje-besedil-za-korpus-solar" target="_blank">Več informacij o sodelovanju</a>
+        <a href="{{ROUTE_PREFIX}}/about">O orodju</a>
        <a href="{{ROUTE_PREFIX}}/logout">Odjava</a>
    </div>
 </header>
--- a/templates/solar-manage-institution.html
+++ b/templates/solar-manage-institution.html
@@ -26,7 +26,7 @@
        <a href="{{ROUTE_PREFIX}}/admin">Administracijski meni</a>
        {% endif %}
        <a href="https://rsdo.slovenscina.eu/zbiranje-besedil-za-korpus-solar" target="_blank">Več informacij o sodelovanju</a>
-        <a href="/about">O orodju</a>
+        <a href="{{ROUTE_PREFIX}}/about">O orodju</a>
        <a href="{{ROUTE_PREFIX}}/logout">Odjava</a>
    </div>
 </header>
--- a/templates/solar-oddaja.html
+++ b/templates/solar-oddaja.html
@@ -23,7 +23,7 @@
            <a href="{{ROUTE_PREFIX}}/admin">Administracijski meni</a>
            {% endif %}
            <a href="https://rsdo.slovenscina.eu/zbiranje-besedil-za-korpus-solar" target="_blank">Več informacij o sodelovanju</a>
-            <a href="/about">O orodju</a>
+            <a href="{{ROUTE_PREFIX}}/about">O orodju</a>
            <a href="{{ROUTE_PREFIX}}/logout">Odjava</a>
        </div>
    </header>
--- a/templates/solar-pogodbe.html
+++ b/templates/solar-pogodbe.html
@@ -23,7 +23,7 @@
            <a href="{{ROUTE_PREFIX}}/admin">Administracijski meni</a>
            {% endif %}
            <a href="https://rsdo.slovenscina.eu/zbiranje-besedil-za-korpus-solar" target="_blank">Več informacij o sodelovanju</a>
-            <a href="/about">O orodju</a>
+            <a href="{{ROUTE_PREFIX}}/about">O orodju</a>
            <a href="{{ROUTE_PREFIX}}/logout">Odjava</a>
        </div>
    </header>
--- a/templates/solar-zgodovina.html
+++ b/templates/solar-zgodovina.html
@@ -25,7 +25,7 @@
            <a href="{{ROUTE_PREFIX}}/admin">Administracijski meni</a>
            {% endif %}
            <a href="https://rsdo.slovenscina.eu/zbiranje-besedil-za-korpus-solar" target="_blank">Več informacij o sodelovanju</a>
-            <a href="/about">O orodju</a>
+            <a href="{{ROUTE_PREFIX}}/about">O orodju</a>
            <a href="{{ROUTE_PREFIX}}/logout">Odjava</a>
        </div>
    </header>
Author	SHA1	Message	Date
Leon Noe Jovan	909928eec3	added prefix for about	2023-02-22 18:07:11 +01:00
Leon Noe Jovan	f97b83abd7	fix sqlachemy to 1.4	2023-02-21 20:33:50 +01:00