Skip to content

Commit

Permalink
Revert "fixed: modify config"
Browse files Browse the repository at this point in the history 
This reverts commit 5933de3.
  • Loading branch information
t-jayk committed Oct 28, 2024
1 parent 5933de3 commit 53b1aaf
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 79 deletions.
23 changes: 9 additions & 14 deletions innopacks/front/resources/views/layouts/app.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,17 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<base href="{{ front_route('home.index') }}">
<title>
@yield('title', system_setting_locale('meta_title', 'InnoShop - 11111111创新的开源电子商务 | Laravel ，多语言和多货币支持，基于Hook的强大插件架构'))</title>
<meta name="keywords"
content="@yield('keywords', system_setting_locale('meta_keywords', 'innoshop, 创新, 开源, 电子商务, Laravel 11, 多语言, 多货币, Hook, 插件架构, 灵活, 强大'))">
<meta name="description"
content="@yield('description', system_setting_locale('meta_description', 'innoshop是一款创新的开源电子商务平台，基于Laravel 11开发，具有多语言和多货币支持的特性。它采用了基于Hook的强大而灵活的插件架构，为用户提供了丰富的定制和扩展功能。欢迎体验innoshop，打造属于您自己的电子商务平台！'))">
<title>@yield('title', system_setting_locale('meta_title', 'InnoShop - 创新的开源电子商务 | Laravel 11，多语言和多货币支持，基于Hook的强大插件架构'))</title>
<meta name="keywords" content="@yield('keywords', system_setting_locale('meta_keywords', 'innoshop, 创新, 开源, 电子商务, Laravel 11, 多语言, 多货币, Hook, 插件架构, 灵活, 强大'))">
<meta name="description" content="@yield('description', system_setting_locale('meta_description', 'innoshop是一款创新的开源电子商务平台，基于Laravel 11开发，具有多语言和多货币支持的特性。它采用了基于Hook的强大而灵活的插件架构，为用户提供了丰富的定制和扩展功能。欢迎体验innoshop，打造属于您自己的电子商务平台！'))">
<meta name="generator" content="InnoShop {{ innoshop_version() }}">
<meta name="csrf-token" content="{{ csrf_token() }}">
<link rel="shortcut icon" href="{{ image_origin(system_setting('vivid', 'images/favicon.png')) }}">
<link rel="stylesheet" href="{{ system_setting('vivid','css/bootstrap.css') }}">
<script src="{{ system_setting(key: 'themes/default/js/app.js') }}"></script>


