Commit 5cdabeb8 authored by Jacob Priddy's avatar Jacob Priddy 👌

add depends on, modify the nginx conf and start on a login ocntroller,

also start adding routes
parent 8c0c180b
Pipeline #12476 failed with stages
in 2 minutes and 43 seconds
......@@ -41,6 +41,8 @@ services:
- ./simple-saml-idp/cert:/var/simplesamlphp-idp/cert
- ./simple-saml-idp/config:/var/simplesamlphp-idp/config
- ./simple-saml-idp/metadata:/var/simplesamlphp-idp/metadata
depends_on:
- dbadmin
logging:
options:
max-size: "10m"
......
......@@ -49,6 +49,8 @@ services:
- ./simple-saml-prod/cert:/var/simplesamlphp/cert
- ./simple-saml-prod/config:/var/simplesamlphp/config
- ./simple-saml-prod/metadata:/var/simplesamlphp/metadata
depends_on:
- dbadmin
logging:
options:
max-size: "10m"
......
......@@ -74,13 +74,13 @@ server {
proxy_redirect off;
}
location /api {
location / {
proxy_pass http://localhost.api;
}
location / {
try_files $uri $uri/ /index.html;
}
#location / {
# try_files $uri $uri/ /index.html;
#}
}
......
<?php
namespace App\Http\Controllers\Web;
use App\Http\Controllers\Controller;
class LoginController extends Controller
{
public function index(): string
{
return 'hi';
}
}
......@@ -45,6 +45,8 @@ class RouteServiceProvider extends ServiceProvider
$this->mapApiRoutes();
$this->mapWebRoutes();
$this->mapFrontendRoutes();
}
/**
......@@ -89,4 +91,14 @@ class RouteServiceProvider extends ServiceProvider
->namespace($this->namespace)
->group(base_path('routes/door.php'));
}
/**
* Define the routes the frontend has
*/
protected function mapFrontendRoutes(): void
{
Route::middleware('web')
->namespace($this->namespace)
->group(base_path('routes/frontend.php'));
}
}
......@@ -112,6 +112,7 @@ return [
* Note that the route must be referenced by name here (wildcards are supported).
*/
'exclude' => [
'web.*',
// 'users.create', 'admin.*'
],
......@@ -299,6 +300,7 @@ return [
'exclude' => [
'me.*',
'door.*',
'web.*',
// 'users.create', 'admin.*'
],
......
<?php
use Illuminate\Support\Facades\Route;
use App\Http\Controllers\Web\LoginController;
/*
|--------------------------------------------------------------------------
| Frontend Routes
|--------------------------------------------------------------------------
|
| Here is where you can register web routes for your application. These
| routes are loaded by the RouteServiceProvider within a group which
| contains the "web" middleware group. Now create something great!
|
*/
Route::get('/', [LoginController::class, 'index'])->name('web.home');
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment