Merge branch 'develop' into release

api/setup/settings/01_env.php

@@ -20,13 +20,15 @@ return [
         $arr = [
             'host' => 'db',
             'name' => $_ENV['MYSQL_DATABASE'],
-            'username' => $_ENV['MYSQL_USER'],
+            'user' => [
+                'name' => $_ENV['MYSQL_USER'],
                 'password' => $_ENV['MYSQL_PASSWORD']
+            ]
         ];
         if (isset($_ENV['MYSQL_PORT'])) {
             $arr['port'] = $_ENV['MYSQL_PORT'];
         }
-        return (object) $arr;
+        return json_decode(json_encode($arr));
     },
     'max_update_days' => 7
 ];

api/setup/setups/01_emails.php

@@ -22,6 +22,6 @@ return [
         }
         $dsn []= "dbname={$database->name}";
         $dsn = implode(';', $dsn);
-        return new PDO($dsn, $database->username, $database->password);
+        return new PDO($dsn, $database->user->name, $database->user->password);
     },
 ];

ui/public/robots.txt

@@ -0,0 +1,3 @@
+User-agent: *
+Disallow: /
+Disallow: /cgi-bin/

ui/resources/views/emails/mailboxes.blade.php

@@ -27,11 +27,11 @@
                         $('<a></a>').attr('href', '{{$urls->base}}/emails/mailbox/' + this.id).html(this.name)
                     )
                     register.append(
-                        $('<a></a>').attr('href', '{{$urls->base}}/emails/mailbox/' + this.id).append(
+                        $('<a></a>').attr('href', '{{$urls->base}}/emails/mailbox/' + this.id).attr('title', 'Show').append(
                             $('<i></i>').addClass('ui big green check circle icon')
                         )
                     ).append(
-                        $('<button></button>').addClass('ui mini circular red icon button').append(
+                        $('<button></button>').addClass('ui mini circular red icon button').attr('title', 'Remove').append(
                             $('<i></i>').addClass('remove icon')
                         ).click(e => {
                             this.unregister($(e.currentTarget))

ui/resources/views/home.blade.php

@@ -48,14 +48,20 @@
                             this.draw().empty()
                             return
                         }
-                        const list = $('<div></div>').addClass('ui list')
+                        const list = $('<div></div>').addClass('ui selection divided list')
                         this.mailboxes.forEach(mb => {
                             let count = ''
                             if (typeof mb.last_checked !== 'undefined') {
-                                count = ' (' + mb.last_checked.count + ')'
+                                count = ' (<i class="envelope outline icon"></i>' + mb.last_checked.count + ')'
                             }
                             list.append(
-                                $('<a></a>').addClass('item').attr('href', '{{$urls->base}}/emails/mailbox/' + mb.id).html(mb.name + count)
+				$('<div></div>').addClass('item').append(
+					$('<i></i>').addClass('inbox icon')
+				).append(
+					$('<div></div>').addClass('content').append(
+		                                $('<a></a>').addClass('header').attr('href', '{{$urls->base}}/emails/mailbox/' + mb.id).html(mb.name).append(count)
+					)
+				)
                             )
                         })
                         parent.append(list)

ui/resources/views/layout/head.blade.php

@@ -7,5 +7,6 @@
             @yield('page_title')
         @endif
     </title>
+    <link type="image/png" sizes="32x32" rel="icon" href="{{$urls->base}}/images/icons8-at-sign-gradient-32.png">
     @include('layout.head.styles')
 </head>