diff --git a/Makefile b/Makefile index f237eb2..344a8f2 100644 --- a/Makefile +++ b/Makefile @@ -49,6 +49,26 @@ dev-dbseed: @echo "------------------------------------------------------------------" @docker compose -f docker-compose.dev.yml exec $(CONTAINER_NAME) python qgisfeedproject/manage.py loaddata qgisfeedproject/qgisfeed/fixtures/*.json + +dev-dbrestore: + @echo + @echo "------------------------------------------------------------------" + @echo "Restore dump from /backups/latest-qgisfeed.dmp and /backups/latest-metabase.dmp in production mode" + @echo "------------------------------------------------------------------" + @echo "stopping qgisfeed container" + @docker compose -f docker-compose.dev.yml stop qgisfeed + @echo "Dropping the gis and metabase databases" + -@docker compose -f docker-compose.dev.yml exec postgis su - postgres -c "dropdb --force qgisfeed" + -@docker compose -f docker-compose.dev.yml exec postgis su - postgres -c "dropdb --force metabase" + @echo "Creating the qgisfeed and metabase databases" + -@docker compose -f docker-compose.dev.yml exec postgis su - postgres -c "createdb -O docker -T template1 qgisfeed" + -@docker compose -f docker-compose.dev.yml exec postgis su - postgres -c "createdb -O docker -T template1 metabase" + @echo "Restore database from backups/latest-qgisfeed.dmp and backups/latest-metabase.dmp" + @docker compose -f docker-compose.dev.yml exec postgis su - postgres -c "pg_restore -c /backups/latest-qgisfeed.dmp -d qgisfeed" + @docker compose -f docker-compose.dev.yml exec postgis su - postgres -c "pg_restore -c /backups/latest-metabase.dmp -d metabase" + @echo "Starting qgisfeed container" + @docker compose -f docker-compose.dev.yml up qgisfeed + dev-createsuperuser: @echo @echo "------------------------------------------------------------------" diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index d0856a6..6a733d5 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -6,7 +6,10 @@ services: environment: POSTGRES_USER: docker POSTGRES_PASS: docker - POSTGRES_DBNAME: qgisfeed + POSTGRES_DBNAME: qgisfeed + volumes: + - ${QGISFEED_DOCKER_SHARED_VOLUME}:/var/lib/postgresql + - ${QGISFEED_BACKUP_VOLUME}:/backups # ports: # - "5436:5432" @@ -41,6 +44,7 @@ services: - postgis volumes: - ../qgis-feed:/code + - /Users/xpirix/Work/Dev/01-Kartoza/00-Data/feed.qgis.org/media:/code/qgisfeedproject/media - ./REQUIREMENTS.txt:/REQUIREMENTS.txt webpack: diff --git a/qgisfeedproject/static/style/scss/style.scss b/qgisfeedproject/static/style/scss/style.scss index cdd2b95..5f799f3 100644 --- a/qgisfeedproject/static/style/scss/style.scss +++ b/qgisfeedproject/static/style/scss/style.scss @@ -15,10 +15,16 @@ mark { } -.content p { - color: $text-primary2; +.content { + p { + color: $text-primary2; + } + h3 { + font-weight: 400; + } } + .box-content { background: $white; border-radius: 10px; @@ -280,4 +286,23 @@ p { .dj_map_wrapper { width: 100%; } +} + +.external-link { + padding-right: 20px; + &:after { + position: absolute; + width: 16px; + content: ""; + margin-top: 5px; + margin-left: 3px; + height: 16px; + z-index: 1; + mask: url("../../images/external.svg"); + background-color: #7fa3b9; + } +} + +.rounded .rich-right img { + box-shadow: 0 0 10px rgba(0, 0, 0, 0.1); } \ No newline at end of file diff --git a/qgisfeedproject/templates/feeds/feed_home_page.html b/qgisfeedproject/templates/feeds/feed_home_page.html index e982070..ad83fc3 100644 --- a/qgisfeedproject/templates/feeds/feed_home_page.html +++ b/qgisfeedproject/templates/feeds/feed_home_page.html @@ -4,13 +4,10 @@ {% block stylesheets %}