Merge pull request #106 from scify/master

Project landing page button text color
scify · Oct 15, 2024 · 0d6b1d3 · 0d6b1d3
2 parents 0cd38a7 + 6a7026c
commit 0d6b1d3
Show file tree

Hide file tree

Showing 37 changed files with 1,042 additions and 171 deletions.
diff --git a/app/BusinessLogicLayer/CrowdSourcingProject/CrowdSourcingProjectManager.php b/app/BusinessLogicLayer/CrowdSourcingProject/CrowdSourcingProjectManager.php
@@ -285,7 +285,10 @@ public function populateInitialValuesForProjectIfNotSet(CrowdSourcingProject $pr
 
     public function populateInitialColorValuesForProjectIfNotSet(CrowdSourcingProject $project): CrowdSourcingProject {
         if (!$project->lp_primary_color) {
-            $project->lp_primary_color = '#707070';
+            $project->lp_primary_color = '#0069d9';
+        }
+        if (!$project->lp_btn_text_color_theme) {
+            $project->lp_btn_text_color_theme = 'light';
         }
 
         return $project;

diff --git a/app/BusinessLogicLayer/lkp/QuestionnaireTypeLkp.php b/app/BusinessLogicLayer/lkp/QuestionnaireTypeLkp.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\BusinessLogicLayer\lkp;
+
+class QuestionnaireTypeLkp {
+    public const MAIN_QUESTIONNAIRE = 1;
+    public const FEEDBACK_QUESTIONNAIRE = 2;
+
+    public static function GetAllTypeIds(): array {
+        return [
+            self::MAIN_QUESTIONNAIRE,
+            self::FEEDBACK_QUESTIONNAIRE,
+        ];
+    }
+}
diff --git a/app/Models/CrowdSourcingProject/CrowdSourcingProject.php b/app/Models/CrowdSourcingProject/CrowdSourcingProject.php
@@ -31,6 +31,7 @@
  * @property string $lp_questionnaire_img_path
  * @property int $lp_show_speak_up_btn
  * @property string $lp_primary_color
+ * @property string $lp_btn_text_color_theme
  * @property int $should_send_email_after_questionnaire_response
  * @property int $display_landing_page_banner
  */
@@ -49,13 +50,15 @@ class CrowdSourcingProject extends Model {
     /**
      * The attributes that are mass assignable.
      *
+     * Note: in the lp_* fields, lp stands for landing page
+     *
      * @var array
      */
     protected $fillable = [
         'slug', 'external_url', 'img_path',
         'logo_path', 'user_creator_id', 'language_id', 'status_id',
         'sm_featured_img_path', 'lp_questionnaire_img_path',
-        'lp_show_speak_up_btn', 'lp_primary_color',
+        'lp_show_speak_up_btn', 'lp_primary_color', 'lp_btn_text_color_theme',
         'should_send_email_after_questionnaire_response',
         'display_landing_page_banner',
     ];

diff --git a/app/Models/CrowdSourcingProject/Problem/CrowdSourcingProjectProblem.php b/app/Models/CrowdSourcingProject/Problem/CrowdSourcingProjectProblem.php
@@ -3,13 +3,15 @@
 namespace App\Models\CrowdSourcingProject\Problem;
 
 use Awobaz\Compoships\Compoships;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class CrowdSourcingProjectProblem extends Model {
     use Compoships;
+    use HasFactory;
     use SoftDeletes;
 
     protected $table = 'crowd_sourcing_project_problems';

diff --git a/app/Models/CrowdSourcingProject/Problem/CrowdSourcingProjectProblemTranslation.php b/app/Models/CrowdSourcingProject/Problem/CrowdSourcingProjectProblemTranslation.php
@@ -5,10 +5,11 @@
 use App\Models\CompositeKeysModel;
 use App\Models\Language;
 use Awobaz\Compoships\Compoships;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class CrowdSourcingProjectProblemTranslation extends CompositeKeysModel {
-    use Compoships;
+    use Compoships, HasFactory;
 
     protected $table = 'crowd_sourcing_project_problem_translations';
     protected $fillable = ['problem_id', 'language_id', 'title', 'description'];

diff --git a/database/factories/CrowdSourcingProject/CrowdSourcingProjectFactory.php b/database/factories/CrowdSourcingProject/CrowdSourcingProjectFactory.php
@@ -20,6 +20,7 @@ public function definition() {
             'lp_questionnaire_img_path' => $this->faker->imageUrl(),
             'lp_show_speak_up_btn' => $this->faker->boolean,
             'lp_primary_color' => $this->faker->hexColor,
+            'lp_btn_text_color_theme' => $this->faker->hexColor,
             'should_send_email_after_questionnaire_response' => $this->faker->boolean,
             'display_landing_page_banner' => $this->faker->boolean,
             'img_path' => $this->faker->imageUrl(),

diff --git a/database/factories/CrowdSourcingProject/Problem/CrowdSourcingProjectProblemFactory.php b/database/factories/CrowdSourcingProject/Problem/CrowdSourcingProjectProblemFactory.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Database\Factories\CrowdSourcingProject\Problem;
+
+use App\BusinessLogicLayer\lkp\CrowdSourcingProjectProblemStatusLkp;
+use App\Models\CrowdSourcingProject\Problem\CrowdSourcingProjectProblem;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+class CrowdSourcingProjectProblemFactory extends Factory {
+    protected $model = CrowdSourcingProjectProblem::class;
+
+    public function definition() {
+        return [
+            'project_id' => 1,
+            'slug' => $this->faker->slug,
+            'status_id' => CrowdSourcingProjectProblemStatusLkp::DRAFT,
+            'created_at' => now(),
+            'updated_at' => now(),
+            'user_creator_id' => 1,
+            'default_language_id' => 6,
+            'img_url' => $this->faker->imageUrl(),
+        ];
+    }
+}
diff --git a/.../factories/CrowdSourcingProject/Problem/CrowdSourcingProjectProblemTranslationFactory.php b/.../factories/CrowdSourcingProject/Problem/CrowdSourcingProjectProblemTranslationFactory.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Database\Factories\CrowdSourcingProject\Problem;
+
+use App\Models\CrowdSourcingProject\Problem\CrowdSourcingProjectProblemTranslation;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+class CrowdSourcingProjectProblemTranslationFactory extends Factory {
+    protected $model = CrowdSourcingProjectProblemTranslation::class;
+
+    public function definition() {
+        return [
+            'problem_id' => 1,
+            'language_id' => 6,
+            'title' => $this->faker->sentence,
+            'description' => $this->faker->paragraph,
+        ];
+    }
+}
diff --git a/database/factories/Questionnaire/QuestionnaireFactory.php b/database/factories/Questionnaire/QuestionnaireFactory.php
@@ -2,6 +2,8 @@
 
 namespace Database\Factories\Questionnaire;
 
+use App\BusinessLogicLayer\lkp\QuestionnaireStatusLkp;
+use App\BusinessLogicLayer\lkp\QuestionnaireTypeLkp;
 use App\Models\Questionnaire\Questionnaire;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
@@ -12,8 +14,8 @@ public function definition() {
         return [
             'project_id' => 1,
             'prerequisite_order' => 1,
-            'status_id' => 1,
-            'type_id' => 1,
+            'status_id' => QuestionnaireStatusLkp::DRAFT,
+            'type_id' => QuestionnaireTypeLkp::MAIN_QUESTIONNAIRE,
             'default_language_id' => 1,
             'goal' => 10,
             'questionnaire_json' => json_encode([

diff --git a/...ations/2024_10_14_121805_add_user_creator_id_to_crowd_sourcing_project_problems_table.php b/...ations/2024_10_14_121805_add_user_creator_id_to_crowd_sourcing_project_problems_table.php
@@ -0,0 +1,24 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up(): void {
+        Schema::table('crowd_sourcing_project_problems', function (Blueprint $table) {
+            $table->unsignedInteger('user_creator_id')->after('project_id')->nullable(true);
+            $table->foreign('user_creator_id')->references('id')->on('users');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void {
+        Schema::table('crowd_sourcing_project_problems', function (Blueprint $table) {});
+    }
+};
diff --git a/database/migrations/2024_10_15_102802_add_lp_btn_text_color_to_crowd_sourcing_projects.php b/database/migrations/2024_10_15_102802_add_lp_btn_text_color_to_crowd_sourcing_projects.php
@@ -0,0 +1,25 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up(): void {
+        Schema::table('crowd_sourcing_projects', function (Blueprint $table) {
+            $table->string('lp_btn_text_color_theme')->after('lp_primary_color')->default('light')->nullable(false);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void {
+        Schema::table('crowd_sourcing_projects', function (Blueprint $table) {
+            //
+        });
+    }
+};
diff --git a/database/seeders/AirQualityProjectSeeder.php b/database/seeders/AirQualityProjectSeeder.php
@@ -111,6 +111,7 @@ public function run(): void {
                 'status_id' => CrowdSourcingProjectProblemStatusLkp::PUBLISHED,
                 'img_url' => '/images/projects/air-quality-europe/problem-1.png',
                 'default_language_id' => 6,
+                'user_creator_id' => 1,
                 'translations' => [
                     [
                         'language_id' => 6,
@@ -168,6 +169,7 @@ public function run(): void {
                 'status_id' => CrowdSourcingProjectProblemStatusLkp::PUBLISHED,
                 'img_url' => '/images/projects/air-quality-europe/problem-2.png',
                 'default_language_id' => 12,
+                'user_creator_id' => 1,
                 'translations' => [
                     [
                         'language_id' => 6,
@@ -225,6 +227,7 @@ public function run(): void {
                 'status_id' => CrowdSourcingProjectProblemStatusLkp::PUBLISHED,
                 'img_url' => null,
                 'default_language_id' => 12,
+                'user_creator_id' => 1,
                 'translations' => [
                     [
                         'language_id' => 6,
@@ -244,6 +247,7 @@ public function run(): void {
                 'status_id' => CrowdSourcingProjectProblemStatusLkp::PUBLISHED,
                 'img_url' => '/images/projects/air-quality-europe/problem-4.png',
                 'default_language_id' => 6,
+                'user_creator_id' => 1,
                 'translations' => [
                     [
                         'language_id' => 6,
@@ -266,6 +270,7 @@ public function run(): void {
                 'status_id' => $problem['status_id'],
                 'img_url' => $problem['img_url'],
                 'default_language_id' => $problem['default_language_id'],
+                'user_creator_id' => $problem['user_creator_id'],
             ]);
             if (isset($problem['translations'])) {
                 foreach ($problem['translations'] as $translation) {

diff --git a/database/seeders/CrowdSourcingProjectColorsSeeder.php b/database/seeders/CrowdSourcingProjectColorsSeeder.php
@@ -2,12 +2,11 @@
 
 namespace Database\Seeders;
 
-use App\Models\CrowdSourcingProject\CrowdSourcingProject;
 use App\Repository\CrowdSourcingProject\CrowdSourcingProjectColorsRepository;
 use Illuminate\Database\Seeder;
 
 class CrowdSourcingProjectColorsSeeder extends Seeder {
-    protected $crowdSourcingProjectColorsRepository;
+    protected CrowdSourcingProjectColorsRepository $crowdSourcingProjectColorsRepository;
 
     public function __construct(CrowdSourcingProjectColorsRepository $crowdSourcingProjectColorsRepository) {
         $this->crowdSourcingProjectColorsRepository = $crowdSourcingProjectColorsRepository;
@@ -76,11 +75,5 @@ public function run() {
         if (app()->environment() !== 'testing') {
             echo "\nDefault colors were created.\n";
         }
-
-        $projects = CrowdSourcingProject::all();
-        foreach ($projects as $project) {
-            $project->lp_primary_color = '#707070';
-            $project->save();
-        }
     }
 }
diff --git a/database/seeders/CrowdSourcingProjectProblemSeeder.php b/database/seeders/CrowdSourcingProjectProblemSeeder.php
@@ -20,6 +20,7 @@ public function run(): void {
                 'status_id' => CrowdSourcingProjectProblemStatusLkp::PUBLISHED,
                 'img_url' => 'https://placehold.co/600x400',
                 'default_language_id' => 6,
+                'user_creator_id' => 1,
                 'translations' => [
                     [
                         'language_id' => 6,
@@ -40,6 +41,7 @@ public function run(): void {
                 'status_id' => CrowdSourcingProjectProblemStatusLkp::UNPUBLISHED,
                 'img_url' => 'https://placehold.co/600x400',
                 'default_language_id' => 6,
+                'user_creator_id' => 1,
                 'translations' => [
                     [
                         'language_id' => 6,
@@ -60,6 +62,7 @@ public function run(): void {
                 'status_id' => CrowdSourcingProjectProblemStatusLkp::PUBLISHED,
                 'img_url' => 'https://placehold.co/600x400',
                 'default_language_id' => 12,
+                'user_creator_id' => 1,
                 'translations' => [
                     [
                         'language_id' => 6,
@@ -80,6 +83,7 @@ public function run(): void {
                 'status_id' => CrowdSourcingProjectProblemStatusLkp::PUBLISHED,
                 'img_url' => 'https://placehold.co/600x400',
                 'default_language_id' => 12,
+                'user_creator_id' => 1,
                 'translations' => [
                     [
                         'language_id' => 6,
@@ -100,6 +104,7 @@ public function run(): void {
                 'status_id' => CrowdSourcingProjectProblemStatusLkp::UNPUBLISHED,
                 'img_url' => 'https://placehold.co/600x400',
                 'default_language_id' => 6,
+                'user_creator_id' => 1,
                 'translations' => [
                     [
                         'language_id' => 6,
@@ -123,6 +128,7 @@ public function run(): void {
                 'status_id' => $problem['status_id'],
                 'img_url' => $problem['img_url'],
                 'default_language_id' => $problem['default_language_id'],
+                'user_creator_id' => $problem['user_creator_id'],
             ]);
             if (isset($problem['translations'])) {
                 foreach ($problem['translations'] as $translation) {

diff --git a/database/seeders/DefaultProjectSeeder.php b/database/seeders/DefaultProjectSeeder.php
@@ -36,7 +36,8 @@ public function run() {
                 'user_creator_id' => 1,
                 'language_id' => 6,
                 'should_send_email_after_questionnaire_response' => 1,
-                'lp_primary_color' => '#707070',
+                'lp_primary_color' => '#0069d9',
+                'lp_btn_text_color_theme' => '#212529',
                 'lp_questionnaire_image_path' => '/images/projects/european-elections/logo.webp',
                 'lp_show_speak_up_btn' => 1,
                 'sm_featured_img_path' => '/images/projects/european-elections/logo.webp',
@@ -52,7 +53,8 @@ public function run() {
                 'user_creator_id' => 1,
                 'language_id' => 6,
                 'should_send_email_after_questionnaire_response' => 1,
-                'lp_primary_color' => '#707070',
+                'lp_primary_color' => '#0069d9',
+                'lp_btn_text_color_theme' => '#212529',
                 'lp_questionnaire_image_path' => '/images/projects/european-democracy/logo.webp',
                 'lp_show_speak_up_btn' => 1,
                 'sm_featured_img_path' => '/images/projects/european-democracy/logo.webp',
@@ -68,7 +70,8 @@ public function run() {
                 'user_creator_id' => 1,
                 'language_id' => 6,
                 'should_send_email_after_questionnaire_response' => 1,
-                'lp_primary_color' => '#707070',
+                'lp_primary_color' => '#0069d9',
+                'lp_btn_text_color_theme' => '#212529',
                 'lp_questionnaire_image_path' => '/images/projects/european-democracy/logo.webp',
                 'lp_show_speak_up_btn' => 1,
                 'sm_featured_img_path' => '/images/projects/european-democracy/logo.webp',

diff --git a/database/seeders/QuestionnaireSeeder.php b/database/seeders/QuestionnaireSeeder.php
@@ -2,6 +2,7 @@
 
 namespace Database\Seeders;
 
+use App\BusinessLogicLayer\lkp\QuestionnaireTypeLkp;
 use App\Repository\CrowdSourcingProject\CrowdSourcingProjectQuestionnaireRepository;
 use App\Repository\Questionnaire\QuestionnaireLanguageRepository;
 use App\Repository\Questionnaire\QuestionnaireRepository;
@@ -30,7 +31,7 @@ public function run() {
                 'id' => 1,
                 'project_id' => 1,
                 'type_id' => 1,
-                'status_id' => 2,
+                'status_id' => QuestionnaireTypeLkp::MAIN_QUESTIONNAIRE,
                 'default_language_id' => 6,
                 'goal' => 100,
                 'max_votes_num' => 10,
@@ -44,7 +45,7 @@ public function run() {
                 'id' => 2,
                 'project_id' => 2,
                 'type_id' => 1,
-                'status_id' => 2,
+                'status_id' => QuestionnaireTypeLkp::MAIN_QUESTIONNAIRE,
                 'default_language_id' => 6,
                 'goal' => 50,
                 'max_votes_num' => 5,

diff --git a/database/seeders/QuestionnaireTypesSeeder.php b/database/seeders/QuestionnaireTypesSeeder.php
@@ -2,14 +2,15 @@
 
 namespace Database\Seeders;
 
+use App\BusinessLogicLayer\lkp\QuestionnaireTypeLkp;
 use App\Models\Questionnaire\QuestionnaireType;
 use Illuminate\Database\Seeder;
 
 class QuestionnaireTypesSeeder extends Seeder {
     public function run() {
         $questionnaire_types = [
-            ['id' => 1, 'name' => 'Main Questionnaire | The questionnaire the users are asked to respond for a project'],
-            ['id' => 2, 'name' => 'Feedback Questionnaire | The quality assessment questionnaire. User are invited to respond after they have responded to the Main questionnaire'],
+            ['id' => QuestionnaireTypeLkp::MAIN_QUESTIONNAIRE, 'name' => 'Main Questionnaire | The questionnaire the users are asked to respond for a project'],
+            ['id' => QuestionnaireTypeLkp::FEEDBACK_QUESTIONNAIRE, 'name' => 'Feedback Questionnaire | The quality assessment questionnaire. User are invited to respond after they have responded to the Main questionnaire'],
         ];
 
         foreach ($questionnaire_types as $questionnaire_type) {