diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..7b01417 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,17 @@ +image: docker:19.03.1 + +variables: + DOCKER_TLS_CERTDIR: "/certs" + IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG + +services: + - docker:19.03.1-dind + +before_script: + - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY + +build: + stage: build + script: + - docker build -t $IMAGE_TAG . + - docker push $IMAGE_TAG diff --git a/src/Dockerfile b/Dockerfile similarity index 64% rename from src/Dockerfile rename to Dockerfile index 5da4889..9e849d8 100644 --- a/src/Dockerfile +++ b/Dockerfile @@ -15,18 +15,18 @@ RUN virtualenv -p python3 venv #RUN bash -c 'source /venv/bin/activate; pip install -r pip-requirements.txt' RUN bash -c 'source /venv/bin/activate; pip install Django==2.0.3 psycopg2==2.7.4 django-statici18n==1.7.0 django-auth-oidc==0.4.5 pyjwkest==1.4.0 bleach==2.1.4 django-anymail==3.0 html2text==2018.1.9' -ADD . /nalodeni/src/ +ADD . /nalodeni/ -#RUN bash -c 'touch /nalodeni/src/main/settings_local.py' # this file needs to exist +#RUN bash -c 'touch /nalodeni/main/settings_local.py' # this file needs to exist #RUN adduser --disabled-login --quiet --gecos nalodeni nalodeni #RUN chown -R nalodeni:nalodeni /nalodeni/ -#RUN chmod u+x /nalodeni/src/docker-entrypoint.sh +#RUN chmod u+x /nalodeni/docker-entrypoint.sh RUN bash -c 'adduser --disabled-login --quiet --gecos nalodeni nalodeni && \ chmod -R o+r /nalodeni/ && \ - chown -R nalodeni:nalodeni /nalodeni/src/static_files && \ - chmod o+x /nalodeni/src/docker-entrypoint.sh && \ - touch /nalodeni/src/main/settings_local.py ' + chown -R nalodeni:nalodeni /nalodeni/static_files && \ + chmod o+x /nalodeni/docker-entrypoint.sh && \ + touch /nalodeni/main/settings_local.py ' USER nalodeni -ENTRYPOINT /nalodeni/src/docker-entrypoint.sh +ENTRYPOINT /nalodeni/docker-entrypoint.sh diff --git a/src/deploy/nginx-sample/nalodeni.sample.conf b/deploy/nginx-sample/nalodeni.sample.conf similarity index 100% rename from src/deploy/nginx-sample/nalodeni.sample.conf rename to deploy/nginx-sample/nalodeni.sample.conf diff --git a/src/deploy/nginx/.gitignore b/deploy/nginx/.gitignore similarity index 100% rename from src/deploy/nginx/.gitignore rename to deploy/nginx/.gitignore diff --git a/src/deploy/nginx/.keep b/deploy/nginx/.keep similarity index 100% rename from src/deploy/nginx/.keep rename to deploy/nginx/.keep diff --git a/docker-compose.sample.yml b/docker-compose.sample.yml new file mode 100644 index 0000000..03f6b26 --- /dev/null +++ b/docker-compose.sample.yml @@ -0,0 +1,46 @@ +version: '3.4' +services: + nginx: + image: nginx:latest + container_name: nalodeni-nginx + ports: + - "80:8001" + volumes: + - ./deploy/nginx:/etc/nginx/conf.d + - nalodeni_static:/static_nalodeni + depends_on: + - nalodeni + + nalodeni: + image: docker-registry.pirati.cz/to/nalodeni.pirati.cz:master + container_name: nalodeni + volumes: + - nalodeni_static:/nalodeni/static_files + ports: + - "8000" + environment: + - NALODENI_DEBUG=b-off + - NALODENI_DEBUG_LOCAL=b-off + - NALODENI_BASE_SUBDOMAIN=s-nalodeni. + - NALODENI_BASE_DOMAIN=s-pirati.cz + - NALODENI_APP_REG_LIMIT_HARD=s-10000 + - NALODENI_APP_REG_LIMIT_SOFT=s-50 + - NALODENI_HTTP_PROTOCOL=s-https + - NALODENI_EMAIL_HOST=s-mailgate.pirati.cz + - NALODENI_EMAIL_HOST_USER=s-nalodeni@pirati.cz + - NALODENI_EMAIL_HOST_PASSWORD=s-XXXXXXXXXXXXXXXXX + - NALODENI_EMAIL_PORT=s-587 + - NALODENI_EMAIL_USE_TLS=b-on + - NALODENI_TOKEN_VALID_SEC=s-604800 + - NALODENI_PSQL_USER=s-nalodeni + - NALODENI_PSQL_HOST=s-10.42.0.11 + - NALODENI_PSQL_DBNAME=s-nalodeni + - NALODENI_PSQL_PASSWORD=s-XXXXXXXXXXXXXXXXXXXXX + - NALODENI_AUTH_AVAIL_IDP=a-pirati,facebook,twitter,google + - NALODENI_AUTH_CLIENT_ID=s-pirati-nalodeni + - NALODENI_AUTH_SERVER=s-https://auth.pirati.cz/auth/realms/pirati/ + - NALODENI_AUTH_CLIENT_SECRET=s-XXXXXXXXXXXXXXXXXXXX +volumes: + nalodeni_static: + + diff --git a/src/docker-entrypoint.sh b/docker-entrypoint.sh similarity index 85% rename from src/docker-entrypoint.sh rename to docker-entrypoint.sh index 938d029..a5ebf7b 100644 --- a/src/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -4,13 +4,13 @@ trap "echo TRAPed signal" HUP INT QUIT KILL TERM source /venv/bin/activate -cd /nalodeni/src +cd /nalodeni python manage.py migrate python manage.py collectstatic --noinput -python manage.py loaddata nalodeni_interestregion nalodeni_topics nalodeni_skills +python manage.py loaddata nalodeni_interestregion nalodeni_topics nalodeni_skills nalodeni_counties PYTHONIOENCODING=utf-8 python manage.py runserver 0.0.0.0:8000 diff --git a/install.sh b/install.sh index 5cdb382..c25634c 100755 --- a/install.sh +++ b/install.sh @@ -1,9 +1,9 @@ virtualenv -p python3.5 venv -source ./venv/bin/activate +source venv/bin/activate pip install --upgrade pip -pip install -r src/pip-requirements.txt +pip install -r pip-requirements.txt ## # Keycloak SSO @@ -29,8 +29,7 @@ SQL ## # App Setup ## -./src/manage.py makemigrations nalodeni -./src/manage.py migrate - +./manage.py makemigrations nalodeni +./manage.py migrate diff --git a/src/keycloak_oidc/__init__.py b/keycloak_oidc/__init__.py similarity index 100% rename from src/keycloak_oidc/__init__.py rename to keycloak_oidc/__init__.py diff --git a/src/keycloak_oidc/auth.py b/keycloak_oidc/auth.py similarity index 100% rename from src/keycloak_oidc/auth.py rename to keycloak_oidc/auth.py diff --git a/src/keycloak_oidc/exceptions.py b/keycloak_oidc/exceptions.py similarity index 100% rename from src/keycloak_oidc/exceptions.py rename to keycloak_oidc/exceptions.py diff --git a/src/keycloak_oidc/middleware.py b/keycloak_oidc/middleware.py similarity index 100% rename from src/keycloak_oidc/middleware.py rename to keycloak_oidc/middleware.py diff --git a/src/keycloak_oidc/urls.py b/keycloak_oidc/urls.py similarity index 100% rename from src/keycloak_oidc/urls.py rename to keycloak_oidc/urls.py diff --git a/src/keycloak_oidc/views.py b/keycloak_oidc/views.py similarity index 100% rename from src/keycloak_oidc/views.py rename to keycloak_oidc/views.py diff --git a/src/main/__init__.py b/main/__init__.py similarity index 100% rename from src/main/__init__.py rename to main/__init__.py diff --git a/src/main/settings.py b/main/settings.py similarity index 100% rename from src/main/settings.py rename to main/settings.py diff --git a/src/main/settings_global.py b/main/settings_global.py similarity index 100% rename from src/main/settings_global.py rename to main/settings_global.py diff --git a/src/main/settings_local.distrib.py b/main/settings_local.distrib.py similarity index 100% rename from src/main/settings_local.distrib.py rename to main/settings_local.distrib.py diff --git a/src/main/templates/base.html b/main/templates/base.html similarity index 100% rename from src/main/templates/base.html rename to main/templates/base.html diff --git a/src/main/urls.py b/main/urls.py similarity index 100% rename from src/main/urls.py rename to main/urls.py diff --git a/src/main/wsgi.py b/main/wsgi.py similarity index 100% rename from src/main/wsgi.py rename to main/wsgi.py diff --git a/src/manage.py b/manage.py similarity index 100% rename from src/manage.py rename to manage.py diff --git a/src/nalodeni/__init__.py b/nalodeni/__init__.py similarity index 100% rename from src/nalodeni/__init__.py rename to nalodeni/__init__.py diff --git a/src/nalodeni/auth.py b/nalodeni/auth.py similarity index 100% rename from src/nalodeni/auth.py rename to nalodeni/auth.py diff --git a/src/nalodeni/fixtures/nalodeni_counties.json b/nalodeni/fixtures/nalodeni_counties.json similarity index 100% rename from src/nalodeni/fixtures/nalodeni_counties.json rename to nalodeni/fixtures/nalodeni_counties.json diff --git a/src/nalodeni/fixtures/nalodeni_interestregion.json b/nalodeni/fixtures/nalodeni_interestregion.json similarity index 100% rename from src/nalodeni/fixtures/nalodeni_interestregion.json rename to nalodeni/fixtures/nalodeni_interestregion.json diff --git a/src/nalodeni/fixtures/nalodeni_interestregion.src.yaml b/nalodeni/fixtures/nalodeni_interestregion.src.yaml similarity index 100% rename from src/nalodeni/fixtures/nalodeni_interestregion.src.yaml rename to nalodeni/fixtures/nalodeni_interestregion.src.yaml diff --git a/src/nalodeni/fixtures/nalodeni_skills.json b/nalodeni/fixtures/nalodeni_skills.json similarity index 100% rename from src/nalodeni/fixtures/nalodeni_skills.json rename to nalodeni/fixtures/nalodeni_skills.json diff --git a/src/nalodeni/fixtures/nalodeni_skills.src.yaml b/nalodeni/fixtures/nalodeni_skills.src.yaml similarity index 100% rename from src/nalodeni/fixtures/nalodeni_skills.src.yaml rename to nalodeni/fixtures/nalodeni_skills.src.yaml diff --git a/src/nalodeni/fixtures/nalodeni_topics.json b/nalodeni/fixtures/nalodeni_topics.json similarity index 100% rename from src/nalodeni/fixtures/nalodeni_topics.json rename to nalodeni/fixtures/nalodeni_topics.json diff --git a/src/nalodeni/fixtures/nalodeni_topics.src.yaml b/nalodeni/fixtures/nalodeni_topics.src.yaml similarity index 100% rename from src/nalodeni/fixtures/nalodeni_topics.src.yaml rename to nalodeni/fixtures/nalodeni_topics.src.yaml diff --git a/src/nalodeni/forms.py b/nalodeni/forms.py similarity index 99% rename from src/nalodeni/forms.py rename to nalodeni/forms.py index 24ef6c1..8dcd097 100644 --- a/src/nalodeni/forms.py +++ b/nalodeni/forms.py @@ -61,7 +61,7 @@ class AppUserSsoForm(ModelForm): class Meta: model = models.AppUser fields = ['city', 'postcode', 'district', 'kind', - 'email', 'email_contact', 'email_contact_active', 'dc_stamp'] + 'email', 'email_contact', 'email_contact_active', 'dc_stamp' ] def clean_postcode(self): data = self.cleaned_data['postcode'] diff --git a/src/nalodeni/migrations/0001_initial.py b/nalodeni/migrations/0001_initial.py similarity index 100% rename from src/nalodeni/migrations/0001_initial.py rename to nalodeni/migrations/0001_initial.py diff --git a/src/nalodeni/migrations/0002_remove_appuser_postcode.py b/nalodeni/migrations/0002_remove_appuser_postcode.py similarity index 100% rename from src/nalodeni/migrations/0002_remove_appuser_postcode.py rename to nalodeni/migrations/0002_remove_appuser_postcode.py diff --git a/src/nalodeni/migrations/0003_appuser_district.py b/nalodeni/migrations/0003_appuser_district.py similarity index 100% rename from src/nalodeni/migrations/0003_appuser_district.py rename to nalodeni/migrations/0003_appuser_district.py diff --git a/src/nalodeni/migrations/0004_appuser_postcode.py b/nalodeni/migrations/0004_appuser_postcode.py similarity index 100% rename from src/nalodeni/migrations/0004_appuser_postcode.py rename to nalodeni/migrations/0004_appuser_postcode.py diff --git a/src/nalodeni/migrations/0005_appuser_emailtoken.py b/nalodeni/migrations/0005_appuser_emailtoken.py similarity index 100% rename from src/nalodeni/migrations/0005_appuser_emailtoken.py rename to nalodeni/migrations/0005_appuser_emailtoken.py diff --git a/src/nalodeni/migrations/0006_auto_20180312_0112.py b/nalodeni/migrations/0006_auto_20180312_0112.py similarity index 100% rename from src/nalodeni/migrations/0006_auto_20180312_0112.py rename to nalodeni/migrations/0006_auto_20180312_0112.py diff --git a/src/nalodeni/migrations/0007_auto_20180312_0213.py b/nalodeni/migrations/0007_auto_20180312_0213.py similarity index 100% rename from src/nalodeni/migrations/0007_auto_20180312_0213.py rename to nalodeni/migrations/0007_auto_20180312_0213.py diff --git a/src/nalodeni/migrations/0008_appuser_city.py b/nalodeni/migrations/0008_appuser_city.py similarity index 100% rename from src/nalodeni/migrations/0008_appuser_city.py rename to nalodeni/migrations/0008_appuser_city.py diff --git a/src/nalodeni/migrations/0009_auto_20180323_1145.py b/nalodeni/migrations/0009_auto_20180323_1145.py similarity index 100% rename from src/nalodeni/migrations/0009_auto_20180323_1145.py rename to nalodeni/migrations/0009_auto_20180323_1145.py diff --git a/src/nalodeni/migrations/0010_auto_20180323_1214.py b/nalodeni/migrations/0010_auto_20180323_1214.py similarity index 100% rename from src/nalodeni/migrations/0010_auto_20180323_1214.py rename to nalodeni/migrations/0010_auto_20180323_1214.py diff --git a/src/nalodeni/migrations/0011_auto_20180323_1312.py b/nalodeni/migrations/0011_auto_20180323_1312.py similarity index 100% rename from src/nalodeni/migrations/0011_auto_20180323_1312.py rename to nalodeni/migrations/0011_auto_20180323_1312.py diff --git a/src/nalodeni/migrations/0012_auto_20180325_1851.py b/nalodeni/migrations/0012_auto_20180325_1851.py similarity index 100% rename from src/nalodeni/migrations/0012_auto_20180325_1851.py rename to nalodeni/migrations/0012_auto_20180325_1851.py diff --git a/src/nalodeni/migrations/0013_auto_20180325_2109.py b/nalodeni/migrations/0013_auto_20180325_2109.py similarity index 100% rename from src/nalodeni/migrations/0013_auto_20180325_2109.py rename to nalodeni/migrations/0013_auto_20180325_2109.py diff --git a/src/nalodeni/migrations/0014_auto_20180325_2110.py b/nalodeni/migrations/0014_auto_20180325_2110.py similarity index 100% rename from src/nalodeni/migrations/0014_auto_20180325_2110.py rename to nalodeni/migrations/0014_auto_20180325_2110.py diff --git a/src/nalodeni/migrations/0015_auto_20180325_2326.py b/nalodeni/migrations/0015_auto_20180325_2326.py similarity index 100% rename from src/nalodeni/migrations/0015_auto_20180325_2326.py rename to nalodeni/migrations/0015_auto_20180325_2326.py diff --git a/src/nalodeni/migrations/0016_appuser_interestedin.py b/nalodeni/migrations/0016_appuser_interestedin.py similarity index 100% rename from src/nalodeni/migrations/0016_appuser_interestedin.py rename to nalodeni/migrations/0016_appuser_interestedin.py diff --git a/src/nalodeni/migrations/0017_auto_20180410_1144.py b/nalodeni/migrations/0017_auto_20180410_1144.py similarity index 100% rename from src/nalodeni/migrations/0017_auto_20180410_1144.py rename to nalodeni/migrations/0017_auto_20180410_1144.py diff --git a/src/nalodeni/migrations/0018_auto_20180410_1547.py b/nalodeni/migrations/0018_auto_20180410_1547.py similarity index 100% rename from src/nalodeni/migrations/0018_auto_20180410_1547.py rename to nalodeni/migrations/0018_auto_20180410_1547.py diff --git a/src/nalodeni/migrations/0019_auto_20180617_1104.py b/nalodeni/migrations/0019_auto_20180617_1104.py similarity index 100% rename from src/nalodeni/migrations/0019_auto_20180617_1104.py rename to nalodeni/migrations/0019_auto_20180617_1104.py diff --git a/src/nalodeni/migrations/0020_auto_20180617_1146.py b/nalodeni/migrations/0020_auto_20180617_1146.py similarity index 100% rename from src/nalodeni/migrations/0020_auto_20180617_1146.py rename to nalodeni/migrations/0020_auto_20180617_1146.py diff --git a/src/nalodeni/migrations/0021_auto_20180617_1310.py b/nalodeni/migrations/0021_auto_20180617_1310.py similarity index 100% rename from src/nalodeni/migrations/0021_auto_20180617_1310.py rename to nalodeni/migrations/0021_auto_20180617_1310.py diff --git a/src/nalodeni/migrations/0022_appuser_email_contact_token.py b/nalodeni/migrations/0022_appuser_email_contact_token.py similarity index 100% rename from src/nalodeni/migrations/0022_appuser_email_contact_token.py rename to nalodeni/migrations/0022_appuser_email_contact_token.py diff --git a/src/nalodeni/migrations/0023_appuser_ts_for_ldap_sync.py b/nalodeni/migrations/0023_appuser_ts_for_ldap_sync.py similarity index 100% rename from src/nalodeni/migrations/0023_appuser_ts_for_ldap_sync.py rename to nalodeni/migrations/0023_appuser_ts_for_ldap_sync.py diff --git a/src/nalodeni/migrations/0024_appregemail_data_consent.py b/nalodeni/migrations/0024_appregemail_data_consent.py similarity index 100% rename from src/nalodeni/migrations/0024_appregemail_data_consent.py rename to nalodeni/migrations/0024_appregemail_data_consent.py diff --git a/src/nalodeni/migrations/0025_appregemail_dc_stamp.py b/nalodeni/migrations/0025_appregemail_dc_stamp.py similarity index 100% rename from src/nalodeni/migrations/0025_appregemail_dc_stamp.py rename to nalodeni/migrations/0025_appregemail_dc_stamp.py diff --git a/src/nalodeni/migrations/0026_appuser_dc_stamp.py b/nalodeni/migrations/0026_appuser_dc_stamp.py similarity index 100% rename from src/nalodeni/migrations/0026_appuser_dc_stamp.py rename to nalodeni/migrations/0026_appuser_dc_stamp.py diff --git a/src/nalodeni/migrations/0027_auto_20180625_0314.py b/nalodeni/migrations/0027_auto_20180625_0314.py similarity index 100% rename from src/nalodeni/migrations/0027_auto_20180625_0314.py rename to nalodeni/migrations/0027_auto_20180625_0314.py diff --git a/src/nalodeni/migrations/0028_auto_20180707_1508.py b/nalodeni/migrations/0028_auto_20180707_1508.py similarity index 100% rename from src/nalodeni/migrations/0028_auto_20180707_1508.py rename to nalodeni/migrations/0028_auto_20180707_1508.py diff --git a/src/nalodeni/migrations/0029_appuser_createdstamp.py b/nalodeni/migrations/0029_appuser_createdstamp.py similarity index 100% rename from src/nalodeni/migrations/0029_appuser_createdstamp.py rename to nalodeni/migrations/0029_appuser_createdstamp.py diff --git a/src/nalodeni/migrations/0030_appregemail_createdstamp.py b/nalodeni/migrations/0030_appregemail_createdstamp.py similarity index 100% rename from src/nalodeni/migrations/0030_appregemail_createdstamp.py rename to nalodeni/migrations/0030_appregemail_createdstamp.py diff --git a/src/nalodeni/migrations/0031_auto_20180815_0639.py b/nalodeni/migrations/0031_auto_20180815_0639.py similarity index 100% rename from src/nalodeni/migrations/0031_auto_20180815_0639.py rename to nalodeni/migrations/0031_auto_20180815_0639.py diff --git a/src/nalodeni/migrations/0032_auto_20180818_1728.py b/nalodeni/migrations/0032_auto_20180818_1728.py similarity index 100% rename from src/nalodeni/migrations/0032_auto_20180818_1728.py rename to nalodeni/migrations/0032_auto_20180818_1728.py diff --git a/src/nalodeni/migrations/0033_auto_20180818_1729.py b/nalodeni/migrations/0033_auto_20180818_1729.py similarity index 100% rename from src/nalodeni/migrations/0033_auto_20180818_1729.py rename to nalodeni/migrations/0033_auto_20180818_1729.py diff --git a/src/nalodeni/migrations/0034_auto_20180818_1730.py b/nalodeni/migrations/0034_auto_20180818_1730.py similarity index 100% rename from src/nalodeni/migrations/0034_auto_20180818_1730.py rename to nalodeni/migrations/0034_auto_20180818_1730.py diff --git a/src/nalodeni/migrations/0035_newsletter_is_del.py b/nalodeni/migrations/0035_newsletter_is_del.py similarity index 100% rename from src/nalodeni/migrations/0035_newsletter_is_del.py rename to nalodeni/migrations/0035_newsletter_is_del.py diff --git a/src/nalodeni/migrations/0036_newsletter_kind.py b/nalodeni/migrations/0036_newsletter_kind.py similarity index 100% rename from src/nalodeni/migrations/0036_newsletter_kind.py rename to nalodeni/migrations/0036_newsletter_kind.py diff --git a/src/nalodeni/migrations/0037_auto_20180818_1934.py b/nalodeni/migrations/0037_auto_20180818_1934.py similarity index 100% rename from src/nalodeni/migrations/0037_auto_20180818_1934.py rename to nalodeni/migrations/0037_auto_20180818_1934.py diff --git a/src/nalodeni/migrations/0038_newsmsg_is_del.py b/nalodeni/migrations/0038_newsmsg_is_del.py similarity index 100% rename from src/nalodeni/migrations/0038_newsmsg_is_del.py rename to nalodeni/migrations/0038_newsmsg_is_del.py diff --git a/src/nalodeni/migrations/0039_auto_20180819_0221.py b/nalodeni/migrations/0039_auto_20180819_0221.py similarity index 100% rename from src/nalodeni/migrations/0039_auto_20180819_0221.py rename to nalodeni/migrations/0039_auto_20180819_0221.py diff --git a/src/nalodeni/migrations/0040_auto_20180819_0222.py b/nalodeni/migrations/0040_auto_20180819_0222.py similarity index 100% rename from src/nalodeni/migrations/0040_auto_20180819_0222.py rename to nalodeni/migrations/0040_auto_20180819_0222.py diff --git a/src/nalodeni/migrations/0041_auto_20180819_0254.py b/nalodeni/migrations/0041_auto_20180819_0254.py similarity index 100% rename from src/nalodeni/migrations/0041_auto_20180819_0254.py rename to nalodeni/migrations/0041_auto_20180819_0254.py diff --git a/src/nalodeni/migrations/0042_auto_20180819_0255.py b/nalodeni/migrations/0042_auto_20180819_0255.py similarity index 100% rename from src/nalodeni/migrations/0042_auto_20180819_0255.py rename to nalodeni/migrations/0042_auto_20180819_0255.py diff --git a/src/nalodeni/migrations/0043_auto_20180819_0257.py b/nalodeni/migrations/0043_auto_20180819_0257.py similarity index 100% rename from src/nalodeni/migrations/0043_auto_20180819_0257.py rename to nalodeni/migrations/0043_auto_20180819_0257.py diff --git a/src/nalodeni/migrations/0044_auto_20180819_0847.py b/nalodeni/migrations/0044_auto_20180819_0847.py similarity index 100% rename from src/nalodeni/migrations/0044_auto_20180819_0847.py rename to nalodeni/migrations/0044_auto_20180819_0847.py diff --git a/src/nalodeni/migrations/0045_auto_20180819_0848.py b/nalodeni/migrations/0045_auto_20180819_0848.py similarity index 100% rename from src/nalodeni/migrations/0045_auto_20180819_0848.py rename to nalodeni/migrations/0045_auto_20180819_0848.py diff --git a/src/nalodeni/migrations/0046_auto_20180819_0900.py b/nalodeni/migrations/0046_auto_20180819_0900.py similarity index 100% rename from src/nalodeni/migrations/0046_auto_20180819_0900.py rename to nalodeni/migrations/0046_auto_20180819_0900.py diff --git a/src/nalodeni/migrations/0047_newsletter_recipients.py b/nalodeni/migrations/0047_newsletter_recipients.py similarity index 100% rename from src/nalodeni/migrations/0047_newsletter_recipients.py rename to nalodeni/migrations/0047_newsletter_recipients.py diff --git a/src/nalodeni/migrations/0048_auto_20180819_1025.py b/nalodeni/migrations/0048_auto_20180819_1025.py similarity index 100% rename from src/nalodeni/migrations/0048_auto_20180819_1025.py rename to nalodeni/migrations/0048_auto_20180819_1025.py diff --git a/src/nalodeni/migrations/0049_auto_20181123_1607.py b/nalodeni/migrations/0049_auto_20181123_1607.py similarity index 100% rename from src/nalodeni/migrations/0049_auto_20181123_1607.py rename to nalodeni/migrations/0049_auto_20181123_1607.py diff --git a/src/nalodeni/migrations/0050_auto_20190220_2358.py b/nalodeni/migrations/0050_auto_20190220_2358.py similarity index 100% rename from src/nalodeni/migrations/0050_auto_20190220_2358.py rename to nalodeni/migrations/0050_auto_20190220_2358.py diff --git a/src/nalodeni/migrations/0051_auto_20190221_0035.py b/nalodeni/migrations/0051_auto_20190221_0035.py similarity index 100% rename from src/nalodeni/migrations/0051_auto_20190221_0035.py rename to nalodeni/migrations/0051_auto_20190221_0035.py diff --git a/src/nalodeni/migrations/0052_auto_20190303_1151.py b/nalodeni/migrations/0052_auto_20190303_1151.py similarity index 100% rename from src/nalodeni/migrations/0052_auto_20190303_1151.py rename to nalodeni/migrations/0052_auto_20190303_1151.py diff --git a/src/nalodeni/migrations/0053_auto_20190303_1207.py b/nalodeni/migrations/0053_auto_20190303_1207.py similarity index 100% rename from src/nalodeni/migrations/0053_auto_20190303_1207.py rename to nalodeni/migrations/0053_auto_20190303_1207.py diff --git a/src/nalodeni/migrations/0054_auto_20190412_1852.py b/nalodeni/migrations/0054_auto_20190412_1852.py similarity index 100% rename from src/nalodeni/migrations/0054_auto_20190412_1852.py rename to nalodeni/migrations/0054_auto_20190412_1852.py diff --git a/src/nalodeni/migrations/0055_auto_20191113_0942.py b/nalodeni/migrations/0055_auto_20191113_0942.py similarity index 100% rename from src/nalodeni/migrations/0055_auto_20191113_0942.py rename to nalodeni/migrations/0055_auto_20191113_0942.py diff --git a/src/nalodeni/migrations/0056_appuser_county.py b/nalodeni/migrations/0056_appuser_county.py similarity index 100% rename from src/nalodeni/migrations/0056_appuser_county.py rename to nalodeni/migrations/0056_appuser_county.py diff --git a/src/nalodeni/migrations/0057_auto_20191113_1114.py b/nalodeni/migrations/0057_auto_20191113_1114.py similarity index 100% rename from src/nalodeni/migrations/0057_auto_20191113_1114.py rename to nalodeni/migrations/0057_auto_20191113_1114.py diff --git a/nalodeni/migrations/0058_appuser_dc_undo_stamp.py b/nalodeni/migrations/0058_appuser_dc_undo_stamp.py new file mode 100644 index 0000000..6ec2726 --- /dev/null +++ b/nalodeni/migrations/0058_appuser_dc_undo_stamp.py @@ -0,0 +1,18 @@ +# Generated by Django 2.0.3 on 2019-11-13 16:33 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('nalodeni', '0057_auto_20191113_1114'), + ] + + operations = [ + migrations.AddField( + model_name='appuser', + name='dc_undo_stamp', + field=models.DateTimeField(blank=True, default=None, null=True, verbose_name='Datum odvolání souhlasu se zprac.os.údajů'), + ), + ] diff --git a/src/nalodeni/migrations/__init__.py b/nalodeni/migrations/__init__.py similarity index 100% rename from src/nalodeni/migrations/__init__.py rename to nalodeni/migrations/__init__.py diff --git a/src/nalodeni/migrations/does-not-work/0002_auto_20180228_1631.py b/nalodeni/migrations/does-not-work/0002_auto_20180228_1631.py similarity index 100% rename from src/nalodeni/migrations/does-not-work/0002_auto_20180228_1631.py rename to nalodeni/migrations/does-not-work/0002_auto_20180228_1631.py diff --git a/src/nalodeni/migrations/works/0002_remove_appuser_postcode.py b/nalodeni/migrations/works/0002_remove_appuser_postcode.py similarity index 100% rename from src/nalodeni/migrations/works/0002_remove_appuser_postcode.py rename to nalodeni/migrations/works/0002_remove_appuser_postcode.py diff --git a/src/nalodeni/migrations/works/0003_appuser_district.py b/nalodeni/migrations/works/0003_appuser_district.py similarity index 100% rename from src/nalodeni/migrations/works/0003_appuser_district.py rename to nalodeni/migrations/works/0003_appuser_district.py diff --git a/src/nalodeni/migrations/works/0004_appuser_postcode.py b/nalodeni/migrations/works/0004_appuser_postcode.py similarity index 100% rename from src/nalodeni/migrations/works/0004_appuser_postcode.py rename to nalodeni/migrations/works/0004_appuser_postcode.py diff --git a/src/nalodeni/models.py b/nalodeni/models.py similarity index 98% rename from src/nalodeni/models.py rename to nalodeni/models.py index d45963a..dc4d440 100644 --- a/src/nalodeni/models.py +++ b/nalodeni/models.py @@ -185,7 +185,11 @@ class AppUser(AbstractUser, DataAudited): ts_for_ldap_sync = DateTimeField(_('Timestamp pro LDAP synchronizaci'), default=datetime.datetime.now, blank=True, null=True) + # datum udeleni a odvolani souhlasu se zpracovanim osobnich udaju + # logika: je-li dc_stamp=Null, souhlas neni udelen. + # pole dc_undo_stamp ma pouze informacni vyznam, kdy k odvolani souhlasu doslo dc_stamp = DateTimeField(_('Data consent timestamp'), default=None, blank=True, null=True) + dc_undo_stamp = DateTimeField(_('Datum odvolání souhlasu se zprac.os.údajů'), default=None, blank=True, null=True) # dotaznik pro uzivatele userform = ForeignKey('UserForm', on_delete=CASCADE, verbose_name=_('dotazník'), diff --git a/src/nalodeni/news.py b/nalodeni/news.py similarity index 100% rename from src/nalodeni/news.py rename to nalodeni/news.py diff --git a/src/nalodeni/people.py b/nalodeni/people.py similarity index 100% rename from src/nalodeni/people.py rename to nalodeni/people.py diff --git a/src/nalodeni/static/css/main.css b/nalodeni/static/css/main.css similarity index 100% rename from src/nalodeni/static/css/main.css rename to nalodeni/static/css/main.css diff --git a/src/nalodeni/static/css/main_local.css b/nalodeni/static/css/main_local.css similarity index 100% rename from src/nalodeni/static/css/main_local.css rename to nalodeni/static/css/main_local.css diff --git a/src/nalodeni/static/fonts/BebasNeue/Bebas Neue - SIL Open Font License 1.1.pdf b/nalodeni/static/fonts/BebasNeue/Bebas Neue - SIL Open Font License 1.1.pdf similarity index 100% rename from src/nalodeni/static/fonts/BebasNeue/Bebas Neue - SIL Open Font License 1.1.pdf rename to nalodeni/static/fonts/BebasNeue/Bebas Neue - SIL Open Font License 1.1.pdf diff --git a/src/nalodeni/static/fonts/BebasNeue/BebasNeue-Bold.ttf b/nalodeni/static/fonts/BebasNeue/BebasNeue-Bold.ttf similarity index 100% rename from src/nalodeni/static/fonts/BebasNeue/BebasNeue-Bold.ttf rename to nalodeni/static/fonts/BebasNeue/BebasNeue-Bold.ttf diff --git a/src/nalodeni/static/fonts/BebasNeue/BebasNeue-Book.ttf b/nalodeni/static/fonts/BebasNeue/BebasNeue-Book.ttf similarity index 100% rename from src/nalodeni/static/fonts/BebasNeue/BebasNeue-Book.ttf rename to nalodeni/static/fonts/BebasNeue/BebasNeue-Book.ttf diff --git a/src/nalodeni/static/fonts/BebasNeue/BebasNeue-Light.ttf b/nalodeni/static/fonts/BebasNeue/BebasNeue-Light.ttf similarity index 100% rename from src/nalodeni/static/fonts/BebasNeue/BebasNeue-Light.ttf rename to nalodeni/static/fonts/BebasNeue/BebasNeue-Light.ttf diff --git a/src/nalodeni/static/fonts/BebasNeue/BebasNeue-Regular.ttf b/nalodeni/static/fonts/BebasNeue/BebasNeue-Regular.ttf similarity index 100% rename from src/nalodeni/static/fonts/BebasNeue/BebasNeue-Regular.ttf rename to nalodeni/static/fonts/BebasNeue/BebasNeue-Regular.ttf diff --git a/src/nalodeni/static/fonts/BebasNeue/BebasNeue-Thin.ttf b/nalodeni/static/fonts/BebasNeue/BebasNeue-Thin.ttf similarity index 100% rename from src/nalodeni/static/fonts/BebasNeue/BebasNeue-Thin.ttf rename to nalodeni/static/fonts/BebasNeue/BebasNeue-Thin.ttf diff --git a/src/nalodeni/static/fonts/BebasNeue/BebasNeue.css b/nalodeni/static/fonts/BebasNeue/BebasNeue.css similarity index 100% rename from src/nalodeni/static/fonts/BebasNeue/BebasNeue.css rename to nalodeni/static/fonts/BebasNeue/BebasNeue.css diff --git a/src/nalodeni/static/fonts/BebasNeue/source.txt b/nalodeni/static/fonts/BebasNeue/source.txt similarity index 100% rename from src/nalodeni/static/fonts/BebasNeue/source.txt rename to nalodeni/static/fonts/BebasNeue/source.txt diff --git a/src/nalodeni/static/fonts/FontAwesome.otf b/nalodeni/static/fonts/FontAwesome.otf similarity index 100% rename from src/nalodeni/static/fonts/FontAwesome.otf rename to nalodeni/static/fonts/FontAwesome.otf diff --git a/src/nalodeni/static/fonts/firasans/fira-sans-v8-latin_latin-ext-300italic.ttf b/nalodeni/static/fonts/firasans/fira-sans-v8-latin_latin-ext-300italic.ttf similarity index 100% rename from src/nalodeni/static/fonts/firasans/fira-sans-v8-latin_latin-ext-300italic.ttf rename to nalodeni/static/fonts/firasans/fira-sans-v8-latin_latin-ext-300italic.ttf diff --git a/src/nalodeni/static/fonts/firasans/fira-sans-v8-latin_latin-ext-300italic.woff b/nalodeni/static/fonts/firasans/fira-sans-v8-latin_latin-ext-300italic.woff similarity index 100% rename from src/nalodeni/static/fonts/firasans/fira-sans-v8-latin_latin-ext-300italic.woff rename to nalodeni/static/fonts/firasans/fira-sans-v8-latin_latin-ext-300italic.woff diff --git a/src/nalodeni/static/fonts/firasans/fira-sans-v8-latin_latin-ext-300italic.woff2 b/nalodeni/static/fonts/firasans/fira-sans-v8-latin_latin-ext-300italic.woff2 similarity index 100% rename from src/nalodeni/static/fonts/firasans/fira-sans-v8-latin_latin-ext-300italic.woff2 rename to nalodeni/static/fonts/firasans/fira-sans-v8-latin_latin-ext-300italic.woff2 diff --git a/src/nalodeni/static/fonts/firasans/fira-sans-v8-latin_latin-ext-500.ttf b/nalodeni/static/fonts/firasans/fira-sans-v8-latin_latin-ext-500.ttf similarity index 100% rename from src/nalodeni/static/fonts/firasans/fira-sans-v8-latin_latin-ext-500.ttf rename to nalodeni/static/fonts/firasans/fira-sans-v8-latin_latin-ext-500.ttf diff --git a/src/nalodeni/static/fonts/firasans/fira-sans-v8-latin_latin-ext-500.woff b/nalodeni/static/fonts/firasans/fira-sans-v8-latin_latin-ext-500.woff similarity index 100% rename from src/nalodeni/static/fonts/firasans/fira-sans-v8-latin_latin-ext-500.woff rename to nalodeni/static/fonts/firasans/fira-sans-v8-latin_latin-ext-500.woff diff --git a/src/nalodeni/static/fonts/firasans/fira-sans-v8-latin_latin-ext-500.woff2 b/nalodeni/static/fonts/firasans/fira-sans-v8-latin_latin-ext-500.woff2 similarity index 100% rename from src/nalodeni/static/fonts/firasans/fira-sans-v8-latin_latin-ext-500.woff2 rename to nalodeni/static/fonts/firasans/fira-sans-v8-latin_latin-ext-500.woff2 diff --git a/src/nalodeni/static/fonts/firasans/fira-sans-v8-latin_latin-ext-700.woff b/nalodeni/static/fonts/firasans/fira-sans-v8-latin_latin-ext-700.woff similarity index 100% rename from src/nalodeni/static/fonts/firasans/fira-sans-v8-latin_latin-ext-700.woff rename to nalodeni/static/fonts/firasans/fira-sans-v8-latin_latin-ext-700.woff diff --git a/src/nalodeni/static/fonts/firasans/fira-sans-v8-latin_latin-ext-700.woff2 b/nalodeni/static/fonts/firasans/fira-sans-v8-latin_latin-ext-700.woff2 similarity index 100% rename from src/nalodeni/static/fonts/firasans/fira-sans-v8-latin_latin-ext-700.woff2 rename to nalodeni/static/fonts/firasans/fira-sans-v8-latin_latin-ext-700.woff2 diff --git a/src/nalodeni/static/fonts/firasans/fira-sans-v8-latin_latin-ext-regular.ttf b/nalodeni/static/fonts/firasans/fira-sans-v8-latin_latin-ext-regular.ttf similarity index 100% rename from src/nalodeni/static/fonts/firasans/fira-sans-v8-latin_latin-ext-regular.ttf rename to nalodeni/static/fonts/firasans/fira-sans-v8-latin_latin-ext-regular.ttf diff --git a/src/nalodeni/static/fonts/firasans/fira-sans-v8-latin_latin-ext-regular.woff b/nalodeni/static/fonts/firasans/fira-sans-v8-latin_latin-ext-regular.woff similarity index 100% rename from src/nalodeni/static/fonts/firasans/fira-sans-v8-latin_latin-ext-regular.woff rename to nalodeni/static/fonts/firasans/fira-sans-v8-latin_latin-ext-regular.woff diff --git a/src/nalodeni/static/fonts/firasans/fira-sans-v8-latin_latin-ext-regular.woff2 b/nalodeni/static/fonts/firasans/fira-sans-v8-latin_latin-ext-regular.woff2 similarity index 100% rename from src/nalodeni/static/fonts/firasans/fira-sans-v8-latin_latin-ext-regular.woff2 rename to nalodeni/static/fonts/firasans/fira-sans-v8-latin_latin-ext-regular.woff2 diff --git a/src/nalodeni/static/fonts/fontawesome-webfont.eot b/nalodeni/static/fonts/fontawesome-webfont.eot similarity index 100% rename from src/nalodeni/static/fonts/fontawesome-webfont.eot rename to nalodeni/static/fonts/fontawesome-webfont.eot diff --git a/src/nalodeni/static/fonts/fontawesome-webfont.svg b/nalodeni/static/fonts/fontawesome-webfont.svg similarity index 100% rename from src/nalodeni/static/fonts/fontawesome-webfont.svg rename to nalodeni/static/fonts/fontawesome-webfont.svg diff --git a/src/nalodeni/static/fonts/fontawesome-webfont.ttf b/nalodeni/static/fonts/fontawesome-webfont.ttf similarity index 100% rename from src/nalodeni/static/fonts/fontawesome-webfont.ttf rename to nalodeni/static/fonts/fontawesome-webfont.ttf diff --git a/src/nalodeni/static/fonts/fontawesome-webfont.woff b/nalodeni/static/fonts/fontawesome-webfont.woff similarity index 100% rename from src/nalodeni/static/fonts/fontawesome-webfont.woff rename to nalodeni/static/fonts/fontawesome-webfont.woff diff --git a/src/nalodeni/static/fonts/fontawesome-webfont.woff2 b/nalodeni/static/fonts/fontawesome-webfont.woff2 similarity index 100% rename from src/nalodeni/static/fonts/fontawesome-webfont.woff2 rename to nalodeni/static/fonts/fontawesome-webfont.woff2 diff --git a/src/nalodeni/static/fonts/glyphicons-halflings-regular.eot b/nalodeni/static/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from src/nalodeni/static/fonts/glyphicons-halflings-regular.eot rename to nalodeni/static/fonts/glyphicons-halflings-regular.eot diff --git a/src/nalodeni/static/fonts/glyphicons-halflings-regular.svg b/nalodeni/static/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from src/nalodeni/static/fonts/glyphicons-halflings-regular.svg rename to nalodeni/static/fonts/glyphicons-halflings-regular.svg diff --git a/src/nalodeni/static/fonts/glyphicons-halflings-regular.ttf b/nalodeni/static/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from src/nalodeni/static/fonts/glyphicons-halflings-regular.ttf rename to nalodeni/static/fonts/glyphicons-halflings-regular.ttf diff --git a/src/nalodeni/static/fonts/glyphicons-halflings-regular.woff b/nalodeni/static/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from src/nalodeni/static/fonts/glyphicons-halflings-regular.woff rename to nalodeni/static/fonts/glyphicons-halflings-regular.woff diff --git a/src/nalodeni/static/fonts/google/FiraSans-OpenSans.css b/nalodeni/static/fonts/google/FiraSans-OpenSans.css similarity index 100% rename from src/nalodeni/static/fonts/google/FiraSans-OpenSans.css rename to nalodeni/static/fonts/google/FiraSans-OpenSans.css diff --git a/src/nalodeni/static/fonts/google/mem5YaGs126MiZpBA-UN7rgOUuhs.ttf b/nalodeni/static/fonts/google/mem5YaGs126MiZpBA-UN7rgOUuhs.ttf similarity index 100% rename from src/nalodeni/static/fonts/google/mem5YaGs126MiZpBA-UN7rgOUuhs.ttf rename to nalodeni/static/fonts/google/mem5YaGs126MiZpBA-UN7rgOUuhs.ttf diff --git a/src/nalodeni/static/fonts/google/mem5YaGs126MiZpBA-UNirkOUuhs.ttf b/nalodeni/static/fonts/google/mem5YaGs126MiZpBA-UNirkOUuhs.ttf similarity index 100% rename from src/nalodeni/static/fonts/google/mem5YaGs126MiZpBA-UNirkOUuhs.ttf rename to nalodeni/static/fonts/google/mem5YaGs126MiZpBA-UNirkOUuhs.ttf diff --git a/src/nalodeni/static/fonts/google/mem8YaGs126MiZpBA-UFVZ0e.ttf b/nalodeni/static/fonts/google/mem8YaGs126MiZpBA-UFVZ0e.ttf similarity index 100% rename from src/nalodeni/static/fonts/google/mem8YaGs126MiZpBA-UFVZ0e.ttf rename to nalodeni/static/fonts/google/mem8YaGs126MiZpBA-UFVZ0e.ttf diff --git a/src/nalodeni/static/fonts/google/va9B4kDNxMZdWfMOD5VnLK3eRhf_.ttf b/nalodeni/static/fonts/google/va9B4kDNxMZdWfMOD5VnLK3eRhf_.ttf similarity index 100% rename from src/nalodeni/static/fonts/google/va9B4kDNxMZdWfMOD5VnLK3eRhf_.ttf rename to nalodeni/static/fonts/google/va9B4kDNxMZdWfMOD5VnLK3eRhf_.ttf diff --git a/src/nalodeni/static/fonts/google/va9B4kDNxMZdWfMOD5VnZKveRhf_.ttf b/nalodeni/static/fonts/google/va9B4kDNxMZdWfMOD5VnZKveRhf_.ttf similarity index 100% rename from src/nalodeni/static/fonts/google/va9B4kDNxMZdWfMOD5VnZKveRhf_.ttf rename to nalodeni/static/fonts/google/va9B4kDNxMZdWfMOD5VnZKveRhf_.ttf diff --git a/src/nalodeni/static/fonts/google/va9E4kDNxMZdWfMOD5Vvl4jO.ttf b/nalodeni/static/fonts/google/va9E4kDNxMZdWfMOD5Vvl4jO.ttf similarity index 100% rename from src/nalodeni/static/fonts/google/va9E4kDNxMZdWfMOD5Vvl4jO.ttf rename to nalodeni/static/fonts/google/va9E4kDNxMZdWfMOD5Vvl4jO.ttf diff --git a/src/nalodeni/static/fonts/google/va9f4kDNxMZdWfMOD5VvkrBiQyf4VFw.ttf b/nalodeni/static/fonts/google/va9f4kDNxMZdWfMOD5VvkrBiQyf4VFw.ttf similarity index 100% rename from src/nalodeni/static/fonts/google/va9f4kDNxMZdWfMOD5VvkrBiQyf4VFw.ttf rename to nalodeni/static/fonts/google/va9f4kDNxMZdWfMOD5VvkrBiQyf4VFw.ttf diff --git a/src/nalodeni/static/fonts/opensans/open-sans-v15-latin_latin-ext-700.ttf b/nalodeni/static/fonts/opensans/open-sans-v15-latin_latin-ext-700.ttf similarity index 100% rename from src/nalodeni/static/fonts/opensans/open-sans-v15-latin_latin-ext-700.ttf rename to nalodeni/static/fonts/opensans/open-sans-v15-latin_latin-ext-700.ttf diff --git a/src/nalodeni/static/fonts/opensans/open-sans-v15-latin_latin-ext-700.woff2 b/nalodeni/static/fonts/opensans/open-sans-v15-latin_latin-ext-700.woff2 similarity index 100% rename from src/nalodeni/static/fonts/opensans/open-sans-v15-latin_latin-ext-700.woff2 rename to nalodeni/static/fonts/opensans/open-sans-v15-latin_latin-ext-700.woff2 diff --git a/src/nalodeni/static/fonts/opensans/open-sans-v15-latin_latin-ext-regular.woff b/nalodeni/static/fonts/opensans/open-sans-v15-latin_latin-ext-regular.woff similarity index 100% rename from src/nalodeni/static/fonts/opensans/open-sans-v15-latin_latin-ext-regular.woff rename to nalodeni/static/fonts/opensans/open-sans-v15-latin_latin-ext-regular.woff diff --git a/src/nalodeni/static/fonts/opensans/open-sans-v15-latin_latin-ext-regular.woff2 b/nalodeni/static/fonts/opensans/open-sans-v15-latin_latin-ext-regular.woff2 similarity index 100% rename from src/nalodeni/static/fonts/opensans/open-sans-v15-latin_latin-ext-regular.woff2 rename to nalodeni/static/fonts/opensans/open-sans-v15-latin_latin-ext-regular.woff2 diff --git a/src/nalodeni/static/img/flags/cs.png b/nalodeni/static/img/flags/cs.png similarity index 100% rename from src/nalodeni/static/img/flags/cs.png rename to nalodeni/static/img/flags/cs.png diff --git a/src/nalodeni/static/img/flags/en.png b/nalodeni/static/img/flags/en.png similarity index 100% rename from src/nalodeni/static/img/flags/en.png rename to nalodeni/static/img/flags/en.png diff --git a/src/nalodeni/static/img/flags/sk.png b/nalodeni/static/img/flags/sk.png similarity index 100% rename from src/nalodeni/static/img/flags/sk.png rename to nalodeni/static/img/flags/sk.png diff --git a/src/nalodeni/static/img/list-icon.jpg b/nalodeni/static/img/list-icon.jpg similarity index 100% rename from src/nalodeni/static/img/list-icon.jpg rename to nalodeni/static/img/list-icon.jpg diff --git a/src/nalodeni/static/img/pirati-na-lodi.jpg b/nalodeni/static/img/pirati-na-lodi.jpg similarity index 100% rename from src/nalodeni/static/img/pirati-na-lodi.jpg rename to nalodeni/static/img/pirati-na-lodi.jpg diff --git a/src/nalodeni/static/img/pirati-vlajky.jpg b/nalodeni/static/img/pirati-vlajky.jpg similarity index 100% rename from src/nalodeni/static/img/pirati-vlajky.jpg rename to nalodeni/static/img/pirati-vlajky.jpg diff --git a/src/nalodeni/static/img/pirati-vlajky_orig.jpg b/nalodeni/static/img/pirati-vlajky_orig.jpg similarity index 100% rename from src/nalodeni/static/img/pirati-vlajky_orig.jpg rename to nalodeni/static/img/pirati-vlajky_orig.jpg diff --git a/src/nalodeni/static/img/tiles/lightGrey.png b/nalodeni/static/img/tiles/lightGrey.png similarity index 100% rename from src/nalodeni/static/img/tiles/lightGrey.png rename to nalodeni/static/img/tiles/lightGrey.png diff --git a/src/nalodeni/static/img/topics/icon-komunalni.png b/nalodeni/static/img/topics/icon-komunalni.png similarity index 100% rename from src/nalodeni/static/img/topics/icon-komunalni.png rename to nalodeni/static/img/topics/icon-komunalni.png diff --git a/src/nalodeni/static/img/topics/icon-politici.png b/nalodeni/static/img/topics/icon-politici.png similarity index 100% rename from src/nalodeni/static/img/topics/icon-politici.png rename to nalodeni/static/img/topics/icon-politici.png diff --git a/src/nalodeni/static/img/topics/icon-sdruzeni.png b/nalodeni/static/img/topics/icon-sdruzeni.png similarity index 100% rename from src/nalodeni/static/img/topics/icon-sdruzeni.png rename to nalodeni/static/img/topics/icon-sdruzeni.png diff --git a/src/nalodeni/static/img/topics/icon-systemy.png b/nalodeni/static/img/topics/icon-systemy.png similarity index 100% rename from src/nalodeni/static/img/topics/icon-systemy.png rename to nalodeni/static/img/topics/icon-systemy.png diff --git a/src/nalodeni/static/img/topics/icon-tymy.png b/nalodeni/static/img/topics/icon-tymy.png similarity index 100% rename from src/nalodeni/static/img/topics/icon-tymy.png rename to nalodeni/static/img/topics/icon-tymy.png diff --git a/src/nalodeni/static/img/topics/icon-univ.png b/nalodeni/static/img/topics/icon-univ.png similarity index 100% rename from src/nalodeni/static/img/topics/icon-univ.png rename to nalodeni/static/img/topics/icon-univ.png diff --git a/src/nalodeni/static/img/topics/icon-univerzita.png b/nalodeni/static/img/topics/icon-univerzita.png similarity index 100% rename from src/nalodeni/static/img/topics/icon-univerzita.png rename to nalodeni/static/img/topics/icon-univerzita.png diff --git a/src/nalodeni/static/img/topics/icon-zakladni.png b/nalodeni/static/img/topics/icon-zakladni.png similarity index 100% rename from src/nalodeni/static/img/topics/icon-zakladni.png rename to nalodeni/static/img/topics/icon-zakladni.png diff --git a/src/nalodeni/static/js/vendor/foundation.js b/nalodeni/static/js/vendor/foundation.js similarity index 100% rename from src/nalodeni/static/js/vendor/foundation.js rename to nalodeni/static/js/vendor/foundation.js diff --git a/src/nalodeni/static/js/vendor/foundation.min.js b/nalodeni/static/js/vendor/foundation.min.js similarity index 100% rename from src/nalodeni/static/js/vendor/foundation.min.js rename to nalodeni/static/js/vendor/foundation.min.js diff --git a/src/nalodeni/static/js/vendor/jquery.js b/nalodeni/static/js/vendor/jquery.js similarity index 100% rename from src/nalodeni/static/js/vendor/jquery.js rename to nalodeni/static/js/vendor/jquery.js diff --git a/src/nalodeni/static/js/vendor/what-input.js b/nalodeni/static/js/vendor/what-input.js similarity index 100% rename from src/nalodeni/static/js/vendor/what-input.js rename to nalodeni/static/js/vendor/what-input.js diff --git a/src/nalodeni/static/libs/select2_4.0.5.css b/nalodeni/static/libs/select2_4.0.5.css similarity index 100% rename from src/nalodeni/static/libs/select2_4.0.5.css rename to nalodeni/static/libs/select2_4.0.5.css diff --git a/src/nalodeni/static/libs/select2_4.0.5.js b/nalodeni/static/libs/select2_4.0.5.js similarity index 100% rename from src/nalodeni/static/libs/select2_4.0.5.js rename to nalodeni/static/libs/select2_4.0.5.js diff --git a/src/nalodeni/stats.py b/nalodeni/stats.py similarity index 100% rename from src/nalodeni/stats.py rename to nalodeni/stats.py diff --git a/src/nalodeni/templates/about.html b/nalodeni/templates/about.html similarity index 100% rename from src/nalodeni/templates/about.html rename to nalodeni/templates/about.html diff --git a/src/nalodeni/templates/about_text.html b/nalodeni/templates/about_text.html similarity index 100% rename from src/nalodeni/templates/about_text.html rename to nalodeni/templates/about_text.html diff --git a/src/nalodeni/templates/dotaznik.html b/nalodeni/templates/dotaznik.html similarity index 100% rename from src/nalodeni/templates/dotaznik.html rename to nalodeni/templates/dotaznik.html diff --git a/src/nalodeni/templates/dotaznik_follow.html b/nalodeni/templates/dotaznik_follow.html similarity index 100% rename from src/nalodeni/templates/dotaznik_follow.html rename to nalodeni/templates/dotaznik_follow.html diff --git a/src/nalodeni/templates/follow_buttons.html b/nalodeni/templates/follow_buttons.html similarity index 100% rename from src/nalodeni/templates/follow_buttons.html rename to nalodeni/templates/follow_buttons.html diff --git a/src/nalodeni/templates/follow_pirates.html b/nalodeni/templates/follow_pirates.html similarity index 100% rename from src/nalodeni/templates/follow_pirates.html rename to nalodeni/templates/follow_pirates.html diff --git a/src/nalodeni/templates/ja_pirat.html b/nalodeni/templates/ja_pirat.html similarity index 100% rename from src/nalodeni/templates/ja_pirat.html rename to nalodeni/templates/ja_pirat.html diff --git a/src/nalodeni/templates/join_pirates.html b/nalodeni/templates/join_pirates.html similarity index 100% rename from src/nalodeni/templates/join_pirates.html rename to nalodeni/templates/join_pirates.html diff --git a/src/nalodeni/templates/nastenka.html b/nalodeni/templates/nastenka.html similarity index 100% rename from src/nalodeni/templates/nastenka.html rename to nalodeni/templates/nastenka.html diff --git a/src/nalodeni/templates/nastenka/email_vizitka.html b/nalodeni/templates/nastenka/email_vizitka.html similarity index 100% rename from src/nalodeni/templates/nastenka/email_vizitka.html rename to nalodeni/templates/nastenka/email_vizitka.html diff --git a/src/nalodeni/templates/news/block_edit.html b/nalodeni/templates/news/block_edit.html similarity index 100% rename from src/nalodeni/templates/news/block_edit.html rename to nalodeni/templates/news/block_edit.html diff --git a/src/nalodeni/templates/news/list.html b/nalodeni/templates/news/list.html similarity index 100% rename from src/nalodeni/templates/news/list.html rename to nalodeni/templates/news/list.html diff --git a/src/nalodeni/templates/news/list_edit.html b/nalodeni/templates/news/list_edit.html similarity index 100% rename from src/nalodeni/templates/news/list_edit.html rename to nalodeni/templates/news/list_edit.html diff --git a/src/nalodeni/templates/news/list_show.html b/nalodeni/templates/news/list_show.html similarity index 100% rename from src/nalodeni/templates/news/list_show.html rename to nalodeni/templates/news/list_show.html diff --git a/src/nalodeni/templates/news/list_show_recipients.html b/nalodeni/templates/news/list_show_recipients.html similarity index 100% rename from src/nalodeni/templates/news/list_show_recipients.html rename to nalodeni/templates/news/list_show_recipients.html diff --git a/src/nalodeni/templates/news/msg_edit.html b/nalodeni/templates/news/msg_edit.html similarity index 100% rename from src/nalodeni/templates/news/msg_edit.html rename to nalodeni/templates/news/msg_edit.html diff --git a/src/nalodeni/templates/news/msg_send_custom.html b/nalodeni/templates/news/msg_send_custom.html similarity index 100% rename from src/nalodeni/templates/news/msg_send_custom.html rename to nalodeni/templates/news/msg_send_custom.html diff --git a/src/nalodeni/templates/news/msg_show.html b/nalodeni/templates/news/msg_show.html similarity index 100% rename from src/nalodeni/templates/news/msg_show.html rename to nalodeni/templates/news/msg_show.html diff --git a/src/nalodeni/templates/news/msg_to_email.html b/nalodeni/templates/news/msg_to_email.html similarity index 100% rename from src/nalodeni/templates/news/msg_to_email.html rename to nalodeni/templates/news/msg_to_email.html diff --git a/src/nalodeni/templates/page_eurovolby_2019.html b/nalodeni/templates/page_eurovolby_2019.html similarity index 100% rename from src/nalodeni/templates/page_eurovolby_2019.html rename to nalodeni/templates/page_eurovolby_2019.html diff --git a/src/nalodeni/templates/paluby.html b/nalodeni/templates/paluby.html similarity index 100% rename from src/nalodeni/templates/paluby.html rename to nalodeni/templates/paluby.html diff --git a/src/nalodeni/templates/people/eu2019.html b/nalodeni/templates/people/eu2019.html similarity index 100% rename from src/nalodeni/templates/people/eu2019.html rename to nalodeni/templates/people/eu2019.html diff --git a/src/nalodeni/templates/people/list.html b/nalodeni/templates/people/list.html similarity index 92% rename from src/nalodeni/templates/people/list.html rename to nalodeni/templates/people/list.html index 53454b9..b87da2e 100644 --- a/src/nalodeni/templates/people/list.html +++ b/nalodeni/templates/people/list.html @@ -69,7 +69,12 @@ $(document).ready(function(){ - {{p.admin_note}} + + {% if p.dc_undo_stamp is not None %} + Souhlas se zpracováním osobních údajů odvolán {{p.dc_undo_stamp}}
+ {% endif %} + {{p.admin_note}} + {% endfor %} diff --git a/src/nalodeni/templates/people/pending.html b/nalodeni/templates/people/pending.html similarity index 100% rename from src/nalodeni/templates/people/pending.html rename to nalodeni/templates/people/pending.html diff --git a/src/nalodeni/templates/person/detail.html b/nalodeni/templates/person/detail.html similarity index 95% rename from src/nalodeni/templates/person/detail.html rename to nalodeni/templates/person/detail.html index 4ea54bc..f0b26e2 100644 --- a/src/nalodeni/templates/person/detail.html +++ b/nalodeni/templates/person/detail.html @@ -40,6 +40,7 @@   Datum registrace{{obj.createdStamp}} Datum souhlasu os. údajů{{obj.dc_stamp|default_if_none:'-'}} + Datum odvolání souhlasu oú{{obj.dc_undo_stamp|default_if_none:''}} Administrátorská poznámka{{obj.admin_note}} diff --git a/src/nalodeni/templates/person/edit.html b/nalodeni/templates/person/edit.html similarity index 100% rename from src/nalodeni/templates/person/edit.html rename to nalodeni/templates/person/edit.html diff --git a/src/nalodeni/templates/pirati_cz.html b/nalodeni/templates/pirati_cz.html similarity index 99% rename from src/nalodeni/templates/pirati_cz.html rename to nalodeni/templates/pirati_cz.html index e8cf18e..80820dd 100644 --- a/src/nalodeni/templates/pirati_cz.html +++ b/nalodeni/templates/pirati_cz.html @@ -375,7 +375,7 @@
  • Aplikaci spravuje
    -
    Martin Rejman
    +
    Technický odbor Pirátů
    • diff --git a/src/nalodeni/templates/pirati_cz_euro2019.html b/nalodeni/templates/pirati_cz_euro2019.html similarity index 100% rename from src/nalodeni/templates/pirati_cz_euro2019.html rename to nalodeni/templates/pirati_cz_euro2019.html diff --git a/src/nalodeni/templates/posadky.html b/nalodeni/templates/posadky.html similarity index 100% rename from src/nalodeni/templates/posadky.html rename to nalodeni/templates/posadky.html diff --git a/src/nalodeni/templates/prihlaseni.html b/nalodeni/templates/prihlaseni.html similarity index 100% rename from src/nalodeni/templates/prihlaseni.html rename to nalodeni/templates/prihlaseni.html diff --git a/src/nalodeni/templates/profil.html b/nalodeni/templates/profil.html similarity index 90% rename from src/nalodeni/templates/profil.html rename to nalodeni/templates/profil.html index 53227ff..0927d71 100644 --- a/src/nalodeni/templates/profil.html +++ b/nalodeni/templates/profil.html @@ -59,7 +59,16 @@ požadovaných funkcí a služeb. Detaily způsobu zpracování osobních údajů jsou k dispozici online. -
    Datum souhlasu se zpracováním os. údajů:
    {{form.dc_stamp}}
    +
    + Datum souhlasu se zpracováním os. údajů:
    + {{form.dc_stamp}} + {% if request.user.dc_stamp is not None %} + Odvolat souhlas se zpracováním osobních údajů + {% endif %} + {% if request.user.dc_undo_stamp is not None %} + (souhlas odvolán {{request.user.dc_undo_stamp}}) + {% endif %} +
    {%comment%}
    {{form.interestedIn.label}}
    {{form.interestedIn.errors}}{{form.interestedIn}}
    {%endcomment%} diff --git a/src/nalodeni/templates/registrace.html b/nalodeni/templates/registrace.html similarity index 100% rename from src/nalodeni/templates/registrace.html rename to nalodeni/templates/registrace.html diff --git a/src/nalodeni/templates/social_buttons.html b/nalodeni/templates/social_buttons.html similarity index 100% rename from src/nalodeni/templates/social_buttons.html rename to nalodeni/templates/social_buttons.html diff --git a/src/nalodeni/templates/stats/reg_counts.html b/nalodeni/templates/stats/reg_counts.html similarity index 100% rename from src/nalodeni/templates/stats/reg_counts.html rename to nalodeni/templates/stats/reg_counts.html diff --git a/src/nalodeni/templates/test.html b/nalodeni/templates/test.html similarity index 100% rename from src/nalodeni/templates/test.html rename to nalodeni/templates/test.html diff --git a/src/nalodeni/templates/vstupte.html b/nalodeni/templates/vstupte.html similarity index 100% rename from src/nalodeni/templates/vstupte.html rename to nalodeni/templates/vstupte.html diff --git a/src/nalodeni/urls.py b/nalodeni/urls.py similarity index 100% rename from src/nalodeni/urls.py rename to nalodeni/urls.py diff --git a/src/nalodeni/views.py b/nalodeni/views.py similarity index 97% rename from src/nalodeni/views.py rename to nalodeni/views.py index 8a69aa5..862f87b 100644 --- a/src/nalodeni/views.py +++ b/nalodeni/views.py @@ -488,18 +488,27 @@ def email_vizitka(request): @login_required(login_url="/prihlaseni") @transaction.atomic def profil(request): - if request.user.ssoUid: - _form = forms.AppUserSsoForm - else: - _form = forms.AppUserForm + + _form = forms.AppUserSsoForm if request.user.ssoUid else forms.AppUserForm + + def save_and_redirect(page): + request.user.save() + return HttpResponseRedirect(page) # TODO :: check and enforce DB transaction to prevent race-condition attacks if request.method == "GET": + + # udeleni souhlasu se zpracovanim osobnich udaju if request.GET.get('doConsent', None) is not None: request.user.dc_stamp = datetime.now() - request.user.save() + request.user.dc_undo_stamp = None + return save_and_redirect('/ja-pirat/profil/') - return HttpResponseRedirect('/ja-pirat/profil/') + # odvolani souhlasu se zpracovanim osobnich udaju + if request.GET.get('undoConsent', None) is not None: + request.user.dc_stamp = None + request.user.dc_undo_stamp = datetime.now() + return save_and_redirect('/ja-pirat/profil/') emailToken = request.GET.get('t', None) if emailToken: @@ -535,7 +544,6 @@ def profil(request): request.user.save() return redirect('nalodeni:profil') - # create edit form form = _form(instance=request.user) @@ -550,7 +558,6 @@ def profil(request): form.instance.email_contact_verified = False form.save() - if (form.instance.email_contact != None and not form.instance.email_contact_verified): try: diff --git a/src/pip-requirements.txt b/pip-requirements.txt similarity index 100% rename from src/pip-requirements.txt rename to pip-requirements.txt diff --git a/src/records_audit/__init__.py b/records_audit/__init__.py similarity index 100% rename from src/records_audit/__init__.py rename to records_audit/__init__.py diff --git a/src/records_audit/migrations/0001_initial.py b/records_audit/migrations/0001_initial.py similarity index 100% rename from src/records_audit/migrations/0001_initial.py rename to records_audit/migrations/0001_initial.py diff --git a/src/records_audit/migrations/0002_auto_20190411_2008.py b/records_audit/migrations/0002_auto_20190411_2008.py similarity index 100% rename from src/records_audit/migrations/0002_auto_20190411_2008.py rename to records_audit/migrations/0002_auto_20190411_2008.py diff --git a/src/records_audit/migrations/0003_auto_20190411_2010.py b/records_audit/migrations/0003_auto_20190411_2010.py similarity index 100% rename from src/records_audit/migrations/0003_auto_20190411_2010.py rename to records_audit/migrations/0003_auto_20190411_2010.py diff --git a/src/records_audit/migrations/0004_auto_20190412_0112.py b/records_audit/migrations/0004_auto_20190412_0112.py similarity index 100% rename from src/records_audit/migrations/0004_auto_20190412_0112.py rename to records_audit/migrations/0004_auto_20190412_0112.py diff --git a/src/records_audit/migrations/__init__.py b/records_audit/migrations/__init__.py similarity index 100% rename from src/records_audit/migrations/__init__.py rename to records_audit/migrations/__init__.py diff --git a/src/records_audit/models.py b/records_audit/models.py similarity index 100% rename from src/records_audit/models.py rename to records_audit/models.py diff --git a/src/records_audit/utils.py b/records_audit/utils.py similarity index 100% rename from src/records_audit/utils.py rename to records_audit/utils.py diff --git a/src/run-venv.sh b/run-venv.sh similarity index 91% rename from src/run-venv.sh rename to run-venv.sh index f084f6e..21fe9bb 100755 --- a/src/run-venv.sh +++ b/run-venv.sh @@ -3,7 +3,7 @@ # spousti nalodeni v jiz inicializovanem virtualenv # pomocny skript pro potreby ladeni, v provozu se nepouziva (misto toho jede v dockeru) -source ../venv/bin/activate +source venv/bin/activate if [[ "x$1" == "x+" ]]; then ./manage.py runserver_plus 127.0.0.1:8010 diff --git a/src/run.sh b/run.sh similarity index 100% rename from src/run.sh rename to run.sh diff --git a/src/.gitignore b/src/.gitignore deleted file mode 100644 index 64e9c99..0000000 --- a/src/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -nalodeni.env - diff --git a/src/docker-compose.sample.yml b/src/docker-compose.sample.yml deleted file mode 100644 index 27bd8c2..0000000 --- a/src/docker-compose.sample.yml +++ /dev/null @@ -1,27 +0,0 @@ -version: '2' -services: - nginx: - image: nginx:latest - container_name: nalodeni-nginx - ports: - - "80:8001" - volumes: - - ./deploy/nginx:/etc/nginx/conf.d - - vol_static_nalodeni:/static_nalodeni - depends_on: - - nalodeni - nalodeni: - build: . - container_name: nalodeni - command: bash -c "/nalodeni/src/docker-entrypoint.sh" - volumes: - - vol_static_nalodeni:/nalodeni/src/static_files - ports: - - "8000" - environment: - - NALODENI_DEBUG=off - - NALODENI_DEBUG_LOCAL=off - - -volumes: - vol_static_nalodeni: diff --git a/static_files/.gitkeep b/static_files/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/templates/index.html b/templates/index.html similarity index 100% rename from src/templates/index.html rename to templates/index.html