diff --git a/.gitignore b/.gitignore index f5acaed..474d4cb 100644 --- a/.gitignore +++ b/.gitignore @@ -134,5 +134,4 @@ nginx/nginx.conf.prod docker-compose.dev.yml pg_dumps/ django_static/ -django_media/ dit_frontend/ \ No newline at end of file diff --git a/deploy/django.yml b/deploy/django.yml index 6532f31..0c874d0 100644 --- a/deploy/django.yml +++ b/deploy/django.yml @@ -19,7 +19,12 @@ spec: containers: - name: django image: DEPLOY_IMAGE_TAG - command: ["sh", "-c", "python manage.py delete_views && python manage.py create_procedures && python manage.py migrate && python manage.py create_views && python manage.py runserver 0.0.0.0:${DJANGO_PORT}"] + command: ["sh", "-c", "python manage.py delete_views && python manage.py create_procedures && python manage.py migrate && && + python manage.py loaddata fixtures/groups.json && + python manage.py loaddata fixtures/post_and_pvz.json && + python manage.py loaddata fixtures/post_and_pvz_groups.json && + python manage.py loaddata fixtures/otherobjectscategorys.json && + python manage.py loaddata fixtures/otherobjectsgroups.json && python manage.py create_views && python manage.py runserver 0.0.0.0:${DJANGO_PORT}"] ports: - containerPort: 8000 name: django-port diff --git a/django_media/post_and_pvz_group_images/namekhalva_typepostamat_SizeM.png b/django_media/post_and_pvz_group_images/namekhalva_typepostamat_SizeM.png new file mode 100644 index 0000000..c413a9f Binary files /dev/null and b/django_media/post_and_pvz_group_images/namekhalva_typepostamat_SizeM.png differ diff --git a/django_media/post_and_pvz_group_images/nameozon_typePVZ_SizeM.png b/django_media/post_and_pvz_group_images/nameozon_typePVZ_SizeM.png new file mode 100644 index 0000000..a2e154a Binary files /dev/null and b/django_media/post_and_pvz_group_images/nameozon_typePVZ_SizeM.png differ diff --git a/django_media/post_and_pvz_group_images/nameozon_typepostamat_SizeM.png b/django_media/post_and_pvz_group_images/nameozon_typepostamat_SizeM.png new file mode 100644 index 0000000..95cd3fe Binary files /dev/null and b/django_media/post_and_pvz_group_images/nameozon_typepostamat_SizeM.png differ diff --git a/django_media/post_and_pvz_group_images/namesdek_typePVZ_SizeM.png b/django_media/post_and_pvz_group_images/namesdek_typePVZ_SizeM.png new file mode 100644 index 0000000..cec6d6b Binary files /dev/null and b/django_media/post_and_pvz_group_images/namesdek_typePVZ_SizeM.png differ diff --git a/django_media/post_and_pvz_group_images/namesdek_typepostamat_SizeM.png b/django_media/post_and_pvz_group_images/namesdek_typepostamat_SizeM.png new file mode 100644 index 0000000..e9a4d69 Binary files /dev/null and b/django_media/post_and_pvz_group_images/namesdek_typepostamat_SizeM.png differ diff --git a/django_media/post_and_pvz_group_images/namewb_typePVZ_SizeM.png b/django_media/post_and_pvz_group_images/namewb_typePVZ_SizeM.png new file mode 100644 index 0000000..85e5c53 Binary files /dev/null and b/django_media/post_and_pvz_group_images/namewb_typePVZ_SizeM.png differ diff --git a/django_media/post_and_pvz_group_images/pochta-PVZ-M.png b/django_media/post_and_pvz_group_images/pochta-PVZ-M.png new file mode 100644 index 0000000..2b76e27 Binary files /dev/null and b/django_media/post_and_pvz_group_images/pochta-PVZ-M.png differ diff --git a/django_media/post_and_pvz_group_images/pochta-postamat-M_gBJlHTO.png b/django_media/post_and_pvz_group_images/pochta-postamat-M_gBJlHTO.png new file mode 100644 index 0000000..0d7ffec Binary files /dev/null and b/django_media/post_and_pvz_group_images/pochta-postamat-M_gBJlHTO.png differ diff --git a/django_media/post_and_pvz_group_images/ya.market-PVZ-M_KWksDvo.png b/django_media/post_and_pvz_group_images/ya.market-PVZ-M_KWksDvo.png new file mode 100644 index 0000000..8793c6e Binary files /dev/null and b/django_media/post_and_pvz_group_images/ya.market-PVZ-M_KWksDvo.png differ diff --git a/django_media/post_and_pvz_group_images/ya.market-postamat-M.png b/django_media/post_and_pvz_group_images/ya.market-postamat-M.png new file mode 100644 index 0000000..ab84c1a Binary files /dev/null and b/django_media/post_and_pvz_group_images/ya.market-postamat-M.png differ diff --git a/docker-compose.yml b/docker-compose.yml index d6a74e8..3d08407 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -30,9 +30,10 @@ services: sh -c "python manage.py migrate && python manage.py collectstatic --noinput && python manage.py loaddata fixtures/groups.json && - python3 manage.py loaddata fixtures/post_and_pvz.json && - python3 manage.py loaddata fixtures/otherobjectscategorys.json && - python3 manage.py loaddata fixtures/otherobjectsgroups.json && + python manage.py loaddata fixtures/post_and_pvz.json && + python manage.py loaddata fixtures/post_and_pvz_groups.json && + python manage.py loaddata fixtures/otherobjectscategorys.json && + python manage.py loaddata fixtures/otherobjectsgroups.json && python manage.py runserver 0.0.0.0:${DJANGO_PORT}" environment: <<: *postgres-variables diff --git a/fixtures/groups.json b/fixtures/groups.json index 48ec9c4..44a2d36 100644 --- a/fixtures/groups.json +++ b/fixtures/groups.json @@ -1 +1 @@ -[{"model": "auth.group", "pk": 1, "fields": {"name": "Администратор пользователей", "permissions": [13, 14, 15, 16]}}, {"model": "auth.group", "pk": 2, "fields": {"name": "Зритель", "permissions": [28]}}, {"model": "auth.group", "pk": 3, "fields": {"name": "Редактор", "permissions": [25, 26, 27, 28]}}] \ No newline at end of file +[{"model": "auth.group", "pk": 1, "fields": {"name": "Зритель", "permissions": [["view_placementpoint", "service", "placementpoint"]]}}, {"model": "auth.group", "pk": 2, "fields": {"name": "Редактор", "permissions": [["add_placementpoint", "service", "placementpoint"], ["change_placementpoint", "service", "placementpoint"], ["delete_placementpoint", "service", "placementpoint"], ["view_placementpoint", "service", "placementpoint"]]}}, {"model": "auth.group", "pk": 3, "fields": {"name": "Администратор пользователей", "permissions": [["add_user", "auth", "user"], ["change_user", "auth", "user"], ["delete_user", "auth", "user"], ["view_user", "auth", "user"]]}}] \ No newline at end of file diff --git a/fixtures/otherobjectsgroups.json b/fixtures/otherobjectsgroups.json index be3c364..af81a58 100644 --- a/fixtures/otherobjectsgroups.json +++ b/fixtures/otherobjectsgroups.json @@ -1,9 +1,9 @@ -[{"model": "service.otherobjectsgroup", "pk": 4, "fields": {"name": "business_activity", "category": 4, "image": "other_objects_group_images/imgonline-com-ua-Blur-v2Mhg2f07JEmbet_MINlljC.png", "visible": false}}, - {"model": "service.otherobjectsgroup", "pk": 5, "fields": {"name": "metro_stations", "category": 5, "image": "other_objects_group_images/imgonline-com-ua-Blur-v2Mhg2f07JEmbet_5QjtY2T.png", "visible": false}}, - {"model": "service.otherobjectsgroup", "pk": 23, "fields": {"name": "bargains", "category": 22, "image": "other_objects_group_images/imgonline-com-ua-Blur-v2Mhg2f07JEmbet_3GZcX5B.png", "visible": false}}, +[{"model": "service.otherobjectsgroup", "pk": 4, "fields": {"name": "business_activity", "category": 4, "image": "", "visible": false}}, + {"model": "service.otherobjectsgroup", "pk": 5, "fields": {"name": "metro_stations", "category": 5, "image": "", "visible": false}}, + {"model": "service.otherobjectsgroup", "pk": 23, "fields": {"name": "bargains", "category": 22, "image": "", "visible": false}}, {"model": "service.otherobjectsgroup", "pk": 24, "fields": {"name": "BC", "category": 23, "image": "", "visible": false}}, {"model": "service.otherobjectsgroup", "pk": 25, "fields": {"name": "flats_cnt", "category": 24, "image": "", "visible": false}}, - {"model": "service.otherobjectsgroup", "pk": 26, "fields": {"name": "offers_estate", "category": 25, "image": "other_objects_group_images/imgonline-com-ua-Blur-v2Mhg2f07JEmbet_EzmxSGd.png", "visible": false}}, + {"model": "service.otherobjectsgroup", "pk": 26, "fields": {"name": "offers_estate", "category": 25, "image": "", "visible": false}}, {"model": "service.otherobjectsgroup", "pk": 27, "fields": {"name": "schools", "category": 26, "image": "", "visible": false}}, {"model": "service.otherobjectsgroup", "pk": 28, "fields": {"name": "kindergar", "category": 27, "image": "", "visible": false}}, {"model": "service.otherobjectsgroup", "pk": 29, "fields": {"name": "stops", "category": 28, "image": "", "visible": false}}, diff --git a/fixtures/post_pvz_groups.json b/fixtures/post_pvz_groups.json new file mode 100644 index 0000000..ab4de33 --- /dev/null +++ b/fixtures/post_pvz_groups.json @@ -0,0 +1 @@ +[{"model": "service.post_and_pvzgroup", "pk": 7, "fields": {"name": "Ozon", "category": 1, "image": "post_and_pvz_group_images/nameozon_typePVZ_SizeM.png", "visible": true, "include_in_ml": true}}, {"model": "service.post_and_pvzgroup", "pk": 8, "fields": {"name": "СДЭК", "category": 1, "image": "post_and_pvz_group_images/namesdek_typePVZ_SizeM.png", "visible": true, "include_in_ml": true}}, {"model": "service.post_and_pvzgroup", "pk": 9, "fields": {"name": "Халва", "category": 2, "image": "post_and_pvz_group_images/namekhalva_typepostamat_SizeM.png", "visible": true, "include_in_ml": false}}, {"model": "service.post_and_pvzgroup", "pk": 10, "fields": {"name": "СДЭК", "category": 2, "image": "post_and_pvz_group_images/namesdek_typepostamat_SizeM.png", "visible": true, "include_in_ml": false}}, {"model": "service.post_and_pvzgroup", "pk": 12, "fields": {"name": "Ozon", "category": 2, "image": "post_and_pvz_group_images/nameozon_typepostamat_SizeM.png", "visible": true, "include_in_ml": false}}, {"model": "service.post_and_pvzgroup", "pk": 17, "fields": {"name": "WildBerries", "category": 1, "image": "post_and_pvz_group_images/namewb_typePVZ_SizeM.png", "visible": true, "include_in_ml": false}}, {"model": "service.post_and_pvzgroup", "pk": 19, "fields": {"name": "Яндекс.Маркет", "category": 1, "image": "post_and_pvz_group_images/ya.market-PVZ-M_KWksDvo.png", "visible": true, "include_in_ml": true}}, {"model": "service.post_and_pvzgroup", "pk": 20, "fields": {"name": "Яндекс.Маркет", "category": 2, "image": "post_and_pvz_group_images/ya.market-postamat-M.png", "visible": true, "include_in_ml": true}}, {"model": "service.post_and_pvzgroup", "pk": 24, "fields": {"name": "Почта России", "category": 1, "image": "post_and_pvz_group_images/pochta-PVZ-M.png", "visible": true, "include_in_ml": true}}, {"model": "service.post_and_pvzgroup", "pk": 25, "fields": {"name": "Почта России", "category": 2, "image": "post_and_pvz_group_images/pochta-postamat-M_gBJlHTO.png", "visible": true, "include_in_ml": true}}] \ No newline at end of file