ソースを参照

Update to Laravel 11

master
Immanuel Onyeka 2ヶ月前
コミット
244d2ff918
14個のファイルの変更1613行の追加2031行の削除
  1. +1
    -1
      .gitignore
  2. +1
    -1
      app/Http/Kernel.php
  3. +6
    -2
      app/Http/Middleware/TrustProxies.php
  4. +1
    -0
      app/Providers/AppServiceProvider.php
  5. +24
    -20
      composer.json
  6. +1388
    -1966
      composer.lock
  7. +1
    -1
      config/app.php
  8. +0
    -22
      public/build/assets/main-BIFT_6Bb.js
  9. +166
    -1
      public/build/manifest.json
  10. +0
    -0
      public/images/teamwork.png
  11. +4
    -1
      resources/js/main.js
  12. +9
    -10
      resources/views/home.blade.php
  13. +5
    -3
      resources/views/master.blade.php
  14. +7
    -3
      vite.config.js

+ 1
- 1
.gitignore ファイルの表示

@@ -2,7 +2,7 @@
node_modules
/dist
ses
public/assets
public/build/assets
/vendor
package-lock.json



+ 1
- 1
app/Http/Kernel.php ファイルの表示

@@ -16,7 +16,7 @@ class Kernel extends HttpKernel
protected $middleware = [
// \App\Http\Middleware\TrustHosts::class,
\App\Http\Middleware\TrustProxies::class,
\Fruitcake\Cors\HandleCors::class,
\Illuminate\Http\Middleware\HandleCors::class,
\App\Http\Middleware\PreventRequestsDuringMaintenance::class,
\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
\App\Http\Middleware\TrimStrings::class,


+ 6
- 2
app/Http/Middleware/TrustProxies.php ファイルの表示

@@ -2,7 +2,7 @@

namespace App\Http\Middleware;

use Fideloper\Proxy\TrustProxies as Middleware;
use Illuminate\Http\Middleware\TrustProxies as Middleware;
use Illuminate\Http\Request;

class TrustProxies extends Middleware
@@ -19,5 +19,9 @@ class TrustProxies extends Middleware
*
* @var int
*/
protected $headers = Request::HEADER_X_FORWARDED_FOR | Request::HEADER_X_FORWARDED_HOST | Request::HEADER_X_FORWARDED_PORT | Request::HEADER_X_FORWARDED_PROTO | Request::HEADER_X_FORWARDED_AWS_ELB;
protected $headers = Request::HEADER_X_FORWARDED_FOR |
Request::HEADER_X_FORWARDED_HOST |
Request::HEADER_X_FORWARDED_PORT |
Request::HEADER_X_FORWARDED_PROTO |
Request::HEADER_X_FORWARDED_AWS_ELB;
}

+ 1
- 0
app/Providers/AppServiceProvider.php ファイルの表示

@@ -3,6 +3,7 @@
namespace App\Providers;

use Illuminate\Support\ServiceProvider;
use Illuminate\Support\Facades\Vite;

