Merge branch 'release/0.1'

art-institute-of-chicago · Aug 14, 2017 · 9381e3b · 9381e3b
2 parents 37df076 + 679b4eb
commit 9381e3b
Show file tree

Hide file tree

Showing 265 changed files with 8,199 additions and 2,840 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,10 @@
+# editorconfig.org
+root = true
+
+[*.php]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+trim_trailing_whitespace = true
diff --git a/.env.example b/.env.example
@@ -34,11 +34,11 @@ PUSHER_APP_SECRET=
 
 SCOUT_QUEUE=true
 
-SOLR_HOST=localhost
-SOLR_PORT=8983
-SOLR_PATH=/solr/
-SOLR_CORE=collection1
+ELASTICSEARCH_HOST=localhost
+ELASTICSEARCH_PORT=9200
+ELASTICSEARCH_SCHEME=http
+ELASTICSEARCH_INDEX=data_aggregator
 
 LAKE_URL=
-IIIF_URL=
+
 COLLECTIONS_DATA_SERVICE_URL=
diff --git a/README.md b/README.md
@@ -126,6 +126,8 @@ php artisan migrate:refresh --seed
 
 Be aware that if you've imported real data into into any of your tables they will be truncated and replaced with fake data.
 
+If you recieve an `Solarium\Exception\OutOfBoundsException`, ensure that your Solr instance is reachable.
+
 #### 5. Create unit tests
 
 Now that you've got your data structured and some test data to play with, you can begin wiring together the API

diff --git a/VERSION b/VERSION
@@ -0,0 +1 @@
+0.1
diff --git a/app/Collections/Agent.php b/app/Collections/Agent.php
diff --git a/app/Collections/Asset.php b/app/Collections/Asset.php
diff --git a/app/Collections/CollectionsModel.php b/app/Collections/CollectionsModel.php
diff --git a/app/Collections/Exhibition.php b/app/Collections/Exhibition.php