Merge branch 'master' into production

app/Http/Kernel.php

@@ -51,7 +51,7 @@ class Kernel extends HttpKernel
      *
      * @var array
      */
-    protected $middlewareAliases = [
+    protected $routeMiddleware = [
         'auth' => \App\Http\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
         'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,

app/Providers/AuthServiceProvider.php

@@ -22,6 +22,7 @@ class AuthServiceProvider extends ServiceProvider
      */
     public function boot()
     {
+        $this->registerPolicies();
 
         //
     }

composer.json

@@ -6,11 +6,11 @@
     "type": "project",
     "require": {
         "php": "^8.0.2",
-        "inertiajs/inertia-laravel": "^0.6.11",
-        "laravel/framework": "^10.0",
-        "laravel/ui": "^4.0",
+        "inertiajs/inertia-laravel": "^0.6.3",
+        "laravel/framework": "^9.19.0",
         "laravel/helpers": "^1.4",
         "laravel/tinker": "^2.4.1",
+        "laravel/ui": "^3.0",
         "pusher/pusher-php-server": "^7.2"
     },
     "require-dev": {
@@ -18,11 +18,11 @@
         "filp/whoops": "^2.0",
         "fzaninotto/faker": "^1.4",
         "mockery/mockery": "^1.0",
-        "nunomaduro/collision": "^7.0",
-        "nunomaduro/larastan": "^2.9.5",
+        "nunomaduro/collision": "^6.1",
+        "nunomaduro/larastan": "^0.7.4",
         "nunomaduro/phpinsights": "*",
-        "phpstan/phpstan": "^1.10.66",
-        "phpunit/phpunit": "^10.0"
+        "phpstan/phpstan": "^0.12.85",
+        "phpunit/phpunit": "^9.0"
     },
     "autoload": {
         "classmap": [
@@ -64,6 +64,6 @@
             "dealerdirect/phpcodesniffer-composer-installer": true
         }
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "prefer-stable": true
 }

package.json

@@ -19,8 +19,5 @@
         "sass": "^1.56.1",
         "sass-loader": "^8.0.2",
         "vite": "^3.2.3"
-    },
-    "dependencies": {
-        "moment": "^2.29.4"
     }
 }

public/build/manifest.json

