From 4e8c9187e8646666e2cd803a801dcd6dacb9fb67 Mon Sep 17 00:00:00 2001
From: "Thoeni Fabian (Student Com20)" <fabian.thoeni@stud-inf.unibz.it>
Date: Fri, 10 Dec 2021 01:31:26 +0100
Subject: [PATCH] v2
---
app/Http/Controllers/QuestionController.php | 20 ++++++++++++-------
app/Models/MeinModel.php | 12 -----------
..._09_122812_create_list_questions_table.php | 2 +-
...021_12_09_224012_create_answers_table.php} | 11 ++++++----
public/css/styles.css | 4 ++--
resources/views/home.blade.php | 17 ++++++++++++----
6 files changed, 36 insertions(+), 30 deletions(-)
delete mode 100644 app/Models/MeinModel.php
rename database/migrations/{2021_12_07_172525_create_mein_models_table.php => 2021_12_09_224012_create_answers_table.php} (57%)
diff --git a/app/Http/Controllers/QuestionController.php b/app/Http/Controllers/QuestionController.php
index d717e4c..88e8d7e 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 c25c280..0000000
--- 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 3b0eb6c..2435632 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 3453d80..33bcf55 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 092d268..1a80ff2 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 778412c..8e8b329 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>
--
GitLab