diff --git a/app/Http/Controllers/QuestionController.php b/app/Http/Controllers/QuestionController.php index d717e4c5021961516b2d7663d12486512956fb4d..88e8d7e46d21c1e2e38f97d8ff4c9ce970824e8c 100644 --- a/app/Http/Controllers/QuestionController.php +++ b/app/Http/Controllers/QuestionController.php @@ -4,32 +4,38 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; use App\Models\ListQuestion; +use App\Models\Answers; class QuestionController extends Controller { public function index(){ - return view('home', ['Questions' => ListQuestion::all()]); + return view('home', ['Questions' => ListQuestion::all()], ['Answerss' => Answers::all()],); } public function saveQuestion(Request $request){ $newListQuestion = new ListQuestion; $newListQuestion->question = $request->ListQuestion; + $newListQuestion->user = auth()->user()->name; //$newListQuestion->answer = $request->ListQuestion; $newListQuestion->save(); //\Log::info(json_encode($request->all())); - //return redirect('/', ['Questions' => ListQuestion::all()]); - return back(); + return redirect('/'); + //return view('home', ['Questions' => ListQuestion::all()]); } public function saveAnswer(Request $request){ - $newListQuestion = new ListQuestion; - $newListQuestion->question = $request->ListQuestion; - $newListQuestion->save(); + $newAnswer = new Answers; + $newAnswer->questionId = $request->currentId; + $newAnswer->answers = $request->Answers; + $newAnswer->user = auth()->user()->name; + $newAnswer->save(); + + //\Log::info(json_encode($request->all())); - return redirect('/'); + return redirect('/'); } } diff --git a/app/Models/MeinModel.php b/app/Models/MeinModel.php deleted file mode 100644 index c25c2802af53f9e2c8503de10e9aac32642104f1..0000000000000000000000000000000000000000 --- a/app/Models/MeinModel.php +++ /dev/null @@ -1,12 +0,0 @@ -<?php - -namespace App\Models; - -use Illuminate\Database\Eloquent\Factories\HasFactory; -use Illuminate\Database\Eloquent\Model; - -class MeinModel extends Model -{ - public $timestamps = false; - use HasFactory; -} diff --git a/database/migrations/2021_12_09_122812_create_list_questions_table.php b/database/migrations/2021_12_09_122812_create_list_questions_table.php index 3b0eb6cda4a8304e9e72fcec28f30dd3f1ffd092..24356328faeadbda5331f1a0dc613f36aa0f74a9 100644 --- a/database/migrations/2021_12_09_122812_create_list_questions_table.php +++ b/database/migrations/2021_12_09_122812_create_list_questions_table.php @@ -16,7 +16,7 @@ class CreateListQuestionsTable extends Migration Schema::create('list_questions', function (Blueprint $table) { $table->id(); $table->string('question'); - $table->string('answer'); + $table->string('user'); $table->timestamps(); }); } diff --git a/database/migrations/2021_12_07_172525_create_mein_models_table.php b/database/migrations/2021_12_09_224012_create_answers_table.php similarity index 57% rename from database/migrations/2021_12_07_172525_create_mein_models_table.php rename to database/migrations/2021_12_09_224012_create_answers_table.php index 3453d80828e44e9e422d5b21a2589bcfddd4303d..33bcf5525d83ca5db06add363a29c4e3b35b3837 100644 --- a/database/migrations/2021_12_07_172525_create_mein_models_table.php +++ b/database/migrations/2021_12_09_224012_create_answers_table.php @@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class CreateMeinModelsTable extends Migration +class CreateAnswersTable extends Migration { /** * Run the migrations. @@ -13,9 +13,12 @@ class CreateMeinModelsTable extends Migration */ public function up() { - Schema::create('mein_models', function (Blueprint $table) { + Schema::create('answers', function (Blueprint $table) { $table->id(); - $table->string('question'); + $table->integer('questionId'); + $table->string('answers'); + $table->string('user'); + $table->timestamps(); }); } @@ -26,6 +29,6 @@ class CreateMeinModelsTable extends Migration */ public function down() { - Schema::dropIfExists('mein_models'); + Schema::dropIfExists('answers'); } } diff --git a/public/css/styles.css b/public/css/styles.css index 092d26816612a68cd9fae96f06c3640f135280b0..1a80ff23f27139097b892c4b7a1d098537e8b879 100644 --- a/public/css/styles.css +++ b/public/css/styles.css @@ -3,12 +3,12 @@ @import url('https://fonts.googleapis.com/css?family=Numans'); html,body{ -background-image: url('https://wallpaperaccess.com/full/187161.jpg'); +background-image: url('https://steamcdn-a.akamaihd.net/steamcommunity/public/images/items/286300/c33a58cd147d270171996c766b102de411603d89.jpg'); /*('https://wallpaperaccess.com/full/187161.jpg');*/ background-repeat: repeat-y; background-size: cover; height: 100%; font-family: 'Numans', sans-serif; } - .top-buffer { margin-top:15px;} + diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 778412c96bf640c6044175386f23a0dc1c889e2b..8e8b329001b21d9dbc01538864d16219f5cbdd83 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -33,7 +33,9 @@ @foreach ($Questions as $ListQuestion) <div class="card"> - <div class="card-header">{{ __('Question:') }} {{ $ListQuestion->question}}</div> + <div class="card-header">{{ __('Question:') }} {{ $ListQuestion->question}} + <div>Question by: {{ $ListQuestion->user}}</div> + </div> <div class="card-body"> @if (session('status')) @@ -42,11 +44,18 @@ </div> @endif - <form method="post" action="{{ route('saveQuestionRoute') }}"> + <form method="post" action="{{ route('saveAnswerRoute') }}"> {{ csrf_field() }} + @foreach ($Answerss as $Answers) + @if($ListQuestion->id == $Answers->questionId) + <p>{{ $Answers->user}}: {{ $Answers->answers}} </p> + @endif + @endforeach + + <input type="hidden" name="currentId" value="{{ $ListQuestion->id}}" /> <div class="form-group"> - <input type="text" name="Answer" class="form-control" placeholder="Enter answer"> - <button type="submit" class="top-buffer">Submit Answer</button> + <input type="text" name="Answers" class="form-control" placeholder="Enter answer"> + <button type="submit" class="top-buffer">Submit Answer</button> </div> </form>