diff --git a/app/Console/Commands/SendConfirmations.php b/app/Console/Commands/SendConfirmations.php index 3518206b48..31f22680db 100644 --- a/app/Console/Commands/SendConfirmations.php +++ b/app/Console/Commands/SendConfirmations.php @@ -74,7 +74,8 @@ protected function send($model) { $to = $model->creator_email; $apiCode = config('sendgrid.api_key'); - $sender = config('sendgrid.email'); + $senderEmail = config('sendgrid.email'); + $senderName = config('sendgrid.name'); $templateId = config('sendgrid.template_id'); $baseUrl = config('aic.protocol') . '://' . config('app.url'); @@ -96,7 +97,8 @@ protected function send($model) ] ], 'from' => [ - 'email' => $sender + 'email' => $senderEmail, + 'name' => $senderName, ], 'template_id' => $templateId, ]; diff --git a/app/Http/Controllers/MyMuseumTourController.php b/app/Http/Controllers/MyMuseumTourController.php index e6d25b3ef1..add3a6c53e 100644 --- a/app/Http/Controllers/MyMuseumTourController.php +++ b/app/Http/Controllers/MyMuseumTourController.php @@ -113,6 +113,7 @@ public function qrcode(Request $request, $id) 'eccLevel' => EccLevel::L, 'outputType' => QROutputInterface::GDIMAGE_PNG, 'version' => 5, + 'quietzoneSize' => 0, ] ); diff --git a/config/galleries.php b/config/galleries.php index b9fc6873aa..ace0078edd 100644 --- a/config/galleries.php +++ b/config/galleries.php @@ -845,14 +845,14 @@ 26772 => [ "gallery_title" => "Gallery 150", "gallery_level" => "first level", - "gallery_location" => "Arts of the Greek, Roman and Byantine Worlds Galleries ", + "gallery_location" => "Arts of the Greek, Roman and Byzantine Worlds Galleries ", ], 26773 => [ "gallery_title" => "Gallery 151", "gallery_level" => "first level", - "gallery_location" => "Arts of the Greek, Roman and Byantine Worlds Galleries ", + "gallery_location" => "Arts of the Greek, Roman and Byzantine Worlds Galleries ", ], @@ -866,21 +866,21 @@ 26774 => [ "gallery_title" => "Gallery 152", "gallery_level" => "first level", - "gallery_location" => "Arts of the Greek, Roman and Byantine Worlds Galleries ", + "gallery_location" => "Arts of the Greek, Roman and Byzantine Worlds Galleries ", ], 26776 => [ "gallery_title" => "Gallery 153", "gallery_level" => "first level", - "gallery_location" => "Arts of the Greek, Roman and Byantine Worlds Galleries ", + "gallery_location" => "Arts of the Greek, Roman and Byzantine Worlds Galleries ", ], 26777 => [ "gallery_title" => "Gallery 154", "gallery_level" => "first level", - "gallery_location" => "Arts of the Greek, Roman and Byantine Worlds Galleries ", + "gallery_location" => "Arts of the Greek, Roman and Byzantine Worlds Galleries ", ], diff --git a/config/sendgrid.php b/config/sendgrid.php index b23ce39bdb..446f25c77a 100644 --- a/config/sendgrid.php +++ b/config/sendgrid.php @@ -4,5 +4,6 @@ 'api_url' => env('SENDGRID_API_URL'), 'api_key' => env('SENDGRID_API_KEY'), 'email' => env('SENDGRID_EMAIL'), + 'name' => env('SENDGRID_NAME'), 'template_id' => env('SENDGRID_TEMPLATE_ID'), ]; diff --git a/frontend/icons/bloomberg.svg b/frontend/icons/bloomberg.svg index dd73c1a565..bb6631e53d 100644 --- a/frontend/icons/bloomberg.svg +++ b/frontend/icons/bloomberg.svg @@ -1,32 +1,68 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + diff --git a/frontend/icons/choose.svg b/frontend/icons/choose.svg index 32b49b8222..0aac3ae017 100644 --- a/frontend/icons/choose.svg +++ b/frontend/icons/choose.svg @@ -1,35 +1,4 @@ - - - - - + + + diff --git a/frontend/icons/finish.svg b/frontend/icons/finish.svg index ad33baf748..48486c73a6 100644 --- a/frontend/icons/finish.svg +++ b/frontend/icons/finish.svg @@ -1,27 +1,7 @@ - - - - - - + + + + + + diff --git a/frontend/icons/personalize.svg b/frontend/icons/personalize.svg index 22beada743..719835297d 100644 --- a/frontend/icons/personalize.svg +++ b/frontend/icons/personalize.svg @@ -1,32 +1,11 @@ - - - - - - - - - - - - + + + + + + + + + + diff --git a/frontend/images/my_museum_tour--aic-bloomberg.png b/frontend/images/my_museum_tour--aic-bloomberg.png new file mode 100644 index 0000000000..483ec8b014 Binary files /dev/null and b/frontend/images/my_museum_tour--aic-bloomberg.png differ diff --git a/frontend/images/my_museum_tour--aic.png b/frontend/images/my_museum_tour--aic.png deleted file mode 100644 index 117a14cbc9..0000000000 Binary files a/frontend/images/my_museum_tour--aic.png and /dev/null differ diff --git a/frontend/images/my_museum_tour--bloomberg.png b/frontend/images/my_museum_tour--bloomberg.png deleted file mode 100644 index 92a6bf154d..0000000000 Binary files a/frontend/images/my_museum_tour--bloomberg.png and /dev/null differ diff --git a/frontend/js/behaviors/myMuseumTourBuilder/myMuseumTourBuilder.js b/frontend/js/behaviors/myMuseumTourBuilder/myMuseumTourBuilder.js index c2d136403c..6d3fcc3ea7 100644 --- a/frontend/js/behaviors/myMuseumTourBuilder/myMuseumTourBuilder.js +++ b/frontend/js/behaviors/myMuseumTourBuilder/myMuseumTourBuilder.js @@ -1,12 +1,27 @@ import ReactDOM from 'react-dom'; import React from 'react'; import MyMuseumTourBuilder from 'my-museum-tour-builder'; +import * as Sentry from "@sentry/react"; export default function myMuseumTourBuilder(container) { this.init = function () { let dataString = container.getAttribute('data-hide-from-tours'); + let sentryDsn = container.getAttribute('data-dsn'); const hideFromTours = dataString.length > 0 ? dataString.split(",") : []; - console.log(hideFromTours); + + Sentry.init({ + dsn: sentryDsn, + integrations: [ + Sentry.browserTracingIntegration(), + Sentry.replayIntegration({ + maskAllText: false, + blockAllMedia: false, + }), + ], + tracesSampleRate: 1.0, + replaysSessionSampleRate: 0.1, + replaysOnErrorSampleRate: 1.0, + }); ReactDOM.render( Design a personalized tour by directly searching artworks or exploring themes that can help you get started.

') - @slot('button_text', 'Create your own tour') - @slot('gtmAttributes', 'data-gtm-event="Create your own tour" data-gtm-event-category="internal-ad-click"') + @slot('button_text', 'Create Your Own Tour') + @slot('gtmAttributes', 'data-gtm-event="Create Your Own Tour" data-gtm-event-category="internal-ad-click"') @slot('my_museum_tour', true) @slot('secondary_button_href', '/my-museum-tour') - @slot('secondary_button_text', 'View ready-made tours') + @slot('secondary_button_text', 'View Ready-Made Tours') @slot('my_museum_tour_bottom', true) @endcomponent @endsection diff --git a/resources/views/site/myMuseumTourBuilder.blade.php b/resources/views/site/myMuseumTourBuilder.blade.php index a13ffa4aff..f9f368e66e 100644 --- a/resources/views/site/myMuseumTourBuilder.blade.php +++ b/resources/views/site/myMuseumTourBuilder.blade.php @@ -1,7 +1,7 @@ @extends('layouts.app') @section('content') -
+
@endsection diff --git a/resources/views/site/myMuseumToursPdfLayout.blade.php b/resources/views/site/myMuseumToursPdfLayout.blade.php index 8b705ab57c..894ca5f819 100644 --- a/resources/views/site/myMuseumToursPdfLayout.blade.php +++ b/resources/views/site/myMuseumToursPdfLayout.blade.php @@ -167,13 +167,12 @@ @endisset - + - - +

See your tour here