Merge remote-tracking branch 'origin/main'

# Conflicts:
#	routes/web.php

app/Http/Controllers/FileController.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Http\Requests\FileRequest;
+use App\Http\Requests\StorefileRequest;
+use App\Http\Requests\UpdatefileRequest;
+use App\Models\file;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Storage;
+
+class FileController extends Controller
+{
+    public function datasubmit(FileRequest $request): RedirectResponse
+    {
+        //upload file in public folder
+        //dd($reqest->all());
+        //$filename = 'new_file.'.$request->filename->extension();
+        //$request->filename->move(public_path('uploads'), $filename);
+
+        //dd($request->all());
+        //$request->validate([
+        //    'filename'=>'required'
+        //]);
+
+        $filename = 'new_file.'.$request->file("filetoinsert")->getClientOriginalExtension();
+        $request->file("filetoinsert")->storeAs('file_temp', $filename);
+
+        //$request->filename->storeAs('file_temp', $filename);
+        return redirect('/words');
+    }
+
+    public function delete(): RedirectResponse
+    {
+        Storage::delete('file_temp/new_file.txt');
+        return redirect('/words');
+    }
+}

app/Http/Controllers/WordsController.php

@@ -2,11 +2,11 @@
 
 namespace App\Http\Controllers;
 
+use App\Http\Requests\WordRequest;
 use App\Models\Word;
 
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
-
 class WordsController extends Controller
 {
     public function __construct()
@@ -25,20 +25,49 @@ class WordsController extends Controller
     /**
      * Store a new Word in the database.
      */
-    public function store(Request $request): RedirectResponse
+    public function store(WordRequest $request): RedirectResponse
     {
-        // Validate the request...
-
         $word = new Word;
-
         $word->name = $request->name;
         $word->translation = $request->translation;
-
-        //$word->name = $request->input('name');
-        //$word->translation = $request->input('translation');
-
         $word->save();
 
         return redirect('/words');
     }
+
+    /**
+     * Update an existing Word in the database.
+     */
+    public function edit($id)
+    {
+        $data = Word::find($id);
+        $id = $data->id;
+        $name = $data->name;
+        $translation = $data->translation;
+        //return $translation;
+        return view("words.modify-word-form", compact('id', "name", "translation"));
+    }
+
+    /**
+     * Update an existing Word in the database.
+     */
+    public function update(WordRequest $request, $id): RedirectResponse
+    {
+        $data = Word::find($id);
+
+        $data->name = $request->name;
+        $data->translation = $request->translation;
+        $data->save();
+
+        return redirect('/words');
+    }
+
+    /**
+     * Delete an existing Word in the database.
+     */
+    public function delete($id): RedirectResponse
+    {
+        Word::destroy($id);
+        return redirect('/words');
+    }
 }