Skip to content

532 form for bugs #600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

532 form for bugs #600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
360a794
added link for bug reports
MarinaProsche Aug 7, 2024
3a11a6c
try ti fix actions
MarinaProsche Aug 7, 2024
380f811
change spell docker-compose
MarinaProsche Aug 7, 2024
e541efe
change spelling in all docs
MarinaProsche Aug 7, 2024
1e31ebf
Merge branch 'master' into 532_form_for_bugs
MarinaProsche Sep 3, 2024
7207a94
links and support added
MarinaProsche Sep 4, 2024
e2a1e58
send constants to html directly
MarinaProsche Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@
app.config['UPLOAD_FOLDER'] = UPLOAD_FOLDER
app.config['CELERY_RESULT_BACKEND'] = os.environ.get("CELERY_RESULT_BACKEND", "redis://localhost:6379")
app.config['CELERY_BROKER_URL'] = os.environ.get("CELERY_BROKER_URL", "redis://localhost:6379")
app.config['LINK_FOR_BUGS_REPORT'] = os.environ.get("LINK_FOR_BUGS_REPORT", f"")
app.config['SUPPORT_MAIL'] = os.environ.get("SUPPORT_MAIL", f"[email protected]")

app.register_blueprint(admin, url_prefix='/admin')
app.register_blueprint(users, url_prefix='/users')
Expand Down Expand Up @@ -730,7 +732,6 @@ def default():
else:
return render_template("intro_page.html")


# Disable caching:

@app.after_request
Expand Down
29 changes: 18 additions & 11 deletions app/templates/intro_page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,29 @@
{# Accepts: header dependicies #}


{% extends "root.html" %}

{% block title %}Главная страница{% endblock %}

{% block main %}
<div class="header row">
<a class="text-right my-auto" id="user_info" href="/login">Вход для администратора</a>
</div>
<div class="holder row justify-content-center">
<div class="col-11 col-sm-8 col-md-5 col-lg-4 col-xl-3 my-auto">
<h2 class="text-center ins" id="greeting">Добро пожаловать в Document Insight System </h2>
<div class="text-center">
<p>Для использования системы вам необходимо перейти из курса на
<br><b><a href="https://e.moevm.info">https://e.moevm.info/</a> </br>
</p>
<div style="display: flex; flex-direction: column; min-height: 100vh;">
<div class="header row">
<a class="text-right my-auto" id="user_info" href="/login">Вход для администратора</a>
</div>
<div class="holder row justify-content-center" style="flex: 1;">
<div class="col-11 col-sm-8 col-md-5 col-lg-4 col-xl-3 my-auto">
<h2 class="text-center ins" id="greeting">Добро пожаловать в Document Insight System</h2>
<div class="text-center">
<p>Для использования системы вам необходимо перейти из курса на
<br><b><a href="https://e.moevm.info">https://e.moevm.info/</a> </br>
</p>
</div>
</div>
</div>
<div style="text-align: left; margin-top: auto; ">
<p>Если вы обнаружили ошибку, пожалуйста,
<a href='{{ config.LINK_FOR_BUGS_REPORT }}'>сообщите здесь</a>
<br>Адрес поддержки: {{ config.SUPPORT_MAIL }}
</p>
</div>
</div>
{% endblock %}