Merge pull request #151 from avored/developed

Developed
avored · Oct 17, 2020 · 27c5d82 · 27c5d82
2 parents 5353bbd + 635ed71
commit 27c5d82
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 29 deletions.
diff --git a/.github/workflows/avored-test.yml b/.github/workflows/avored-test.yml
@@ -9,15 +9,17 @@ jobs:
       fail-fast: true
       matrix:
         # php: ['7.2', '7.3', '7.4']
-        php: ['7.2']
-        laravel: ['5.8.*', '6.*', '7.*']
+        php: ['7.3']
+        laravel: ['5.8.*', '6.*', '7.*', '8.*']
         include:
           - laravel: '5.8.*'
             testbench: '3.8.*'
           - laravel: '6.*'
             testbench: '4.*'
           - laravel: '7.*'
             testbench: '5.*'
+          - laravel: '8.*'
+            testbench: '6.*' 
 
     name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
 

diff --git a/composer.json b/composer.json
@@ -21,28 +21,30 @@
 	],
 	"type" : "library",
 	"require" : {
-		"php" : ">=7.2",
+		"php" : ">=7.3.5",
 		"symfony/yaml": "^4.2",
-		"laravel/passport": "^7.4|^8.0|^9.0",
+		"laravel/passport": "^7.4|^8.0|^9.0|^10.0",
 		"barryvdh/laravel-dompdf": "^0.8.4",
 		"laravel/helpers": "^1.1",
-		"laravel/framework" : "^5.8.15|^6.0|^7.0",
+		"laravel/framework" : "^5.8.15|^6.0|^7.0|^8.0",
 		"rebing/graphql-laravel": "^5.1",
 		"laravel/ui": "^2.0|^1.0",
-		"doctrine/dbal": "^2.10"
+		"doctrine/dbal": "^2.10",
+		"laravel/legacy-factories": "^1.0",
+		"illuminate/macroable": "^8.0",
+        	"symfony/finder": "^3.4|^4.0|^5.0"
 	},
 	"require-dev" : {
 		"phpunit/phpunit": "^8.0|^9.0",
-		"orchestra/testbench": "^3.8|^4.0|^5.0",
+		"orchestra/testbench": "^3.8|^4.0|^5.0|^6.0",
 		"phpstan/phpstan": "^0.12.27"
 	},
 	"autoload" : {
-		"classmap": [
-            "database/factories"
-        ],
 		"psr-4" : {
-			"AvoRed\\Framework\\" : "src/"
-
+			"AvoRed\\Framework\\" : "src/",
+			"AvoRed\\Framework\\App\\": "app/",
+			"AvoRed\\Framework\\Database\\Factories\\": "database/factories/",
+			"AvoRed\\Framework\\Database\\Seeders\\": "database/seeders/"
 		}
 	},
 	"autoload-dev" : {

diff --git a/resources/views/user/auth/login.blade.php b/resources/views/user/auth/login.blade.php
@@ -10,7 +10,7 @@
     <title>@yield('meta_title', 'AvoRed E commerce')</title>
     <!-- Styles -->
 
-    <link href="/admin/css/app.css" rel="stylesheet">
+    <link href="{{ route('admin.app.styles') }}" rel="stylesheet">
 </head>
 <body>
     <div id="app">
@@ -103,11 +103,12 @@ class="h-5 w-5 text-red-500 group-hover:text-red-400"
         </login-fields>
     </div>
     @if(file_exists(public_path('mix-manifest.json')))
-        <script src="/admin/js/avored.js"></script>
-        <script src="/admin/js/app.js"></script>
+        <!-- Ideally, it should go mix url here -->
+        <script src="{{ route('admin.avored.scripts') }}"></script>
+        <script src="{{ route('admin.app.scripts') }}"></script>
     @else
-        <script src="/admin/js/avored.js"></script>
-        <script src="/admin/js/app.js"></script>
+        <script src="{{ route('admin.avored.scripts') }}"></script>
+        <script src="{{ route('admin.app.scripts') }}"></script>
     @endif
     @stack('scripts')
 </body>

diff --git a/resources/views/user/auth/password/new.blade.php b/resources/views/user/auth/password/new.blade.php
@@ -9,10 +9,8 @@
 
     <title>@yield('meta_title', 'AvoRed E commerce')</title>
 
-    <script defer src="{{ asset('avored-admin/js/app.js') }}"></script>
-
-    <!-- Styles -->
-    <link href="{{ asset('avored-admin/css/app.css') }}" rel="stylesheet">
+    <link href="{{ route('admin.app.styles') }}" rel="stylesheet">
+
 </head>
 <body>
     <div id="app">
@@ -78,7 +76,7 @@
                     <input type="hidden" name="token" value="{{ $token }}" />
 
 
-                    <div class="mt-6">
+                    <div class="mt-6 relative">
                         <button 
                             type="submit" 
                             class="w-full flex justify-center py-2 px-4 border border-red-500 text-sm font-medium rounded-md text-white bg-red-600 hover:bg-red-500 focus:outline-none focus:border-red-700 focus:shadow-outline-red active:bg-red-700"
@@ -101,6 +99,14 @@ class="h-5 w-5 text-red-500 hover:text-red-400"
             </div>
         </div>
     </div>
+    @if(file_exists(public_path('mix-manifest.json')))
+        <!-- Ideally, it should go mix url here -->
+        <script src="{{ route('admin.avored.scripts') }}"></script>
+        <script src="{{ route('admin.app.scripts') }}"></script>
+    @else
+        <script src="{{ route('admin.avored.scripts') }}"></script>
+        <script src="{{ route('admin.app.scripts') }}"></script>
+    @endif
     @stack('scripts')
 </body>
 </html>
diff --git a/resources/views/user/auth/reset.blade.php b/resources/views/user/auth/reset.blade.php
@@ -9,10 +9,8 @@
 
     <title>@yield('meta_title', 'AvoRed E commerce')</title>
 
-    <script defer src="{{ asset('avored-admin/js/app.js') }}"></script>
-
     <!-- Styles -->
-    <link href="{{ asset('avored-admin/css/app.css') }}" rel="stylesheet">
+    <link href="{{ route('admin.app.styles') }}" rel="stylesheet">
 </head>
 <body>
     <div id="app">
@@ -53,9 +51,6 @@
                                     ></avored-input>
                                 </div>
 
-
-
-
                             <div class="mt-6">
                                 <button 
                                     type="submit" 
@@ -82,6 +77,14 @@ class="h-5 w-5 text-red-800"
             </div>
 
     </div>
+    @if(file_exists(public_path('mix-manifest.json')))
+        <!-- Ideally, it should go mix url here -->
+        <script src="{{ route('admin.avored.scripts') }}"></script>
+        <script src="{{ route('admin.app.scripts') }}"></script>
+    @else
+        <script src="{{ route('admin.avored.scripts') }}"></script>
+        <script src="{{ route('admin.app.scripts') }}"></script>
+    @endif
     @stack('scripts')
 </body>
 </html>
diff --git a/src/User/Notifications/ResetPassword.php b/src/User/Notifications/ResetPassword.php
@@ -46,7 +46,7 @@ public function toMail($notifiable)
     {
         return (new MailMessage)
             ->line('You are receiving this email because we received a password reset request for your account.')
-            ->action('Reset Password', url('/password/reset', $this->token))
+            ->action('Reset Password', route('admin.password.reset', $this->token))
             ->line('If you did not request a password reset, no further action is required.');
     }
 }