diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..f40e00a --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,19 @@ +stages: + - linting + - black + +flake8: + stage: linting + image: registry.gitlab.com/pipeline-components/flake8:latest + script: + - pip install -r requirements/test.txt + - flake8 . + only: + - main + +black_check: + stage: black + image: python:3.9 + script: + - pip install -r requirements/dev.txt + - black --check --config pyproject.toml . \ No newline at end of file diff --git a/CineSync/CineSync/settings.py b/CineSync/CineSync/settings.py index 384e686..1a465e8 100644 --- a/CineSync/CineSync/settings.py +++ b/CineSync/CineSync/settings.py @@ -15,9 +15,7 @@ AUTH_USER_MODEL = 'auth.User' ALLOWED_HOSTS = os.getenv( 'DJANGO_ALLOWED_HOSTS', - default=[ - 'localhost,127.0.0.1', - ], + default='localhost,127.0.0.1', ).split(',') INSTALLED_APPS = [ @@ -96,19 +94,19 @@ DATABASES = { AUTH_PASSWORD_VALIDATORS = [ { 'NAME': 'django.contrib.auth.' - 'password_validation.UserAttributeSimilarityValidator', + 'password_validation.UserAttributeSimilarityValidator', }, { 'NAME': 'django.contrib.auth.' - 'password_validation.MinimumLengthValidator', + 'password_validation.MinimumLengthValidator', }, { 'NAME': 'django.contrib.auth.' - 'password_validation.CommonPasswordValidator', + 'password_validation.CommonPasswordValidator', }, { 'NAME': 'django.contrib.auth.' - 'password_validation.NumericPasswordValidator', + 'password_validation.NumericPasswordValidator', }, ] diff --git a/CineSync/static/css/includes/film_timtable_card.css b/CineSync/static/css/includes/film_timtable_card.css index cae21ae..ce53a62 100644 --- a/CineSync/static/css/includes/film_timtable_card.css +++ b/CineSync/static/css/includes/film_timtable_card.css @@ -45,7 +45,7 @@ border: 1px solid #eaeaea; } .film_card_title_row { - height: 20%; + height: 15%; margin-top: 0.5vw; margin-bottom: 0.5vw; display: flex; @@ -55,14 +55,14 @@ justify-content: space-evenly; } .film_card_row { - height: 60%; + height: 70%; display: flex; align-items: center; flex-direction: row; flex-wrap: nowrap; } .film_card_footer { - height: 20%; + height: 15%; display: flex; align-items: flex-start; flex-direction: row; @@ -110,4 +110,12 @@ background-color: #0d1d3a; border-radius: 5vw; border: 1px solid #eaeaea; +} +.film_session_block { + display: flex; + flex-direction: column; + flex-wrap: nowrap; + align-items: center; + justify-content: center; + margin-bottom: 0.4vw; } \ No newline at end of file diff --git a/CineSync/templates/includes/film_timetable_card.html b/CineSync/templates/includes/film_timetable_card.html index c90429f..361e29d 100644 --- a/CineSync/templates/includes/film_timetable_card.html +++ b/CineSync/templates/includes/film_timetable_card.html @@ -23,9 +23,12 @@
{% for time_sessions in session %} - -
{{ time_sessions.start_datetime|time:"H:i" }}
-
+
+ +
{{ time_sessions.start_datetime|time:"H:i" }}
+
+ +
{% endfor %}