Merge branch 'develop'

art-institute-of-chicago · Mar 16, 2023 · 34a3521 · 34a3521
2 parents 1b935bf + 866a47c
commit 34a3521
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 824 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-6.38
+6.40
diff --git a/app/Http/Controllers/Forms/EducatorAdmissionController.php b/app/Http/Controllers/Forms/EducatorAdmissionController.php
@@ -31,7 +31,7 @@ public function index()
                     'type' => 'input',
                     'variation' => null,
                     'id' => 'name',
-                    'placeholder' => '',
+                    'autocomplete' => 'name',
                     'textCount' => false,
                     'value' => old('name'),
                     'error' => (!empty($errors) && $errors->first('name')) ? $errors->first('name') : null,
@@ -123,7 +123,6 @@ public function index()
                     'type' => 'input',
                     'variation' => null,
                     'id' => 'grades_taught',
-                    'placeholder' => '',
                     'textCount' => false,
                     'value' => old('grades_taught'),
                     'error' => (!empty($errors) && $errors->first('grades_taught')) ? $errors->first('grades_taught') : null,
@@ -142,7 +141,6 @@ public function index()
                     'type' => 'input',
                     'variation' => null,
                     'id' => 'subjects_taught',
-                    'placeholder' => '',
                     'textCount' => false,
                     'value' => old('subjects_taught'),
                     'error' => (!empty($errors) && $errors->first('subjects_taught')) ? $errors->first('subjects_taught') : null,

diff --git a/app/Http/Controllers/Forms/EmailSubscriptionsController.php b/app/Http/Controllers/Forms/EmailSubscriptionsController.php
@@ -124,6 +124,7 @@ public function index(Request $request)
                     'variation' => null,
                     'id' => 'email',
                     'placeholder' => 'your@email.com',
+                    'autocomplete' => 'email',
                     'textCount' => false,
                     'value' => $this->getOld('email'),
                     'error' => (!empty($errors) && $errors->first('email')) ? $errors->first('email') : null,
@@ -155,7 +156,7 @@ public function index(Request $request)
                     'type' => 'input',
                     'variation' => null,
                     'id' => 'first_name',
-                    'placeholder' => '',
+                    'autocomplete' => 'given-name',
                     'textCount' => false,
                     'value' => $this->getOld('first_name'),
                     'error' => (!empty($errors) && $errors->first('first_name')) ? $errors->first('first_name') : null,
@@ -174,7 +175,7 @@ public function index(Request $request)
                     'type' => 'input',
                     'variation' => null,
                     'id' => 'last_name',
-                    'placeholder' => '',
+                    'autocomplete' => 'family-name',
                     'textCount' => false,
                     'value' => $this->getOld('last_name'),
                     'error' => (!empty($errors) && $errors->first('last_name')) ? $errors->first('last_name') : null,

diff --git a/app/Http/Controllers/Forms/FilmingAndPhotoShootProposalController.php b/app/Http/Controllers/Forms/FilmingAndPhotoShootProposalController.php
@@ -32,7 +32,7 @@ public function index()
                     'type' => 'input',
                     'variation' => null,
                     'id' => 'name',
-                    'placeholder' => '',
+                    'autocomplete' => 'name',
                     'textCount' => false,
                     'value' => old('name'),
                     'error' => (!empty($errors) && $errors->first('name')) ? $errors->first('name') : null,
@@ -52,6 +52,7 @@ public function index()
                     'variation' => null,
                     'id' => 'email',
                     'placeholder' => 'your@email.com',
+                    'autocomplete' => 'email',
                     'textCount' => false,
                     'value' => old('email'),
                     'error' => (!empty($errors) && $errors->first('email')) ? $errors->first('email') : null,
@@ -70,7 +71,7 @@ public function index()
                     'type' => 'tel',
                     'variation' => null,
                     'id' => 'phone_number',
