Skip to content

Commit 83e381f

Browse files
mariobehlingmariobehling
authored
Merge branch 'enext' into fix/global_settings_redesign
2 parents b04903b + da0fcd8 commit 83e381f

File tree

86 files changed

+6192
-14
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+6192
-14
lines changed

‎app/eventyay/config/settings.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -755,7 +755,7 @@ def instance_name(request):
755755
"health_check_interval": 30,
756756
}
757757

758-
REDIS_URL = config.get('redis', 'location') if not DEBUG else 'redis://localhost:6379/0'
758+
REDIS_URL = config.get('redis', 'location')
759759
HAS_REDIS = bool(REDIS_URL)
760760
REDIS_HOSTS = [{
761761
"address": REDIS_URL,
@@ -820,8 +820,8 @@ def instance_name(request):
820820
SESSION_ENGINE = 'django.contrib.sessions.backends.db'
821821

822822
# Celery configuration
823-
CELERY_BROKER_URL = config.get('celery', 'broker') if not DEBUG else 'redis://localhost:6379/2'
824-
CELERY_RESULT_BACKEND = config.get('celery', 'backend') if not DEBUG else 'redis://localhost:6379/1'
823+
CELERY_BROKER_URL = config.get('celery', 'broker')
824+
CELERY_RESULT_BACKEND = config.get('celery', 'backend')
825825
CELERY_TASK_ALWAYS_EAGER = False if not DEBUG else True
826826
CELERY_TASK_SERIALIZER = "json"
827827
CELERY_RESULT_SERIALIZER = "json"

‎app/eventyay/control/templates/pretixcontrol/event/fragment_info_box.html‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@ <h3 class="panel-title">
1212
<div class="info-row">
1313
{% trans "Teams of the organizer are" %}
1414
<span></span>
15-
{% for id, name in organizer_teams %}
16-
<strong><a href="{% url 'control:organizer.team' request.organizer.slug id %}">{{ name }}</a></strong>
17-
{% if not forloop.last %}, {% endif %}
18-
{% endfor %}
15+
{% for id, name in organizer_teams %}
16+
<strong><a href="{% url 'control:organizer.team' request.organizer.slug id %}">{{ name }}</a></strong>{% if not forloop.last %}, {% endif %}
17+
{% endfor %}
1918
</div>
2019
</div>
2120
</div>

‎app/eventyay/static/eventyay-common/js/ui/popover.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ $(function () {
2020
const accountPath = `/common/account/`;
2121
const adminPath = `/control/admin/`;
2222

23-
const logoutPath = `/control/logout?${logoutParams}`;
23+
const logoutPath = `/common/logout/?${logoutParams}`;
2424

2525
const options = {
2626
html: true,

‎app/eventyay/static/pretixcontrol/js/ui/popover.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ $(function () {
1818
const accountPath = `/common/account/`;
1919
const adminPath = `/control/admin/`;
2020

21-
const logoutPath = `/control/logout?${logoutParams}`;
21+
const logoutPath = `/common/logout/?${logoutParams}`;
2222

2323
const options = {
2424
html: true,

‎app/eventyay/static/pretixpresale/js/ui/popover.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ $(function () {
3939

4040
// Constructing logout path using URLSearchParams
4141
let logoutParams = new URLSearchParams({ back: backUrl });
42-
var logoutPath = `/control/logout?${logoutParams}`;
42+
var logoutPath = `/common/logout/?${logoutParams}`;
4343

4444
var profilePath = `/control/settings/`;
4545
var orderPath = `/control/settings/orders/`;

‎deployment/docker-compose.yml‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@ services:
44
web:
55
image: eventyay/eventyay-next:enext
66
container_name: eventyay-next-web
7-
build:
8-
context: ../app
9-
dockerfile: Dockerfile.prod
107
command: gunicorn eventyay.config.wsgi:application --bind 0.0.0.0:8000
118
volumes:
129
- ./data/static:/home/app/web/eventyay/static.dist
1310
- ./data/data:/data
11+
- ./eventyay.cfg:/etc/eventyay.cfg:ro
1412
ports:
1513
- 8000:8000
1614
expose:
@@ -21,6 +19,18 @@ services:
2119
- db
2220
- redis
2321

22+
worker:
23+
image: eventyay/eventyay-next:enext
24+
container_name: eventyay-next-worker
25+
entrypoint: celery -A eventyay worker -l info
26+
volumes:
27+
- ./eventyay.cfg:/etc/eventyay.cfg:ro
28+
env_file:
29+
- ./.env
30+
depends_on:
31+
- db
32+
- redis
33+
2434
db:
2535
image: postgres:15
2636
container_name: eventyay-next-db

‎docker-compose.yml‎

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: eventyay
1+
name: eventyay-next
22

33
services:
44
web:
@@ -14,6 +14,31 @@ services:
1414
- ./.env.dev
1515
depends_on:
1616
- db
17+
- redis
18+
19+
worker:
20+
build: ./app
21+
platform: linux/amd64
22+
container_name: eventyay-next-worker
23+
entrypoint: celery -A eventyay worker -l info
24+
volumes:
25+
- ./app/eventyay:/usr/src/app/eventyay
26+
env_file:
27+
- ./.env.dev
28+
depends_on:
29+
- db
30+
- redis
31+
32+
redis:
33+
image: redis:latest
34+
platform: linux/amd64
35+
container_name: eventyay-next-redis
36+
restart: unless-stopped
37+
volumes:
38+
- rd:/data
39+
healthcheck:
40+
test: [ "CMD", "redis-cli", "--raw", "incr", "ping" ]
41+
1742
db:
1843
image: postgres:15
1944
platform: linux/amd64
@@ -25,3 +50,4 @@ services:
2550

2651
volumes:
2752
postgres_data_dev:
53+
rd:

‎eventyay-talk-video/.github/workflows/style.yml‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
name: Code Style
2+
3+
on:
4+
push:
5+
branches: [ main ]
6+
paths-ignore:
7+
- 'pretalx_venueless/locale/**'
8+
- 'pretalx_venueless/static/**'
9+
pull_request:
10+
branches: [ main ]
11+
paths-ignore:
12+
- 'pretalx_venueless/locale/**'
13+
- 'pretalx_venueless/static/**'
14+
15+
16+
jobs:
17+
isort:
18+
name: isort
19+
runs-on: ubuntu-latest
20+
steps:
21+
- uses: actions/checkout@v2
22+
- name: Set up Python 3.11
23+
uses: actions/setup-python@v1
24+
with:
25+
cache: "pip"
26+
python-version: "3.11"
27+
- name: Install isort
28+
run: pip3 install isort
29+
- name: Run isort
30+
run: isort -c .
31+
flake:
32+
name: flake8
33+
runs-on: ubuntu-latest
34+
steps:
35+
- uses: actions/checkout@v2
36+
- name: Set up Python 3.11
37+
uses: actions/setup-python@v1
38+
with:
39+
cache: "pip"
40+
python-version: "3.11"
41+
- name: Install Dependencies
42+
run: pip3 install flake8 flake8-bugbear
43+
- name: Run flake8
44+
run: flake8 .
45+
working-directory: .
46+
black:
47+
name: black
48+
runs-on: ubuntu-latest
49+
steps:
50+
- uses: actions/checkout@v2
51+
- name: Set up Python 3.11
52+
uses: actions/setup-python@v1
53+
with:
54+
cache: "pip"
55+
python-version: "3.11"
56+
- name: Install Dependencies
57+
run: pip3 install black
58+
- name: Run black
59+
run: black --check .
60+
working-directory: .
61+
djhtml:
62+
name: djhtml
63+
runs-on: ubuntu-latest
64+
steps:
65+
- uses: actions/checkout@v2
66+
- name: Set up Python 3.11
67+
uses: actions/setup-python@v1
68+
with:
69+
cache: "pip"
70+
python-version: "3.11"
71+
- name: Install Dependencies
72+
run: pip3 install djhtml
73+
- name: Run docformatter
74+
run: find -name "*.html" | xargs djhtml -c
75+
working-directory: .
76+
packaging:
77+
name: packaging
78+
runs-on: ubuntu-latest
79+
steps:
80+
- uses: actions/checkout@v2
81+
- name: Set up Python 3.11
82+
uses: actions/setup-python@v1
83+
with:
84+
cache: "pip"
85+
python-version: "3.11"
86+
- name: Install Dependencies
87+
run: pip3 install twine check-manifest -Ue .
88+
- name: Run check-manifest
89+
run: check-manifest .
90+
working-directory: .
91+
- name: Build package
92+
run: python -m build
93+
working-directory: .
94+
- name: Check package
95+
run: twine check dist/*
96+
working-directory: .

‎eventyay-talk-video/.gitignore‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
# Byte-compiled / optimized / DLL files
2+
__pycache__/
3+
*.py[cod]
4+
*$py.class
5+
6+
# C extensions
7+
*.so
8+
9+
# Distribution / packaging
10+
.Python
11+
env/
12+
build/
13+
develop-eggs/
14+
dist/
15+
downloads/
16+
eggs/
17+
.eggs/
18+
lib/
19+
lib64/
20+
parts/
21+
sdist/
22+
var/
23+
*.egg-info/
24+
.installed.cfg
25+
*.egg
26+
.ropeproject/
27+
28+
# PyInstaller
29+
# Usually these files are written by a python script from a template
30+
# before PyInstaller builds the exe, so as to inject date/other infos into it.
31+
*.manifest
32+
*.spec
33+
34+
# Installer logs
35+
pip-log.txt
36+
pip-delete-this-directory.txt
37+
38+
# Unit test / coverage reports
39+
htmlcov/
40+
.tox/
41+
.coverage
42+
.coverage.*
43+
.cache
44+
nosetests.xml
45+
coverage.xml
46+
*,cover
47+
.hypothesis/
48+
49+
# Translations
50+
*.mo
51+
*.pot
52+
53+
# Django stuff:
54+
*.log
55+
56+
# Sphinx documentation
57+
docs/_build/
58+
59+
# PyBuilder
60+
target/
61+
62+
#Ipython Notebook
63+
.ipynb_checkpoints

‎eventyay-talk-video/LICENSE‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Copyright 2021 Tobias Kunze
2+
3+
Licensed under the Apache License, Version 2.0 (the "License");
4+
you may not use this file except in compliance with the License.
5+
You may obtain a copy of the License at
6+
7+
http://www.apache.org/licenses/LICENSE-2.0
8+
9+
Unless required by applicable law or agreed to in writing, software
10+
distributed under the License is distributed on an "AS IS" BASIS,
11+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
See the License for the specific language governing permissions and
13+
limitations under the License.

0 commit comments

Comments
 (0)