From 715a49d9fe5c2b62f75bbab0e339105cd48601cb Mon Sep 17 00:00:00 2001 From: spencerrlongg Date: Wed, 8 Nov 2023 14:29:06 -0600 Subject: [PATCH 01/27] update php in composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b5c08777d..57a5fe304 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "php": "8.0 - 8.2", + "php": "8.1 - 8.2", "ext-curl": "*", "ext-fileinfo": "*", "ext-json": "*", From 7f4b2d6e42384dd70186b41ea5687942d891109c Mon Sep 17 00:00:00 2001 From: spencerrlongg Date: Wed, 8 Nov 2023 16:10:09 -0600 Subject: [PATCH 02/27] modal and initial stuff working --- .../Components/personal-access-tokens.php | 26 ++++++ resources/views/account/api.blade.php | 2 + .../create-token-modal.blade.php | 87 +++++++++++++++++++ .../personal-access-tokens/panel.blade.php | 26 ++++++ 4 files changed, 141 insertions(+) create mode 100644 app/View/Components/personal-access-tokens.php create mode 100644 resources/views/components/personal-access-tokens/create-token-modal.blade.php create mode 100644 resources/views/components/personal-access-tokens/panel.blade.php diff --git a/app/View/Components/personal-access-tokens.php b/app/View/Components/personal-access-tokens.php new file mode 100644 index 000000000..79b4eab1a --- /dev/null +++ b/app/View/Components/personal-access-tokens.php @@ -0,0 +1,26 @@ + + {{-- New Component --}} + @else

{{ trans('general.feature_disabled') }}

@endif diff --git a/resources/views/components/personal-access-tokens/create-token-modal.blade.php b/resources/views/components/personal-access-tokens/create-token-modal.blade.php new file mode 100644 index 000000000..4ac888d2f --- /dev/null +++ b/resources/views/components/personal-access-tokens/create-token-modal.blade.php @@ -0,0 +1,87 @@ +@props([ + 'title' => 'Create Token', + '' +]) + + + \ No newline at end of file diff --git a/resources/views/components/personal-access-tokens/panel.blade.php b/resources/views/components/personal-access-tokens/panel.blade.php new file mode 100644 index 000000000..043b3d81c --- /dev/null +++ b/resources/views/components/personal-access-tokens/panel.blade.php @@ -0,0 +1,26 @@ +@props([ + 'token_url' => url('oauth/personal-access-tokens'), + 'scopes_url' => url('oauth/scopes'), +]) + +
+

New Personal Access Token Component

+
+

{{ $token_url }}

+

{{ $scopes_url }}