-                    'placeholder' => '',
+                    'autocomplete' => 'tel',
                     'textCount' => false,
                     'value' => old('phone_number'),
                     'error' => (!empty($errors) && $errors->first('phone_number')) ? $errors->first('phone_number') : null,
@@ -90,7 +91,6 @@ public function index()
                     'type' => 'textarea',
                     'variation' => null,
                     'id' => 'description',
-                    'placeholder' => '',
                     'value' => old('description'),
                     'error' => (!empty($errors) && $errors->first('description')) ? $errors->first('description') : null,
                     'optional' => false,
@@ -160,7 +160,6 @@ public function index()
                     'type' => 'textarea',
                     'variation' => null,
                     'id' => 'locations',
-                    'placeholder' => '',
                     'value' => old('locations'),
                     'error' => (!empty($errors) && $errors->first('locations')) ? $errors->first('locations') : null,
                     'optional' => false,
@@ -178,7 +177,6 @@ public function index()
                     'type' => 'input',
                     'variation' => null,
                     'id' => 'required_time',
-                    'placeholder' => '',
                     'textCount' => false,
                     'value' => old('required_time'),
                     'error' => (!empty($errors) && $errors->first('required_time')) ? $errors->first('required_time') : null,
@@ -197,7 +195,6 @@ public function index()
                     'type' => 'textarea',
                     'variation' => null,
                     'id' => 'crew_members',
-                    'placeholder' => '',
                     'value' => old('crew_members'),
                     'error' => (!empty($errors) && $errors->first('crew_members')) ? $errors->first('crew_members') : null,
                     'optional' => false,
@@ -215,7 +212,6 @@ public function index()
                     'type' => 'textarea',
                     'variation' => null,
                     'id' => 'equipment_list',
-                    'placeholder' => '',
                     'value' => old('equipment_list'),
                     'error' => (!empty($errors) && $errors->first('equipment_list')) ? $errors->first('equipment_list') : null,
                     'optional' => false,

diff --git a/app/Http/Controllers/Forms/RyersonClassVisitController.php b/app/Http/Controllers/Forms/RyersonClassVisitController.php
@@ -34,7 +34,7 @@ public function index()
                     'type' => 'input',
                     'variation' => null,
                     'id' => 'name',
-                    'placeholder' => '',
+                    'autocomplete' => 'name',
                     'textCount' => false,
                     'value' => old('name'),
                     'error' => (!empty($errors) && $errors->first('name')) ? $errors->first('name') : null,
@@ -54,6 +54,7 @@ public function index()
                     'variation' => null,
                     'id' => 'email',
                     'placeholder' => 'your@email.com',
+                    'autocomplete' => 'email',
                     'textCount' => false,
                     'value' => old('email'),
                     'error' => (!empty($errors) && $errors->first('email')) ? $errors->first('email') : null,
@@ -72,7 +73,7 @@ public function index()
                     'type' => 'tel',
                     'variation' => null,
                     'id' => 'phone_number',
-                    'placeholder' => '',
+                    'autocomplete' => 'tel',
                     'textCount' => false,
                     'value' => old('phone_number'),
                     'error' => (!empty($errors) && $errors->first('phone_number')) ? $errors->first('phone_number') : null,
@@ -111,7 +112,6 @@ public function index()
                     'type' => 'input',
                     'variation' => null,
                     'id' => 'non_saic_institution',
-                    'placeholder' => '',
                     'textCount' => false,
                     'value' => old('non_saic_institution'),
                     'error' => (!empty($errors) && $errors->first('non_saic_institution')) ? $errors->first('non_saic_institution') : null,
@@ -130,7 +130,6 @@ public function index()
                     'type' => 'input',
                     'variation' => null,
                     'id' => 'department',
-                    'placeholder' => '',
                     'textCount' => false,
                     'value' => old('department'),
                     'error' => (!empty($errors) && $errors->first('department')) ? $errors->first('department') : null,
