Merge branch 'master' into 'production'

Master

See merge request Romulus21/portal!65

.gitlab-ci.yml

@@ -64,6 +64,8 @@ before_script:
   - php artisan migrate
   # Run database seed
   - php artisan db:seed
+  only:
+    - master
 
 test:
   script:

app/Http/Controllers/UserController.php

@@ -2,10 +2,12 @@
 
 namespace App\Http\Controllers;
 
+use App\Mail\newUserInvitation;
 use App\User;
 use App\Http\Resources\User as UserResource;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Str;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -25,6 +27,8 @@ class UserController extends Controller
         request()['password'] = Hash::make(Str::random(30));
         $user = User::create($this->validateData());
 
+        Mail::to($user->email)->send(new newUserInvitation($user));
+
         return (new UserResource($user))
             ->response()
             ->setStatusCode(Response::HTTP_CREATED);

app/Mail/newUserInvitation.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Mail;
+
+use App\User;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
+use Illuminate\Queue\SerializesModels;
+
+class newUserInvitation extends Mailable
+{
+    use Queueable, SerializesModels;
+
+    /**
+     * @var User
+     */
+    private $user;
+
+    /**
+     * Create a new message instance.
+     *
+     * @param User $user
+     */
+    public function __construct(User $user)
+    {
+        $this->user = $user;
+    }
+
+    /**
+     * Build the message.
+     *
+     * @return $this
+     */
+    public function build()
+    {
+        return $this->from('portal@bricooli.fr')
+            ->markdown('mail.new-user-invitation')
+            ->with([
+                'user' => $this->user,
+            ]);
+    }
+}

resources/js/views/Automation/AutomaticLinksHome.vue

@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div v-if="authUser.data.attributes.is_admin">
         <div class="card block">
             <h2>Raspberry Links</h2>
             <ul class="mt-2">
@@ -10,6 +10,8 @@
 </template>
 
 <script>
+import {mapGetters} from 'vuex'
+
 export default {
     name: 'AutomaticLinksHome',
     data: function () {
@@ -18,6 +20,7 @@ export default {
                 { name: 'Météo', link: 'http://192.168.1.32/meteo/meteo'},
                 { name: 'MotionEye', link: 'http://192.168.1.32:8765'},
                 { name: 'TT-RSS', link: 'https://tt-rss.bricooli.fr'},
+                { name: 'Datus', link: 'https://192.168.1.24:5001'},
                 { name: 'Pi-Hole', link: 'http://192.168.1.32/admin/index.php'},
                 { name: 'RaspAp', link: 'http://192.168.1.32/raspap'},
                 { name: 'Kodi', link: 'http://192.168.1.19:8080/'},
@@ -26,5 +29,10 @@ export default {
             ],
         }
     },
+    computed: {
+        ...mapGetters({
+            authUser: 'authUser',
+        })
+    },
 }
 </script>

resources/js/views/Bookmark/BookmarkIndex.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="p-4">
+    <div class="mx-2 p-2">
         <div v-if="modal" class="modal-container" @click="modal = ! modal"></div>
         <div v-if="modal" class="modal px-2">
             <p class="m-2 text-center">Add a new to-do list ?</p>

resources/views/mail/new-user-invitation.blade.php

@@ -0,0 +1,15 @@
+
+@component('mail::message')
+# Confirmation d'inscription sur [portal.bricooli.fr](https://portal.bricooli.fr)
+
+Bonjour {{ $user->name }},
+
+Nous confirmons votre cooptation sur [portal.bricooli.fr](https://portal.bricooli.fr).
+Vous pouver désormais vous inscrire en faisant :
+
+@component('mail::button', ['url' => route('password.request')])
+email oublié
+@endcomponent
+
+Merci
+@endcomponent

tailwind.config.js

@@ -63,4 +63,11 @@ module.exports = {
     },
     variants: {},
     plugins: [],
+    purge: {
+        enable: true,
+        content: [
+            './resources/js/**/*.vue',
+            './resources/views/**/*.blade.php',
+        ],
+    }
 }