From 18744c60574e33794f944b48773161d21905e09c Mon Sep 17 00:00:00 2001 From: Paul Isaris Date: Mon, 14 Oct 2024 10:43:45 +0300 Subject: [PATCH 1/7] - Added user creator id column in problems - Added Model Factories to Problems and Problem Solutions so that we can add tests --- .../Problem/CrowdSourcingProjectProblem.php | 2 ++ ...CrowdSourcingProjectProblemTranslation.php | 3 ++- .../CrowdSourcingProjectProblemFactory.php | 24 +++++++++++++++++++ ...urcingProjectProblemTranslationFactory.php | 20 ++++++++++++++++ ..._crowd_sourcing_project_problems_table.php | 24 +++++++++++++++++++ database/seeders/AirQualityProjectSeeder.php | 5 ++++ .../CrowdSourcingProjectProblemSeeder.php | 6 +++++ 7 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 database/factories/CrowdSourcingProject/Problem/CrowdSourcingProjectProblemFactory.php create mode 100644 database/factories/CrowdSourcingProject/Problem/CrowdSourcingProjectProblemTranslationFactory.php create mode 100644 database/migrations/2024_10_14_121805_add_user_creator_id_to_crowd_sourcing_project_problems_table.php diff --git a/app/Models/CrowdSourcingProject/Problem/CrowdSourcingProjectProblem.php b/app/Models/CrowdSourcingProject/Problem/CrowdSourcingProjectProblem.php index 446194d8..5ff1dd23 100644 --- a/app/Models/CrowdSourcingProject/Problem/CrowdSourcingProjectProblem.php +++ b/app/Models/CrowdSourcingProject/Problem/CrowdSourcingProjectProblem.php @@ -3,6 +3,7 @@ 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; @@ -11,6 +12,7 @@ class CrowdSourcingProjectProblem extends Model { use Compoships; use SoftDeletes; + use HasFactory; protected $table = 'crowd_sourcing_project_problems'; protected $fillable = ['id', 'project_id', 'slug', 'status_id', 'img_url', 'default_language_id']; diff --git a/app/Models/CrowdSourcingProject/Problem/CrowdSourcingProjectProblemTranslation.php b/app/Models/CrowdSourcingProject/Problem/CrowdSourcingProjectProblemTranslation.php index e63ee730..534ccfb1 100644 --- 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/Problem/CrowdSourcingProjectProblemFactory.php b/database/factories/CrowdSourcingProject/Problem/CrowdSourcingProjectProblemFactory.php new file mode 100644 index 00000000..f29a831c --- /dev/null +++ b/database/factories/CrowdSourcingProject/Problem/CrowdSourcingProjectProblemFactory.php @@ -0,0 +1,24 @@ + 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/database/factories/CrowdSourcingProject/Problem/CrowdSourcingProjectProblemTranslationFactory.php b/database/factories/CrowdSourcingProject/Problem/CrowdSourcingProjectProblemTranslationFactory.php new file mode 100644 index 00000000..ff7ba3dc --- /dev/null +++ b/database/factories/CrowdSourcingProject/Problem/CrowdSourcingProjectProblemTranslationFactory.php @@ -0,0 +1,20 @@ + 1, + 'language_id' => 6, + 'title' => $this->faker->sentence, + 'description' => $this->faker->paragraph, + ]; + } + +} \ No newline at end of file diff --git a/database/migrations/2024_10_14_121805_add_user_creator_id_to_crowd_sourcing_project_problems_table.php b/database/migrations/2024_10_14_121805_add_user_creator_id_to_crowd_sourcing_project_problems_table.php new file mode 100644 index 00000000..f191f914 --- /dev/null +++ b/database/migrations/2024_10_14_121805_add_user_creator_id_to_crowd_sourcing_project_problems_table.php @@ -0,0 +1,24 @@ +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/seeders/AirQualityProjectSeeder.php b/database/seeders/AirQualityProjectSeeder.php index fbc6250b..910fc4da 100644 --- 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/CrowdSourcingProjectProblemSeeder.php b/database/seeders/CrowdSourcingProjectProblemSeeder.php index 669e0a02..fd7832a1 100644 --- 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) { From 4af8b3d1fb5a48c6275746c38f8d57b7ecc7fe98 Mon Sep 17 00:00:00 2001 From: Kostas Papandreou Date: Fri, 11 Oct 2024 16:58:02 +0300 Subject: [PATCH 2/7] - moved design colors definitions to common.scss, removed them from project/problem/landing-page.scss - made utility classes for bg-color & bg-image in common.scss & switched over to using them instead of separate rules in project/problem/landing-page.scss - commented about bootstrap custom xxl breakpoint in project/problem/landing-page.scss - removed font imports from project/problem/landing-page.scss - replaced use of "--clr-primary-yellow" color to use "--project-primary-color" - changed "project-problem-page" class to be an id instead - on project-related pages, added "The Campaign" to top navbar - made "share-circle-btn" component use "currentColor" for color value of svg - small code syntax improvements --- resources/assets/sass/common.scss | 26 ++++++++++-- .../sass/project/problem/landing-page.scss | 42 ++++--------------- resources/lang/en/menu.php | 1 + .../components/share-circle-btn.blade.php | 2 +- .../partials/navbar.blade.php | 5 +++ .../problems/landing-page.blade.php | 8 ++-- 6 files changed, 43 insertions(+), 41 deletions(-) diff --git a/resources/assets/sass/common.scss b/resources/assets/sass/common.scss index 30f2b2a0..786d928d 100644 --- a/resources/assets/sass/common.scss +++ b/resources/assets/sass/common.scss @@ -9,10 +9,10 @@ @import "../../../node_modules/bootstrap-sweetalert/dist/sweetalert.css"; // Supports weights 100-900 -@import '@fontsource-variable/noto-sans'; +@import "@fontsource-variable/noto-sans"; // Supports weights 300-800 -@import '@fontsource-variable/open-sans'; +@import "@fontsource-variable/open-sans"; @import "sidebar"; @@ -25,6 +25,13 @@ @import "common/social"; @import "common/footer"; +:root { + --clr-primary-white: #fdfffc; + --clr-primary-black: #000000 ; + --clr-secondary-light-grey: #e8e9eb; + --clr-secondary-grey: #4d5359; +} + html, body { font-size: 16px; @@ -301,4 +308,17 @@ a.link { height: 35px; margin-right: 5px; } -} \ No newline at end of file +} + +.bg-clr-primary-white { + background-color: var(--clr-primary-white); +} + +.bg-clr-secondary-light-grey { + background-color: var(--clr-secondary-light-grey); +} + +.bg-image-noise { + background-image: url("/images/problems/bg-noise-sample.png"); + background-repeat: repeat; +} diff --git a/resources/assets/sass/project/problem/landing-page.scss b/resources/assets/sass/project/problem/landing-page.scss index bdc0b6c0..3e336d7d 100644 --- a/resources/assets/sass/project/problem/landing-page.scss +++ b/resources/assets/sass/project/problem/landing-page.scss @@ -1,34 +1,9 @@ -@import "bootstrap_4point6_custom_xxl"; - -// Supports weights 100-900 -@import '@fontsource-variable/noto-sans'; - -// Supports weights 300-800 -@import '@fontsource-variable/open-sans'; - -:root { - --clr-page-bg-clr-grey: #fdfffc; - --clr-primary-yellow: #f5ba16; - --primary-white: #fdfffc; - --primary-black: #000000 ; - --secondary-ochre: #b08307; - --clr-secondary-light-grey: #e8e9eb; - --clr-secondary-grey: #4d5359; -} - -#app { - background-color: var(--clr-page-bg-clr-grey); -} +@import "bootstrap_4point6_custom_xxl"; // this page uses custom styles to support one more bootstrap size: xxl from 1260px and UP -.project-problem-page { +#project-problem-page { #problems-overview { - margin-bottom: 3.25rem; - } - - #problems-list { - background-image: url("/images/problems/bg-noise-sample.png"); - background-repeat: repeat; + padding-bottom: 3.25rem; } .project-title { @@ -103,7 +78,7 @@ box-shadow: 0 4px 4px 0 #00000040, 0 4px 4px 0 #00000040; svg { - color: var(--clr-primary-yellow); + color: var(--project-primary-color); } } } @@ -194,6 +169,7 @@ top: 1rem; right: 2rem; background-color: transparent; + color: var(--project-primary-color); &:hover { box-shadow: 0 4px 4px 0 #00000040; @@ -207,7 +183,7 @@ button.cta-btn { width: auto; padding: 1.9rem 4.3rem; - background-color: var(--clr-primary-yellow); + background-color: var(--project-primary-color); border: none; border-radius: 1.5rem; // 21px box-shadow: 0 4px 4px 0 #00000040; @@ -232,10 +208,10 @@ // from "sm" and UP @media (min-width: 576px) { - .project-problem-page { + #project-problem-page { #problems-overview { - margin-bottom: 7.5rem; + padding-bottom: 7.5rem; } .project-title { @@ -263,7 +239,7 @@ // from "md" and UP @media (min-width: 768px) { - .project-problem-page #problems-list h2 { + #project-problem-page #problems-list h2 { margin-top: 7.5rem; } } diff --git a/resources/lang/en/menu.php b/resources/lang/en/menu.php index bbd15af7..a7c2f192 100644 --- a/resources/lang/en/menu.php +++ b/resources/lang/en/menu.php @@ -16,6 +16,7 @@ 'my_account' => 'My Account', 'my_history' => 'My history', 'sign_out' => 'Sign out', + 'the_campaign' => 'The Campaign', ]; diff --git a/resources/views/components/share-circle-btn.blade.php b/resources/views/components/share-circle-btn.blade.php index db6ba085..3be07719 100644 --- a/resources/views/components/share-circle-btn.blade.php +++ b/resources/views/components/share-circle-btn.blade.php @@ -1,6 +1,6 @@ \ No newline at end of file diff --git a/resources/views/crowdsourcing-project/partials/navbar.blade.php b/resources/views/crowdsourcing-project/partials/navbar.blade.php index 23567446..09e2d9af 100644 --- a/resources/views/crowdsourcing-project/partials/navbar.blade.php +++ b/resources/views/crowdsourcing-project/partials/navbar.blade.php @@ -19,6 +19,11 @@
    + @if(isset($viewModel->project)) +
  • + {{ __("menu.the_campaign")}} +
    • + @endif @if(!isset($onErrorPage)) @include("partials.login-menu-options") @endif diff --git a/resources/views/crowdsourcing-project/problems/landing-page.blade.php b/resources/views/crowdsourcing-project/problems/landing-page.blade.php index 987fb9d5..f4103006 100644 --- a/resources/views/crowdsourcing-project/problems/landing-page.blade.php +++ b/resources/views/crowdsourcing-project/problems/landing-page.blade.php @@ -3,7 +3,7 @@ @vite('resources/assets/sass/project/problem/landing-page.scss') @@ -11,15 +11,15 @@ @section('content') -
    +
    @include('partials.flash-messages-and-errors') -
    +
    @include('crowdsourcing-project.problems.partials.problems-overview')
    -
    +
    @include('crowdsourcing-project.problems.partials.problems-list')
    From 9cb178bb716a0c2544c097793f9bbb0f18ded29c Mon Sep 17 00:00:00 2001 From: Kostas Papandreou Date: Mon, 14 Oct 2024 12:19:17 +0300 Subject: [PATCH 3/7] IP-137: Implemented new design of the questionnaire landing page --- .../questionnaire/QuestionnaireDisplay.vue | 20 ++- resources/assets/sass/common.scss | 48 ++++++++ .../questionnaire-page.blade.php | 116 ++++++++++++------ 3 files changed, 139 insertions(+), 45 deletions(-) diff --git a/resources/assets/js/vue-components/questionnaire/QuestionnaireDisplay.vue b/resources/assets/js/vue-components/questionnaire/QuestionnaireDisplay.vue index 550b32e2..fa4d94fa 100644 --- a/resources/assets/js/vue-components/questionnaire/QuestionnaireDisplay.vue +++ b/resources/assets/js/vue-components/questionnaire/QuestionnaireDisplay.vue @@ -19,14 +19,24 @@

    -
    -
    - {{ +
    +
    + {{ + trans("questionnaire.sign_in") + }} +
    +
    + +
    +
    +
    +
    + {{ trans("questionnaire.sign_in") }}
    -
    - +
    +
    diff --git a/resources/assets/sass/common.scss b/resources/assets/sass/common.scss index 786d928d..74ca025c 100644 --- a/resources/assets/sass/common.scss +++ b/resources/assets/sass/common.scss @@ -322,3 +322,51 @@ a.link { background-image: url("/images/problems/bg-noise-sample.png"); background-repeat: repeat; } + +.btn.btn-primary.call-to-action { + background-color: var(--project-primary-color); + color: black; + box-shadow: 0 4px 4px rgba(0, 0, 0, 0.25); + border: none; + padding: 25px 30px; + font-size: 20px; + font-weight: 600; + line-height: 25px; + + &:hover { + box-shadow: + 0 4px 4px rgba(0, 0, 0, 0.25), + 0 4px 4px rgba(0, 0, 0, 0.25); + } + + &:focus, + &:focus-visible { + outline: 4px solid black; + box-shadow: + 0 4px 4px rgba(0, 0, 0, 0.25), + 0 4px 4px rgba(0, 0, 0, 0.25); + } +} +.btn.btn-outline-primary.call-to-action { + background-color: transparent; + color: black; + outline: 2px solid black; + border: none; + padding: 25px 30px; + font-size: 20px; + font-weight: 600; + line-height: 25px; + + &:hover, + &:active, + &:not(:disabled):not(.disabled):active, + &:focus, + &:focus-visible { + background-color: transparent !important; + color: black; + outline: 4px solid black; + box-shadow: + 0 4px 4px rgba(0, 0, 0, 0.25), + 0 4px 4px rgba(0, 0, 0, 0.25); + } +} diff --git a/resources/views/questionnaire/questionnaire-page.blade.php b/resources/views/questionnaire/questionnaire-page.blade.php index e1a89b4f..3698cb8f 100644 --- a/resources/views/questionnaire/questionnaire-page.blade.php +++ b/resources/views/questionnaire/questionnaire-page.blade.php @@ -1,54 +1,90 @@ @php use Illuminate\Support\Facades\Auth; @endphp + @extends('crowdsourcing-project.layout') +@push('css') + +@endpush + @section('content') -
    -
    -
    -

    {{$viewModel->questionnaire->fieldsTranslation->title}}

    -
    -
    - @if($viewModel->shouldShowQuestionnaireDescription()) -
    -
    -
    -
    -
    {!! $viewModel->questionnaire->fieldsTranslation->description !!}
    -
    + +
    + + @include('partials.flash-messages-and-errors') + +
    +
    +
    +
    +

    {{$viewModel->questionnaire->fieldsTranslation->title}}

    + @if($viewModel->shouldShowQuestionnaireDescription()) +
    +
    +
    +
    +

    {!! $viewModel->questionnaire->fieldsTranslation->description !!}

    +
    +
    +
    +
    +
    + @endif + @if ($viewModel->shouldShowQuestionnaireStatisticsLink()) +
    +
    +

    {{ __("questionnaire.check_what_other_respondents")}} + {{ __("questionnaire.here")}}. +

    +
    +
    + @endif
    -
    - @endif - @if ($viewModel->shouldShowQuestionnaireStatisticsLink()) -
    -
    -
    {{ __("questionnaire.check_what_other_respondents")}} - {{ __("questionnaire.here")}}.
    +
    + +
    +
    +
    +
    + + +
    -
    - @endif -
    -
    -
    - - -
    +
    + +
    + + @if (App::environment('local')) +
    +
    +
    xs (default)
    +
    sm
    +
    md
    +
    lg
    +
    xl
    +
    custom_xxl
    -
    + @endif + @endsection + @push('scripts') @vite('resources/assets/js/questionnaire/questionnaire-page.js') -@endpush \ No newline at end of file +@endpush From afe4fe807110f1c96006d5c0c027c45391f9593a Mon Sep 17 00:00:00 2001 From: Kostas Papandreou Date: Mon, 14 Oct 2024 12:25:03 +0300 Subject: [PATCH 4/7] fixed broken css on home page --- resources/assets/sass/common.scss | 88 ++++++++++++++++--------------- 1 file changed, 46 insertions(+), 42 deletions(-) diff --git a/resources/assets/sass/common.scss b/resources/assets/sass/common.scss index 74ca025c..fe6b9692 100644 --- a/resources/assets/sass/common.scss +++ b/resources/assets/sass/common.scss @@ -323,50 +323,54 @@ a.link { background-repeat: repeat; } -.btn.btn-primary.call-to-action { - background-color: var(--project-primary-color); - color: black; - box-shadow: 0 4px 4px rgba(0, 0, 0, 0.25); - border: none; - padding: 25px 30px; - font-size: 20px; - font-weight: 600; - line-height: 25px; +.project-layout { - &:hover { - box-shadow: - 0 4px 4px rgba(0, 0, 0, 0.25), - 0 4px 4px rgba(0, 0, 0, 0.25); - } - - &:focus, - &:focus-visible { - outline: 4px solid black; - box-shadow: - 0 4px 4px rgba(0, 0, 0, 0.25), - 0 4px 4px rgba(0, 0, 0, 0.25); + .btn.btn-primary.call-to-action { + background-color: var(--project-primary-color); + color: black; + box-shadow: 0 4px 4px rgba(0, 0, 0, 0.25); + border: none; + padding: 25px 30px; + font-size: 20px; + font-weight: 600; + line-height: 25px; + + &:hover { + box-shadow: + 0 4px 4px rgba(0, 0, 0, 0.25), + 0 4px 4px rgba(0, 0, 0, 0.25); + } + + &:focus, + &:focus-visible { + outline: 4px solid black; + box-shadow: + 0 4px 4px rgba(0, 0, 0, 0.25), + 0 4px 4px rgba(0, 0, 0, 0.25); + } } -} -.btn.btn-outline-primary.call-to-action { - background-color: transparent; - color: black; - outline: 2px solid black; - border: none; - padding: 25px 30px; - font-size: 20px; - font-weight: 600; - line-height: 25px; - - &:hover, - &:active, - &:not(:disabled):not(.disabled):active, - &:focus, - &:focus-visible { - background-color: transparent !important; + + .btn.btn-outline-primary.call-to-action { + background-color: transparent; color: black; - outline: 4px solid black; - box-shadow: - 0 4px 4px rgba(0, 0, 0, 0.25), - 0 4px 4px rgba(0, 0, 0, 0.25); + outline: 2px solid black; + border: none; + padding: 25px 30px; + font-size: 20px; + font-weight: 600; + line-height: 25px; + + &:hover, + &:active, + &:not(:disabled):not(.disabled):active, + &:focus, + &:focus-visible { + background-color: transparent !important; + color: black; + outline: 4px solid black; + box-shadow: + 0 4px 4px rgba(0, 0, 0, 0.25), + 0 4px 4px rgba(0, 0, 0, 0.25); + } } } From 36761569a52209d7336b51e33611f0a576ef0d5d Mon Sep 17 00:00:00 2001 From: Paul Isaris Date: Mon, 14 Oct 2024 12:43:21 +0300 Subject: [PATCH 5/7] IP-174: Added tests for Project Landing page (show correct CTA for each scenario) --- .../lkp/QuestionnaireTypeLkp.php | 15 + .../Problem/CrowdSourcingProjectProblem.php | 2 +- ...urcingProjectProblemTranslationFactory.php | 3 +- .../Questionnaire/QuestionnaireFactory.php | 6 +- database/seeders/QuestionnaireSeeder.php | 5 +- database/seeders/QuestionnaireTypesSeeder.php | 5 +- .../partials/motto.blade.php | 84 +-- .../CrowdSourcingProjectControllerTest.php | 2 +- .../CrowdSourcingProjectLandingPageTest.php | 574 ++++++++++++++++++ 9 files changed, 652 insertions(+), 44 deletions(-) create mode 100644 app/BusinessLogicLayer/lkp/QuestionnaireTypeLkp.php rename tests/Feature/Controllers/{ => CrowdSourcingProject}/CrowdSourcingProjectControllerTest.php (99%) create mode 100644 tests/Feature/Controllers/CrowdSourcingProject/CrowdSourcingProjectLandingPageTest.php diff --git a/app/BusinessLogicLayer/lkp/QuestionnaireTypeLkp.php b/app/BusinessLogicLayer/lkp/QuestionnaireTypeLkp.php new file mode 100644 index 00000000..56f346f8 --- /dev/null +++ b/app/BusinessLogicLayer/lkp/QuestionnaireTypeLkp.php @@ -0,0 +1,15 @@ + $this->faker->paragraph, ]; } - -} \ No newline at end of file +} diff --git a/database/factories/Questionnaire/QuestionnaireFactory.php b/database/factories/Questionnaire/QuestionnaireFactory.php index 1f50e787..91dc43dd 100644 --- 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/database/seeders/QuestionnaireSeeder.php b/database/seeders/QuestionnaireSeeder.php index 66595ca3..fc84c8b5 100644 --- 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 index f2c2814e..302f08e6 100644 --- 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) { diff --git a/resources/views/crowdsourcing-project/partials/motto.blade.php b/resources/views/crowdsourcing-project/partials/motto.blade.php index 8e8be160..18152249 100644 --- a/resources/views/crowdsourcing-project/partials/motto.blade.php +++ b/resources/views/crowdsourcing-project/partials/motto.blade.php @@ -24,44 +24,60 @@ class="text text-center pt-5">{!! $viewModel->project->currentTranslation->motto @if($viewModel->questionnaire) {{-- USER RESPONDED TO THE QUESTIONNAIRE --}} @if($viewModel->userResponse) -
    -

    - @if(!$viewModel->thankYouMode) - {{ __("questionnaire.already_answered") }} - @endif - {{ __("questionnaire.thank_you_for_your_response") }} + @if($viewModel->projectHasPublishedProblems && !$viewModel->thankYouMode) + + {{__("project-problems.project_landing_page_problems_action_button")}} + + @else +
    +

    + @if(!$viewModel->thankYouMode) + {{ __("questionnaire.already_answered") }} + @endif + {{ __("questionnaire.thank_you_for_your_response") }} - {{-- IF HE HAS RESPONDEDED TO THE FEEDBACK ALREADY, DISPLAY THE TITLE TO INVITE TO SHARE ON SOCIAL--}} - @if (!$viewModel->displayFeedbackQuestionnaire() && $viewModel->shareUrlForFacebook!=null && $viewModel->shareUrlForTwitter!=null) - {{ __("questionnaire.invite_your_friends_to_answer")}}: - @endif -

    - @if($viewModel->thankYouMode && isset($badge)) -
    -
    -
    - @include('gamification.badge-single', ['badge' => $badge]) -
    -
    - @if(\Illuminate\Support\Facades\Auth::check()) -
    -
    -

    {{ __('questionnaire.visit_dashboard_and_invite') }}

    + {{-- IF HE HAS RESPONDEDED TO THE FEEDBACK ALREADY, DISPLAY THE TITLE TO INVITE TO SHARE ON SOCIAL--}} + @if (!$viewModel->displayFeedbackQuestionnaire() && $viewModel->shareUrlForFacebook!=null && $viewModel->shareUrlForTwitter!=null) + {{ __("questionnaire.invite_your_friends_to_answer") }}: + @endif +

    + @if($viewModel->thankYouMode && isset($badge)) +
    +
    +
    + @include('gamification.badge-single', ['badge' => $badge])
    -
    -
    - - {{ __("menu.my_dashboard") }} - + @if(\Illuminate\Support\Facades\Auth::check()) +
    +
    +

    {{ __('questionnaire.visit_dashboard_and_invite') }}

    +
    -
    - @endif -
    - @endif -
    -
    +
    +
    + @if($viewModel->projectHasPublishedProblems) + + {{__("project-problems.project_landing_page_problems_action_button")}} + + @else + + {{ __("menu.my_dashboard") }} + + @endif +
    +
    + @endif +
    + @endif +
    +
    + @endif {{-- IF HE HAS NOT RESPONDEDED TO THE FEEDBACK, INVITE HIM TO DO SO--}} @if ($viewModel->displayFeedbackQuestionnaire())
    diff --git a/tests/Feature/Controllers/CrowdSourcingProjectControllerTest.php b/tests/Feature/Controllers/CrowdSourcingProject/CrowdSourcingProjectControllerTest.php similarity index 99% rename from tests/Feature/Controllers/CrowdSourcingProjectControllerTest.php rename to tests/Feature/Controllers/CrowdSourcingProject/CrowdSourcingProjectControllerTest.php index d20b8a5a..3f459dc7 100644 --- a/tests/Feature/Controllers/CrowdSourcingProjectControllerTest.php +++ b/tests/Feature/Controllers/CrowdSourcingProject/CrowdSourcingProjectControllerTest.php @@ -1,6 +1,6 @@ has(UserRole::factory()->state(['role_id' => UserRolesLkp::REGISTERED_USER])) + ->create(); + $this->be($user); + + // Create a Crowd Sourcing Project (Campaign) + $project = CrowdSourcingProject::factory()->create(); + + // Create some Problems and attach them to the Campaign + $problems = CrowdSourcingProjectProblem::factory(3)->create([ + 'project_id' => $project->id, + ]); + + // Create a Problem Translation for each Problem + foreach ($problems as $problem) { + CrowdSourcingProjectProblemTranslation::factory()->create([ + 'problem_id' => $problem->id, + ]); + } + + // When the user navigates in the Project Campaign page + $response = $this->get(route('project.landing-page', ['locale' => 'en', 'project_slug' => $project->slug])); + + // We need to assert that the page has the Problems Call-to-Action (CTA) button + $response->assertSee('See all problems'); + } + + /** + * @test + * + * @group crowd-sourcing-project + * + * Test Scenario 2: + * GIVEN that a Project Campaign does have an active Questionnaire + * + * AND there exist published Problems associated with the Project , + * + * WHEN the user navigates in the Project Campaign page, + * + * THEN the user should see the CTA to answer the Questionnaire + * @return void + */ + public function test_user_should_see_cta_for_questionnaire() { + // Given that a registered user has responded to the questionnaire + $user = User::factory() + ->has(UserRole::factory()->state(['role_id' => UserRolesLkp::REGISTERED_USER])) + ->create(); + $this->be($user); + + // Create a Crowd Sourcing Project (Campaign) + $project = CrowdSourcingProject::factory()->create(); + + // Create some Problems and attach them to the Campaign + $problems = CrowdSourcingProjectProblem::factory(3)->create([ + 'project_id' => $project->id, + ]); + + // Create a Problem Translation for each Problem + foreach ($problems as $problem) { + CrowdSourcingProjectProblemTranslation::factory()->create([ + 'problem_id' => $problem->id, + ]); + } + + // Create a Questionnaire for the Project + $questionnaire = Questionnaire::factory()->create([ + 'project_id' => $project->id, + 'status_id' => QuestionnaireStatusLkp::PUBLISHED, + ]); + + // When the user navigates in the Project Campaign page + $response = $this->get(route('project.landing-page', ['locale' => 'en', 'project_slug' => $project->slug])); + + // We need to assert that the page has the Questionnaire Call-to-Action (CTA) button + $response->assertSee('Answer the questionnaire'); + } + + /** + * @test + * + * @group crowd-sourcing-project + * + * Test Scenario 3: + * GIVEN that a Project Campaign does have an active Questionnaire + * + * AND there exist published Problems associated with the Project , + * + * AND the user has already answered the Questionnaire + * + * WHEN the user navigates in the Project Campaign page, + * + * THEN the user should see the CTA to contribute to the Problems campaign + * @return void + */ + public function test_user_should_see_cta_for_problems_campaign_page_after_answering_questionnaire() { + // Given that a registered user has responded to the questionnaire + $user = User::factory() + ->has(UserRole::factory()->state(['role_id' => UserRolesLkp::REGISTERED_USER])) + ->create(); + $this->be($user); + + // Create a Crowd Sourcing Project (Campaign) + $project = CrowdSourcingProject::factory()->create(); + + // Create some Problems and attach them to the Campaign + $problems = CrowdSourcingProjectProblem::factory(3)->create([ + 'project_id' => $project->id, + ]); + + // Create a Problem Translation for each Problem + foreach ($problems as $problem) { + CrowdSourcingProjectProblemTranslation::factory()->create([ + 'problem_id' => $problem->id, + ]); + } + + // Create a Questionnaire for the Project + $questionnaire = Questionnaire::factory()->create([ + 'project_id' => $project->id, + 'status_id' => QuestionnaireStatusLkp::PUBLISHED, + ]); + + // Create a response for the Questionnaire + $questionnaire_response = QuestionnaireResponse::factory()->create([ + 'questionnaire_id' => $questionnaire->id, + 'user_id' => $user->id, + ]); + + // When the user navigates in the Project Campaign page + $response = $this->get(route('project.landing-page', ['locale' => 'en', 'project_slug' => $project->slug])); + + // We need to assert that the page has the Problems Call-to-Action (CTA) button + $response->assertSee('See all problems'); + } + + /** + * @test + * + * @group crowd-sourcing-project + * + * Test Scenario 4: + * GIVEN that a Project Campaign has a finalized and a draft Questionnaire + * + * AND there exist published Problems associated with the Project , + * + * AND the user has already answered the finalized Questionnaire + * + * WHEN the user navigates in the Project Campaign page, + * + * THEN the user should see the CTA to contribute to the Problems campaign + * @return void + */ + public function test_user_should_see_cta_for_problems_campaign_page_after_answering_completed_questionnaire() { + // Given that a registered user has responded to the questionnaire + $user = User::factory() + ->has(UserRole::factory()->state(['role_id' => UserRolesLkp::REGISTERED_USER])) + ->create(); + $this->be($user); + + // Create a Crowd Sourcing Project (Campaign) + $project = CrowdSourcingProject::factory()->create(); + + // Create some Problems and attach them to the Campaign + $problems = CrowdSourcingProjectProblem::factory(3)->create([ + 'project_id' => $project->id, + ]); + + // Create a Problem Translation for each Problem + foreach ($problems as $problem) { + CrowdSourcingProjectProblemTranslation::factory()->create([ + 'problem_id' => $problem->id, + ]); + } + + // Create a Questionnaire for the Project + $questionnaire_finalized = Questionnaire::factory()->create([ + 'project_id' => $project->id, + 'status_id' => QuestionnaireStatusLkp::FINALIZED, + ]); + + $questionnaire_draft = Questionnaire::factory()->create([ + 'project_id' => $project->id, + 'status_id' => QuestionnaireStatusLkp::DRAFT, + ]); + + // Create a response for the Questionnaire + $questionnaire_response = QuestionnaireResponse::factory()->create([ + 'questionnaire_id' => $questionnaire_finalized->id, + 'user_id' => $user->id, + ]); + + // When the user navigates in the Project Campaign page + $response = $this->get(route('project.landing-page', ['locale' => 'en', 'project_slug' => $project->slug])); + + // We need to assert that the page has the Problems Call-to-Action (CTA) button + $response->assertSee('See all problems'); + } + + /** + * @test + * + * @group crowd-sourcing-project + * + * Test Scenario 5: + * GIVEN that a Project Campaign has a finalized and a draft Questionnaire + * + * AND there exist published Problems associated with the Project , + * + * AND the user has not answered the finalized Questionnaire + * + * WHEN the user navigates in the Project Campaign page, + * + * THEN the user should see the CTA to contribute to the Problems campaign + * @return void + */ + public function test_user_should_see_cta_for_problems_campaign_page_without_answering_completed_questionnaire() { + // Given that a registered user has responded to the questionnaire + $user = User::factory() + ->has(UserRole::factory()->state(['role_id' => UserRolesLkp::REGISTERED_USER])) + ->create(); + $this->be($user); + + // Create a Crowd Sourcing Project (Campaign) + $project = CrowdSourcingProject::factory()->create(); + + // Create some Problems and attach them to the Campaign + $problems = CrowdSourcingProjectProblem::factory(3)->create([ + 'project_id' => $project->id, + ]); + + // Create a Problem Translation for each Problem + foreach ($problems as $problem) { + CrowdSourcingProjectProblemTranslation::factory()->create([ + 'problem_id' => $problem->id, + ]); + } + + // Create a Questionnaire for the Project + $questionnaire_finalized = Questionnaire::factory()->create([ + 'project_id' => $project->id, + 'status_id' => QuestionnaireStatusLkp::FINALIZED, + ]); + + $questionnaire_draft = Questionnaire::factory()->create([ + 'project_id' => $project->id, + 'status_id' => QuestionnaireStatusLkp::DRAFT, + ]); + + // When the user navigates in the Project Campaign page + $response = $this->get(route('project.landing-page', ['locale' => 'en', 'project_slug' => $project->slug])); + + // We need to assert that the page has the Questionnaire Call-to-Action (CTA) button + $response->assertSee('Answer the questionnaire'); + } + + /** + * @test + * + * @group crowd-sourcing-project + * + * Test Scenario 6: + * GIVEN that a Project Campaign has a finalized and a draft Questionnaire + * + * AND there exist only unpublished Problems associated with the Project, + * + * AND the Project has an external link, + * + * AND the user has not answered the finalized Questionnaire + * + * WHEN the user navigates in the Project Campaign page, + * + * THEN the user should see the CTA for the external link of the Project + * @return void + */ + public function test_user_should_see_cta_for_external_link_without_answering_completed_questionnaire() { + // Given that a registered user has responded to the questionnaire + $user = User::factory() + ->has(UserRole::factory()->state(['role_id' => UserRolesLkp::REGISTERED_USER])) + ->create(); + $this->be($user); + + // Create a Crowd Sourcing Project (Campaign) + $project = CrowdSourcingProject::factory()->create([ + 'external_url' => 'https://www.example.com', + ]); + + // Create some Problems and attach them to the Campaign + $problems = CrowdSourcingProjectProblem::factory(3)->create([ + 'project_id' => $project->id, + 'status_id' => CrowdSourcingProjectProblemStatusLkp::UNPUBLISHED, + ]); + + // Create a Problem Translation for each Problem + foreach ($problems as $problem) { + CrowdSourcingProjectProblemTranslation::factory()->create([ + 'problem_id' => $problem->id, + ]); + } + + // Create a Questionnaire for the Project + $questionnaire_finalized = Questionnaire::factory()->create([ + 'project_id' => $project->id, + 'status_id' => QuestionnaireStatusLkp::FINALIZED, + ]); + + $questionnaire_draft = Questionnaire::factory()->create([ + 'project_id' => $project->id, + 'status_id' => QuestionnaireStatusLkp::DRAFT, + ]); + + // When the user navigates in the Project Campaign page + $response = $this->get(route('project.landing-page', ['locale' => 'en', 'project_slug' => $project->slug])); + + // We need to assert that the page has the external link Call-to-Action (CTA) button + $response->assertSee('Visit project’s site'); + } + + /** + * @test + * + * @group crowd-sourcing-project + * + * Test Scenario 7: + * GIVEN that a Project Campaign has a finalized and a draft Questionnaire + * + * AND there exist only unpublished Problems associated with the Project, + * + * AND the Project has an external link, + * + * And the Project has a published feedback questionnaire + * + * AND the user has not answered the finalized Questionnaire + * + * AND the user has not answered the feedback questionnaire + * + * WHEN the user navigates in the Project Campaign page, + * + * THEN the user should see the CTA for answering the feedback questionnaire + * @return void + */ + public function test_user_should_see_cta_for_feedback_questionnaire_without_answering_completed_questionnaire() { + // Given that a registered user has responded to the questionnaire + $user = User::factory() + ->has(UserRole::factory()->state(['role_id' => UserRolesLkp::REGISTERED_USER])) + ->create(); + $this->be($user); + + // Create a Crowd Sourcing Project (Campaign) + $project = CrowdSourcingProject::factory()->create([ + 'external_url' => 'https://www.example.com', + ]); + + // Create some Problems and attach them to the Campaign + $problems = CrowdSourcingProjectProblem::factory(3)->create([ + 'project_id' => $project->id, + 'status_id' => CrowdSourcingProjectProblemStatusLkp::UNPUBLISHED, + ]); + + // Create a Problem Translation for each Problem + foreach ($problems as $problem) { + CrowdSourcingProjectProblemTranslation::factory()->create([ + 'problem_id' => $problem->id, + ]); + } + + // Create a Questionnaire for the Project + $questionnaire_finalized = Questionnaire::factory()->create([ + 'project_id' => $project->id, + 'status_id' => QuestionnaireStatusLkp::FINALIZED, + ]); + + $questionnaire_draft = Questionnaire::factory()->create([ + 'project_id' => $project->id, + 'status_id' => QuestionnaireStatusLkp::DRAFT, + ]); + + // Create a feedback questionnaire for the Project + $feedback_questionnaire = Questionnaire::factory()->create([ + 'project_id' => $project->id, + 'status_id' => QuestionnaireStatusLkp::PUBLISHED, + 'type_id' => QuestionnaireTypeLkp::FEEDBACK_QUESTIONNAIRE, + ]); + + // When the user navigates in the Project Campaign page + $response = $this->get(route('project.landing-page', ['locale' => 'en', 'project_slug' => $project->slug])); + + // We need to assert that the page has the external link Call-to-Action (CTA) button + $response->assertSee(__('questionnaire.give_us_feedback')); + } + + /** + * @test + * + * @group crowd-sourcing-project + * + * Test Scenario 8: + * GIVEN that a Project Campaign has an active and a draft Questionnaire + * + * AND there exist only unpublished Problems associated with the Project, + * + * AND the Project has an external link, + * + * And the Project has a published feedback questionnaire + * + * AND the user has already answered the finalized Questionnaire + * + * AND the user has already answered the feedback questionnaire + * + * WHEN the user navigates in the Project Campaign page, + * + * THEN the user should see the CTA for visiting the external link of the Project + * @return void + */ + public function test_user_should_see_cta_for_external_link_after_answering_questionnaire_and_feedback_questionnaire() { + // Given that a registered user has responded to the questionnaire + $user = User::factory() + ->has(UserRole::factory()->state(['role_id' => UserRolesLkp::REGISTERED_USER])) + ->create(); + $this->be($user); + + // Create a Crowd Sourcing Project (Campaign) with an external link + $project = CrowdSourcingProject::factory()->create([ + 'external_url' => 'https://www.example.com', + ]); + + // Create some Problems and attach them to the Campaign + $problems = CrowdSourcingProjectProblem::factory(3)->create([ + 'project_id' => $project->id, + 'status_id' => CrowdSourcingProjectProblemStatusLkp::UNPUBLISHED, + ]); + + // Create a Problem Translation for each Problem + foreach ($problems as $problem) { + CrowdSourcingProjectProblemTranslation::factory()->create([ + 'problem_id' => $problem->id, + ]); + } + + // Create a Questionnaire for the Project + $questionnaire = Questionnaire::factory()->create([ + 'project_id' => $project->id, + 'status_id' => QuestionnaireStatusLkp::PUBLISHED, + ]); + + $questionnaire_draft = Questionnaire::factory()->create([ + 'project_id' => $project->id, + 'status_id' => QuestionnaireStatusLkp::DRAFT, + ]); + + // Create a response for the Questionnaire + $questionnaire_response = QuestionnaireResponse::factory()->create([ + 'questionnaire_id' => $questionnaire->id, + 'user_id' => $user->id, + ]); + + // Create a feedback questionnaire for the Project + $feedback_questionnaire = Questionnaire::factory()->create([ + 'project_id' => $project->id, + 'status_id' => QuestionnaireStatusLkp::PUBLISHED, + 'type_id' => QuestionnaireTypeLkp::FEEDBACK_QUESTIONNAIRE, + ]); + + // Create a response for the feedback Questionnaire + $feedback_questionnaire_response = QuestionnaireResponse::factory()->create([ + 'questionnaire_id' => $feedback_questionnaire->id, + 'user_id' => $user->id, + ]); + + // When the user navigates in the Project Campaign page + $response = $this->get(route('project.landing-page', ['locale' => 'en', 'project_slug' => $project->slug])); + + // We need to assert that the page has the external link Call-to-Action (CTA) button + $response->assertSee(__('questionnaire.visit_projects_site')); + } + + /** + * @test + * + * @group crowd-sourcing-project + * + * Test Scenario 9: + * GIVEN that a Project Campaign has an active Questionnaire + * + * AND there exist only unpublished Problems associated with the Project, + * + * AND the Project does not have an external link, + * + * And the Project does not have a feedback questionnaire + * + * AND the user has already answered the Questionnaire + * + * WHEN the user navigates in the Project Campaign page, + * + * THEN the user should see the message for sharing the questionnaire with friends + * @return void + */ + public function test_user_should_see_cta_for_sharing_questionnaire_after_answering_questionnaire() { + // Given that a registered user has responded to the questionnaire + $user = User::factory() + ->has(UserRole::factory()->state(['role_id' => UserRolesLkp::REGISTERED_USER])) + ->create(); + $this->be($user); + + // Create a Crowd Sourcing Project (Campaign) + $project = CrowdSourcingProject::factory()->create(); + + // Create some Problems and attach them to the Campaign + $problems = CrowdSourcingProjectProblem::factory(3)->create([ + 'project_id' => $project->id, + 'status_id' => CrowdSourcingProjectProblemStatusLkp::UNPUBLISHED, + ]); + + // Create a Problem Translation for each Problem + foreach ($problems as $problem) { + CrowdSourcingProjectProblemTranslation::factory()->create([ + 'problem_id' => $problem->id, + ]); + } + + // Create a Questionnaire for the Project + $questionnaire = Questionnaire::factory()->create([ + 'project_id' => $project->id, + 'status_id' => QuestionnaireStatusLkp::PUBLISHED, + ]); + + // Create a response for the Questionnaire + $questionnaire_response = QuestionnaireResponse::factory()->create([ + 'questionnaire_id' => $questionnaire->id, + 'user_id' => $user->id, + ]); + + // When the user navigates in the Project Campaign page + $response = $this->get(route('project.landing-page', ['locale' => 'en', 'project_slug' => $project->slug])); + + // We need to assert that the page has the external link Call-to-Action (CTA) button + $response->assertSee(__('questionnaire.invite_your_friends_to_answer')); + } +} From 4401ea4a630976d3118239eb156b4994234cfa54 Mon Sep 17 00:00:00 2001 From: Kostas Papandreou Date: Mon, 14 Oct 2024 14:15:09 +0300 Subject: [PATCH 6/7] IP-138: Implemented new design of the questionnaire page --- .../questionnaire/questionnaire-display.scss | 40 +++++++++++++++---- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/resources/assets/sass/questionnaire/questionnaire-display.scss b/resources/assets/sass/questionnaire/questionnaire-display.scss index a74f64f9..4b48e756 100644 --- a/resources/assets/sass/questionnaire/questionnaire-display.scss +++ b/resources/assets/sass/questionnaire/questionnaire-display.scss @@ -7,13 +7,33 @@ .sv-btn.sv-footer__next-btn, .sv-btn.sv-footer__prev-btn, .sv-btn.sv-footer__start-btn, - .sv_nav_btn { - background-color: $brand-primary; - border-radius: 3px; + .sv_nav_btn { + background-color: var(--project-primary-color); + color: black; + border-radius: 21px; + border: none; + width: 270px; + box-shadow: 0 4px 4px rgba(0, 0, 0, 0.25); + border: none; + padding: 25px 30px; font-size: 20px; - font-weight: 500; - line-height: 1.7em; - border: 2px solid white; + font-weight: 600; + line-height: 25px; + + &:hover { + box-shadow: + 0 4px 4px rgba(0, 0, 0, 0.25), + 0 4px 4px rgba(0, 0, 0, 0.25); + } + + &:focus, + &:focus-visible { + outline: 4px solid black; + box-shadow: + 0 4px 4px rgba(0, 0, 0, 0.25), + 0 4px 4px rgba(0, 0, 0, 0.25); + } + } .sv-btn.sv-footer__prev-btn { @@ -27,7 +47,7 @@ } .sv_main.sv_default_css .sv_body { - border-color: $brand-primary; + border-color: var(--project-primary-color); } .sv_main .sv_body { @@ -126,3 +146,9 @@ font-weight: bold; } } + +.sv-action-bar.sv-action-bar--default-size-mode.sv_nav { + margin: 0 auto; + padding-left: 0; + overflow: visible; +} From d3fc74d242c3f2436261cd4eb72446fcbc6b716f Mon Sep 17 00:00:00 2001 From: Paul Isaris Date: Tue, 15 Oct 2024 11:10:53 +0300 Subject: [PATCH 7/7] IP-176: As an administrator, I can set the text color of the buttons in the Project Landing page (and it's derivatives) so that each button can have a special bg color and text color --- .../CrowdSourcingProjectManager.php | 5 +++- .../CrowdSourcingProject.php | 5 +++- .../CrowdSourcingProjectFactory.php | 1 + ..._text_color_to_crowd_sourcing_projects.php | 25 +++++++++++++++++ .../CrowdSourcingProjectColorsSeeder.php | 9 +----- database/seeders/DefaultProjectSeeder.php | 9 ++++-- resources/assets/sass/common.scss | 2 +- .../assets/sass/project/landing-page.scss | 4 +-- .../sass/project/problem/landing-page.scss | 5 ++-- .../questionnaire/questionnaire-display.scss | 2 +- .../projects/create-edit/form-page.blade.php | 14 ++++++---- .../partials/landing-page.blade.php | 28 +++++++++++++++++-- .../landing-page.blade.php | 4 +-- .../problems/landing-page.blade.php | 2 +- .../project-unavailable.blade.php | 5 ++-- .../partials/menu.blade.php | 4 +-- .../questionnaire-page.blade.php | 1 + .../thanks_for_responding.blade.php | 5 ++-- vite.config.mjs | 1 + 19 files changed, 93 insertions(+), 38 deletions(-) create mode 100644 database/migrations/2024_10_15_102802_add_lp_btn_text_color_to_crowd_sourcing_projects.php diff --git a/app/BusinessLogicLayer/CrowdSourcingProject/CrowdSourcingProjectManager.php b/app/BusinessLogicLayer/CrowdSourcingProject/CrowdSourcingProjectManager.php index 3432d2f7..b2f02d1b 100644 --- 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/Models/CrowdSourcingProject/CrowdSourcingProject.php b/app/Models/CrowdSourcingProject/CrowdSourcingProject.php index 01e12767..7b6ec975 100644 --- 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/database/factories/CrowdSourcingProject/CrowdSourcingProjectFactory.php b/database/factories/CrowdSourcingProject/CrowdSourcingProjectFactory.php index 8d48db76..215a80a8 100644 --- 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/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 new file mode 100644 index 00000000..9ad33283 --- /dev/null +++ b/database/migrations/2024_10_15_102802_add_lp_btn_text_color_to_crowd_sourcing_projects.php @@ -0,0 +1,25 @@ +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/CrowdSourcingProjectColorsSeeder.php b/database/seeders/CrowdSourcingProjectColorsSeeder.php index 188ddd94..292d8f39 100644 --- 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/DefaultProjectSeeder.php b/database/seeders/DefaultProjectSeeder.php index 93d52209..7eb248bf 100644 --- 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/resources/assets/sass/common.scss b/resources/assets/sass/common.scss index fe6b9692..c586db43 100644 --- a/resources/assets/sass/common.scss +++ b/resources/assets/sass/common.scss @@ -327,7 +327,7 @@ a.link { .btn.btn-primary.call-to-action { background-color: var(--project-primary-color); - color: black; + color: var(--btn-text-color); box-shadow: 0 4px 4px rgba(0, 0, 0, 0.25); border: none; padding: 25px 30px; diff --git a/resources/assets/sass/project/landing-page.scss b/resources/assets/sass/project/landing-page.scss index d5d3324c..4af6867f 100644 --- a/resources/assets/sass/project/landing-page.scss +++ b/resources/assets/sass/project/landing-page.scss @@ -1384,7 +1384,7 @@ footer { .project-layout a.btn { background-color: var(--project-primary-color); - color: black; + color: var(--btn-text-color); } .project-layout { @@ -1395,7 +1395,7 @@ footer { &:not(:disabled):not(.disabled):active, &:not(:disabled):not(.disabled):active:focus { background-color: var(--project-primary-color); - color: black; + color: var(--btn-text-color); box-shadow: 0 4px 4px #00000040,0 4px 4px #00000040; } diff --git a/resources/assets/sass/project/problem/landing-page.scss b/resources/assets/sass/project/problem/landing-page.scss index 3e336d7d..ef0198d9 100644 --- a/resources/assets/sass/project/problem/landing-page.scss +++ b/resources/assets/sass/project/problem/landing-page.scss @@ -172,11 +172,11 @@ color: var(--project-primary-color); &:hover { - box-shadow: 0 4px 4px 0 #00000040; + box-shadow: 0 4px 4px 0 var(--btn-text-color); } &:focus-visible { - outline: 3px solid black; // bookmark - calculate in rem + outline: 3px solid var(--btn-text-color); // bookmark - calculate in rem } } @@ -184,6 +184,7 @@ width: auto; padding: 1.9rem 4.3rem; background-color: var(--project-primary-color); + color: var(--btn-text-color); border: none; border-radius: 1.5rem; // 21px box-shadow: 0 4px 4px 0 #00000040; diff --git a/resources/assets/sass/questionnaire/questionnaire-display.scss b/resources/assets/sass/questionnaire/questionnaire-display.scss index 4b48e756..7f1e9144 100644 --- a/resources/assets/sass/questionnaire/questionnaire-display.scss +++ b/resources/assets/sass/questionnaire/questionnaire-display.scss @@ -9,7 +9,7 @@ .sv-btn.sv-footer__start-btn, .sv_nav_btn { background-color: var(--project-primary-color); - color: black; + color: var(--btn-text-color); border-radius: 21px; border: none; width: 270px; diff --git a/resources/views/admin/projects/create-edit/form-page.blade.php b/resources/views/admin/projects/create-edit/form-page.blade.php index c7207f70..aa322792 100644 --- a/resources/views/admin/projects/create-edit/form-page.blade.php +++ b/resources/views/admin/projects/create-edit/form-page.blade.php @@ -72,12 +72,16 @@
    - +
    +
    +
    + +
    +
    +
    - -
    @endsection diff --git a/resources/views/admin/projects/create-edit/partials/landing-page.blade.php b/resources/views/admin/projects/create-edit/partials/landing-page.blade.php index 23c9dfa3..689d8bf2 100644 --- a/resources/views/admin/projects/create-edit/partials/landing-page.blade.php +++ b/resources/views/admin/projects/create-edit/partials/landing-page.blade.php @@ -56,7 +56,6 @@ class="red">*)
+
+ +
+
+ +
+
+
@@ -202,7 +224,7 @@ class="icheck-input" type="checkbox" name="banner_title" class="form-control" value="{{ old('banner_title') ? old('banner_title') : - $viewModel->project->defaultTranslation->banner_title }}"/> + $viewModel->project->defaultTranslation->banner_title }}" /> {{ $errors->first('banner_title') }}
diff --git a/resources/views/crowdsourcing-project/landing-page.blade.php b/resources/views/crowdsourcing-project/landing-page.blade.php index 190bf96b..0893115d 100644 --- a/resources/views/crowdsourcing-project/landing-page.blade.php +++ b/resources/views/crowdsourcing-project/landing-page.blade.php @@ -2,8 +2,8 @@ @push('css') @endpush diff --git a/resources/views/crowdsourcing-project/problems/landing-page.blade.php b/resources/views/crowdsourcing-project/problems/landing-page.blade.php index f4103006..a3496f8a 100644 --- a/resources/views/crowdsourcing-project/problems/landing-page.blade.php +++ b/resources/views/crowdsourcing-project/problems/landing-page.blade.php @@ -4,7 +4,7 @@ @endpush diff --git a/resources/views/crowdsourcing-project/project-unavailable.blade.php b/resources/views/crowdsourcing-project/project-unavailable.blade.php index 12f6fa55..b493b41e 100644 --- a/resources/views/crowdsourcing-project/project-unavailable.blade.php +++ b/resources/views/crowdsourcing-project/project-unavailable.blade.php @@ -2,9 +2,8 @@ @push('css') @endpush diff --git a/resources/views/loggedin-environment/partials/menu.blade.php b/resources/views/loggedin-environment/partials/menu.blade.php index 2d21abc7..72e93204 100644 --- a/resources/views/loggedin-environment/partials/menu.blade.php +++ b/resources/views/loggedin-environment/partials/menu.blade.php @@ -33,12 +33,12 @@ class="nav-icon fa fa-question-circle "> @endcan @can("manage-platform") -
  • COMMUNICATION MANAGEMENT
    • +
  • COMMUNICATION
  • -

    MailChimp Integration

     +

    MailChimp

    • @endcan @can("manage-users") diff --git a/resources/views/questionnaire/questionnaire-page.blade.php b/resources/views/questionnaire/questionnaire-page.blade.php index 3698cb8f..bb53a2d6 100644 --- a/resources/views/questionnaire/questionnaire-page.blade.php +++ b/resources/views/questionnaire/questionnaire-page.blade.php @@ -6,6 +6,7 @@ @endpush diff --git a/resources/views/questionnaire/thanks_for_responding.blade.php b/resources/views/questionnaire/thanks_for_responding.blade.php index 773c9b08..4814cb2b 100644 --- a/resources/views/questionnaire/thanks_for_responding.blade.php +++ b/resources/views/questionnaire/thanks_for_responding.blade.php @@ -3,9 +3,8 @@ @push('css') @vite('resources/assets/sass/questionnaire/questionnaire-thanks.scss') diff --git a/vite.config.mjs b/vite.config.mjs index 3a47980f..083c0d01 100644 --- a/vite.config.mjs +++ b/vite.config.mjs @@ -14,6 +14,7 @@ export default defineConfig({ watch: { usePolling: true, // Useful for file changes in Docker }, + https: false, }, plugins: [ laravel({