+
+ +
+
+
+ + + Create New Token + +
+
+
+ +
\ No newline at end of file From 0c4901487d234c115cde1519f3c49d3701d6f762 Mon Sep 17 00:00:00 2001 From: spencerrlongg Date: Wed, 8 Nov 2023 16:12:01 -0600 Subject: [PATCH 03/27] delete component class (for now) --- .../Components/personal-access-tokens.php | 26 ------------------- 1 file changed, 26 deletions(-) delete mode 100644 app/View/Components/personal-access-tokens.php diff --git a/app/View/Components/personal-access-tokens.php b/app/View/Components/personal-access-tokens.php deleted file mode 100644 index 79b4eab1a..000000000 --- a/app/View/Components/personal-access-tokens.php +++ /dev/null @@ -1,26 +0,0 @@ - Date: Wed, 8 Nov 2023 16:48:20 -0600 Subject: [PATCH 04/27] initial display work done --- app/Http/Controllers/ProfileController.php | 5 +- resources/views/account/api.blade.php | 10 ++-- .../personal-access-tokens/panel.blade.php | 56 +++++++++++++++++++ 3 files changed, 63 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index d67d673a2..f097a93f7 100755 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -87,9 +87,8 @@ class ProfileController extends Controller * * @author [A. Gianotto] [] * @since [v4.0] - * @return View */ - public function api() + public function api(): \Illuminate\Contracts\View\View { // Make sure the self.api permission has been granted @@ -97,7 +96,7 @@ class ProfileController extends Controller abort(403); } - return view('account/api'); + return view('account/api')->with('tokens', Auth::user()->tokens()->get()); } /** diff --git a/resources/views/account/api.blade.php b/resources/views/account/api.blade.php index 8afe9a2a6..2e97c9974 100644 --- a/resources/views/account/api.blade.php +++ b/resources/views/account/api.blade.php @@ -14,12 +14,12 @@
@if (!config('app.lock_passwords')) - - +{{-- --}} +{{-- --}} {{-- New Component --}} - + @else

{{ trans('general.feature_disabled') }}

@endif diff --git a/resources/views/components/personal-access-tokens/panel.blade.php b/resources/views/components/personal-access-tokens/panel.blade.php index 043b3d81c..9f02b87da 100644 --- a/resources/views/components/personal-access-tokens/panel.blade.php +++ b/resources/views/components/personal-access-tokens/panel.blade.php @@ -1,6 +1,7 @@ @props([ 'token_url' => url('oauth/personal-access-tokens'), 'scopes_url' => url('oauth/scopes'), + 'tokens' => [], ])
@@ -21,6 +22,61 @@
+
+ + @if($tokens->count() === 0) +

+ You have not created any personal access tokens. +

+ @endif + + + + @if($tokens->count() > 0) + + + + + + + + + @endif + + + + + @foreach($tokens as $token) + + + + + + @endforeach + + + + + +
NameCreatedExpiresDelete
+ {{ $token->name }} + + {{ $token->created_at }} + + {{ $token->expires_at }} + + + + +
+
+ + + + + + \ No newline at end of file From 5615fc09e6b5c13352d7054521f5e1df21b2cceb Mon Sep 17 00:00:00 2001 From: spencerrlongg Date: Wed, 8 Nov 2023 16:55:29 -0600 Subject: [PATCH 05/27] add view modal --- .../personal-access-tokens/panel.blade.php | 3 ++ .../view-new-token.blade.php | 29 +++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 resources/views/components/personal-access-tokens/view-new-token.blade.php diff --git a/resources/views/components/personal-access-tokens/panel.blade.php b/resources/views/components/personal-access-tokens/panel.blade.php index 9f02b87da..8f203bc53 100644 --- a/resources/views/components/personal-access-tokens/panel.blade.php +++ b/resources/views/components/personal-access-tokens/panel.blade.php @@ -79,4 +79,7 @@ + + + \ No newline at end of file diff --git a/resources/views/components/personal-access-tokens/view-new-token.blade.php b/resources/views/components/personal-access-tokens/view-new-token.blade.php new file mode 100644 index 000000000..a211747be --- /dev/null +++ b/resources/views/components/personal-access-tokens/view-new-token.blade.php @@ -0,0 +1,29 @@ + \ No newline at end of file From 8e4c0f60a16fafc5d1e981da4352b947f28dec76 Mon Sep 17 00:00:00 2001 From: spencerrlongg Date: Wed, 8 Nov 2023 17:36:54 -0600 Subject: [PATCH 06/27] return format --- app/Http/Controllers/ProfileController.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index f097a93f7..c25389477 100755 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -96,7 +96,9 @@ class ProfileController extends Controller abort(403); } - return view('account/api')->with('tokens', Auth::user()->tokens()->get()); + return view('account/api', [ + 'tokens' => Auth::user()->tokens()->get(), + ]); } /** From fbfc817c5fae00bd644363d85bacb300d035ab51 Mon Sep 17 00:00:00 2001 From: spencerrlongg Date: Mon, 13 Nov 2023 19:47:03 -0600 Subject: [PATCH 07/27] just some cleanup --- app/Http/Controllers/ProfileController.php | 1 - resources/views/account/api.blade.php | 8 ++++---- .../personal-access-tokens/create-token-modal.blade.php | 2 +- .../components/personal-access-tokens/panel.blade.php | 7 ++++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index c25389477..b28da702f 100755 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -90,7 +90,6 @@ class ProfileController extends Controller */ public function api(): \Illuminate\Contracts\View\View { - // Make sure the self.api permission has been granted if (!Gate::allows('self.api')) { abort(403); diff --git a/resources/views/account/api.blade.php b/resources/views/account/api.blade.php index 2e97c9974..13172af8a 100644 --- a/resources/views/account/api.blade.php +++ b/resources/views/account/api.blade.php @@ -14,10 +14,10 @@
@if (!config('app.lock_passwords')) -{{-- --}} -{{-- --}} + + {{-- New Component --}} @else diff --git a/resources/views/components/personal-access-tokens/create-token-modal.blade.php b/resources/views/components/personal-access-tokens/create-token-modal.blade.php index 4ac888d2f..ee8eedc88 100644 --- a/resources/views/components/personal-access-tokens/create-token-modal.blade.php +++ b/resources/views/components/personal-access-tokens/create-token-modal.blade.php @@ -8,7 +8,7 @@
- +

Create Token diff --git a/resources/views/components/personal-access-tokens/panel.blade.php b/resources/views/components/personal-access-tokens/panel.blade.php index 8f203bc53..b84d9bac6 100644 --- a/resources/views/components/personal-access-tokens/panel.blade.php +++ b/resources/views/components/personal-access-tokens/panel.blade.php @@ -43,11 +43,11 @@ @endif - + @foreach($tokens as $token) - @foreach($tokens as $token) + {{ $token->name }} @@ -59,7 +59,7 @@ {{ $token->expires_at }} - @endforeach + @@ -68,6 +68,7 @@ + @endforeach

From e504b202355339c1433ed3e5cc98f084b42b9e03 Mon Sep 17 00:00:00 2001 From: spencerrlongg Date: Tue, 14 Nov 2023 11:01:38 -0600 Subject: [PATCH 08/27] couple small changes --- resources/views/account/api.blade.php | 8 +-- .../create-token-modal.blade.php | 62 ++++++++++--------- 2 files changed, 36 insertions(+), 34 deletions(-) diff --git a/resources/views/account/api.blade.php b/resources/views/account/api.blade.php index 13172af8a..2e97c9974 100644 --- a/resources/views/account/api.blade.php +++ b/resources/views/account/api.blade.php @@ -14,10 +14,10 @@
@if (!config('app.lock_passwords')) - - +{{-- --}} +{{-- --}} {{-- New Component --}} @else diff --git a/resources/views/components/personal-access-tokens/create-token-modal.blade.php b/resources/views/components/personal-access-tokens/create-token-modal.blade.php index ee8eedc88..e3aedc5bd 100644 --- a/resources/views/components/personal-access-tokens/create-token-modal.blade.php +++ b/resources/views/components/personal-access-tokens/create-token-modal.blade.php @@ -1,6 +1,6 @@ @props([ 'title' => 'Create Token', - '' + 'errors' => false, ]) @@ -11,25 +11,27 @@

- Create Token + {{ $title }}

-
-

Whoops! Something went wrong!

-
-
    -
  • -{{-- {{ error }}--}} -
    • -
-
+ @if($errors === true) +
+

Whoops! Something went wrong!

+
+
    +
  • + {{-- {{ error }}--}} +
    • +
+
+ @endif
-
- +{{-- >--}} +{{-- --}} -
-
--}} +{{-- -
-
-
-
+{{-- --}} +{{--
--}} +{{--
--}} +{{--
--}} +{{--
--}}
From 9f303cc116ac6ada1da67c5a703860f211cb741e Mon Sep 17 00:00:00 2001 From: spencerrlongg Date: Tue, 14 Nov 2023 11:50:27 -0600 Subject: [PATCH 09/27] playing around with livewire --- app/Http/Livewire/PersonalAccessTokens.php | 40 +++++++++ resources/views/account/api.blade.php | 6 +- .../livewire/personal-access-tokens.blade.php | 85 +++++++++++++++++++ 3 files changed, 129 insertions(+), 2 deletions(-) create mode 100644 app/Http/Livewire/PersonalAccessTokens.php create mode 100644 resources/views/livewire/personal-access-tokens.blade.php diff --git a/app/Http/Livewire/PersonalAccessTokens.php b/app/Http/Livewire/PersonalAccessTokens.php new file mode 100644 index 000000000..c9e30a943 --- /dev/null +++ b/app/Http/Livewire/PersonalAccessTokens.php @@ -0,0 +1,40 @@ + Auth::user()->tokens, + ]); + } + + public function rules(): array + { + return [ + 'name' => 'required', + 'scopes' => 'nullable|array', + ]; + } + + public function createToken(): void + { + Auth::user()->createToken($this->name, $this->scopes); + } + + public function deleteToken($tokenId): void + { + Auth::user()->tokens()->where('id', $tokenId)->delete(); + } + + public function getTokensProperty(): array + { + return Auth::user()->tokens; + } +} diff --git a/resources/views/account/api.blade.php b/resources/views/account/api.blade.php index 2e97c9974..8098ea7e3 100644 --- a/resources/views/account/api.blade.php +++ b/resources/views/account/api.blade.php @@ -18,8 +18,10 @@ {{-- token-url="{{ url('oauth/personal-access-tokens') }}"--}} {{-- scopes-url="{{ url('oauth/scopes') }}">--}} {{-- --}} - {{-- New Component --}} - + {{-- New Blade Component --}} +{{-- --}} + {{-- New Livewire Component --}} + @else

