Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge branch 'main' into update #425

Closed
wants to merge 1 commit into from
Closed

Merge branch 'main' into update #425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions app/Http/Controllers/Frontend/FrontendController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,7 @@ class FrontendController extends Controller
*/
public function index()
{
$body_class = '';

// return view('dashboard', compact('body_class'));
return view('frontend.index', compact('body_class'));
return view('frontend.index');
}

/**
Expand All @@ -26,9 +23,7 @@ public function index()
*/
public function privacy()
{
$body_class = '';

return view('frontend.privacy', compact('body_class'));
return view('frontend.privacy');
}

/**
Expand All @@ -38,8 +33,6 @@ public function privacy()
*/
public function terms()
{
$body_class = '';

return view('frontend.terms', compact('body_class'));
return view('frontend.terms');
}
}
4 changes: 0 additions & 4 deletions resources/views/backend/layouts/app.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@

<title>@yield('title') | {{ config('app.name') }}</title>

@stack('before-styles')

<script src="{{ asset('vendor/jquery/jquery-3.6.4.min.js') }}"></script>

@vite(['resources/sass/app-backend.scss', 'resources/js/app-backend.js'])
Expand Down Expand Up @@ -74,8 +72,6 @@
</div>

<!-- Scripts -->
@stack('before-scripts')

@livewireScripts

@stack('after-scripts')
Expand Down
7 changes: 0 additions & 7 deletions resources/views/frontend/layouts/app.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="description" content="{{ setting('meta_description') }}">
<meta name="keyword" content="{{ setting('meta_keyword') }}">

@include('frontend.includes.meta')

<!-- Shortcut Icon -->
Expand All @@ -20,8 +19,6 @@
<!-- CSRF Token -->
<meta name="csrf-token" content="{{ csrf_token() }}">

@stack('before-styles')

@vite(['resources/css/app-frontend.css'])
@vite(['resources/js/app-frontend.js'])

Expand All @@ -34,7 +31,6 @@

@include('frontend.includes.header')


<main>
@yield('content')
</main>
Expand All @@ -44,9 +40,6 @@
</body>

<!-- Scripts -->
@stack('before-scripts')


@stack('after-scripts')

</html>