Mirrors/my-idlers
1
0
Fork 0
mirror of https://github.com/cp6/my-idlers.git synced 2024-11-16 15:33:44 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #92 from Gamerboy59/main

Browse Source 
Update resources and fix register/login page
This commit is contained in:
corbpie 2023-08-07 17:44:48 +10:00 committed by GitHub
commit 0aeb38d516
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
composer.json
View File

@ -11,19 +11,19 @@
"license": "MIT",
"require": {
"php": "^8.1",
"guzzlehttp/guzzle": "^7.5",
"guzzlehttp/guzzle": "^7.7",
"laravel/framework": "^10",
"laravel/tinker": "^2.8",
"laravel/ui": "^4.2",
"yajra/laravel-datatables-oracle": "~10.3",
"yajra/laravel-datatables-oracle": "~10.7",
"ext-json": "*",
"doctrine/dbal": "v3.6"
},
"require-dev": {
"fakerphp/faker": "^1.21",
"laravel/breeze": "^1.19",
"laravel/sail": "^1.20",
"mockery/mockery": "^1.5",
"fakerphp/faker": "^1.23",
"laravel/breeze": "^1.22",
"laravel/sail": "^1.23",
"mockery/mockery": "^1.6",
"nunomaduro/collision": "^7",
"phpunit/phpunit": "^10",
"spatie/laravel-ignition": "^2"

14
package.json
View File

@ -11,22 +11,22 @@
"build": "webpack --config webpack.config.js"
},
"devDependencies": {
"axios": "^0.21.4",
"bootstrap": "^5.2.3",
"axios": "^0.27.2",
"bootstrap": "^5.3.1",
"bootstrap-dark-5": "^1.1.3",
"bootstrap-data-table": "^1.0.0",
"datatables": "^1.10.18",
"datatables.net-bs": "^1.13.2",
"datatables.net-bs": "^1.13.6",
"font-awesome": "^4.7.0",
"jquery": "^3.6.3",
"jquery": "^3.7.0",
"laravel-mix": "^6.0.49",
"vue": "^2.7.14",
"vue-loader": "^17.0.1",
"vue-loader": "^17.2.2",
"vue-resource": "^1.5.3",
"vue-template-compiler": "^2.7.14"
},
"dependencies": {
"@fortawesome/fontawesome-free": "^6.3.0",
"datatables.net-bs5": "^1.13.2"
"@fortawesome/fontawesome-free": "^6.4.2",
"datatables.net-bs5": "^1.13.6"
}
}

BIN
public/css/app.css vendored
View File

Binary file not shown.

BIN
public/css/dark.css vendored
View File

Binary file not shown.

BIN
public/css/light.css vendored
View File

Binary file not shown.

BIN
public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.ttf vendored
View File

Binary file not shown.

BIN
public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.woff2 vendored
View File

Binary file not shown.

BIN
public/fonts/vendor/@fortawesome/fontawesome-free/webfa-regular-400.ttf vendored
View File

Binary file not shown.

BIN
public/fonts/vendor/@fortawesome/fontawesome-free/webfa-regular-400.woff2 vendored
View File

Binary file not shown.

BIN
public/fonts/vendor/@fortawesome/fontawesome-free/webfa-solid-900.ttf vendored
View File

Binary file not shown.

BIN
public/fonts/vendor/@fortawesome/fontawesome-free/webfa-solid-900.woff2 vendored
View File

Binary file not shown.

BIN
public/fonts/vendor/@fortawesome/fontawesome-free/webfa-v4compatibility.ttf vendored
View File

Binary file not shown.

BIN
public/fonts/vendor/@fortawesome/fontawesome-free/webfa-v4compatibility.woff2 vendored
View File

Binary file not shown.

BIN
public/js/app.js vendored
View File

Binary file not shown.

15
resources/views/layouts/guest.blade.php
View File

@ -6,14 +6,25 @@
<meta name="csrf-token" content="{{ csrf_token() }}">
<title>@yield('title') - @if (config()->has('app.name')) {{ config('app.name') }} @else My idlers @endif</title>
<link rel="icon" type="image" href="{{asset(Session::get('favicon') ?? 'favicon.ico')}}"/>
<link rel="stylesheet" href="{{ asset('css/bootstrap.min.css') }}">
@if(Session::get('dark_mode'))
<link rel="stylesheet" href="{{ asset('css/dark.css') }}">
@else
<link rel="stylesheet" href="{{ asset('css/light.css') }}">
@endif
<link rel="stylesheet" href="{{ asset('css/app.css') }}">
@yield('css_links')
@yield('style')
<x-form-style></x-form-style>
<script src="{{ asset('js/bootstrap.min.js') }}" defer></script>
</head>
<body>
{{ $slot }}
<script src="{{ asset('js/app.js') }}" defer></script>
@yield('scripts')
</body>
</html>

13
resources/views/layouts/index.blade.php
View File

@ -9,17 +9,18 @@
@endif
<title>@yield('title') - @if (config()->has('app.name')){{ config('app.name') }} @else My idlers @endif</title>
<link rel="icon" type="image" href="{{asset(Session::get('favicon') ?? 'favicon.ico')}}"/>
@if(Session::get('dark_mode'))
<link rel="stylesheet" href="{{ asset('css/bootstrap-dark.min.css') }}">
<link rel="stylesheet" href="{{ asset('css/dark.css') }}">
@else
<link rel="stylesheet" href="{{ asset('css/bootstrap.min.css') }}">
<link rel="stylesheet" href="{{ asset('css/light.css') }}">
@endif
<link rel="stylesheet" href="{{ asset('css/fa.min.css') }}">
<link rel="stylesheet" href="{{ asset('css/app.css') }}">
@yield('css_style')
<script src="{{ asset('js/vue.min.js') }}"></script>
@yield('css_links')
@yield('style')
</head>
<body class="font-sans antialiased">
<div class="container-fluid">
@ -33,7 +34,7 @@
<div class="container">
@yield('content')
</div>
<script src="{{ asset('js/bootstrap.min.js') }}" defer></script>
<script src="{{ asset('js/app.js') }}" defer></script>
@yield('scripts')
</body>
</html>