Merge branch 'master' into wowa_training_v2

f188a8ba · Alex · 11a3db27 · 019e1d23 · f188a8ba · f188a8ba
Commit f188a8ba authored 4 years ago by Alex
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 /public/storage
 /storage/*.key
 /vendor
+/.idea
 .env
 .env.backup
 .idea/

--- a/README.md
+++ b/README.md
@@ -10,6 +10,16 @@ Web interface for MARK server.

 ![System status](figures/status.png)

+## Demo mode
+
+In ```demo``` mode, the user is directly logged in as administrator (no password required). To activate demo mode, change **.env** :
+
+```
+APP_ENV=demo
+```
+
+or set environment variable ```APP_ENV=demo```.
+
 ## Contributing

 Start a mongodb container and a mark-example container so we have some toy
@@ -22,6 +32,7 @@ docker-compose up
 Start Laravel integrated webserver

 ```bash
+cp .env.example .env
 php artisan serve
 ```


--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -21,6 +21,7 @@ class Kernel extends HttpKernel
        \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
        \App\Http\Middleware\TrimStrings::class,
        \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
+        \App\Http\Middleware\DemoMode::class,
    ];

    /**

--- a/app/Http/Middleware/DemoMode.php
+++ b/app/Http/Middleware/DemoMode.php
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Auth;
+use App\User;
+
+class DemoMode
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        if (App::environment('demo')) {
+            $admin = User::find(1);
+            Auth::login($admin);
+        }
+
+        return $next($request);
+    }
+}
--- a/public/android-chrome-192x192.png
+++ b/public/android-chrome-192x192.png
--- a/public/android-chrome-512x512.png
+++ b/public/android-chrome-512x512.png
--- a/public/apple-touch-icon.png
+++ b/public/apple-touch-icon.png
--- a/public/favicon-16x16.png
+++ b/public/favicon-16x16.png
--- a/public/favicon-32x32.png
+++ b/public/favicon-32x32.png
--- a/public/favicon.ico
+++ b/public/favicon.ico
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -18,6 +18,10 @@

    <!-- Styles -->
    <link href="{{ asset('css/app.css') }}" rel="stylesheet">
+
+    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
 </head>
 <body>
    <div id="app">

--- a/routes/web.php
+++ b/routes/web.php
@@ -15,10 +15,10 @@ use Illuminate\Support\Facades\Route;

 $app_url = config("app.url");
 if (!empty($app_url)) {
-   URL::forceRootUrl($app_url);
+    URL::forceRootUrl($app_url);

-   $schema = explode(':', $app_url)[0];
-   URL::forceScheme($schema);
+    $schema = explode(':', $app_url)[0];
+    URL::forceScheme($schema);
 }

 Route::get('/', function () {