Merge branch 'develop'

art-institute-of-chicago · May 4, 2023 · 6d8002b · 6d8002b
2 parents 63f6508 + 9771903
commit 6d8002b
Show file tree

Hide file tree

Showing 344 changed files with 6,186 additions and 5,030 deletions.
diff --git a/.env.example b/.env.example
@@ -74,6 +74,8 @@ CLOUDFRONT_DISTRIBUTION=
 COULDFRONT_SDK_VERSION=
 COULDFRONT_REGION=
 
+API_BASE_URL=https://api-dev.artic.edu
+API_PUBLIC_URL=https://api-dev.artic.edu
 API_CACHE_ENABLED=true
 API_CACHE_TTL=60
 API_CACHE_VERSION=1

diff --git a/.env.testing b/.env.testing
@@ -3,11 +3,13 @@ APP_ENV=testing
 APP_KEY=base64:nkScfqkJ+t4c4JMZOgO4hEK6gy0rOEF9f71FuL6AuzI=
 APP_DEBUG=true
 APP_LOG_LEVEL=debug
-APP_URL=http://localhost
+APP_URL=localhost
 
 DB_CONNECTION='pgsql'
 DB_HOST='127.0.0.1'
 DB_PORT=5432
 DB_DATABASE='testing'
 DB_USERNAME='homestead'
 DB_PASSWORD='secret'
+
+SHOW_DEFAULT_RELATED_ITEMS=false
diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
@@ -0,0 +1,16 @@
+name: Linting
+on: [push]
+jobs:
+    lint:
+        runs-on: ubuntu-20.04
+        steps:
+            - name: Install PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: 8.1
+            - name: Checkout code
+              uses: actions/checkout@v3
+            - name: Install PHP dependencies
+              run: composer install --no-interaction --no-progress --no-scripts
+            - name: Run PHP CodeSniffer
+              run: composer lint
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -4,154 +4,61 @@
 Contributions to artic.edu may include major feature development, bug fixing, writing documentation, editing, reviewing, idea generation, presentation, product management, and maintenance. We are grateful for every contribution.
 
 ## Art Institute of Chicago team
-> Past and present
-
-### nikhil trivedi
-Role: Director of Engineering  
-GitHub: [nikhiltri](https://github.com/nikhiltri)  
-Twitter: [@nikhiltri](https://twitter.com/nikhiltri)
-
-### Zach Garwood
-Role: Web Developer
-GitHub: [zachgarwood](https://github.com/zachgarwood)
-GitLab: [zachgarwood](https://gitlab.com/zachgarwood)
-
-### Trevin Alonzo
-Role: Web Developer
-Github: [web-dev-trev](https://github.com/web-dev-trev)
-
-### Illya Moskvin
-Role: Senior Web Developer  
-GitHub: [IllyaMoskvin](https://github.com/IllyaMoskvin)  
-Twitter: [@IllyaMoskvin](https://twitter.com/IllyaMoskvin)
-
-### Josh Andrews
-Role: Product Owner  
-GitHub: [jbandrews](https://github.com/jbandrews)  
-Twitter: [@joshandrews](https://twitter.com/joshandrews)
-
-### Kirsten Southwell
-Role: Creative Director, Visual Design  
-Twitter: [@kmsouthwell](https://twitter.com/kmsouthwell)
-
-### Michael Neault
-Role: AVP & Executive Creative Director, Experience Design  
-Twitter: [@michael_neault](https://twitter.com/michael_neault)
-
-### Tina Shah
-Role: Senior Web Developer  
-GitHub: [surreal8](https://github.com/surreal8)  
-Twitter: [@tshah](https://twitter.com/tshah)
-
-### Mike Bingaman
-Role: Systems Administrator  
-GitHub: [bingaman](https://github.com/bingaman)  
-Twitter: [@bingaman](https://twitter.com/bingaman)
-
-### Mark Dascoli
-Role: Integration Technologist  
-GitHub: [markdascoli](https://github.com/markdascoli)  
-Twitter: [@markdascoli](https://twitter.com/markdascoli)
-
+### Current staff
+
+| Name | Role | Contact |
+|---|---|---|
+| nikhil trivedi | Director of Engineering | GitHub: [nikhiltri](https://github.com/nikhiltri), Twitter: [@nikhiltri](https://twitter.com/nikhiltri) |
+| Zach Garwood | Web Developer | GitHub: [zachgarwood](https://github.com/zachgarwood), GitLab: [zachgarwood](https://gitlab.com/zachgarwood) |
+| Trevin Alonzo | Web Developer | Github: [web-dev-trev](https://github.com/web-dev-trev) |
+| Josh Andrews | Product Owner | GitHub: [jbandrews](https://github.com/jbandrews), Twitter: [@joshandrews](https://twitter.com/joshandrews) |
+| Michael Neault | AVP & Executive Creative Director, Experience Design | Twitter: [@michael_neault](https://twitter.com/michael_neault) |
+| Mike Bingaman | Systems Administrator | GitHub: [bingaman](https://github.com/bingaman), Twitter: [@bingaman](https://twitter.com/bingaman) |
+| Lauren Makholm | Assoc Director of Production and Manager of Digital Initiatives, Print & Digital Publishing | [LinkedIn](https://www.linkedin.com/in/lmakholm/) |
+
+### Former staff
+| Name | Role | Contact |
+|---|---|---|
+| Illya Moskvin | Senior Web Developer | GitHub: [IllyaMoskvin](https://github.com/IllyaMoskvin), Twitter: [@IllyaMoskvin](https://twitter.com/IllyaMoskvin) |
+| Tina Shah | Senior Web Developer | GitHub: [surreal8](https://github.com/surreal8), Twitter: [@tshah](https://twitter.com/tshah) |
+| Kirsten Southwell | Creative Director, Visual Design | Twitter: [@kmsouthwell](https://twitter.com/kmsouthwell) |
+| Marc Choi | Senior Designer, Visual Design | [LinkedIn](https://www.linkedin.com/in/marcchoi/) |
+| Mark Dascoli | Integration Technologist | GitHub: [markdascoli](https://github.com/markdascoli), Twitter: [@markdascoli](https://twitter.com/markdascoli) |
 
 ## Initial development and interactive features by AREA 17
 > [area17.com](http://www.area17.com/)
 
-### Kemp Attwood
-Role: Creative Director  
-Site: [area17.com/about/kemp-attwood](https://area17.com/about/kemp-attwood)  
-Twitter: [@attwoodkemp](https://twitter.com/attwoodkemp)
-
-### Jesse Golomb
-Role: Producer  
-Site: [area17.com/about/jesse-golomb](https://area17.com/about/jesse-golomb)  
-Twitter: [@jessegolomb_](https://twitter.com/jessegolomb_)
-
-### Pat McQueen
-Role: Strategy  
-Site: [area17.com/about/pat-mcqueen](https://area17.com/about/pat-mcqueen)
-
-### Skyler Swezy
-Role: Strategy  
-Site: [area17.com/about/skyler-swezy](https://area17.com/about/skyler-swezy)  
-Twitter: [@skylerswezy](https://twitter.com/skylerswezy)
-
-### Christophe da Silva
-Role: UX  
-Site: [area17.com/about/christophe-da-silva](https://area17.com/about/christophe-da-silva)  
-Twitter: [@kjuice](https://twitter.com/kjuice)
-
-### Marius Roosendaal
-Role: Designer  
-Site: [area17.com/about/marius-roosendaal](https://area17.com/about/marius-roosendaal)  
-Twitter: [@mroosendaal](https://twitter.com/mroosendaal)
-
-### Iain Lawson
-Role: Technical Lead  
-Site: [area17.com/about/iain-lawson](https://area17.com/about/iain-lawson)
-
-### Fernando Petrelli
-Role: Back End Development  
-Site: [area17.com/about/fernando-petrelli](https://area17.com/about/fernando-petrelli)  
-GitHub: [ferpetrelli](https://github.com/ferpetrelli)  
-Twitter: [@ferpetrelli](https://twitter.com/ferpetrelli)
-
-### Quentin Renard
-Role: Back End Development  
-Site: [area17.com/about/quentin-renard](https://area17.com/about/quentin-renard)  
-GitHub: [ifox](https://github.com/ifox)  
-Twitter: [@ifox](https://twitter.com/ifox)
-
-### Mike Byrne
-Role: Front End Development  
-Site: [area17.com/about/mike-byrne](https://area17.com/about/mike-byrne)  
-GitHub: [13twelve](https://github.com/13twelve)  
-Twitter: [@13twelve](https://twitter.com/13twelve)
-
-### Mubashar Iqbal
-Role: Back End Development  
-GitHub: [mubashariqbal](https://github.com/mubashariqbal)  
-Twitter: [@mubashariqbal](https://twitter.com/mubashariqbal)
-
-### Yanhao Li
-Role: Back End Development  
-GitHub: [yanhao-li](https://github.com/yanhao-li)  
-Twitter: [@yanhao_li](https://twitter.com/yanhao_li)
-
-### Tim Brook
-Role: Front End Development  
-GitHub: [mrtimbrook](https://github.com/mrtimbrook)  
-Twitter: [@tim_brook](https://twitter.com/tim_brook)
-
-### Pablo Barrios
-Role: Back End Development  
-GitHub: [sauron](https://github.com/sauron)  
-Twitter: [@pablo_barrios](https://twitter.com/pablo_barrios)
-
-### Kyle Wayne Luck
-Role: Back End Development  
-GitHub: [kylewayneluck](https://github.com/kylewayneluck)  
-Twitter: [@kylewayneluck](https://twitter.com/kylewayneluck)
-
-### Nicolas Davi
-Role: Front End Development  
-GitHub: [nicolasdavi](https://github.com/nicolasdavi)  
-Twitter: [@nicolasdavi](https://twitter.com/nicolasdavi)
-
-### Powell May
-Role: Back End Development  
-GitHub: [ptouch718](https://github.com/ptouch718)  
-Twitter: [@ptouch718](https://twitter.com/ptouch718)
-
-### Chris Hale
-Role: Front End Development  
-GitHub: [chrishale](https://github.com/chrishale)  
-Twitter: [@chrishale](https://twitter.com/chrishale)
-
-### Luis Lavena
-Role: Back End Development  
-GitHub: [luislavena](https://github.com/luislavena)  
-Twitter: [@luislavena](https://twitter.com/luislavena)
+| Name | Role | Contact |
+|---|---|---|
+| Kemp Attwood | Creative Director | Site: [area17.com/about/kemp-attwood](https://area17.com/about/kemp-attwood), Twitter: [@attwoodkemp](https://twitter.com/attwoodkemp) |
+| Jesse Golomb | Producer | Site: [area17.com/about/jesse-golomb](https://area17.com/about/jesse-golomb), Twitter: [@jessegolomb_](https://twitter.com/jessegolomb_) |
+| Pat McQueen | Strategy | Site: [area17.com/about/pat-mcqueen](https://area17.com/about/pat-mcqueen) |
+| Skyler Swezy | Strategy | Site: [area17.com/about/skyler-swezy](https://area17.com/about/skyler-swezy), Twitter: [@skylerswezy](https://twitter.com/skylerswezy) |
+| Christophe da Silva | UX | Site: [area17.com/about/christophe-da-silva](https://area17.com/about/christophe-da-silva), Twitter: [@kjuice](https://twitter.com/kjuice) |
+| Marius Roosendaal | Designer | Site: [area17.com/about/marius-roosendaal](https://area17.com/about/marius-roosendaal), Twitter: [@mroosendaal](https://twitter.com/mroosendaal) |
+| Iain Lawson | Technical Lead | Site: [area17.com/about/iain-lawson](https://area17.com/about/iain-lawson) |
+| Fernando Petrelli | Back End Development | Site: [area17.com/about/fernando-petrelli](https://area17.com/about/fernando-petrelli), GitHub: [ferpetrelli](https://github.com/ferpetrelli), Twitter: [@ferpetrelli](https://twitter.com/ferpetrelli) |
+| Quentin Renard | Back End Development | Site: [area17.com/about/quentin-renard](https://area17.com/about/quentin-renard), GitHub: [ifox](https://github.com/ifox), Twitter: [@ifox](https://twitter.com/ifox) |
+| Mike Byrne | Front End Development | Site: [area17.com/about/mike-byrne](https://area17.com/about/mike-byrne), GitHub: [13twelve](https://github.com/13twelve), Twitter: [@13twelve](https://twitter.com/13twelve) |
+| Mubashar Iqbal | Back End Development | GitHub: [mubashariqbal](https://github.com/mubashariqbal), Twitter: [@mubashariqbal](https://twitter.com/mubashariqbal) |
+| Yanhao Li | Back End Development | GitHub: [yanhao-li](https://github.com/yanhao-li), Twitter: [@yanhao_li](https://twitter.com/yanhao_li) |
+| Tim Brook | Front End Development | GitHub: [mrtimbrook](https://github.com/mrtimbrook), Twitter: [@tim_brook](https://twitter.com/tim_brook) |
+| Pablo Barrios | Back End Development | GitHub: [sauron](https://github.com/sauron), Twitter: [@pablo_barrios](https://twitter.com/pablo_barrios) |
+| Kyle Wayne Luck | Back End Development | GitHub: [kylewayneluck](https://github.com/kylewayneluck), Twitter: [@kylewayneluck](https://twitter.com/kylewayneluck) |
+| Nicolas Davi | Front End Development | GitHub: [nicolasdavi](https://github.com/nicolasdavi), Twitter: [@nicolasdavi](https://twitter.com/nicolasdavi) |
+| Powell May | Back End Development | GitHub: [ptouch718](https://github.com/ptouch718), Twitter: [@ptouch718](https://twitter.com/ptouch718) |
+| Chris Hale | Front End Development | GitHub: [chrishale](https://github.com/chrishale), Twitter: [@chrishale](https://twitter.com/chrishale) |
+| Luis Lavena | Back End Development | GitHub: [luislavena](https://github.com/luislavena), Twitter: [@luislavena](https://twitter.com/luislavena) |
+
+## Layered Image Viewer initial development by Cogapp
+> [cogapp.com](http://www.cogapp.com/)
+
+| Name | Role | Contact |
+|---|---|---|
+| Jon White | Senior Front-End Developer, he/him | Site: [cogapp.com/team/jon-white](https://www.cogapp.com/team/jon-white) |
+| Tristin Roddis | Technical Director, he/him | Site: [cogapp.com/team/tristan-roddis](https://www.cogapp.com/team/tristan-roddis) |
+| Hannah Baker | Developer | Site: [cogapp.com/team/hannah-baker](https://www.cogapp.com/team/hannah-baker) |
+| Louise Cole | Production Director, she/her | Site: [cogapp.com/team/louise-cole](https://www.cogapp.com/team/louise-cole) |
 
 ## Site
 Built with [Twill](https://twill.io).

diff --git a/README.md b/README.md
@@ -153,6 +153,34 @@ git checkout -b feature/good-short-description
 # ... make some changes
 ```
 
+### Formatting your code
+
+We use the [PHP CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer)
+tool to ensure that all of our code is consistently formatted. Before checking
+in any changes, we recommend running the `lint` script:
+```bash
+composer lint
+```
+
+Additional arguments can be passed to PHP CodeSniffer. For example, if you wanted
+to view the full lint report instead of the default summary:
+```bash
+composer lint -- --report=full
+```
+
+Some linting errors can be automattically addressed by PHP CodeSniffer itself and
+a second tool,
+[PHP Coding Standard Fixer](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer).
+If the lint script returns a list of errors, we recommend running the `format`
+script:
+```bash
+composer format
+```
+
+These two tools are fairly comprehensive, but are not able to address every
+linting error. You may need to manually make some formatting changes to your
+code in order to pass the lint check.
+
 ### Commiting your changes
 ```bash
 # Make sure you're working off of the latest commit on the branch

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-6.40
+6.41
diff --git a/app/Console/Commands/Events/EventExport.php b/app/Console/Commands/Events/EventExport.php
@@ -3,10 +3,8 @@
 namespace App\Console\Commands\Events;
 
 use App\Models\Event;
-
 use League\Csv\Writer;
 use Illuminate\Support\Facades\Storage;
-
 use Aic\Hub\Foundation\AbstractCommand as BaseCommand;
 
 class EventExport extends BaseCommand

diff --git a/app/Console/Commands/Events/EventImport.php b/app/Console/Commands/Events/EventImport.php
@@ -5,10 +5,8 @@
 use App\Models\Event;
 use App\Models\ApiRelation;
 use App\Models\Api\TicketedEvent;
-
 use League\Csv\Reader;
 use Illuminate\Support\Facades\Storage;
-
 use Aic\Hub\Foundation\AbstractCommand as BaseCommand;
 
 class EventImport extends BaseCommand

diff --git a/app/Console/Commands/FixGalleries.php b/app/Console/Commands/FixGalleries.php
@@ -3,7 +3,6 @@
 namespace App\Console\Commands;
 
 use App\Models\Vendor\Block;
-
 use Illuminate\Console\Command;
 
 class FixGalleries extends Command