class AppServiceProvider extends ServiceProvider
{


+ 24
- 20
composer.json ファイルの表示

@@ -1,27 +1,22 @@
{
"name": "laravel/laravel",
"type": "project",
"description": "The Laravel Framework.",
"keywords": ["framework", "laravel"],
"description": "The skeleton application for the Laravel framework.",
"keywords": ["laravel", "framework"],
"license": "MIT",
"require": {
"php": "^7.3|^8.0",
"fideloper/proxy": "^4.4",
"fruitcake/laravel-cors": "^2.0",
"guzzlehttp/guzzle": "^7.0.1",
"laravel/cashier": "^12.14",
"laravel/framework": "^8.12",
"laravel/sanctum": "^2.10",
"laravel/tinker": "^2.5",
"stripe/stripe-php": "^7.82"
"php": "^8.2",
"laravel/framework": "^11.9",
"laravel/tinker": "^2.9",
"stripe/stripe-php": "^15.2"
},
"require-dev": {
"facade/ignition": "^2.5",
"fakerphp/faker": "^1.9.1",
"laravel/sail": "^1.0.1",
"mockery/mockery": "^1.4.2",
"nunomaduro/collision": "^5.0",
"phpunit/phpunit": "^9.3.3"
"fakerphp/faker": "^1.23",
"laravel/pint": "^1.13",
"laravel/sail": "^1.26",
"mockery/mockery": "^1.6",
"nunomaduro/collision": "^8.0",
"phpunit/phpunit": "^11.0.1"
},
"autoload": {
"psr-4": {
@@ -40,11 +35,16 @@
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
"@php artisan package:discover --ansi"
],
"post-update-cmd": [
"@php artisan vendor:publish --tag=laravel-assets --ansi --force"
],
"post-root-package-install": [
"@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
],
"post-create-project-cmd": [
"@php artisan key:generate --ansi"
"@php artisan key:generate --ansi",
"@php -r \"file_exists('database/database.sqlite') || touch('database/database.sqlite');\"",
"@php artisan migrate --graceful --ansi"
]
},
"extra": {
@@ -55,8 +55,12 @@
"config": {
"optimize-autoloader": true,
"preferred-install": "dist",
"sort-packages": true
"sort-packages": true,
"allow-plugins": {
"pestphp/pest-plugin": true,
"php-http/discovery": true
}
},
"minimum-stability": "dev",
"minimum-stability": "stable",
"prefer-stable": true
}

+ 1388
- 1966
composer.lock
ファイル差分が大きすぎるため省略します
ファイルの表示


+ 1
- 1
config/app.php ファイルの表示

@@ -161,7 +161,6 @@ return [
Illuminate\Translation\TranslationServiceProvider::class,
Illuminate\Validation\ValidationServiceProvider::class,
Illuminate\View\ViewServiceProvider::class,

/*
* Package Service Providers...
*/
@@ -227,6 +226,7 @@ return [
'URL' => Illuminate\Support\Facades\URL::class,
'Validator' => Illuminate\Support\Facades\Validator::class,
'View' => Illuminate\Support\Facades\View::class,
'Vite' => Illuminate\Support\Facades\Vite::class,

],



+ 0
- 22
public/build/assets/main-BIFT_6Bb.js
ファイル差分が大きすぎるため省略します
ファイルの表示


+ 166
- 1
public/build/manifest.json ファイルの表示

@@ -3,6 +3,10 @@
"file": "assets/PatuaOne-Regular-3kzkBYcj.ttf",
"src": "resources/PatuaOne-Regular.ttf"
},
"resources/images/admin.svg": {
"file": "assets/admin-DzZkJFj8.svg",
"src": "resources/images/admin.svg"
},
"resources/images/arrow-left-circle-fill.svg": {
"file": "assets/arrow-left-circle-fill-DynM7rXh.svg",
"src": "resources/images/arrow-left-circle-fill.svg"
@@ -11,38 +15,126 @@
"file": "assets/arrow-right-circle-fill-CBb9yxsX.svg",
"src": "resources/images/arrow-right-circle-fill.svg"
},
"resources/images/arrow-up.svg": {
"file": "assets/arrow-up-DPs1EOYs.svg",
"src": "resources/images/arrow-up.svg"
},
"resources/images/black-circle.svg": {
"file": "assets/black-circle-BCNsooL-.svg",
"src": "resources/images/black-circle.svg"
},
"resources/images/box-seam.svg": {
"file": "assets/box-seam-Wxkng9Gd.svg",
"src": "resources/images/box-seam.svg"
},
"resources/images/cancel-icon2.svg": {
"file": "assets/cancel-icon2-AuEb0qpq.svg",
"src": "resources/images/cancel-icon2.svg"
},
"resources/images/cancel.svg": {
"file": "assets/cancel-yqlcIJiN.svg",
"src": "resources/images/cancel.svg"
},
"resources/images/caret-down.svg": {
"file": "assets/caret-down-Bs9j1a0t.svg",
"src": "resources/images/caret-down.svg"
},
"resources/images/cart-fill.svg": {
"file": "assets/cart-fill-GPt3EgqY.svg",
"src": "resources/images/cart-fill.svg"
},
"resources/images/cart3.svg": {
"file": "assets/cart3-CcBSCbdz.svg",
"src": "resources/images/cart3.svg"
},
"resources/images/chat-text-fill.svg": {
"file": "assets/chat-text-fill-DkYTIFCB.svg",
"src": "resources/images/chat-text-fill.svg"
},
"resources/images/check-mark.svg": {
"file": "assets/check-mark-Q7galBYU.svg",
"src": "resources/images/check-mark.svg"
},
"resources/images/checked.svg": {
"file": "assets/checked-BppigPIi.svg",
"src": "resources/images/checked.svg"
},
"resources/images/checked2.svg": {
"file": "assets/checked2-o0YFR3D7.svg",
"src": "resources/images/checked2.svg"
},
"resources/images/chevron-compact-down.svg": {
"file": "assets/chevron-compact-down-CtKpOqDC.svg",
"src": "resources/images/chevron-compact-down.svg"
},
"resources/images/chevron-down.svg": {
"file": "assets/chevron-down-BjsmPeNv.svg",
"src": "resources/images/chevron-down.svg"
},
"resources/images/circle.svg": {
"file": "assets/circle-Do2V3_6T.svg",
"src": "resources/images/circle.svg"
},
"resources/images/clipboard.svg": {
"file": "assets/clipboard-h5E3Nx3J.svg",
"src": "resources/images/clipboard.svg"
},
"resources/images/close-icon-black.svg": {
"file": "assets/close-icon-black-xyYpAKIV.svg",
"src": "resources/images/close-icon-black.svg"
},
"resources/images/close.svg": {
"file": "assets/close-k9gnfYIN.svg",
"src": "resources/images/close.svg"
},
"resources/images/coin-stack.svg": {
"file": "assets/coin-stack-DErFuLeA.svg",
"src": "resources/images/coin-stack.svg"
},
"resources/images/coins.svg": {
"file": "assets/coins-DagPxuoK.svg",
"src": "resources/images/coins.svg"
},
"resources/images/columns.svg": {
"file": "assets/columns-CEi42iD0.svg",
"src": "resources/images/columns.svg"
},
"resources/images/credit-card-2-back-fill.svg": {
"file": "assets/credit-card-2-back-fill-CxXtFfXf.svg",
"src": "resources/images/credit-card-2-back-fill.svg"
},
"resources/images/dot-grid.png": {
"file": "assets/dot-grid-BDAiZWn-.png",
"src": "resources/images/dot-grid.png"
},
"resources/images/green-check.svg": {
"file": "assets/green-check-Bg-Ln0LP.svg",
"src": "resources/images/green-check.svg"
},
"resources/images/home.svg": {
"file": "assets/home-7nPtx3jq.svg",
"src": "resources/images/home.svg"
},
"resources/images/instagram-icon.svg": {
"file": "assets/instagram-icon-Di3Avv-g.svg",
"src": "resources/images/instagram-icon.svg"
},
"resources/images/layers-fill.svg": {
"file": "assets/layers-fill-BUQRZcCW.svg",
"src": "resources/images/layers-fill.svg"
},
"resources/images/life-preserver.svg": {
"file": "assets/life-preserver-peEBYMfm.svg",
"src": "resources/images/life-preserver.svg"
},
"resources/images/lighting.svg": {
"file": "assets/lighting-DT_Q0Lir.svg",
"src": "resources/images/lighting.svg"
},
"resources/images/link.svg": {
"file": "assets/link-QZA8DnPR.svg",
"src": "resources/images/link.svg"
},
"resources/images/loading-white.svg": {
"file": "assets/loading-white-CQqcC_jm.svg",
"src": "resources/images/loading-white.svg"
@@ -51,10 +143,26 @@
"file": "assets/loading-MfVqFC_F.svg",
"src": "resources/images/loading.svg"
},
"resources/images/menu-button-fill.svg": {
"file": "assets/menu-button-fill-DSrIHwe_.svg",
"src": "resources/images/menu-button-fill.svg"
},
"resources/images/menu-icon.svg": {
"file": "assets/menu-icon-JHD8WyuK.svg",
"src": "resources/images/menu-icon.svg"
},
"resources/images/orders.svg": {
"file": "assets/orders-BBuz_X__.svg",
"src": "resources/images/orders.svg"
},
"resources/images/package.svg": {
"file": "assets/package-B-kRltbn.svg",
"src": "resources/images/package.svg"
},
"resources/images/panel-preview.png": {
"file": "assets/panel-preview-l_-p7DVF.png",
"src": "resources/images/panel-preview.png"
},
"resources/images/payeer.png": {
"file": "assets/payeer-KINjIAkf.png",
"src": "resources/images/payeer.png"
@@ -63,24 +171,76 @@
"file": "assets/perfect_money-Dxga5CQE.svg",
"src": "resources/images/perfect_money.svg"
},
"resources/images/person-fill.svg": {
"file": "assets/person-fill-BgQTX5xd.svg",
"src": "resources/images/person-fill.svg"
},
"resources/images/plus-square-fill.svg": {
"file": "assets/plus-square-fill-DacBONws.svg",
"src": "resources/images/plus-square-fill.svg"
},
"resources/images/plus.svg": {
"file": "assets/plus-DSfqkTt2.svg",
"src": "resources/images/plus.svg"
},
"resources/images/settings.svg": {
"file": "assets/settings-DvIFrM5n.svg",
"src": "resources/images/settings.svg"
},
"resources/images/spotify-icon.svg": {
"file": "assets/spotify-icon-COCRivxk.svg",
"src": "resources/images/spotify-icon.svg"
},
"resources/images/square.svg": {
"file": "assets/square-BHm7Rbd3.svg",
"src": "resources/images/square.svg"
},
"resources/images/statistics.svg": {
"file": "assets/statistics-CFuQNwBR.svg",
"src": "resources/images/statistics.svg"
},
"resources/images/summary.svg": {
"file": "assets/summary-BCFKulhJ.svg",
"src": "resources/images/summary.svg"
},
"resources/images/tap.svg": {
"file": "assets/tap-CUMVRmXC.svg",
"src": "resources/images/tap.svg"
},
"resources/images/tik-tok.svg": {
"file": "assets/tik-tok-BSB0U4jG.svg",
"src": "resources/images/tik-tok.svg"
},
"resources/images/trendplays-icon.png": {
"file": "assets/trendplays-icon-ClxtfqFU.png",
"src": "resources/images/trendplays-icon.png"
},
"resources/images/trendplays-logo.png": {
"file": "assets/trendplays-logo-IcWn7YON.png",
"src": "resources/images/trendplays-logo.png"
},
"resources/images/twitter.svg": {
"file": "assets/twitter-BBPcZW-S.svg",
"src": "resources/images/twitter.svg"
},
"resources/images/wallet2.svg": {
"file": "assets/wallet2-B2U7trtN.svg",
"src": "resources/images/wallet2.svg"
},
"resources/images/warning-colored.svg": {
"file": "assets/warning-colored-DDC1cIZO.svg",
"src": "resources/images/warning-colored.svg"
},
"resources/images/warning.svg": {
"file": "assets/warning-jtXoRg6y.svg",
"src": "resources/images/warning.svg"
},
"resources/images/youtube-icon.svg": {
"file": "assets/youtube-icon-Dt1NUtsi.svg",
"src": "resources/images/youtube-icon.svg"
},
"resources/js/main.js": {
"file": "assets/main-BIFT_6Bb.js",
"file": "assets/main-sIDVxMBq.js",
"name": "main",
"src": "resources/js/main.js",
"isEntry": true,
@@ -109,5 +269,10 @@
"assets/black-circle-BCNsooL-.svg",
"assets/close-icon-black-xyYpAKIV.svg"
]
},
"resources/scss/main.scss": {
"file": "assets/main-Pm5c0fuk.css",
"src": "resources/scss/main.scss",
"isEntry": true
}
}

