From fb1ae0f3bc06b354012ecc350477ff1d1ce73c41 Mon Sep 17 00:00:00 2001 From: Stypox Date: Sat, 2 Aug 2025 13:20:51 +0200 Subject: [PATCH 1/5] Fix start_db.sh again --- start_db.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/start_db.sh b/start_db.sh index 3535b0f1..a509b94c 100755 --- a/start_db.sh +++ b/start_db.sh @@ -12,6 +12,8 @@ if [[ $# == 1 ]] && [[ $1 == "stop" ]]; then echo "Stopped the postgres container" elif [[ $# == 1 ]] && [[ $1 == "db" ]]; then echo "Setting up database" + sudo docker stop postgres + sudo docker container rm -f postgres sudo docker run -d --name postgres -p 5432:5432 -e POSTGRES_PASSWORD=test -e POSTGRES_USER=mindshub postgres until psql "postgres://mindshub:test@localhost:5432" <<< "CREATE DATABASE insignorocketdb;"; do sleep 0.5; From fb881d649b9f5dd32d97b4ad59fabced75fd0245 Mon Sep 17 00:00:00 2001 From: Degra02 Date: Sat, 2 Aug 2025 13:25:31 +0200 Subject: [PATCH 2/5] boh --- .../migrations/0142_add_cloned_item_sync.py | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 src/c3nav/mapdata/migrations/0142_add_cloned_item_sync.py diff --git a/src/c3nav/mapdata/migrations/0142_add_cloned_item_sync.py b/src/c3nav/mapdata/migrations/0142_add_cloned_item_sync.py new file mode 100644 index 00000000..215b3ae1 --- /dev/null +++ b/src/c3nav/mapdata/migrations/0142_add_cloned_item_sync.py @@ -0,0 +1,35 @@ +# Generated by Django 5.1.5 on 2025-08-02 00:38 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('contenttypes', '0002_remove_content_type_name'), + ('mapdata', '0138_rangingbeacon_max_observed_num_clients_and_more'), + ('mapdata', '0141_add_sensor_data_field') + ] + + operations = [ + migrations.CreateModel( + name='ClonedItemSync', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('original_object_id', models.PositiveIntegerField()), + ('cloned_object_id', models.PositiveIntegerField()), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('is_active', models.BooleanField(default=True)), + ('sync_fields', models.JSONField(default=list, help_text='List of field names to keep synchronized')), + ('cloned_content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='cloned_synced_items', to='contenttypes.contenttype')), + ('original_content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='original_synced_items', to='contenttypes.contenttype')), + ], + options={ + 'verbose_name': 'Cloned Item Sync', + 'verbose_name_plural': 'Cloned Item Syncs', + 'indexes': [models.Index(fields=['original_content_type', 'original_object_id'], name='mapdata_clo_origina_62f4ee_idx'), models.Index(fields=['cloned_content_type', 'cloned_object_id'], name='mapdata_clo_cloned__027e07_idx')], + 'unique_together': {('original_content_type', 'original_object_id', 'cloned_content_type', 'cloned_object_id')}, + }, + ), + ] From 5dd7bce67b4dfc046f60929e9101980b325a0d11 Mon Sep 17 00:00:00 2001 From: Degra02 Date: Sat, 2 Aug 2025 13:27:48 +0200 Subject: [PATCH 3/5] remove migration --- .../migrations/0139_add_cloned_item_sync.py | 34 ------------------- 1 file changed, 34 deletions(-) delete mode 100644 src/c3nav/mapdata/migrations/0139_add_cloned_item_sync.py diff --git a/src/c3nav/mapdata/migrations/0139_add_cloned_item_sync.py b/src/c3nav/mapdata/migrations/0139_add_cloned_item_sync.py deleted file mode 100644 index 68a07f23..00000000 --- a/src/c3nav/mapdata/migrations/0139_add_cloned_item_sync.py +++ /dev/null @@ -1,34 +0,0 @@ -# Generated by Django 5.1.5 on 2025-08-02 00:38 - -import django.db.models.deletion -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('contenttypes', '0002_remove_content_type_name'), - ('mapdata', '0138_rangingbeacon_max_observed_num_clients_and_more'), - ] - - operations = [ - migrations.CreateModel( - name='ClonedItemSync', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('original_object_id', models.PositiveIntegerField()), - ('cloned_object_id', models.PositiveIntegerField()), - ('created_at', models.DateTimeField(auto_now_add=True)), - ('is_active', models.BooleanField(default=True)), - ('sync_fields', models.JSONField(default=list, help_text='List of field names to keep synchronized')), - ('cloned_content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='cloned_synced_items', to='contenttypes.contenttype')), - ('original_content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='original_synced_items', to='contenttypes.contenttype')), - ], - options={ - 'verbose_name': 'Cloned Item Sync', - 'verbose_name_plural': 'Cloned Item Syncs', - 'indexes': [models.Index(fields=['original_content_type', 'original_object_id'], name='mapdata_clo_origina_62f4ee_idx'), models.Index(fields=['cloned_content_type', 'cloned_object_id'], name='mapdata_clo_cloned__027e07_idx')], - 'unique_together': {('original_content_type', 'original_object_id', 'cloned_content_type', 'cloned_object_id')}, - }, - ), - ] From bfcbd54147969b88728ffe410d5611178e72801d Mon Sep 17 00:00:00 2001 From: Alessio Date: Sat, 2 Aug 2025 13:40:31 +0200 Subject: [PATCH 4/5] final commit --- local_run/data-copy/c3nav.cfg | 44 +++++++++++++++++++++++++++++++++++ local_run/data/c3nav.cfg | 44 +++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 local_run/data-copy/c3nav.cfg create mode 100644 local_run/data/c3nav.cfg diff --git a/local_run/data-copy/c3nav.cfg b/local_run/data-copy/c3nav.cfg new file mode 100644 index 00000000..db3e8c76 --- /dev/null +++ b/local_run/data-copy/c3nav.cfg @@ -0,0 +1,44 @@ +# SPDX-FileCopyrightText: 2024 NOI Techpark +# +# SPDX-License-Identifier: CC0-1.0 + +[c3nav] +svg_renderer=rsvg +editor=False +user_registration=false +initial_level=2 +header_logo=/data/logo/sfscon.svg +imprint_link=https://www.sfscon.it/impressum/ +branding=SFSCON map +app_enabled=False + +[locale] +languages=en + +[theme] +#is_dark=False +#randomize_primary_color=False +map_background=#f7f8f8 +map_wall_fill=#e5e4e5 +map_wall_border=#c1bfbe +#map_door_fill=#ffffff +map_ground_fill=#f7f8f8 +#map_obstacles_default_fill=#b7b7b7 +#map_obstacles_default_border=#888888 +#css_primary=#9b4dca +#css_initial=#ffffff +#css_primary=#9b4dca +#css_logo=None +#css_secondary=#525862 +#css_tertiary=#f0f0f0 +#css_quaternary=#767676 +#css_quinary=#cccccc +css_header_text=#000000 +#css_header_text_hover=#eeeeee +css_header_background=#ffffff +#css_shadow=#000000 +#css_overlay_background=#ffffff +#css_grid=#000000 +#css_modal_backdrop=#000000 +#css_route_dots_shadow=#ffffff +#map_background=#dcdcdc diff --git a/local_run/data/c3nav.cfg b/local_run/data/c3nav.cfg new file mode 100644 index 00000000..db3e8c76 --- /dev/null +++ b/local_run/data/c3nav.cfg @@ -0,0 +1,44 @@ +# SPDX-FileCopyrightText: 2024 NOI Techpark +# +# SPDX-License-Identifier: CC0-1.0 + +[c3nav] +svg_renderer=rsvg +editor=False +user_registration=false +initial_level=2 +header_logo=/data/logo/sfscon.svg +imprint_link=https://www.sfscon.it/impressum/ +branding=SFSCON map +app_enabled=False + +[locale] +languages=en + +[theme] +#is_dark=False +#randomize_primary_color=False +map_background=#f7f8f8 +map_wall_fill=#e5e4e5 +map_wall_border=#c1bfbe +#map_door_fill=#ffffff +map_ground_fill=#f7f8f8 +#map_obstacles_default_fill=#b7b7b7 +#map_obstacles_default_border=#888888 +#css_primary=#9b4dca +#css_initial=#ffffff +#css_primary=#9b4dca +#css_logo=None +#css_secondary=#525862 +#css_tertiary=#f0f0f0 +#css_quaternary=#767676 +#css_quinary=#cccccc +css_header_text=#000000 +#css_header_text_hover=#eeeeee +css_header_background=#ffffff +#css_shadow=#000000 +#css_overlay_background=#ffffff +#css_grid=#000000 +#css_modal_backdrop=#000000 +#css_route_dots_shadow=#ffffff +#map_background=#dcdcdc From 7a7b1df1fa70a16b5239de2a9f4c1a5a9c7febec Mon Sep 17 00:00:00 2001 From: Alessio Date: Sat, 2 Aug 2025 13:41:33 +0200 Subject: [PATCH 5/5] removed data garbadge --- local_run/data/c3nav.cfg | 44 ---------------------------------- local_run/data/logo/sfscon.svg | 6 ----- 2 files changed, 50 deletions(-) delete mode 100644 local_run/data/c3nav.cfg delete mode 100644 local_run/data/logo/sfscon.svg diff --git a/local_run/data/c3nav.cfg b/local_run/data/c3nav.cfg deleted file mode 100644 index db3e8c76..00000000 --- a/local_run/data/c3nav.cfg +++ /dev/null @@ -1,44 +0,0 @@ -# SPDX-FileCopyrightText: 2024 NOI Techpark -# -# SPDX-License-Identifier: CC0-1.0 - -[c3nav] -svg_renderer=rsvg -editor=False -user_registration=false -initial_level=2 -header_logo=/data/logo/sfscon.svg -imprint_link=https://www.sfscon.it/impressum/ -branding=SFSCON map -app_enabled=False - -[locale] -languages=en - -[theme] -#is_dark=False -#randomize_primary_color=False -map_background=#f7f8f8 -map_wall_fill=#e5e4e5 -map_wall_border=#c1bfbe -#map_door_fill=#ffffff -map_ground_fill=#f7f8f8 -#map_obstacles_default_fill=#b7b7b7 -#map_obstacles_default_border=#888888 -#css_primary=#9b4dca -#css_initial=#ffffff -#css_primary=#9b4dca -#css_logo=None -#css_secondary=#525862 -#css_tertiary=#f0f0f0 -#css_quaternary=#767676 -#css_quinary=#cccccc -css_header_text=#000000 -#css_header_text_hover=#eeeeee -css_header_background=#ffffff -#css_shadow=#000000 -#css_overlay_background=#ffffff -#css_grid=#000000 -#css_modal_backdrop=#000000 -#css_route_dots_shadow=#ffffff -#map_background=#dcdcdc diff --git a/local_run/data/logo/sfscon.svg b/local_run/data/logo/sfscon.svg deleted file mode 100644 index 8480f30c..00000000 --- a/local_run/data/logo/sfscon.svg +++ /dev/null @@ -1,6 +0,0 @@ - -logo