diff --git a/config/app.php b/config/app.php index cac09f7..34d2b42 100644 --- a/config/app.php +++ b/config/app.php @@ -13,10 +13,10 @@ return [ | */ - 'name' => env('APP_NAME', 'Laravel'), - 'title' => env('APP_TITLE', 'BJJ and Wrestling in Whitchurch'), - 'email' => env('TO_EMAIL', 'contact@acebjj.co.uk'), - 'phone' => env('PHONE_NUM', '07911111111'), + 'name' => env('APP_NAME', 'Stu moved you'), + 'title' => env('APP_TITLE', 'Stu moves you | Removals | Waste management'), + 'email' => env('TO_EMAIL', ''), //TOOD + 'phone' => env('PHONE_NUM', '07572041039'), /* |-------------------------------------------------------------------------- diff --git a/config/routes.php b/config/routes.php index f8b7a9a..11b2f8d 100644 --- a/config/routes.php +++ b/config/routes.php @@ -7,16 +7,6 @@ return [ 'name' => 'Home', 'icon' => 'far fa-house', ], - [ - 'path' => '/removals', - 'name' => 'Removals', - 'icon' => 'far fa-truck', - ], - [ - 'path' => '/waste-management', - 'name' => 'Waste Management', - 'icon' => 'fas fa-recycle', - ], [ 'path' => '/contact-us', 'name' => 'Contact us', diff --git a/config/ace.php b/config/site.php similarity index 100% rename from config/ace.php rename to config/site.php diff --git a/config/social.php b/config/social.php index 0c59c60..87507ee 100644 --- a/config/social.php +++ b/config/social.php @@ -3,7 +3,7 @@ return [ 'links' => [ 'facebook' => [ - 'url' => 'https://www.facebook.com/people/Ace-BJJ/61583597135207', + 'url' => 'https://www.facebook.com/profile.php?id=61573221070115', 'icon' => 'fab fa-facebook', 'name' => 'Facebook', ], diff --git a/package-lock.json b/package-lock.json index b462cf5..b76de0d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "Ace", + "name": "stuart-craig-removals", "lockfileVersion": 3, "requires": true, "packages": { diff --git a/resources/css/app.css b/resources/css/app.css index 449adf7..a01534f 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -12,7 +12,8 @@ --font-sans: 'Instrument Sans', ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji'; --primary: #F7D720; - --secondary: #0091FE; + /*--secondary: #0091FE;*/ + --secondary: #000000; --tertiary:#000000; } diff --git a/resources/views/components/footer.blade.php b/resources/views/components/footer.blade.php index 29f8db0..bdd83ee 100644 --- a/resources/views/components/footer.blade.php +++ b/resources/views/components/footer.blade.php @@ -3,7 +3,7 @@

© {{ config('app.name') }}

- Est. {{ config('ace.est') }} + Est. {{ config('site.est') }}
diff --git a/resources/views/components/info.blade.php b/resources/views/components/info.blade.php index 91e8af1..0314b8b 100644 --- a/resources/views/components/info.blade.php +++ b/resources/views/components/info.blade.php @@ -34,7 +34,7 @@
-

Transportation to New Address /Storage

+

Transportation to New Address or Storage

We'll move your items safely and efficiently to your new home or business premises, or to a secure storage facility.

diff --git a/resources/views/components/meta.blade.php b/resources/views/components/meta.blade.php index ba974a3..1b9c759 100644 --- a/resources/views/components/meta.blade.php +++ b/resources/views/components/meta.blade.php @@ -2,17 +2,17 @@ - - + + - + - + - + @@ -22,8 +22,15 @@ - - - + + + + +{{--// SPA I decide copy. Ability to change stuff. --}} +{{--// --}} +{{--Get rid of waste removals-add-contact page back in--}} + +{{--Get domain stumoves or stumovesyou--}} +{{--hosting --}} diff --git a/resources/views/pages/pricing.blade.php b/resources/views/pages/pricing.blade.php index 300ddc3..4147b46 100644 --- a/resources/views/pages/pricing.blade.php +++ b/resources/views/pages/pricing.blade.php @@ -8,7 +8,7 @@

Pricing

- @foreach(config('ace.pricing') as $price) + @foreach(config('site.pricing') as $price) @if(($price['startDate'] ?? null) === null || $price['startDate'] > now()) @include('components.price', $price) @endif diff --git a/resources/views/pages/timetable.blade.php b/resources/views/pages/timetable.blade.php index ba64923..57f2c6c 100644 --- a/resources/views/pages/timetable.blade.php +++ b/resources/views/pages/timetable.blade.php @@ -42,13 +42,13 @@ Add classes to your calendar
- @if(config('ace.show_coaches')) + @if(config('site.show_coaches'))

Meet the Coach

@include('components.coach', [ 'name' => 'Shaun', - 'description' => 'A black belt under Casey Jones, and one of the coaches at SBG shropshire. with more than ' . config('ace.teaching_date')->diff(now())->years . ' years experience teaching Jiu-jitsu and wrestling. He enjoys seeing progress from his students, and often travels to competitions to help them compete.', + 'description' => 'A black belt under Casey Jones, and one of the coaches at SBG shropshire. with more than ' . config('site.teaching_date')->diff(now())->years . ' years experience teaching Jiu-jitsu and wrestling. He enjoys seeing progress from his students, and often travels to competitions to help them compete.', 'link' => 'https://www.instagram.com/shauncsbg/' ])
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php index c42f814..ccbdfa8 100644 --- a/resources/views/welcome.blade.php +++ b/resources/views/welcome.blade.php @@ -25,9 +25,9 @@
in Shrewsbury | Shropshire | Nationwide
- @if(config('ace.start_date') > now()) + @if(config('site.start_date') > now())
- Starting {{ config('ace.start_date')->format('d M Y') }} + Starting {{ config('site.start_date')->format('d M Y') }}
@endif
@@ -40,7 +40,7 @@
- @if(config('ace.show_trial')) + @if(config('site.show_trial'))

Have a question?

@@ -51,7 +51,7 @@
@endif - @if(config('ace.show_location') && config('ace.map_key')) + @if(config('site.show_location') && config('site.map_key'))

Where to find us

@@ -59,7 +59,7 @@ width="100%" height="450" frameborder="0" style="border:0" referrerpolicy="no-referrer-when-downgrade" - src="https://www.google.com/maps/embed/v1/place?key={{ config('ace.map_key') }}&q={{ config('ace.address') }}" + src="https://www.google.com/maps/embed/v1/place?key={{ config('site.map_key') }}&q={{ config('site.address') }}" allowfullscreen>