@@ -149,7 +148,6 @@ public function index()
                     'type' => 'input',
                     'variation' => null,
                     'id' => 'course_title',
-                    'placeholder' => '',
                     'textCount' => false,
                     'value' => old('course_title'),
                     'error' => (!empty($errors) && $errors->first('course_title')) ? $errors->first('course_title') : null,
@@ -168,7 +166,6 @@ public function index()
                     'type' => 'input',
                     'variation' => null,
                     'id' => 'course_level',
-                    'placeholder' => '',
                     'textCount' => false,
                     'value' => old('course_level'),
                     'error' => (!empty($errors) && $errors->first('course_level')) ? $errors->first('course_level') : null,
@@ -226,7 +223,6 @@ public function index()
                     'type' => 'textarea',
                     'variation' => null,
                     'id' => 'multiple_sessions_description',
-                    'placeholder' => '',
                     'value' => old('multiple_sessions_description'),
                     'error' => (!empty($errors) && $errors->first('multiple_sessions_description')) ? $errors->first('multiple_sessions_description') : null,
                     'optional' => false,
@@ -316,7 +312,6 @@ public function index()
                     'type' => 'input',
                     'variation' => null,
                     'id' => 'alt_times',
-                    'placeholder' => '',
                     'textCount' => false,
                     'value' => old('alt_times'),
                     'error' => (!empty($errors) && $errors->first('alt_times')) ? $errors->first('alt_times') : null,
@@ -336,7 +331,6 @@ public function index()
                     'pattern' => '\d*',
                     'variation' => null,
                     'id' => 'no_of_students',
-                    'placeholder' => '',
                     'textCount' => false,
                     'value' => old('no_of_students'),
                     'error' => (!empty($errors) && $errors->first('no_of_students')) ? $errors->first('no_of_students') : null,
@@ -393,7 +387,6 @@ public function index()
                     'type' => 'textarea',
                     'variation' => null,
                     'id' => 'collections_related_assignment_description',
-                    'placeholder' => '',
                     'value' => old('collections_related_assignment_description'),
                     'error' => (!empty($errors) && $errors->first('collections_related_assignment_description')) ? $errors->first('collections_related_assignment_description') : null,
                     'optional' => false,
@@ -411,7 +404,6 @@ public function index()
                     'type' => 'textarea',
                     'variation' => null,
                     'id' => 'collection_materials_requested_for_visit',
-                    'placeholder' => '',
                     'value' => old('collection_materials_requested_for_visit'),
                     'error' => (!empty($errors) && $errors->first('collection_materials_requested_for_visit')) ? $errors->first('collection_materials_requested_for_visit') : null,
                     'optional' => false,

diff --git a/app/Models/Page.php b/app/Models/Page.php
@@ -232,6 +232,7 @@ class Page extends AbstractModel
         7 => 'Floor Icon',
         8 => 'Virtual Queue',
         9 => 'Proof of Vaccination',
+        10 => 'Dining'
     ];
 
     public function scopeForType($query, $type)

diff --git a/frontend/icons/dining.svg b/frontend/icons/dining.svg
diff --git a/frontend/scss/setup/_icons.scss b/frontend/scss/setup/_icons.scss
@@ -67,6 +67,9 @@ More variants maybe added later, so anything thats not a 16px square SVG needs a
   <svg class="icon--closer_look">
     <use xlink:href="#icon--closer_look"></use>
   </svg>
+  <svg class="icon--dining">
+    <use xlink:href="#icon--dining"></use>
+  </svg>
   <svg class="icon--download--24">
     <use xlink:href="#icon--download--24"></use>
   </svg>
@@ -361,6 +364,11 @@ The cloud front server caches icons, if you add a new icon, or edit an icon, you
   height: 44px;
 }
 
