Merge pull request #9 from HijenHEK/dev

Dev
HijenHEK · Mar 20, 2022 · 3dee78f · 3dee78f
2 parents 550c10c + 9d40806
commit 3dee78f
Show file tree

Hide file tree

Showing 7 changed files with 5,079 additions and 23,953 deletions.
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
@@ -10,6 +10,8 @@ class UserController extends Controller
 
  public function __invoke(Request $request)
  {
- return response()->json($request->user());
+ if(auth()->check()){
+ return response()->json(auth()->user());
+ }
  }
 }
diff --git a/app/Http/Controllers/VerificationController.php b/app/Http/Controllers/VerificationController.php
@@ -3,14 +3,11 @@
 namespace App\Http\Controllers;
 
 use App\Models\User;
-use Illuminate\Auth\Access\AuthorizationException;
-use Illuminate\Foundation\Auth\VerifiesEmails;
 use Illuminate\Http\Request;
 
 class VerificationController extends Controller
 {
  //
- use VerifiesEmails;
 
  /**
  * Mark the authenticated user's email address as verified.

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -10,21 +10,21 @@
  "production": "mix --production"
  },
  "devDependencies": {
- "@vue/compiler-sfc": "^3.0.11",
- "autoprefixer": "^10.2.5",
- "axios": "^0.21",
- "laravel-mix": "^6.0.0-beta.17",
+ "@vue/compiler-sfc": "^3.2.31",
+ "autoprefixer": "^10.4.4",
+ "axios": "^0.21.4",
+ "laravel-mix": "^6.0.43",
  "lodash": "^4.17.19",
- "postcss": "^8.2.12",
- "tailwindcss": "^2.1.1",
- "vue": "^3.0.11",
- "vue-loader": "^16.2.0"
+ "postcss": "^8.4.12",
+ "tailwindcss": "^2.2.19",
+ "vue": "^3.2.31",
+ "vue-loader": "^16.8.3"
  },
  "dependencies": {
- "@heroicons/vue": "^1.0.1",
+ "@heroicons/vue": "^1.0.6",
  "moment": "^2.29.1",
- "vue-router": "^4.0.6",
- "vuex": "^4.0.0",
+ "vue-router": "^4.0.14",
+ "vuex": "^4.0.2",
  "vuex-shared-mutations": "^1.0.2"
  }
 }
diff --git a/resources/js/store/index.js b/resources/js/store/index.js
@@ -79,7 +79,7 @@ export default createStore({
  await axios.get('/api/user').then((res) => {
  commit('setUser', res.data);
  }).catch((err) => {
-
+ throw err.response
  })
  },
  async profile({commit},payload) {

diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
@@ -6,8 +6,6 @@
 
  <title>Laravel</title>
 
- <!-- Fonts -->
- <link href="https://fonts.googleapis.com/css2?family=Nunito:wght@400;600;700&display=swap" rel="stylesheet">
 
  <!-- Styles -->
  <style>

diff --git a/routes/api.php b/routes/api.php
@@ -38,10 +38,11 @@
 Route::middleware('auth:sanctum')->group(function () {
  Route::patch('/profile', ProfileController::class);
  Route::patch('/password', PasswordController::class);
- Route::get('/user', UserController::class);
+
  Route::post('/logout', [AuthController::class, 'logout']);
 
  // in app verification
  // Route::post('/verify-email/{id}/{hash}', [VerificationController::class, 'verify'])->name('verify');
  // Route::post('/verify-resend', [VerificationController::class, 'resend']);
 });
+Route::get('/user', UserController::class);