diff --git a/app/Http/Livewire/ProjectProposal/ProjectProposalVoting.php b/app/Http/Livewire/ProjectProposal/ProjectProposalVoting.php index 5fcd3af1..cbbd326e 100644 --- a/app/Http/Livewire/ProjectProposal/ProjectProposalVoting.php +++ b/app/Http/Livewire/ProjectProposal/ProjectProposalVoting.php @@ -8,6 +8,7 @@ use App\Models\User; use App\Models\Vote; use Illuminate\Validation\Rule; use Livewire\Component; +use RalphJSmit\Laravel\SEO\Support\SEOData; class ProjectProposalVoting extends Component { @@ -49,6 +50,9 @@ class ProjectProposalVoting extends Component $this->vote->project_proposal_id = $this->projectProposal->id; $this->vote->value = false; } + if (!$this->fromUrl) { + $this->fromUrl = url()->previous(); + } } public function yes() @@ -102,6 +106,12 @@ class ProjectProposalVoting extends Component }) ->orderByDesc('votes_count') ->get(), + ])->layout('layouts.app', [ + 'SEOData' => new SEOData( + title: __('Project Proposal'), + description: __('Submit a project proposal and let the community vote on it through the elected voters. All other community members can also vote.'), + image: asset('img/voting.jpg') + ), ]); } } diff --git a/public/img/voting.jpg b/public/img/voting.jpg new file mode 100644 index 00000000..3424f4e4 Binary files /dev/null and b/public/img/voting.jpg differ diff --git a/resources/views/livewire/project-proposal/project-proposal-voting.blade.php b/resources/views/livewire/project-proposal/project-proposal-voting.blade.php index d1c38318..83aae448 100644 --- a/resources/views/livewire/project-proposal/project-proposal-voting.blade.php +++ b/resources/views/livewire/project-proposal/project-proposal-voting.blade.php @@ -19,29 +19,42 @@
-
- -
- - Yes, support it! - - - No, don't support it! - -
+
- - - +
+

{{ __('Description') }}

+
+ +
+ + {!! $projectProposal->description !!} + +
-
- +
+
+ + Yes, support it! + + + No, don't support it! + +
-
+ + +
+ +
+ + +
-
+ class="w-full" + > +
+
-
-
+
-
-
-

{{ __('Entitled voters') }}

+
+
+

{{ __('Entitled voters') }}

+
+ +
    + + @foreach($entitledVoters as $voter) + @php + $vote = $voter->votes->first(); + if (!$voter->votes->first()) { + $text = __('not voted yet'); + } elseif (!$vote->value) { + $text = __('Reason') . ': ' . $voter->votes->first()?->reason; + } + @endphp +
  • + +
    +

    + {{ $voter->name }} + @if($voter->votes->first()?->value) + {{ __('Yes') }} + @endif + @if($voter->votes->first() && !$voter->votes->first()?->value) + {{ __('No') }} + @endif +

    +

    + {{ $text ?? '' }} +

    +
    +
  • + @endforeach + +
-
    +
    +
    +

    {{ __('Other voters') }}

    +
    - @foreach($entitledVoters as $voter) - @php - $vote = $voter->votes->first(); - if (!$voter->votes->first()) { - $text = __('not voted yet'); - } elseif (!$vote->value) { - $text = __('Reason') . ': ' . $voter->votes->first()?->reason; - } - @endphp -
  • - -
    -

    - {{ $voter->name }} - @if($voter->votes->first()?->value) - {{ __('Yes') }} - @endif - @if($voter->votes->first() && !$voter->votes->first()?->value) - {{ __('No') }} - @endif -

    -

    - {{ $text ?? '' }} -

    -
    -
  • - @endforeach +
      -
    -
    + @foreach($otherVoters as $voter) + @php + $vote = $voter->votes->first(); + if (!$voter->votes->first()) { + $text = __('not voted yet'); + } elseif (!$vote->value) { + $text = __('Reason') . ': ' . $voter->votes->first()?->reason; + } + @endphp +
  • + +
    +

    + {{ $voter->name }} + @if($voter->votes->first()?->value) + {{ __('Yes') }} + @endif + @if($voter->votes->first() && !$voter->votes->first()?->value) + {{ __('No') }} + @endif +

    +

    + {{ $text ?? '' }} +

    +
    +
  • + @endforeach -
    -
    -

    {{ __('Other voters') }}

    +
-
    - - @foreach($otherVoters as $voter) - @php - $vote = $voter->votes->first(); - if (!$voter->votes->first()) { - $text = __('not voted yet'); - } elseif (!$vote->value) { - $text = __('Reason') . ': ' . $voter->votes->first()?->reason; - } - @endphp -
  • - -
    -

    - {{ $voter->name }} - @if($voter->votes->first()?->value) - {{ __('Yes') }} - @endif - @if($voter->votes->first() && !$voter->votes->first()?->value) - {{ __('No') }} - @endif -

    -

    - {{ $text ?? '' }} -

    -
    -
  • - @endforeach - -
-