+.icon--dining {
+  width: 200px;
+  height: 200px;
+}
+
 .icon--download--24 {
   width: 24px;
   height: 24px;

diff --git a/resources/views/components/atoms/_email.blade.php b/resources/views/components/atoms/_email.blade.php
@@ -10,7 +10,7 @@
     @if (isset($textCount) and $textCount)
     <span class="input__io-container" data-behavior="textCount">
     @endif
-    <input class="f-secondary" type="{{ $type ?? 'email'}}" value="{{ $value ?? '' }}" id="{{ $id ?? '' }}" name="{{ $name }}" placeholder="{{ $placeholder ?? 'your@email.com' }}" {{ $disabled ?? '' }} {{ $required ?? '' }}>
+    <input class="f-secondary" type="{{ $type ?? 'email'}}" value="{{ $value ?? '' }}" id="{{ $id ?? '' }}" name="{{ $name }}" placeholder="{{ $placeholder ?? 'your@email.com' }}" {{ $disabled ?? '' }} {{ $required ?? '' }} autocomplete="email">
     @if (isset($textCount) and $textCount)
     <output for="{{ $id ?? '' }}" class="f-secondary"></output></span>
     @endif

diff --git a/resources/views/components/atoms/_input.blade.php b/resources/views/components/atoms/_input.blade.php
@@ -10,7 +10,7 @@
     @if (isset($textCount) and $textCount)
     <span class="input__io-container" data-behavior="textCount">
     @endif
-    <input class="f-secondary" type="{{ $type ?? 'text'}}" value="{{ $value ?? '' }}" id="{{ $id ?? '' }}" name="{{ $name }}" placeholder="{{ $placeholder ?? '' }}" {{ $disabled ?? '' }} {{ (isset($pattern)) ? 'pattern=' .$pattern : '' }} {{ $required ?? '' }}>
+    <input class="f-secondary" type="{{ $type ?? 'text'}}" value="{{ $value ?? '' }}" id="{{ $id ?? '' }}" name="{{ $name }}" {!! (isset($placeholder)) ? 'placeholder="' .$placeholder . '"' : '' !!} {!! (isset($autocomplete)) ? 'autocomplete="' .$autocomplete .'"' : '' !!} {{ $disabled ?? '' }} {{ (isset($pattern)) ? 'pattern=' .$pattern : '' }} {{ $required ?? '' }}>
     @if (isset($textCount) and $textCount)
     <output for="{{ $id ?? '' }}" class="f-secondary"></output></span>
     @endif

diff --git a/resources/views/components/blocks/_blocks.blade.php b/resources/views/components/blocks/_blocks.blade.php
@@ -325,6 +325,7 @@
                     @slot('id', $block['id'] ?? 'i_'.$loop->iteration)
                     @slot('name', $block['id'] ?? 'i_'.$loop->iteration)
                     @slot('placeholder', $block['placeholder'] ?? null)
+                    @slot('autocomplete', $block['autocomplete'] ?? null)
                     @slot('textCount', $block['textCount'] ?? false)
                     @slot('value', $block['value'] ?? null)
                     @slot('error', $block['error'] ?? null)

diff --git a/resources/views/components/molecules/_m-aside-newsletter.blade.php b/resources/views/components/molecules/_m-aside-newsletter.blade.php
@@ -8,7 +8,7 @@
             <span class="m-aside-newsletter__field">
                 <label for="email{{ $rand }}" class="f-secondary">Email address</label>
                 {{ csrf_field() }}
-                <input type="email" name="email" id="email{{ $rand }}" class="f-secondary" placeholder="{{ $placeholder ?? 'your@email.com' }}">
+                <input type="email" name="email" id="email{{ $rand }}" class="f-secondary" placeholder="{{ $placeholder ?? 'your@email.com' }}" autocomplete="email">
                 <button type="submit" class="{{ $btnFont ?? 'f-buttons' }} m-aside-newsletter__btn--submit" data-gtm-event-category="subscribe" data-gtm-event="email">Subscribe</button>
             </span>