Deployment Started . . . . . From https://gitlab.com/gligx/musawer * branch development -> FETCH_HEAD 01069579..c4903a44 development -> origin/development Updating 01069579..c4903a44 Fast-forward .env.example | 14 +-- .gitignore | 2 + app/Events/Web/CustomerRegistered.php | 37 +++++++ app/Events/Web/CustomerVerified.php | 38 +++++++ app/Helpers/sidebar.php | 8 ++ .../EmailTemplate/Includes/EmailTemplateChange.php | 22 ++++ .../EmailTemplate/Includes/EmailTemplateManage.php | 18 +++ .../Controllers/Admin/EmailTemplateController.php | 39 +++++++ app/Http/Controllers/Admin/OrdersController.php | 2 + .../Web/Auth/ForgotPasswordController.php | 3 +- .../Controllers/Web/Auth/RegisterController.php | 7 +- .../Web/Auth/ResetPasswordController.php | 52 ++++++++- .../Web/Auth/VerificationController.php | 47 +++++++- app/Http/Controllers/Web/CartController.php | 3 +- app/Http/Controllers/Web/CheckoutController.php | 11 +- app/Http/Controllers/Web/HomeController.php | 19 ++++ app/Http/Controllers/Web/QuoteController.php | 1 + app/Http/Middleware/RedirectIfAuthenticated.php | 3 +- .../EmailTemplate/EmailTemplateUpdateRequest.php | 44 ++++++++ app/Http/Requests/Web/Auth/LoginRequest.php | 2 +- app/Http/Requests/Web/Auth/RegisterRequest.php | 5 +- .../Web/Subscription/SubscriptionSaveRequest.php | 35 ++++++ app/Listeners/Web/PasswordChangeSuccess.php | 32 ++++++ app/Listeners/Web/SendRegisterSuccess.php | 33 ++++++ app/Listeners/Web/SendVerification.php | 34 ++++++ app/Mail/Web/BookingThankYouEmail.php | 42 +++++++ app/Mail/Web/ForgetPasswordEmail.php | 41 +++++++ app/Mail/Web/NewQuoteRequestedMail.php | 40 +++++++ app/Mail/Web/PasswordChangedEmail.php | 40 +++++++ app/Mail/Web/QuoteApprovedMail.php | 40 +++++++ app/Mail/Web/RegistrationSuccessEmail.php | 40 +++++++ app/Mail/Web/ServiceCompletedMail.php | 42 +++++++ app/Mail/Web/VerificationEmail.php | 56 ++++++++++ app/Models/Customer.php | 17 +++ app/Models/MergeField.php | 12 ++ app/Models/Subscription.php | 12 ++ app/Providers/EventServiceProvider.php | 20 +++- app/Providers/RepositoryServiceProvider.php | 6 + app/Repositories/Cart/CartRepository.php | 19 ++-- app/Repositories/Customer/CustomerRepository.php | 17 +++ .../Customer/CustomerRepositoryInterface.php | 6 + .../EmailTemplate/EmailTemplateRepository.php | 33 ++++++ .../EmailTemplateRepositoryInterface.php | 14 +++ app/Repositories/Order/OrderRepository.php | 13 +++ .../Order/OrderRepositoryInterface.php | 4 + app/Repositories/Product/ProductRepository.php | 12 ++ .../Product/ProductRepositoryInterface.php | 2 + app/Repositories/Quote/QuoteRepository.php | 16 ++- .../Quote/QuoteRepositoryInterface.php | 6 +- .../Subscription/SubscriptionRepository.php | 16 +++ .../SubscriptionRepositoryInterface.php | 8 ++ app/Repositories/User/UserRepository.php | 4 + composer.json | 1 + ...18_10_10_000000_create_mail_templates_table.php | 30 +++++ ...2022_03_14_082402_email_temlplate_name_slug.php | 35 ++++++ .../2022_03_14_090337_password_changing_emails.php | 46 ++++++++ ...2022_03_14_090710_create_merge_fields_table.php | 47 ++++++++ .../2022_03_14_100046_settings_signature.php | 33 ++++++ .../2022_03_14_143913_verification_mail.php | 36 ++++++ ...2022_03_14_164320_registration_success_mail.php | 35 ++++++ .../2022_03_15_090320_order_no_field.php | 32 ++++++ .../2022_03_15_090326_booking_thankyou_mail.php | 37 +++++++ .../2022_03_15_100807_new_quote_requested_mail.php | 37 +++++++ .../2022_03_15_105811_quote_approved_mail.php | 37 +++++++ .../2022_03_15_114504_service_completed_mail.php | 37 +++++++ ...022_03_15_160341_create_subscriptions_table.php | 32 ++++++ deploy.sh.example | 36 ++++++ package.json | 1 + .../css/admin/emailTemplate/viewEmailTemplate.css | 122 +++++++++++++++++++++ public/js/admin/custom/custom-script.js | 12 ++ public/js/admin/emailTemplate/viewEmailTemplate.js | 35 ++++++ resources/css/auth/login.scss | 31 ++++++ resources/css/auth/passwords/reset.scss | 15 +++ resources/css/home/search.scss | 39 +++++++ resources/css/layout/guest.scss | 2 +- resources/css/layout/musawer.scss | 30 ++++- resources/images/content-bg-email.png.png | Bin 0 -> 5485 bytes resources/images/header-bg-email.png | Bin 0 -> 90356 bytes resources/js/account/account.js | 1 - resources/js/auth/login.js | 14 ++- resources/js/auth/passwords/email.js | 17 --- resources/js/auth/passwords/reset.js | 30 +++++ resources/js/auth/register.js | 1 - resources/js/home/search.js | 1 + resources/js/layout/musawer.js | 41 ++++++- .../emailTemplate/editEmailTemplate.blade.php | 53 +++++++++ .../emailTemplate/viewEmailTemplate.blade.php | 56 ++++++++++ resources/views/admin/order/viewOrder.blade.php | 21 +++- .../views/admin/settings/viewSettings.blade.php | 25 +++++ resources/views/web/auth/login.blade.php | 16 ++- resources/views/web/auth/passwords/email.blade.php | 4 +- resources/views/web/auth/passwords/reset.blade.php | 106 ++++++++---------- .../views/web/email/customerTemplate.blade.php | 26 +++++ resources/views/web/home/search.blade.php | 43 ++++++++ resources/views/web/layouts/app.blade.php | 2 + resources/views/web/layouts/footer.blade.php | 11 +- resources/views/web/layouts/topbar.blade.php | 23 ++-- .../views/web/layouts/verifyNotification.blade.php | 16 +++ resources/views/web/quote/createNew.blade.php | 14 ++- routes/admin.php | 8 ++ routes/web.php | 25 +++-- webpack.mix.js | 7 +- 102 files changed, 2291 insertions(+), 157 deletions(-) create mode 100644 app/Events/Web/CustomerRegistered.php create mode 100644 app/Events/Web/CustomerVerified.php create mode 100644 app/Http/Controllers/Admin/EmailTemplate/Includes/EmailTemplateChange.php create mode 100644 app/Http/Controllers/Admin/EmailTemplate/Includes/EmailTemplateManage.php create mode 100644 app/Http/Controllers/Admin/EmailTemplateController.php create mode 100644 app/Http/Requests/Admin/EmailTemplate/EmailTemplateUpdateRequest.php create mode 100644 app/Http/Requests/Web/Subscription/SubscriptionSaveRequest.php create mode 100644 app/Listeners/Web/PasswordChangeSuccess.php create mode 100644 app/Listeners/Web/SendRegisterSuccess.php create mode 100644 app/Listeners/Web/SendVerification.php create mode 100644 app/Mail/Web/BookingThankYouEmail.php create mode 100644 app/Mail/Web/ForgetPasswordEmail.php create mode 100644 app/Mail/Web/NewQuoteRequestedMail.php create mode 100644 app/Mail/Web/PasswordChangedEmail.php create mode 100644 app/Mail/Web/QuoteApprovedMail.php create mode 100644 app/Mail/Web/RegistrationSuccessEmail.php create mode 100644 app/Mail/Web/ServiceCompletedMail.php create mode 100644 app/Mail/Web/VerificationEmail.php create mode 100644 app/Models/MergeField.php create mode 100644 app/Models/Subscription.php create mode 100644 app/Repositories/EmailTemplate/EmailTemplateRepository.php create mode 100644 app/Repositories/EmailTemplate/EmailTemplateRepositoryInterface.php create mode 100644 app/Repositories/Subscription/SubscriptionRepository.php create mode 100644 app/Repositories/Subscription/SubscriptionRepositoryInterface.php create mode 100644 database/migrations/2018_10_10_000000_create_mail_templates_table.php create mode 100644 database/migrations/2022_03_14_082402_email_temlplate_name_slug.php create mode 100644 database/migrations/2022_03_14_090337_password_changing_emails.php create mode 100644 database/migrations/2022_03_14_090710_create_merge_fields_table.php create mode 100644 database/migrations/2022_03_14_100046_settings_signature.php create mode 100644 database/migrations/2022_03_14_143913_verification_mail.php create mode 100644 database/migrations/2022_03_14_164320_registration_success_mail.php create mode 100644 database/migrations/2022_03_15_090320_order_no_field.php create mode 100644 database/migrations/2022_03_15_090326_booking_thankyou_mail.php create mode 100644 database/migrations/2022_03_15_100807_new_quote_requested_mail.php create mode 100644 database/migrations/2022_03_15_105811_quote_approved_mail.php create mode 100644 database/migrations/2022_03_15_114504_service_completed_mail.php create mode 100644 database/migrations/2022_03_15_160341_create_subscriptions_table.php create mode 100644 deploy.sh.example create mode 100644 public/css/admin/emailTemplate/viewEmailTemplate.css create mode 100644 public/js/admin/emailTemplate/viewEmailTemplate.js create mode 100644 resources/css/auth/passwords/reset.scss create mode 100644 resources/css/home/search.scss create mode 100644 resources/images/content-bg-email.png.png create mode 100644 resources/images/header-bg-email.png create mode 100644 resources/js/home/search.js create mode 100644 resources/views/admin/emailTemplate/editEmailTemplate.blade.php create mode 100644 resources/views/admin/emailTemplate/viewEmailTemplate.blade.php create mode 100644 resources/views/web/email/customerTemplate.blade.php create mode 100644 resources/views/web/home/search.blade.php create mode 100644 resources/views/web/layouts/verifyNotification.blade.php added 8 packages, and audited 859 packages in 5s 90 packages are looking for funding run `npm fund` for details 2 moderate severity vulnerabilities Some issues need review, and may require choosing a different dependency. Run `npm audit` for details. > dev > npm run development > development > mix ℹ Compiling Mix  Laravel Mix v6.0.43 ✔ Compiled Successfully in 25313ms ┌───────────────────────────────────┬───────────┐ │ File │ Size │ ├───────────────────────────────────┼───────────┤ │ /images/web/about-bg-1.jpg │ 95.3 KiB │ │ /images/web/about-bg-1.png │ 727 KiB │ │ /images/web/about-bg-1.svg │ 2.51 MiB │ │ /images/web/about-bg-img-1.png │ 406 KiB │ │ /images/web/about-img-1.jpg │ 108 KiB │ │ /images/web/about-img-1.png │ 961 KiB │ │ /images/web/about-img-2.png │ 651 KiB │ │ /images/web/about-img-3.png │ 1.33 MiB │ │ /images/web/about-img-4.png │ 1.11 MiB │ │ /images/web/arrow.png │ 28.1 KiB │ │ /images/web/avatar.png │ 727 bytes │ │ /images/web/back-arrow-1.png │ 282 bytes │ │ /images/web/back-arrow-1.svg │ 650 bytes │ │ /images/web/back-logo.png │ 5.36 KiB │ │ /images/web/back-logo.svg │ 664 bytes │ │ /images/web/banner-1.jpg │ 194 KiB │ │ /images/web/bg-1.jpg │ 63.2 KiB │ │ …ages/web/bg-about-section-2.jpg │ 48.1 KiB │ │ /images/web/cart-img-1.png │ 383 KiB │ │ /images/web/cart-img-2.png │ 291 KiB │ │ /images/web/cart-img-3.png │ 279 KiB │ │ /images/web/cart-list-img-1.png │ 12.4 KiB │ │ /images/web/cart-list-img-2.png │ 15.3 KiB │ │ /images/web/contact-icon-1.png │ 12.5 KiB │ │ /images/web/contact-icon-2.png │ 7.28 KiB │ │ /images/web/contact-icon-3.png │ 24.3 KiB │ │ …es/web/content-bg-email.png.png │ 5.36 KiB │ │ …web/corporate-photography-1.png │ 274 KiB │ │ /images/web/favicon.png │ 13.8 KiB │ │ /images/web/header-bg-email.png │ 88.2 KiB │ │ /images/web/highlight-img-1.png │ 554 KiB │ │ /images/web/highlight-img-2.png │ 390 KiB │ │ /images/web/highlight-img-3.png │ 377 KiB │ │ /images/web/login-mob-img-1.PNG │ 926 KiB │ │ /images/web/logo-2.png │ 103 KiB │ │ /images/web/logo-dark.png │ 6.03 KiB │ │ /images/web/logo-light.png │ 6.01 KiB │ │ /images/web/logo.png │ 10.8 KiB │ │ /images/web/loyalty-active.png │ 2.7 KiB │ │ /images/web/loyalty-inactive.png │ 2.47 KiB │ │ /images/web/order-progress-1.PNG │ 18.1 KiB │ │ /images/web/p-img-1.png │ 274 KiB │ │ /images/web/p-img-2.png │ 205 KiB │ │ /images/web/p-img-3.png │ 226 KiB │ │ /images/web/p-img-4.png │ 186 KiB │ │ /images/web/p-img-5.png │ 230 KiB │ │ /images/web/p-img-6.png │ 199 KiB │ │ /images/web/p-img-7.png │ 188 KiB │ │ /images/web/p-img-8.jpg │ 35 KiB │ │ /images/web/p-img-9.jpg │ 55.8 KiB │ │ /images/web/package-bg-1.png │ 1.74 MiB │ │ /images/web/package-img-1.png │ 181 KiB │ │ /images/web/photography-1.jpg │ 19.5 KiB │ │ /images/web/photography-2.jpg │ 18.9 KiB │ │ /images/web/photography-3.jpg │ 63.3 KiB │ │ /images/web/photography-4.jpg │ 23.7 KiB │ │ /images/web/photography-5.jpg │ 24.1 KiB │ │ /images/web/photography-6.jpg │ 27.5 KiB │ │ …ages/web/photography-banner.jpg │ 185 KiB │ │ /images/web/photography-img-1.png │ 155 KiB │ │ /images/web/photography-img-2.png │ 166 KiB │ │ /images/web/photography-img-3.png │ 291 KiB │ │ /images/web/popup-img-1.png │ 66.3 KiB │ │ /images/web/profile-points.png │ 7.89 KiB │ │ /images/web/profile-points.svg │ 5.93 KiB │ │ /images/web/register-bg-1.png │ 1.22 MiB │ │ /images/web/slide-img-1.jpg │ 53.3 KiB │ │ /images/web/slide-img-2.jpg │ 66.1 KiB │ │ /images/web/slide-img-3.jpg │ 27.9 KiB │ │ /images/web/slide-img-4.jpg │ 63.4 KiB │ │ /js/web/account/account.js │ 1.05 MiB │ │ …eb/account/addBillingAddress.js │ 1.24 KiB │ │ …web/account/billingAddresses.js │ 251 bytes │ │ /js/web/account/loyaltyPoints.js │ 242 bytes │ │ /js/web/account/myBookings.js │ 1.51 KiB │ │ /js/web/account/myOrders.js │ 1.75 KiB │ │ /js/web/account/profile.js │ 1.18 KiB │ │ …eb/account/quotationRequests.js │ 135 KiB │ │ /js/web/auth/login.js │ 908 KiB │ │ /js/web/auth/passwords/email.js │ 484 bytes │ │ /js/web/auth/register.js │ 954 KiB │ │ /js/web/auth/reset.js │ 856 KiB │ │ /js/web/auth/verify.js │ 271 bytes │ │ /js/web/cart/addNote.js │ 270 bytes │ │ /js/web/cart/cart.js │ 822 KiB │ │ /js/web/cart/selectLocation.js │ 828 KiB │ │ /js/web/cart/selectSlot.js │ 2.3 MiB │ │ …eb/categories/listCategories.js │ 822 KiB │ │ /js/web/checkout/billing.js │ 822 KiB │ │ /js/web/checkout/review.js │ 822 KiB │ │ /js/web/checkout/thankYou.js │ 822 KiB │ │ /js/web/cms/aboutUs.js │ 822 KiB │ │ /js/web/contact/contact.js │ 879 KiB │ │ /js/web/home/search.js │ 822 KiB │ │ /js/web/home/welcome.js │ 911 KiB │ │ /js/web/packages/listPackages.js │ 822 KiB │ │ /js/web/packages/viewPackage.js │ 822 KiB │ │ /js/web/quote/createNew.js │ 953 KiB │ │ /js/web/services/listServices.js │ 822 KiB │ │ /js/web/services/viewService.js │ 822 KiB │ │ css/web/account/account.css │ 31.6 KiB │ │ css/web/auth/login.css │ 5.94 KiB │ │ css/web/auth/register.css │ 10.5 KiB │ │ css/web/auth/reset.css │ 258 bytes │ │ css/web/cart/cart.css │ 5.05 KiB │ │ css/web/cart/selectLocation.css │ 1.88 KiB │ │ css/web/cart/selectSlot.css │ 42.1 KiB │ │ …b/categories/listCategories.css │ 3.19 KiB │ │ css/web/checkout/billing.css │ 6.37 KiB │ │ css/web/checkout/review.css │ 7.32 KiB │ │ css/web/checkout/thankYou.css │ 701 bytes │ │ css/web/cms/aboutUs.css │ 4.81 KiB │ │ css/web/contact/contact.css │ 3.01 KiB │ │ css/web/home/search.css │ 556 bytes │ │ css/web/home/welcome.css │ 9.73 KiB │ │ css/web/layout/guest.css │ 334 KiB │ │ css/web/layout/musawer.css │ 379 KiB │ │ css/web/packages/listPackages.css │ 3.21 KiB │ │ css/web/packages/viewPackage.css │ 2.72 KiB │ │ css/web/quote/createNew.css │ 5.95 KiB │ │ css/web/services/listServices.css │ 1.16 KiB │ │ css/web/services/viewService.css │ 1.56 KiB │ │ …b43027f47b20503057dfbbaa9401fef │ 162 KiB │ │ …1e38fd9e0e74ba58f7a2b77ef29fdd3 │ 434 KiB │ │ …e59d2330b4c6deb84b340635ed36249 │ 162 KiB │ │ …0fd1704ea223900efa9fd4e869efb08 │ 75.4 KiB │ │ …691f37e57f04c152e2315ab7dbad881 │ 95.7 KiB │ │ …8a8ec1846af02f021a4996de8c737f4 │ 664 bytes │ │ …ea96fc06895fb91bbf16e447d40afc4 │ 194 KiB │ │ …836ce3546ccca5a2cebe43d8be709be │ 63.2 KiB │ │ …eaa10ee74d211c10932c96d9fa62bfb │ 48.1 KiB │ │ …8ea82d6f62391a8c9d092d17dc98b4f │ 1.22 MiB │ │ …8da4872304a16ac25d73b5a876821df │ 1.06 KiB │ │ …79aaaf3562eee12150cf7272b8a096c │ 1.04 KiB │ │ …d88b473e8163463bf3f09be519eadf8 │ 1.11 KiB │ │ …f3d89c056183663b2f98e0aa87293bd │ 1.04 KiB │ │ …e9d787c8969c93afa8d428ac319b746 │ 1.04 KiB │ │ …f01b07148f205f6e8258e92bbf652d9 │ 4.86 KiB │ └───────────────────────────────────┴───────────┘ ✔ Mix: Compiled successfully in 33.84s 1 WARNING in child compilations (Use 'stats.children: true' resp. '--stats-children' for more details) webpack compiled with 1 warning Installing dependencies from lock file (including require-dev) Verifying lock file contents can be installed on current platform. Warning: The lock file is not up to date with the latest changes in composer.json. You may be getting outdated dependencies. It is recommended that you run `composer update` or `composer update `. Nothing to install, update or remove Generating optimized autoload files Class App\Events\web\CustomerVerified located in ./app/Events/Web/CustomerVerified.php does not comply with psr-4 autoloading standard. Skipping. > Illuminate\Foundation\ComposerScripts::postAutoloadDump > @php artisan package:discover --ansi 86 packages you are using are looking for funding. Use the `composer fund` command to find out more! Generating optimized autoload files Class App\Events\web\CustomerVerified located in ./app/Events/Web/CustomerVerified.php does not comply with psr-4 autoloading standard. Skipping. > Illuminate\Foundation\ComposerScripts::postAutoloadDump > @php artisan package:discover --ansi Generated optimized autoload files containing 5833 classes musawerg4demo is not in the sudoers file. This incident will be reported. Deploy finished . . . !