From 175018e906c3bce4af087652a0836f1d3fbf17ec Mon Sep 17 00:00:00 2001 From: Rokas Puzonas Date: Sun, 29 Oct 2023 22:47:41 +0200 Subject: [PATCH] remove chrips --- app/Http/Controllers/ChirpController.php | 90 ------------------- app/Http/Controllers/TestTakingController.php | 65 ++++++++++++++ app/Models/Chirp.php | 21 ----- app/Models/User.php | 5 -- app/Policies/ChirpPolicy.php | 66 -------------- .../2023_10_29_105311_create_chirps_table.php | 29 ------ lang/lt.json | 4 +- resources/views/chirps/edit.blade.php | 14 --- resources/views/chirps/index.blade.php | 56 ------------ resources/views/dashboard.blade.php | 8 +- resources/views/layouts/navigation.blade.php | 16 ++-- resources/views/take-tests.blade.php | 4 + routes/web.php | 13 +-- 13 files changed, 94 insertions(+), 297 deletions(-) delete mode 100644 app/Http/Controllers/ChirpController.php create mode 100644 app/Http/Controllers/TestTakingController.php delete mode 100644 app/Models/Chirp.php delete mode 100644 app/Policies/ChirpPolicy.php delete mode 100644 database/migrations/2023_10_29_105311_create_chirps_table.php delete mode 100644 resources/views/chirps/edit.blade.php delete mode 100644 resources/views/chirps/index.blade.php create mode 100644 resources/views/take-tests.blade.php diff --git a/app/Http/Controllers/ChirpController.php b/app/Http/Controllers/ChirpController.php deleted file mode 100644 index d8aca1d..0000000 --- a/app/Http/Controllers/ChirpController.php +++ /dev/null @@ -1,90 +0,0 @@ - Chirp::with("user")->latest()->get() - ]); - } - - /** - * Show the form for creating a new resource. - */ - public function create() - { - // - } - - /** - * Store a newly created resource in storage. - */ - public function store(Request $request) - { - $validated = $request->validate([ - "message" => "required|string|max:255" - ]); - - $request->user()->chirps()->create($validated); - - return redirect(route("chirps.index")); - } - - /** - * Display the specified resource. - */ - public function show(Chirp $chirp) - { - // - } - - /** - * Show the form for editing the specified resource. - */ - public function edit(Chirp $chirp) - { - $this->authorize("update", $chirp); - - return view("chirps.edit", [ - "chirp" => $chirp - ]); - } - - /** - * Update the specified resource in storage. - */ - public function update(Request $request, Chirp $chirp) - { - $this->authorize("update", $chirp); - - $validated = $request->validate([ - "message" => "required|string|max:255" - ]); - - $chirp->update($validated); - - return redirect(route("chirps.index")); - } - - /** - * Remove the specified resource from storage. - */ - public function destroy(Chirp $chirp) - { - $this->authorize("delete", $chirp); - - $chirp->delete(); - - return redirect(route("chirps.index")); - } -} diff --git a/app/Http/Controllers/TestTakingController.php b/app/Http/Controllers/TestTakingController.php new file mode 100644 index 0000000..2dc8a94 --- /dev/null +++ b/app/Http/Controllers/TestTakingController.php @@ -0,0 +1,65 @@ +belongsTo(User::class); - } -} diff --git a/app/Models/User.php b/app/Models/User.php index d35a2be..4013426 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -45,11 +45,6 @@ class User extends Authenticatable 'password' => 'hashed', ]; - public function chirps(): HasMany - { - return $this->hasMany(Chirp::class); - } - public function tests(): HasMany { return $this->hasMany(Test::class); diff --git a/app/Policies/ChirpPolicy.php b/app/Policies/ChirpPolicy.php deleted file mode 100644 index 6eb109c..0000000 --- a/app/Policies/ChirpPolicy.php +++ /dev/null @@ -1,66 +0,0 @@ -user()->is($user); - } - - /** - * Determine whether the user can delete the model. - */ - public function delete(User $user, Chirp $chirp): bool - { - return $this->update($user, $chirp); - } - - /** - * Determine whether the user can restore the model. - */ - public function restore(User $user, Chirp $chirp): bool - { - return false; - } - - /** - * Determine whether the user can permanently delete the model. - */ - public function forceDelete(User $user, Chirp $chirp): bool - { - return false; - } -} diff --git a/database/migrations/2023_10_29_105311_create_chirps_table.php b/database/migrations/2023_10_29_105311_create_chirps_table.php deleted file mode 100644 index 8a64826..0000000 --- a/database/migrations/2023_10_29_105311_create_chirps_table.php +++ /dev/null @@ -1,29 +0,0 @@ -id(); - $table->foreignId("user_id")->constrained()->cascadeOnDelete(); - $table->string("message"); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - */ - public function down(): void - { - Schema::dropIfExists('chirps'); - } -}; diff --git a/lang/lt.json b/lang/lt.json index 1a05c1b..cec6f90 100644 --- a/lang/lt.json +++ b/lang/lt.json @@ -15,5 +15,7 @@ "Save": "Saugoti", "Cancel": "Atšaukti", "Create test": "Sukurti testą", - "Tests": "Testai" + "Tests": "Testai", + "Take tests": "Laikyti testą", + "Dashboard": "Pagrindinis" } diff --git a/resources/views/chirps/edit.blade.php b/resources/views/chirps/edit.blade.php deleted file mode 100644 index c57467c..0000000 --- a/resources/views/chirps/edit.blade.php +++ /dev/null @@ -1,14 +0,0 @@ - -
-
- @csrf - @method("patch") - - -
- {{ __("Save") }} - {{ __("Cancel") }} -
- -
-
diff --git a/resources/views/chirps/index.blade.php b/resources/views/chirps/index.blade.php deleted file mode 100644 index 99547f8..0000000 --- a/resources/views/chirps/index.blade.php +++ /dev/null @@ -1,56 +0,0 @@ - -
-
- @csrf - - - {{ __('Chirp') }} - - - -
- @foreach ($chirps as $chirp) -
- - - -
-
-
- {{ $chirp->user->name }} - {{ $chirp->created_at->format("j M Y, g:i a") }} - @unless ($chirp->created_at->eq($chirp->updated_at)) - · {{ __("edited") }} - @endunless -
- @if ($chirp->user->is(auth()->user())) - - - - - - - {{ __("Edit") }} - -
- @csrf - @method("delete") - - {{ __("Delete") }} - -
-
-
- @endif -
-

{{ $chirp->message }}

-
-
- @endforeach -
-
-
diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php index 28d3e96..118d583 100644 --- a/resources/views/dashboard.blade.php +++ b/resources/views/dashboard.blade.php @@ -8,10 +8,10 @@
-
- {{ __("You're logged in!") }} - {{ Auth::user()->role }} -
+ {{--
--}} + {{-- {{ __("You're logged in!") }} --}} + {{-- {{ Auth::user()->role }} --}} + {{--
--}}
diff --git a/resources/views/layouts/navigation.blade.php b/resources/views/layouts/navigation.blade.php index 21537f4..2a05b00 100644 --- a/resources/views/layouts/navigation.blade.php +++ b/resources/views/layouts/navigation.blade.php @@ -15,9 +15,6 @@ {{ __('Dashboard') }} - - {{ __('Chirps') }} - @if (Auth::user()->role == "admin") {{ __('Users') }} @@ -28,6 +25,11 @@ {{ __('Tests') }} @endif + @if (Auth::user()->role == "student") + + {{ __('Take tests') }} + + @endif @@ -83,9 +85,6 @@ {{ __('Dashboard') }} - - {{ __('Chirps') }} - @if (Auth::user()->role == "admin") {{ __('Users') }} @@ -96,6 +95,11 @@ {{ __('Tests') }} @endif + @if (Auth::user()->role == "student") + + {{ __('Take tests') }} + + @endif diff --git a/resources/views/take-tests.blade.php b/resources/views/take-tests.blade.php new file mode 100644 index 0000000..a6ee4b0 --- /dev/null +++ b/resources/views/take-tests.blade.php @@ -0,0 +1,4 @@ + +
+
+
diff --git a/routes/web.php b/routes/web.php index c32d51e..128c2c2 100644 --- a/routes/web.php +++ b/routes/web.php @@ -1,6 +1,5 @@ group(function () { Route::delete('/profile', [ProfileController::class, 'destroy'])->name('profile.destroy'); }); -Route::resource("chirps", ChirpController::class) - ->only(["index", "store", "edit", "update", "destroy"]) - ->middleware(["auth", "verified"]); - Route::resource("users", UserController::class) ->only(["index", "store", "edit", "update", "destroy"]) ->middleware(["auth", "verified"]); @@ -48,4 +43,12 @@ Route::resource("questions", QuestionController::class) ->only(["index", "store", "edit", "update", "destroy"]) ->middleware(["auth", "verified"]); +Route::get('/take-tests', function () { + return view('take-tests'); +})->middleware(['auth', 'verified'])->name('take-tests'); + +// Route::resource("test-taking", TestTakingController::class) +// ->only(["index"]) +// ->middleware(["auth", "verified"]); + require __DIR__.'/auth.php';