@@ -1,6 +1,6 @@
 {
   "resources/js/app.js": {
-    "file": "assets/app.4993c47e.js",
+    "file": "assets/app.0299f74e.js",
     "src": "resources/js/app.js",
     "isEntry": true
   },

resources/js/app.js

@@ -6,7 +6,6 @@
  */
 
 import './bootstrap';
-import moment from "moment";
 
 // window.Vue = require('vue');
 
@@ -21,54 +20,3 @@ import moment from "moment";
 // const app = new Vue({
 //     el: '#app'
 // });
-
-function updateTime() {
-    var dates = document.getElementsByClassName("takenItemDate");
-    for (let i = 0; i < dates.length; i++) {
-        let time = dates.item(i).innerText;
-        let fromNow = moment(time).fromNow();
-        let id = "itemPassedTime_" + dates.item(i).id;
-        document.getElementById(id).innerText = fromNow;
-    }
-}
-updateTime();
-setInterval(updateTime, 1 * 60 * 1000);
-
-
-function setFaviconNumber(number) {
-    var canvas = document.createElement('canvas'),
-        ctx,
-        img = document.createElement('img'),
-        link = document.getElementById('favicon').cloneNode(true);
-
-    if (canvas.getContext) {
-      canvas.height = canvas.width = 48; // set the size
-      ctx = canvas.getContext('2d');
-      img.onload = function () { // once the image has loaded
-        ctx.drawImage(this, 0, 0);
-        ctx.font = 'bold 35px "helvetica", sans-serif';
-        ctx.fillStyle = '#ffff66';
-        ctx.fillText(number, 3, 25);
-        link.href = canvas.toDataURL('image/png');
-        document.body.appendChild(link);
-      };
-      img.src = 'favicon.png';
-    }
-};
-
-usedItems = document.getElementById("usedItems").innerText;
-setFaviconNumber(usedItems);
-
-/**
- * Source:
- * https://www.designcise.com/web/tutorial/how-to-detect-if-the-browser-tab-is-active-or-not-using-javascript
- */
-document.addEventListener('visibilitychange', function (event) {
-    if (document.hidden) {
-        console.log('not visible');
-    } else {
-        updateTime();
-    }
-});
-
-

resources/views/home/usedItem.blade.php

@@ -1,7 +1,6 @@
 @if ($item->used_by == \Auth::id())
 <form action="/take" method="POST" class="form-inline">
-    <em id="itemPassedTime_{{$item->id}}" class="pr-sm-2 ml-auto">{{\Carbon\Carbon::parse($item->updated_at)->diffForHumans()}}</em>
-    <div hidden class="takenItemDate" id="{{$item->id}}">{{\Carbon\Carbon::parse($item->updated_at)->format('Y-m-d\TH:i:s.uP')}}</div>
+    <em class="pr-sm-2 ml-auto">{{\Carbon\Carbon::parse($item->updated_at)->diffForHumans()}}</em>
     <div class="w-100 d-xm-block d-sm-none"></div>
     {{ csrf_field() }}
     @method('DELETE')
@@ -17,9 +16,8 @@
         @if ($item->waiting_user_id && $item->waiting_user_id != \Auth::id())
         <strong>> {{str_limit($users[$item->waiting_user_id], 15, '...')}}</strong>
         @endif
-        <small id="itemPassedTime_{{$item->id}}">({{$item->updated_at->diffForHumans()}})</small>
+        <small>({{$item->updated_at->diffForHumans()}})</small>
     </em>
-    <div hidden class="takenItemDate" id="{{$item->id}}">{{$item->updated_at->format('Y-m-d\TH:i:s.uP')}}</div>
     <div class="w-100 d-xm-block d-sm-none"></div>
     {{ csrf_field() }}
     <input type="hidden" name="item" value="{{$item->id}}">
@@ -30,4 +28,4 @@
     <button type="submit" class="btn btn-sm btn-outline-secondary ml-auto">@lang('home.alert_me')</button>
     @endif
 </form>
-@endif
+@endif

resources/views/layouts/app.blade.php

@@ -19,12 +19,9 @@
 
     <!-- Styles -->
     <link href="{{ asset('css/app.css') }}" rel="stylesheet">
-
-    <link id="favicon" rel="icon" type="image/png" href="favicon.png" /> 
 </head>
 
 <body>
-    <div hidden id="usedItems">{{ isset($usedItems) && $usedItems > 0 ? $usedItems : '' }}</div>
     <div id="app">
         <nav class="navbar navbar-expand-md navbar-light navbar-laravel">
             <div class="container">

resources/views/welcome.blade.php

@@ -5,7 +5,6 @@
         <meta name="viewport" content="width=device-width, initial-scale=1">
 
         <title>Share It</title>
-        <link id="favicon" rel="icon" type="image/png" href="favicon.png" /> 
 
         <!-- Fonts -->
         <link href="https://fonts.googleapis.com/css?family=Nunito:200,600" rel="stylesheet" type="text/css">

ssh_homestead.sh

@@ -1,2 +1 @@
-echo "Homestead password is: vagrant"
-ssh homestead -t "cd shareit; bash --login"
+ssh homestead -t "cd code/Bruno\ Fontes/shareit; bash --login"

start_vagrant.sh

@@ -1,7 +1,6 @@
 #!/bin/zsh
 export VAGRANT_CWD=/home/bruno/development/Homestead/
 vagrant up
-eval $DEV_BROWSER http://shareit.test \
-https://mailtrap.io/inboxes/455614/messages \
-https://dashboard.pusher.com/apps/1505830/console \
-&
+#builtin cd ~/development/laravelHomestead && /usr/bin/vagrant up && builtin cd -
+#~/Apps/firefox/firefox-bin http://shareit.test
+#~/Apps/firefox/firefox-bin https://mailtrap.io/inboxes/455614/messages

updateCompserNPM.sh

@@ -1 +1 @@
-ssh homestead -t 'cd shareit; /usr/local/bin/composer update; npm update; echo; echo -n "Press enter to exit..."; read'
+ssh homestead -t 'cd shareit; php7.3 /usr/local/bin/composer update; npm update; echo; echo -n "Press enter to exit..."; read'