Upgrade dependencies and create wrapper

This commit is contained in:
Eric Wang
2022-10-26 00:03:41 +00:00
parent 9ef62f6f26
commit 8aeb72fb67
9 changed files with 350 additions and 519 deletions

View File

@@ -0,0 +1,27 @@
<?php
namespace Convoy\Http\Controllers\Base;
use Illuminate\View\View;
use Illuminate\View\Factory as ViewFactory;
use Convoy\Http\Controllers\Controller;
use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
class IndexController extends Controller
{
/**
* IndexController constructor.
*/
public function __construct(
protected ViewFactory $view
) {
}
/**
* Returns listing of user's servers.
*/
public function index(): View
{
return $this->view->make('app');
}
}

View File

@@ -51,18 +51,12 @@ services:
image: 'quay.io/soketi/soketi:1.4-16-alpine'
expose:
- 6001
# Do not expose the metrics API to the internet in a production environment
# - '${SOKETI_METRICS_SERVER_PORT:-9601}:9601'
env_file: .env
environment:
- SOKETI_DEBUG=${DEBUG}
- SOKETI_DEFAULT_APP_ID=${PUSHER_APP_ID}
- SOKETI_DEFAULT_APP_KEY=${PUSHER_APP_KEY}
- SOKETI_DEFAULT_APP_SECRET=${PUSHER_APP_SECRET}
# - SOKETI_HOST='0.0.0.0'
# - SOKETI_PORT=${PUSHER_PORT}
# - METRICS_SERVER_PORT=${METRICS_SERVER_PORT-9601}
# - SOKETI_DEFAULT_APP_ENABLE_CLIENT_MESSAGES=false
database:
image: mysql:8.0.29
restart: unless-stopped

797
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -6,9 +6,6 @@
},
"devDependencies": {
"@headlessui/react": "^1.4.2",
"@inertiajs/inertia": "^0.11.0",
"@inertiajs/inertia-react": "^0.8.0",
"@inertiajs/progress": "^0.2.6",
"@mantine/core": "^5.3.3",
"@mantine/form": "^5.3.3",
"@mantine/hooks": "^5.3.3",
@@ -17,6 +14,8 @@
"@mantine/notifications": "^5.3.3",
"@tailwindcss/forms": "^0.5.2",
"@types/lodash": "^4.14.182",
"@types/react": "^18.0.17",
"@types/react-dom": "^18.0.6",
"@types/styled-components": "^5.1.25",
"@vitejs/plugin-react": "^1.3.2",
"autoprefixer": "^10.4.2",
@@ -26,13 +25,13 @@
"lodash": "^4.17.19",
"postcss": "^8.4.6",
"pusher-js": "^7.4.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"rollup-plugin-visualizer": "^5.8.2",
"styled-components": "^5.3.5",
"tailwindcss": "^3.1.0",
"twin.macro": "^3.0.0-rc.5",
"vite": "^2.9.11",
"vite": "^3.1.0",
"vite-plugin-babel-macros": "^1.0.6"
},
"dependencies": {

View File

View File

@@ -10,12 +10,9 @@
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Nunito:wght@400;600;700&display=swap">
<!-- Scripts -->
@routes
@viteReactRefresh
@vite('resources/js/app.tsx')
@inertiaHead
@vite('resources/scripts/index.tsx')
</head>
<body class="font-sans antialiased">
@inertia
</body>
</html>

View File

@@ -17,9 +17,9 @@
"jsx": "react-jsx",
"baseUrl": ".",
"paths": {
"@/*": ["resources/js/*"]
"@/*": ["resources/scripts/*"]
}
},
"include": ["resources/js"],
"include": ["resources/scripts"],
"references": [{ "path": "./tsconfig.node.json" }]
}

View File

@@ -1,8 +1,9 @@
{
"compilerOptions": {
"composite": true,
"module": "ESNext",
"moduleResolution": "Node"
},
"include": ["vite.config.ts"]
}
"compilerOptions": {
"composite": true,
"module": "ESNext",
"moduleResolution": "Node",
"allowSyntheticDefaultImports": true
},
"include": ["vite.config.ts"]
}

View File

@@ -5,7 +5,7 @@ import macrosPlugin from 'vite-plugin-babel-macros'
import { visualizer } from 'rollup-plugin-visualizer'
export default defineConfig({
plugins: [react(), laravel(['resources/js/app.tsx']), macrosPlugin(), /* visualizer() */],
plugins: [react(), laravel(['resources/scripts/index.tsx']), macrosPlugin(), /* visualizer() */],
build: {
target: ['es2020'],
},
@@ -16,7 +16,7 @@ export default defineConfig({
},
resolve: {
alias: {
'@': '/resources/js',
'@': '/resources/scripts',
},
},
})