{{ trans('general.feature_disabled') }}

@endif diff --git a/resources/views/livewire/personal-access-tokens.blade.php b/resources/views/livewire/personal-access-tokens.blade.php new file mode 100644 index 000000000..6f8fcaeb7 --- /dev/null +++ b/resources/views/livewire/personal-access-tokens.blade.php @@ -0,0 +1,85 @@ +@props([ + 'token_url' => url('oauth/personal-access-tokens'), + 'scopes_url' => url('oauth/scopes'), +]) + +
+

New Personal Access Token Component

+
+

{{ $token_url }}

+

{{ $scopes_url }}

+
+ +
+
+
+ + + Create New Token + +
+
+
+ + @if($tokens->count() === 0) +

+ You have not created any personal access tokens. +

+ @endif + + + + @if($tokens->count() > 0) + + + + + + + + + @endif + @foreach($tokens as $token) + + + + + + + + + + + + + + + @endforeach + +
NameCreatedExpiresDelete
+ {{ $token->name }} + + {{ $token->created_at }} + + {{ $token->expires_at }} + + + + +
+
+ + + +
+ + + + + + + +
\ No newline at end of file From eaa68327f7b110330c506a821b3bcf18f62bfa7b Mon Sep 17 00:00:00 2001 From: spencerrlongg Date: Wed, 15 Nov 2023 16:27:01 -0600 Subject: [PATCH 10/27] SINGLE QUOTES --- app/Http/Controllers/ProfileController.php | 4 +-- app/Http/Livewire/PersonalAccessTokens.php | 6 +++- resources/views/account/api.blade.php | 4 --- .../livewire/personal-access-tokens.blade.php | 29 ++++--------------- 4 files changed, 12 insertions(+), 31 deletions(-) diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index b28da702f..693613fb7 100755 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -95,9 +95,7 @@ class ProfileController extends Controller abort(403); } - return view('account/api', [ - 'tokens' => Auth::user()->tokens()->get(), - ]); + return view('account/api'); } /** diff --git a/app/Http/Livewire/PersonalAccessTokens.php b/app/Http/Livewire/PersonalAccessTokens.php index c9e30a943..52ee05ced 100644 --- a/app/Http/Livewire/PersonalAccessTokens.php +++ b/app/Http/Livewire/PersonalAccessTokens.php @@ -3,6 +3,7 @@ namespace App\Http\Livewire; use Illuminate\Support\Facades\Auth; +use Illuminate\Support\Facades\Log; use Illuminate\View\View; use Livewire\Component; @@ -30,7 +31,10 @@ class PersonalAccessTokens extends Component public function deleteToken($tokenId): void { - Auth::user()->tokens()->where('id', $tokenId)->delete(); + Log::info('poo'); + //this needs safety (though the scope of auth::user might kind of do it...) + //seems like it does, test more + Auth::user()->tokens()->find($tokenId)->delete(); } public function getTokensProperty(): array diff --git a/resources/views/account/api.blade.php b/resources/views/account/api.blade.php index 8098ea7e3..14367ecd6 100644 --- a/resources/views/account/api.blade.php +++ b/resources/views/account/api.blade.php @@ -1,15 +1,11 @@ @extends('layouts/default') - {{-- Page title --}} @section('title') {{ trans('account/general.personal_api_keys') }} @parent @stop - {{-- Page content --}} @section('content') - -
diff --git a/resources/views/livewire/personal-access-tokens.blade.php b/resources/views/livewire/personal-access-tokens.blade.php index 6f8fcaeb7..ad84e62f8 100644 --- a/resources/views/livewire/personal-access-tokens.blade.php +++ b/resources/views/livewire/personal-access-tokens.blade.php @@ -1,19 +1,8 @@ -@props([ - 'token_url' => url('oauth/personal-access-tokens'), - 'scopes_url' => url('oauth/scopes'), -]) -
-

New Personal Access Token Component

-
-

{{ $token_url }}

-

{{ $scopes_url }}

-
- +

New Livewire Personal Access Token Component

- @@ -46,7 +35,6 @@ - {{ $token->name }} @@ -58,28 +46,23 @@ {{ $token->expires_at }} - - + + {{ $token->id }} + - + - @endforeach + @endforeach
- - -
- - -
\ No newline at end of file From 4cb001287267f53de11119995413a59076ddb825 Mon Sep 17 00:00:00 2001 From: spencerrlongg Date: Wed, 15 Nov 2023 16:33:16 -0600 Subject: [PATCH 11/27] cleanup --- resources/views/livewire/personal-access-tokens.blade.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/resources/views/livewire/personal-access-tokens.blade.php b/resources/views/livewire/personal-access-tokens.blade.php index ad84e62f8..8defbc943 100644 --- a/resources/views/livewire/personal-access-tokens.blade.php +++ b/resources/views/livewire/personal-access-tokens.blade.php @@ -46,9 +46,6 @@ {{ $token->expires_at }} - - {{ $token->id }} - From 9b31ae3146a0ed534041be5c7da2a587941fd736 Mon Sep 17 00:00:00 2001 From: spencerrlongg Date: Wed, 15 Nov 2023 16:51:09 -0600 Subject: [PATCH 12/27] create mostly working --- app/Http/Livewire/PersonalAccessTokens.php | 3 +- .../create-token-modal.blade.php | 2 +- .../livewire/personal-access-tokens.blade.php | 84 ++++++++++++++++++- 3 files changed, 86 insertions(+), 3 deletions(-) diff --git a/app/Http/Livewire/PersonalAccessTokens.php b/app/Http/Livewire/PersonalAccessTokens.php index 52ee05ced..478a0726d 100644 --- a/app/Http/Livewire/PersonalAccessTokens.php +++ b/app/Http/Livewire/PersonalAccessTokens.php @@ -9,6 +9,7 @@ use Livewire\Component; class PersonalAccessTokens extends Component { + public $name; public function render() { return view('livewire.personal-access-tokens', [ @@ -26,7 +27,7 @@ class PersonalAccessTokens extends Component public function createToken(): void { - Auth::user()->createToken($this->name, $this->scopes); + Auth::user()->createToken($this->name); } public function deleteToken($tokenId): void diff --git a/resources/views/components/personal-access-tokens/create-token-modal.blade.php b/resources/views/components/personal-access-tokens/create-token-modal.blade.php index e3aedc5bd..36487a01b 100644 --- a/resources/views/components/personal-access-tokens/create-token-modal.blade.php +++ b/resources/views/components/personal-access-tokens/create-token-modal.blade.php @@ -11,7 +11,7 @@

- {{ $title }} + Create Token

diff --git a/resources/views/livewire/personal-access-tokens.blade.php b/resources/views/livewire/personal-access-tokens.blade.php index 8defbc943..8f5bce391 100644 --- a/resources/views/livewire/personal-access-tokens.blade.php +++ b/resources/views/livewire/personal-access-tokens.blade.php @@ -59,7 +59,89 @@
- + + \ No newline at end of file From af144a5184f849dc9a3b81de78190dc632e2f215 Mon Sep 17 00:00:00 2001 From: spencerrlongg Date: Wed, 15 Nov 2023 16:55:21 -0600 Subject: [PATCH 13/27] cleanup --- app/Http/Livewire/PersonalAccessTokens.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/app/Http/Livewire/PersonalAccessTokens.php b/app/Http/Livewire/PersonalAccessTokens.php index 478a0726d..952613005 100644 --- a/app/Http/Livewire/PersonalAccessTokens.php +++ b/app/Http/Livewire/PersonalAccessTokens.php @@ -20,7 +20,7 @@ class PersonalAccessTokens extends Component public function rules(): array { return [ - 'name' => 'required', + 'name' => 'required|string|max:255', 'scopes' => 'nullable|array', ]; } @@ -37,9 +37,4 @@ class PersonalAccessTokens extends Component //seems like it does, test more Auth::user()->tokens()->find($tokenId)->delete(); } - - public function getTokensProperty(): array - { - return Auth::user()->tokens; - } } From 713b21de14ca429365e3faa83631cc7a6c735d7f Mon Sep 17 00:00:00 2001 From: spencerrlongg Date: Wed, 15 Nov 2023 16:56:08 -0600 Subject: [PATCH 14/27] note --- resources/views/livewire/personal-access-tokens.blade.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/views/livewire/personal-access-tokens.blade.php b/resources/views/livewire/personal-access-tokens.blade.php index 8f5bce391..7835b5802 100644 --- a/resources/views/livewire/personal-access-tokens.blade.php +++ b/resources/views/livewire/personal-access-tokens.blade.php @@ -98,6 +98,7 @@
From fd02385c2223cbbd305a77042e7ee0b5a6cd6089 Mon Sep 17 00:00:00 2001 From: spencerrlongg Date: Wed, 15 Nov 2023 17:14:09 -0600 Subject: [PATCH 15/27] deleted components i've already rebuilt in livewire --- .../create-token-modal.blade.php | 89 ------------------- .../personal-access-tokens/panel.blade.php | 86 ------------------ 2 files changed, 175 deletions(-) delete mode 100644 resources/views/components/personal-access-tokens/create-token-modal.blade.php delete mode 100644 resources/views/components/personal-access-tokens/panel.blade.php diff --git a/resources/views/components/personal-access-tokens/create-token-modal.blade.php b/resources/views/components/personal-access-tokens/create-token-modal.blade.php deleted file mode 100644 index 36487a01b..000000000 --- a/resources/views/components/personal-access-tokens/create-token-modal.blade.php +++ /dev/null @@ -1,89 +0,0 @@ -@props([ - 'title' => 'Create Token', - 'errors' => false, -]) - - - - \ No newline at end of file diff --git a/resources/views/components/personal-access-tokens/panel.blade.php b/resources/views/components/personal-access-tokens/panel.blade.php deleted file mode 100644 index b84d9bac6..000000000 --- a/resources/views/components/personal-access-tokens/panel.blade.php +++ /dev/null @@ -1,86 +0,0 @@ -@props([ - 'token_url' => url('oauth/personal-access-tokens'), - 'scopes_url' => url('oauth/scopes'), - 'tokens' => [], -]) - -
-

New Personal Access Token Component

-
-

{{ $token_url }}

-

{{ $scopes_url }}

-
- -
-
-
- - - Create New Token - -
-
-
- - @if($tokens->count() === 0) -

- You have not created any personal access tokens. -

- @endif - - - - @if($tokens->count() > 0) - - - - - - - - - @endif - @foreach($tokens as $token) - - - - - - - - - - - - - - - @endforeach - -
NameCreatedExpiresDelete
- {{ $token->name }} - - {{ $token->created_at }} - - {{ $token->expires_at }} - - - - -
-
- - - -
- - - - - - - -
\ No newline at end of file From efa8ba596545126663604139c77d8b9715bf069c Mon Sep 17 00:00:00 2001 From: spencerrlongg Date: Wed, 15 Nov 2023 17:24:54 -0600 Subject: [PATCH 16/27] nice, just need frontend work now --- app/Http/Livewire/PersonalAccessTokens.php | 8 +++++++- resources/views/livewire/personal-access-tokens.blade.php | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/Http/Livewire/PersonalAccessTokens.php b/app/Http/Livewire/PersonalAccessTokens.php index 952613005..dbf9aff5d 100644 --- a/app/Http/Livewire/PersonalAccessTokens.php +++ b/app/Http/Livewire/PersonalAccessTokens.php @@ -10,6 +10,8 @@ use Livewire\Component; class PersonalAccessTokens extends Component { public $name; + + public $newTokenString; public function render() { return view('livewire.personal-access-tokens', [ @@ -27,7 +29,11 @@ class PersonalAccessTokens extends Component public function createToken(): void { - Auth::user()->createToken($this->name); + $newToken = Auth::user()->createToken($this->name); + + $this->newTokenString = $newToken->accessToken; + + Log::alert($newToken); } public function deleteToken($tokenId): void diff --git a/resources/views/livewire/personal-access-tokens.blade.php b/resources/views/livewire/personal-access-tokens.blade.php index 7835b5802..90ab8b7ff 100644 --- a/resources/views/livewire/personal-access-tokens.blade.php +++ b/resources/views/livewire/personal-access-tokens.blade.php @@ -144,5 +144,6 @@ +
{{ $newTokenString }}
\ No newline at end of file From 6c6417e5959d8b6d08d0d160468ea1dc67bb0f4d Mon Sep 17 00:00:00 2001 From: spencerrlongg Date: Wed, 15 Nov 2023 20:19:03 -0600 Subject: [PATCH 17/27] ok, maybe i do like livewire --- app/Http/Livewire/PersonalAccessTokens.php | 5 +-- .../livewire/personal-access-tokens.blade.php | 42 +++++++++++++++++-- 2 files changed, 41 insertions(+), 6 deletions(-) diff --git a/app/Http/Livewire/PersonalAccessTokens.php b/app/Http/Livewire/PersonalAccessTokens.php index dbf9aff5d..03d2cb7f2 100644 --- a/app/Http/Livewire/PersonalAccessTokens.php +++ b/app/Http/Livewire/PersonalAccessTokens.php @@ -10,8 +10,8 @@ use Livewire\Component; class PersonalAccessTokens extends Component { public $name; - public $newTokenString; + public function render() { return view('livewire.personal-access-tokens', [ @@ -33,12 +33,11 @@ class PersonalAccessTokens extends Component $this->newTokenString = $newToken->accessToken; - Log::alert($newToken); + $this->dispatchBrowserEvent('tokenCreated', $newToken->accessToken); } public function deleteToken($tokenId): void { - Log::info('poo'); //this needs safety (though the scope of auth::user might kind of do it...) //seems like it does, test more Auth::user()->tokens()->find($tokenId)->delete(); diff --git a/resources/views/livewire/personal-access-tokens.blade.php b/resources/views/livewire/personal-access-tokens.blade.php index 90ab8b7ff..edc4caaef 100644 --- a/resources/views/livewire/personal-access-tokens.blade.php +++ b/resources/views/livewire/personal-access-tokens.blade.php @@ -59,7 +59,7 @@ -