resources/images/teamwork2.png → public/images/teamwork.png ファイルの表示


+ 4
- 1
resources/js/main.js ファイルの表示

@@ -2,7 +2,10 @@ import RegisterArea from './register-area/register-area.vue'
import Panel from './panel/panel.vue'
import '../scss/main.scss'
import { createApp } from 'vue'
importAll(require.context('../images', false, /\.(png|jpe?g|svg)$/))

import.meta.glob([
'../images/**',
]);

let heroText = document.querySelectorAll(".landing-hero h2,.landing-hero p")
let registerToggles = document.querySelectorAll(".register-btn, .register-area\


+ 9
- 10
resources/views/home.blade.php ファイルの表示

@@ -52,7 +52,7 @@

<div class="cards">
<div class="card">
<img src="/img/youtube-icon.svg" alt="youtube-icon">
<img src="{{ Vite::asset('resources/images/youtube-icon.svg') }}" alt="youtube-icon">
<h3>Youtube</h3>
<ul>
<li>Views often increase within 24 hours</li>
@@ -64,7 +64,7 @@
</div>

<div class="card">
<img src="/img/twitter.svg" alt="spotify-icon">
<img src="{{ Vite::asset('resources/images/twitter.svg') }}" alt="spotify-icon">
<h3>Twitter</h3>
<ul>
<li>Impressions and favorites</li>
@@ -75,7 +75,7 @@
</div>

<div class="card">
<img src="/img/instagram-icon.svg" alt="twitter-icon">
<img src="{{ Vite::asset('resources/images/instagram-icon.svg') }}" alt="twitter-icon">
<h3>Instagram</h3>
<ul>
<li>Active user accounts</li>
@@ -87,7 +87,7 @@
</div>

<div class="card">
<img src="/img/tik-tok.svg" alt="twitter-icon">
<img src="{{ Vite::asset('resources/images/tik-tok.svg') }}" alt="tiktok-icon">
<h3>TikTok</h3>
<ul>
<li>Active user accounts</li>
@@ -108,7 +108,7 @@
<path stroke-width="20" fill="none" stroke="#ddd" d="M0,10 C400,0,500,256,250,500"/>
<!- <path fill="none" stroke="white" d="M256,10C115.03,0,0,115.05,0,256c0,140.97,115.05,256,256,256c140.97,0,256-115.05,256-256C512,115.03,396.95,0,256,0z "/> -->
</svg>
<img src="img/teamwork2.png" alt="teamwork">
<img src="{{ asset('images/teamwork.png') }}" alt="teamwork">
</div>
<div class="info-cards">

@@ -136,19 +136,19 @@
<img class="panel-preview" src="/images/panel-preview.png" alt="panel-preview">
<div class="info-items">
<div class="panel-info">
<img src="./img/tap.svg" alt="">
<img src={{ Vite::asset('resources/images/tap.svg') }} alt="">
<h3>Easy to Use</h3>
<p>We provide an extremely user-friendly and intuitive SPA interface to
manage and review your SMM orders.</p>
</div>
<div class="panel-info">
<img src="./img/lighting.svg" alt="">
<img src={{ Vite::asset('resources/images/lighting.svg') }} alt="">
<h3>Powerful</h3>
<p>Our panel contains a variety of features for managing payment
methods, and automatically queuing orders.</p>
</div>
<div class="panel-info">
<img src="./img/statistics.svg" alt="">
<img src={{ Vite::asset('resources/images/statistics.svg') }} alt="">
<h3>Scalable</h3>
<p>We make it easy to organize your marketing campaign with a variety
of accounts and social networks</p>
@@ -222,7 +222,6 @@

@section('scripts')
@parent
<script src="js/app.js"></script>
<script src="js/chunk-vendors.js"></script>
@vite(['resources/js/main.js'])
<!-- <script src="main.js"></script> -->
@endsection

+ 5
- 3
resources/views/master.blade.php ファイルの表示

@@ -5,8 +5,9 @@
<meta charset='utf-8'>
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link rel="stylesheet" href="">
<link rel="shortcut icon" type="image/jpg" href="/img/arrow-up.svg"/>
<link rel="stylesheet" href="/css/app.css">
<link rel="shortcut icon" type="image/jpg"
href={{ Vite::asset('resources/images/arrow-up.svg') }} />
@vite(['resources/scss/main.scss'])
@if (config('app.env') == 'production')
<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id=G-LH36E9P3P5"></script>
@@ -36,7 +37,8 @@
<nav class="navigator @yield('heading-style')" role="navigation">
<a id='logo' href='/'>
<h1>Trendplays</h1>
<img src="/img/arrow-up.svg" height="30px" alt="">
<img src={{ Vite::asset('resources/images/arrow-up.svg') }}
height="30px" alt="">
</a>
@yield('login-form')
<span class="icon-bar"></span>


+ 7
- 3
vite.config.js ファイルの表示

@@ -8,9 +8,13 @@ import laravel from 'laravel-vite-plugin';
export default defineConfig({
plugins: [
vue(),
laravel([
'resources/js/main.js',
]),
laravel({
buildDirectory: null,
input: [
'resources/js/main.js',
'resources/scss/main.scss',
],
}),
],
resolve: {
alias: {


読み込み中…
キャンセル
保存