Merge pull request #267 from rice-crc/develop

Merge develop into main

.gitignore

@@ -1,12 +1,6 @@
 data/*
 !data/empty
 
-src/api/common/static/*
-!src/api/common/static/empty
-
-src/api/geo/staticfiles/*
-!src/api/geo/staticfiles/empty
-
 src/api/static/*
 !src/api/static/empty
 

docker-compose.yml

@@ -64,6 +64,7 @@ services:
       - "127.0.0.1:8000:8000"
     volumes:
       - "./src/api:/srv/voyages-api"
+      - "${STATIC_SOURCE_DIR:-./src/api/static}:/srv/voyages-api/static"
     build:
       context: "./src/api"
       dockerfile: "../../docker/api/Dockerfile"

src/api/common/static/Author_options.json

@@ -0,0 +1 @@
+{"id": {"type": "integer", "many": false}, "posts__id": {"type": "integer", "many": true}, "posts__tags__id": {"type": "integer", "many": true}, "posts__tags__name": {"type": "string", "many": true}, "posts__tags__slug": {"type": "string", "many": true}, "posts__tags__intro": {"type": "string", "many": true}, "posts__thumbnail": {"type": "string", "many": true}, "posts__title": {"type": "string", "many": true}, "posts__language": {"type": "string", "many": true}, "posts__subtitle": {"type": "string", "many": true}, "posts__slug": {"type": "string", "many": true}, "posts__updated_on": {"type": "number", "many": true}, "posts__content": {"type": "string", "many": true}, "posts__created_on": {"type": "number", "many": true}, "posts__status": {"type": "integer", "many": true}, "photo": {"type": "string", "many": false}, "institution__id": {"type": "integer", "many": false}, "institution__name": {"type": "string", "many": false}, "institution__description": {"type": "string", "many": false}, "institution__slug": {"type": "string", "many": false}, "institution__image": {"type": "number", "many": false}, "name": {"type": "string", "many": false}, "description": {"type": "string", "many": false}, "slug": {"type": "string", "many": false}, "role": {"type": "string", "many": false}}

src/api/common/static/Author_options.py

@@ -0,0 +1 @@
+Author_options={'id': {'type': 'integer', 'many': False}, 'posts__id': {'type': 'integer', 'many': True}, 'posts__tags__id': {'type': 'integer', 'many': True}, 'posts__tags__name': {'type': 'string', 'many': True}, 'posts__tags__slug': {'type': 'string', 'many': True}, 'posts__tags__intro': {'type': 'string', 'many': True}, 'posts__thumbnail': {'type': 'string', 'many': True}, 'posts__title': {'type': 'string', 'many': True}, 'posts__language': {'type': 'string', 'many': True}, 'posts__subtitle': {'type': 'string', 'many': True}, 'posts__slug': {'type': 'string', 'many': True}, 'posts__updated_on': {'type': 'number', 'many': True}, 'posts__content': {'type': 'string', 'many': True}, 'posts__created_on': {'type': 'number', 'many': True}, 'posts__status': {'type': 'integer', 'many': True}, 'photo': {'type': 'string', 'many': False}, 'institution__id': {'type': 'integer', 'many': False}, 'institution__name': {'type': 'string', 'many': False}, 'institution__description': {'type': 'string', 'many': False}, 'institution__slug': {'type': 'string', 'many': False}, 'institution__image': {'type': 'number', 'many': False}, 'name': {'type': 'string', 'many': False}, 'description': {'type': 'string', 'many': False}, 'slug': {'type': 'string', 'many': False}, 'role': {'type': 'string', 'many': False}}

src/api/common/static/Estimate_options.json

@@ -0,0 +1 @@
+{"id": {"type": "integer", "many": false}, "nation__id": {"type": "integer", "many": false}, "nation__name": {"type": "string", "many": false}, "nation__order_num": {"type": "integer", "many": false}, "embarkation_region__id": {"type": "integer", "many": false}, "embarkation_region__export_area__id": {"type": "integer", "many": false}, "embarkation_region__export_area__name": {"type": "string", "many": false}, "embarkation_region__export_area__order_num": {"type": "integer", "many": false}, "embarkation_region__export_area__latitude": {"type": "number", "many": false}, "embarkation_region__export_area__longitude": {"type": "number", "many": false}, "embarkation_region__export_area__show_at_zoom": {"type": "integer", "many": false}, "embarkation_region__export_area__show_on_map": {"type": "boolean", "many": false}, "embarkation_region__name": {"type": "string", "many": false}, "embarkation_region__order_num": {"type": "integer", "many": false}, "embarkation_region__latitude": {"type": "number", "many": false}, "embarkation_region__longitude": {"type": "number", "many": false}, "embarkation_region__show_at_zoom": {"type": "integer", "many": false}, "embarkation_region__show_on_map": {"type": "boolean", "many": false}, "disembarkation_region__id": {"type": "integer", "many": false}, "disembarkation_region__import_area__id": {"type": "integer", "many": false}, "disembarkation_region__import_area__name": {"type": "string", "many": false}, "disembarkation_region__import_area__order_num": {"type": "integer", "many": false}, "disembarkation_region__import_area__latitude": {"type": "number", "many": false}, "disembarkation_region__import_area__longitude": {"type": "number", "many": false}, "disembarkation_region__import_area__show_at_zoom": {"type": "integer", "many": false}, "disembarkation_region__import_area__show_on_map": {"type": "boolean", "many": false}, "disembarkation_region__name": {"type": "string", "many": false}, "disembarkation_region__order_num": {"type": "integer", "many": false}, "disembarkation_region__latitude": {"type": "number", "many": false}, "disembarkation_region__longitude": {"type": "number", "many": false}, "disembarkation_region__show_at_zoom": {"type": "integer", "many": false}, "disembarkation_region__show_on_map": {"type": "boolean", "many": false}, "year": {"type": "integer", "many": false}, "embarked_slaves": {"type": "integer", "many": false}, "disembarked_slaves": {"type": "integer", "many": false}}

src/api/common/static/Estimate_options.py

@@ -0,0 +1 @@
+Estimate_options={'id': {'type': 'integer', 'many': False}, 'nation__id': {'type': 'integer', 'many': False}, 'nation__name': {'type': 'string', 'many': False}, 'nation__order_num': {'type': 'integer', 'many': False}, 'embarkation_region__id': {'type': 'integer', 'many': False}, 'embarkation_region__export_area__id': {'type': 'integer', 'many': False}, 'embarkation_region__export_area__name': {'type': 'string', 'many': False}, 'embarkation_region__export_area__order_num': {'type': 'integer', 'many': False}, 'embarkation_region__export_area__latitude': {'type': 'number', 'many': False}, 'embarkation_region__export_area__longitude': {'type': 'number', 'many': False}, 'embarkation_region__export_area__show_at_zoom': {'type': 'integer', 'many': False}, 'embarkation_region__export_area__show_on_map': {'type': 'boolean', 'many': False}, 'embarkation_region__name': {'type': 'string', 'many': False}, 'embarkation_region__order_num': {'type': 'integer', 'many': False}, 'embarkation_region__latitude': {'type': 'number', 'many': False}, 'embarkation_region__longitude': {'type': 'number', 'many': False}, 'embarkation_region__show_at_zoom': {'type': 'integer', 'many': False}, 'embarkation_region__show_on_map': {'type': 'boolean', 'many': False}, 'disembarkation_region__id': {'type': 'integer', 'many': False}, 'disembarkation_region__import_area__id': {'type': 'integer', 'many': False}, 'disembarkation_region__import_area__name': {'type': 'string', 'many': False}, 'disembarkation_region__import_area__order_num': {'type': 'integer', 'many': False}, 'disembarkation_region__import_area__latitude': {'type': 'number', 'many': False}, 'disembarkation_region__import_area__longitude': {'type': 'number', 'many': False}, 'disembarkation_region__import_area__show_at_zoom': {'type': 'integer', 'many': False}, 'disembarkation_region__import_area__show_on_map': {'type': 'boolean', 'many': False}, 'disembarkation_region__name': {'type': 'string', 'many': False}, 'disembarkation_region__order_num': {'type': 'integer', 'many': False}, 'disembarkation_region__latitude': {'type': 'number', 'many': False}, 'disembarkation_region__longitude': {'type': 'number', 'many': False}, 'disembarkation_region__show_at_zoom': {'type': 'integer', 'many': False}, 'disembarkation_region__show_on_map': {'type': 'boolean', 'many': False}, 'year': {'type': 'integer', 'many': False}, 'embarked_slaves': {'type': 'integer', 'many': False}, 'disembarked_slaves': {'type': 'integer', 'many': False}}

src/api/common/static/Institution_options.json

@@ -0,0 +1 @@
+{"id": {"type": "integer", "many": false}, "institution_authors__id": {"type": "integer", "many": true}, "institution_authors__posts__id": {"type": "integer", "many": true}, "institution_authors__posts__tags__id": {"type": "integer", "many": true}, "institution_authors__posts__tags__name": {"type": "string", "many": true}, "institution_authors__posts__tags__slug": {"type": "string", "many": true}, "institution_authors__posts__tags__intro": {"type": "string", "many": true}, "institution_authors__posts__thumbnail": {"type": "string", "many": true}, "institution_authors__posts__title": {"type": "string", "many": true}, "institution_authors__posts__language": {"type": "string", "many": true}, "institution_authors__posts__subtitle": {"type": "string", "many": true}, "institution_authors__posts__slug": {"type": "string", "many": true}, "institution_authors__posts__updated_on": {"type": "number", "many": true}, "institution_authors__posts__content": {"type": "string", "many": true}, "institution_authors__posts__created_on": {"type": "number", "many": true}, "institution_authors__posts__status": {"type": "integer", "many": true}, "institution_authors__photo": {"type": "string", "many": true}, "institution_authors__institution__id": {"type": "integer", "many": true}, "institution_authors__institution__name": {"type": "string", "many": true}, "institution_authors__institution__description": {"type": "string", "many": true}, "institution_authors__institution__slug": {"type": "string", "many": true}, "institution_authors__institution__image": {"type": "number", "many": true}, "institution_authors__name": {"type": "string", "many": true}, "institution_authors__description": {"type": "string", "many": true}, "institution_authors__slug": {"type": "string", "many": true}, "institution_authors__role": {"type": "string", "many": true}, "name": {"type": "string", "many": false}, "description": {"type": "string", "many": false}, "slug": {"type": "string", "many": false}, "image": {"type": "number", "many": false}}

src/api/common/static/Institution_options.py

@@ -0,0 +1 @@
+Institution_options={'id': {'type': 'integer', 'many': False}, 'institution_authors__id': {'type': 'integer', 'many': True}, 'institution_authors__posts__id': {'type': 'integer', 'many': True}, 'institution_authors__posts__tags__id': {'type': 'integer', 'many': True}, 'institution_authors__posts__tags__name': {'type': 'string', 'many': True}, 'institution_authors__posts__tags__slug': {'type': 'string', 'many': True}, 'institution_authors__posts__tags__intro': {'type': 'string', 'many': True}, 'institution_authors__posts__thumbnail': {'type': 'string', 'many': True}, 'institution_authors__posts__title': {'type': 'string', 'many': True}, 'institution_authors__posts__language': {'type': 'string', 'many': True}, 'institution_authors__posts__subtitle': {'type': 'string', 'many': True}, 'institution_authors__posts__slug': {'type': 'string', 'many': True}, 'institution_authors__posts__updated_on': {'type': 'number', 'many': True}, 'institution_authors__posts__content': {'type': 'string', 'many': True}, 'institution_authors__posts__created_on': {'type': 'number', 'many': True}, 'institution_authors__posts__status': {'type': 'integer', 'many': True}, 'institution_authors__photo': {'type': 'string', 'many': True}, 'institution_authors__institution__id': {'type': 'integer', 'many': True}, 'institution_authors__institution__name': {'type': 'string', 'many': True}, 'institution_authors__institution__description': {'type': 'string', 'many': True}, 'institution_authors__institution__slug': {'type': 'string', 'many': True}, 'institution_authors__institution__image': {'type': 'number', 'many': True}, 'institution_authors__name': {'type': 'string', 'many': True}, 'institution_authors__description': {'type': 'string', 'many': True}, 'institution_authors__slug': {'type': 'string', 'many': True}, 'institution_authors__role': {'type': 'string', 'many': True}, 'name': {'type': 'string', 'many': False}, 'description': {'type': 'string', 'many': False}, 'slug': {'type': 'string', 'many': False}, 'image': {'type': 'number', 'many': False}}

src/api/common/static/Post_options.json

@@ -0,0 +1 @@
+{"id": {"type": "integer", "many": false}, "authors__id": {"type": "integer", "many": true}, "authors__photo": {"type": "string", "many": true}, "authors__institution__id": {"type": "integer", "many": true}, "authors__institution__name": {"type": "string", "many": true}, "authors__institution__description": {"type": "string", "many": true}, "authors__institution__slug": {"type": "string", "many": true}, "authors__institution__image": {"type": "number", "many": true}, "authors__name": {"type": "string", "many": true}, "authors__description": {"type": "string", "many": true}, "authors__slug": {"type": "string", "many": true}, "authors__role": {"type": "string", "many": true}, "tags__id": {"type": "integer", "many": true}, "tags__name": {"type": "string", "many": true}, "tags__slug": {"type": "string", "many": true}, "tags__intro": {"type": "string", "many": true}, "thumbnail": {"type": "string", "many": false}, "title": {"type": "string", "many": false}, "language": {"type": "string", "many": false}, "subtitle": {"type": "string", "many": false}, "slug": {"type": "string", "many": false}, "updated_on": {"type": "number", "many": false}, "content": {"type": "string", "many": false}, "created_on": {"type": "number", "many": false}, "status": {"type": "integer", "many": false}}

src/api/common/static/Post_options.py

@@ -0,0 +1 @@
+Post_options={'id': {'type': 'integer', 'many': False}, 'authors__id': {'type': 'integer', 'many': True}, 'authors__photo': {'type': 'string', 'many': True}, 'authors__institution__id': {'type': 'integer', 'many': True}, 'authors__institution__name': {'type': 'string', 'many': True}, 'authors__institution__description': {'type': 'string', 'many': True}, 'authors__institution__slug': {'type': 'string', 'many': True}, 'authors__institution__image': {'type': 'number', 'many': True}, 'authors__name': {'type': 'string', 'many': True}, 'authors__description': {'type': 'string', 'many': True}, 'authors__slug': {'type': 'string', 'many': True}, 'authors__role': {'type': 'string', 'many': True}, 'tags__id': {'type': 'integer', 'many': True}, 'tags__name': {'type': 'string', 'many': True}, 'tags__slug': {'type': 'string', 'many': True}, 'tags__intro': {'type': 'string', 'many': True}, 'thumbnail': {'type': 'string', 'many': False}, 'title': {'type': 'string', 'many': False}, 'language': {'type': 'string', 'many': False}, 'subtitle': {'type': 'string', 'many': False}, 'slug': {'type': 'string', 'many': False}, 'updated_on': {'type': 'number', 'many': False}, 'content': {'type': 'string', 'many': False}, 'created_on': {'type': 'number', 'many': False}, 'status': {'type': 'integer', 'many': False}}