<link rel="shortcut icon" href="{{ image_origin(system_setting('favicon', 'images/favicon.png')) }}">
<link rel="stylesheet" href="{{ mix('themes/default/css/bootstrap.css') }}">
<script src="{{ mix('themes/default/js/app.js') }}"></script>
<script src="{{ asset('vendor/layer/3.5.1/layer.js') }}"></script>
<script src="{{ asset('vendor/bootstrap/js/bootstrap.bundle.min.js') }}"></script>
<link rel="stylesheet" href="{{ system_setting('themes/default/css/app.css') }}">
<link rel="stylesheet" href="{{ mix('themes/default/css/app.css') }}">
<script>
let urls = {
base_url: '{{ front_route('home.index') }}',
Expand All @@ -44,7 +39,7 @@
@endif

<div class="m-0 p-0" id="appContent">
@yield('content')
@yield('content')
</div>

@if (!request('iframe'))
Expand All @@ -54,4 +49,4 @@
@stack('footer')
</body>

</html>
</html>
80 changes: 40 additions & 40 deletions innopacks/panel/resources/views/layouts/app.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<base href="{{ panel_route('home.index') }}">
<title>@yield('title', '') - InnoShop</title>
<meta name="keywords" content="@yield('keywords', 'InnoShop, 创新, 开源, CMS, Laravel , 多语言, 多货币, Hook, 插件架构, 灵活, 强大')">
<meta name="keywords" content="@yield('keywords', 'InnoShop, 创新, 开源, CMS, Laravel 11, 多语言, 多货币, Hook, 插件架构, 灵活, 强大')">
<meta name="generator" content="InnoShop {{ innoshop_version() }}">
<meta name="asset" content="{{ asset('/') }}">
<meta name="description" content="@yield('description', 'InnoShop')">
<meta name="csrf-token" content="{{ csrf_token() }}">
<link rel="shortcut icon" href="{{ image_origin(system_setting('vivid', 'images/favicon.png')) }}">
<link rel="stylesheet" href="{{system_setting('vivid','css/bootstrap.css') }}">
<link rel="stylesheet" href="{{system_setting('vivid','css/app.css') }}">
<link rel="shortcut icon" href="{{ image_origin(system_setting('favicon', 'images/favicon.png')) }}">
<link rel="stylesheet" href="{{ mix('build/panel/css/bootstrap.css') }}">
<link rel="stylesheet" href="{{ mix('build/panel/css/app.css') }}">
<link rel="stylesheet" href="{{ asset('vendor/element-plus/index.css') }}">
<script src="{{ asset('vendor/jquery/jquery-3.7.1.min.js') }}"></script>
<script src="{{ mix('build/panel/js/app.js') }}"></script>
Expand All @@ -37,51 +37,51 @@
</head>

<body class="@yield('body-class')">
@include('panel::layouts.header')
<div class="main-content">
<aside class="sidebar-box navbar-expand-xs border-radius-xl">
<div class="sidebar-body">
<x-panel-sidebar></x-panel-sidebar>
</div>
<div class="mb-menu-close"><i class="bi bi-chevron-left"></i></div>
</aside>
@include('panel::layouts.header')
<div class="main-content">
<aside class="sidebar-box navbar-expand-xs border-radius-xl">
<div class="sidebar-body">
<x-panel-sidebar></x-panel-sidebar>
</div>
<div class="mb-menu-close"><i class="bi bi-chevron-left"></i></div>
</aside>

<div id="content">
<div class="page-title-box py-1 d-flex align-items-center justify-content-between">
<div class="d-flex">
<h4 class="page-title mb-0">@yield('title')</h4>
<div class="ms-4 text-danger">@yield('page-title-after')</div>
</div>
<div class="text-nowrap">@yield('page-title-right')</div>
<div id="content">
<div class="page-title-box py-1 d-flex align-items-center justify-content-between">
<div class="d-flex">
<h4 class="page-title mb-0">@yield('title')</h4>
<div class="ms-4 text-danger">@yield('page-title-after')</div>
</div>
<div class="text-nowrap">@yield('page-title-right')</div>
</div>

<div class="container-fluid p-0 mt-3">
<div class="content-info">
@if (session()->has('errors'))
<x-common-alert type="danger" msg="{{ session('errors')->first() }}" class="mt-4" />
@endif
@if (session('success'))
<x-common-alert type="success" msg="{{ session('success') }}" class="mt-4" />
@endif
@yield('content')
</div>

<div class="page-bottom-btns">
@yield('page-bottom-btns')
</div>
<div class="container-fluid p-0 mt-3">
<div class="content-info">
@if (session()->has('errors'))
<x-common-alert type="danger" msg="{{ session('errors')->first() }}" class="mt-4"/>
@endif
@if (session('success'))
<x-common-alert type="success" msg="{{ session('success') }}" class="mt-4"/>
@endif
@yield('content')
</div>

<p class="text-center text-secondary mt-5">
<a href="https://www.innoshop.com" class="ms-2" target="_blank">InnoShop</a>
{{ innoshop_version() }} &copy; {{ date('Y') }} All Rights
Reserved
</p>
<div class="page-bottom-btns">
@yield('page-bottom-btns')
</div>

<p class="text-center text-secondary mt-5">
<a href="https://www.innoshop.com" class="ms-2" target="_blank">InnoShop</a>
{{ innoshop_version() }} &copy; {{ date('Y') }} All Rights
Reserved
</p>
</div>
</div>
</div>

@include('panel::layouts.footer')
@include('panel::layouts.footer')

@stack('footer')
@stack('footer')
</body>

</html>
23 changes: 0 additions & 23 deletions public/images/logoorange.svg
View file

This file was deleted.

3 changes: 1 addition & 2 deletions webpack.mix.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ const mix = require('laravel-mix');

// front
// If you wish to modify the template's SCSS or JS, please change 'theme' to the directory where your current theme is located.
// const theme = 'vivid';
const theme = 'vivid';
const theme = '';
if (theme === '') {
mix.sass('innopacks/front/resources/css/bootstrap/bootstrap.scss', 'public/themes/default/css/bootstrap.css');
mix.sass('innopacks/front/resources/css/app.scss', 'public/themes/default/css/app.css');
Expand Down

0 comments on commit 53b1aaf

Please sign in to comment.