diff --git a/backend/directus-config/development/seed/directus/directus_files.json b/backend/directus-config/development/seed/directus_files.json similarity index 100% rename from backend/directus-config/development/seed/directus/directus_files.json rename to backend/directus-config/development/seed/directus_files.json diff --git a/backend/directus-config/development/seed/directus/directus_files_marker_outline.json b/backend/directus-config/development/seed/directus_files_marker_outline.json similarity index 100% rename from backend/directus-config/development/seed/directus/directus_files_marker_outline.json rename to backend/directus-config/development/seed/directus_files_marker_outline.json diff --git a/backend/directus-config/development/seed/directus/directus_files_marker_solid.json b/backend/directus-config/development/seed/directus_files_marker_solid.json similarity index 100% rename from backend/directus-config/development/seed/directus/directus_files_marker_solid.json rename to backend/directus-config/development/seed/directus_files_marker_solid.json diff --git a/backend/directus-config/development/seed/directus/files/icons/outline/boat.svg b/backend/directus-config/development/seed/files/icons/outline/boat.svg similarity index 100% rename from backend/directus-config/development/seed/directus/files/icons/outline/boat.svg rename to backend/directus-config/development/seed/files/icons/outline/boat.svg diff --git a/backend/directus-config/development/seed/directus/files/icons/outline/calendar.svg b/backend/directus-config/development/seed/files/icons/outline/calendar.svg similarity index 100% rename from backend/directus-config/development/seed/directus/files/icons/outline/calendar.svg rename to backend/directus-config/development/seed/files/icons/outline/calendar.svg diff --git a/backend/directus-config/development/seed/directus/files/icons/outline/house.svg b/backend/directus-config/development/seed/files/icons/outline/house.svg similarity index 100% rename from backend/directus-config/development/seed/directus/files/icons/outline/house.svg rename to backend/directus-config/development/seed/files/icons/outline/house.svg diff --git a/backend/directus-config/development/seed/directus/files/icons/outline/map-pin.svg b/backend/directus-config/development/seed/files/icons/outline/map-pin.svg similarity index 100% rename from backend/directus-config/development/seed/directus/files/icons/outline/map-pin.svg rename to backend/directus-config/development/seed/files/icons/outline/map-pin.svg diff --git a/backend/directus-config/development/seed/directus/files/icons/outline/user.svg b/backend/directus-config/development/seed/files/icons/outline/user.svg similarity index 100% rename from backend/directus-config/development/seed/directus/files/icons/outline/user.svg rename to backend/directus-config/development/seed/files/icons/outline/user.svg diff --git a/backend/directus-config/development/seed/directus/files/icons/outline/users.svg b/backend/directus-config/development/seed/files/icons/outline/users.svg similarity index 100% rename from backend/directus-config/development/seed/directus/files/icons/outline/users.svg rename to backend/directus-config/development/seed/files/icons/outline/users.svg diff --git a/backend/directus-config/development/seed/directus/files/icons/solid/bicycle.svg b/backend/directus-config/development/seed/files/icons/solid/bicycle.svg similarity index 100% rename from backend/directus-config/development/seed/directus/files/icons/solid/bicycle.svg rename to backend/directus-config/development/seed/files/icons/solid/bicycle.svg diff --git a/backend/directus-config/development/seed/directus/files/icons/solid/boat.svg b/backend/directus-config/development/seed/files/icons/solid/boat.svg similarity index 100% rename from backend/directus-config/development/seed/directus/files/icons/solid/boat.svg rename to backend/directus-config/development/seed/files/icons/solid/boat.svg diff --git a/backend/directus-config/development/seed/directus/files/icons/solid/cafe.svg b/backend/directus-config/development/seed/files/icons/solid/cafe.svg similarity index 100% rename from backend/directus-config/development/seed/directus/files/icons/solid/cafe.svg rename to backend/directus-config/development/seed/files/icons/solid/cafe.svg diff --git a/backend/directus-config/development/seed/directus/files/icons/solid/calendar.svg b/backend/directus-config/development/seed/files/icons/solid/calendar.svg similarity index 100% rename from backend/directus-config/development/seed/directus/files/icons/solid/calendar.svg rename to backend/directus-config/development/seed/files/icons/solid/calendar.svg diff --git a/backend/directus-config/development/seed/directus/files/icons/solid/camp.svg b/backend/directus-config/development/seed/files/icons/solid/camp.svg similarity index 100% rename from backend/directus-config/development/seed/directus/files/icons/solid/camp.svg rename to backend/directus-config/development/seed/files/icons/solid/camp.svg diff --git a/backend/directus-config/development/seed/directus/files/icons/solid/cannabis.svg b/backend/directus-config/development/seed/files/icons/solid/cannabis.svg similarity index 100% rename from backend/directus-config/development/seed/directus/files/icons/solid/cannabis.svg rename to backend/directus-config/development/seed/files/icons/solid/cannabis.svg diff --git a/backend/directus-config/development/seed/directus/files/icons/solid/circle-dot.svg b/backend/directus-config/development/seed/files/icons/solid/circle-dot.svg similarity index 100% rename from backend/directus-config/development/seed/directus/files/icons/solid/circle-dot.svg rename to backend/directus-config/development/seed/files/icons/solid/circle-dot.svg diff --git a/backend/directus-config/development/seed/directus/files/icons/solid/compass.svg b/backend/directus-config/development/seed/files/icons/solid/compass.svg similarity index 100% rename from backend/directus-config/development/seed/directus/files/icons/solid/compass.svg rename to backend/directus-config/development/seed/files/icons/solid/compass.svg diff --git a/backend/directus-config/development/seed/directus/files/icons/solid/crosshair.svg b/backend/directus-config/development/seed/files/icons/solid/crosshair.svg similarity index 100% rename from backend/directus-config/development/seed/directus/files/icons/solid/crosshair.svg rename to backend/directus-config/development/seed/files/icons/solid/crosshair.svg diff --git a/backend/directus-config/development/seed/directus/files/icons/solid/drum.svg b/backend/directus-config/development/seed/files/icons/solid/drum.svg similarity index 100% rename from backend/directus-config/development/seed/directus/files/icons/solid/drum.svg rename to backend/directus-config/development/seed/files/icons/solid/drum.svg diff --git a/backend/directus-config/development/seed/directus/files/icons/solid/fire.svg b/backend/directus-config/development/seed/files/icons/solid/fire.svg similarity index 100% rename from backend/directus-config/development/seed/directus/files/icons/solid/fire.svg rename to backend/directus-config/development/seed/files/icons/solid/fire.svg diff --git a/backend/directus-config/development/seed/directus/files/icons/solid/flower.svg b/backend/directus-config/development/seed/files/icons/solid/flower.svg similarity index 100% rename from backend/directus-config/development/seed/directus/files/icons/solid/flower.svg rename to backend/directus-config/development/seed/files/icons/solid/flower.svg diff --git a/backend/directus-config/development/seed/directus/files/icons/solid/group.svg b/backend/directus-config/development/seed/files/icons/solid/group.svg similarity index 100% rename from backend/directus-config/development/seed/directus/files/icons/solid/group.svg rename to backend/directus-config/development/seed/files/icons/solid/group.svg diff --git a/backend/directus-config/development/seed/directus/files/icons/solid/house.svg b/backend/directus-config/development/seed/files/icons/solid/house.svg similarity index 100% rename from backend/directus-config/development/seed/directus/files/icons/solid/house.svg rename to backend/directus-config/development/seed/files/icons/solid/house.svg diff --git a/backend/directus-config/development/seed/directus/files/icons/solid/liebevoll.jetzt.svg b/backend/directus-config/development/seed/files/icons/solid/liebevoll.jetzt.svg similarity index 100% rename from backend/directus-config/development/seed/directus/files/icons/solid/liebevoll.jetzt.svg rename to backend/directus-config/development/seed/files/icons/solid/liebevoll.jetzt.svg diff --git a/backend/directus-config/development/seed/directus/files/icons/solid/music.svg b/backend/directus-config/development/seed/files/icons/solid/music.svg similarity index 100% rename from backend/directus-config/development/seed/directus/files/icons/solid/music.svg rename to backend/directus-config/development/seed/files/icons/solid/music.svg diff --git a/backend/directus-config/development/seed/directus/files/icons/solid/network.svg b/backend/directus-config/development/seed/files/icons/solid/network.svg similarity index 100% rename from backend/directus-config/development/seed/directus/files/icons/solid/network.svg rename to backend/directus-config/development/seed/files/icons/solid/network.svg diff --git a/backend/directus-config/development/seed/directus/files/icons/solid/offer.svg b/backend/directus-config/development/seed/files/icons/solid/offer.svg similarity index 100% rename from backend/directus-config/development/seed/directus/files/icons/solid/offer.svg rename to backend/directus-config/development/seed/files/icons/solid/offer.svg diff --git a/backend/directus-config/development/seed/directus/files/icons/solid/plant.svg b/backend/directus-config/development/seed/files/icons/solid/plant.svg similarity index 100% rename from backend/directus-config/development/seed/directus/files/icons/solid/plant.svg rename to backend/directus-config/development/seed/files/icons/solid/plant.svg diff --git a/backend/directus-config/development/seed/directus/files/icons/solid/point.svg b/backend/directus-config/development/seed/files/icons/solid/point.svg similarity index 100% rename from backend/directus-config/development/seed/directus/files/icons/solid/point.svg rename to backend/directus-config/development/seed/files/icons/solid/point.svg diff --git a/backend/directus-config/development/seed/directus/files/icons/solid/puzzle.svg b/backend/directus-config/development/seed/files/icons/solid/puzzle.svg similarity index 100% rename from backend/directus-config/development/seed/directus/files/icons/solid/puzzle.svg rename to backend/directus-config/development/seed/files/icons/solid/puzzle.svg diff --git a/backend/directus-config/development/seed/directus/files/icons/solid/quest.svg b/backend/directus-config/development/seed/files/icons/solid/quest.svg similarity index 100% rename from backend/directus-config/development/seed/directus/files/icons/solid/quest.svg rename to backend/directus-config/development/seed/files/icons/solid/quest.svg diff --git a/backend/directus-config/development/seed/directus/files/icons/solid/shop.svg b/backend/directus-config/development/seed/files/icons/solid/shop.svg similarity index 100% rename from backend/directus-config/development/seed/directus/files/icons/solid/shop.svg rename to backend/directus-config/development/seed/files/icons/solid/shop.svg diff --git a/backend/directus-config/development/seed/directus/files/icons/solid/staff-snake.svg b/backend/directus-config/development/seed/files/icons/solid/staff-snake.svg similarity index 100% rename from backend/directus-config/development/seed/directus/files/icons/solid/staff-snake.svg rename to backend/directus-config/development/seed/files/icons/solid/staff-snake.svg diff --git a/backend/directus-config/development/seed/directus/files/icons/solid/star.svg b/backend/directus-config/development/seed/files/icons/solid/star.svg similarity index 100% rename from backend/directus-config/development/seed/directus/files/icons/solid/star.svg rename to backend/directus-config/development/seed/files/icons/solid/star.svg diff --git a/backend/directus-config/development/seed/directus/files/icons/solid/steps.svg b/backend/directus-config/development/seed/files/icons/solid/steps.svg similarity index 100% rename from backend/directus-config/development/seed/directus/files/icons/solid/steps.svg rename to backend/directus-config/development/seed/files/icons/solid/steps.svg diff --git a/backend/directus-config/development/seed/directus/files/icons/solid/suitecase.svg b/backend/directus-config/development/seed/files/icons/solid/suitecase.svg similarity index 100% rename from backend/directus-config/development/seed/directus/files/icons/solid/suitecase.svg rename to backend/directus-config/development/seed/files/icons/solid/suitecase.svg diff --git a/backend/directus-config/development/seed/directus/files/icons/solid/tree.svg b/backend/directus-config/development/seed/files/icons/solid/tree.svg similarity index 100% rename from backend/directus-config/development/seed/directus/files/icons/solid/tree.svg rename to backend/directus-config/development/seed/files/icons/solid/tree.svg diff --git a/backend/directus-config/development/seed/directus/files/icons/solid/user.svg b/backend/directus-config/development/seed/files/icons/solid/user.svg similarity index 100% rename from backend/directus-config/development/seed/directus/files/icons/solid/user.svg rename to backend/directus-config/development/seed/files/icons/solid/user.svg diff --git a/backend/directus-config/development/seed/directus/files/utopia-logo.svg b/backend/directus-config/development/seed/files/utopia-logo.svg similarity index 100% rename from backend/directus-config/development/seed/directus/files/utopia-logo.svg rename to backend/directus-config/development/seed/files/utopia-logo.svg diff --git a/backend/directus-config/development/seed/directus/files/vessel.svg b/backend/directus-config/development/seed/files/vessel.svg similarity index 100% rename from backend/directus-config/development/seed/directus/files/vessel.svg rename to backend/directus-config/development/seed/files/vessel.svg diff --git a/backend/directus-config/development/seed/directus/gallery.json b/backend/directus-config/development/seed/gallery.json similarity index 100% rename from backend/directus-config/development/seed/directus/gallery.json rename to backend/directus-config/development/seed/gallery.json diff --git a/backend/directus-config/development/seed/directus/items.json b/backend/directus-config/development/seed/items.json similarity index 100% rename from backend/directus-config/development/seed/directus/items.json rename to backend/directus-config/development/seed/items.json diff --git a/backend/directus-config/development/seed/directus/layers.json b/backend/directus-config/development/seed/layers.json similarity index 100% rename from backend/directus-config/development/seed/directus/layers.json rename to backend/directus-config/development/seed/layers.json diff --git a/backend/directus-config/development/seed/directus/layers_maps.json b/backend/directus-config/development/seed/layers_maps.json similarity index 100% rename from backend/directus-config/development/seed/directus/layers_maps.json rename to backend/directus-config/development/seed/layers_maps.json diff --git a/backend/directus-config/development/seed/directus/maps.json b/backend/directus-config/development/seed/maps.json similarity index 100% rename from backend/directus-config/development/seed/directus/maps.json rename to backend/directus-config/development/seed/maps.json diff --git a/backend/directus-config/development/seed/directus/marker_icons.json b/backend/directus-config/development/seed/marker_icons.json similarity index 100% rename from backend/directus-config/development/seed/directus/marker_icons.json rename to backend/directus-config/development/seed/marker_icons.json diff --git a/backend/directus-config/development/seed/directus/startEnd.json b/backend/directus-config/development/seed/startEnd.json similarity index 100% rename from backend/directus-config/development/seed/directus/startEnd.json rename to backend/directus-config/development/seed/startEnd.json diff --git a/backend/directus-config/development/seed/directus/texts.json b/backend/directus-config/development/seed/texts.json similarity index 100% rename from backend/directus-config/development/seed/directus/texts.json rename to backend/directus-config/development/seed/texts.json diff --git a/backend/directus-config/development/seed/directus/types.json b/backend/directus-config/development/seed/types.json similarity index 100% rename from backend/directus-config/development/seed/directus/types.json rename to backend/directus-config/development/seed/types.json diff --git a/backend/directus-config/development/seed/manual/branding-logo.sql b/backend/directus-config/development/sql/branding-logo.sql similarity index 100% rename from backend/directus-config/development/seed/manual/branding-logo.sql rename to backend/directus-config/development/sql/branding-logo.sql diff --git a/backend/directus-config/development/seed/manual/register-role.sql b/backend/directus-config/development/sql/register-role.sql similarity index 100% rename from backend/directus-config/development/seed/manual/register-role.sql rename to backend/directus-config/development/sql/register-role.sql diff --git a/backend/directus-config/development/seed/manual/type-ui-components.sql b/backend/directus-config/development/sql/type-ui-components.sql similarity index 100% rename from backend/directus-config/development/seed/manual/type-ui-components.sql rename to backend/directus-config/development/sql/type-ui-components.sql diff --git a/backend/seed.sh b/backend/seed.sh index e64481fb..42b97d31 100755 --- a/backend/seed.sh +++ b/backend/seed.sh @@ -23,19 +23,19 @@ npx directus-sync push \ --directus-password $DIRECTUS_PASSWORD \ || exit 1 -echo "Seed data via directus-sync" +echo "Seed data" npx directus-sync seed push \ + --seed-path $PROJECT_FOLDER/seed \ --directus-url $DIRECTUS_URL \ --directus-email $DIRECTUS_EMAIL \ --directus-password $DIRECTUS_PASSWORD \ - --seed-path $PROJECT_FOLDER/seed/directus \ || exit 1 -SEED_SQL_DIR=$PROJECT_FOLDER/seed/manual +SQL_DIR=$PROJECT_FOLDER/sql -echo "Seed data via sql-files" +echo "Execute custom sql-files" # apply database updates -for filename in $SEED_SQL_DIR/*.sql; do +for filename in $SQL_DIR/*.sql; do echo "Executing $filename" docker exec -i utopia-map-database-1 /bin/bash -c "PGPASSWORD=$PGPASSWORD psql -v ON_ERROR_STOP=1 --username $PGUSER $PGDATABASE" < $filename || exit 1 done \ No newline at end of file