diff --git a/app/Http/Livewire/Frontend/Header.php b/app/Http/Livewire/Frontend/Header.php index c8aec7ee..f14a7500 100644 --- a/app/Http/Livewire/Frontend/Header.php +++ b/app/Http/Livewire/Frontend/Header.php @@ -9,6 +9,7 @@ use App\Models\CourseEvent; use App\Models\LibraryItem; use App\Models\MeetupEvent; use App\Models\OrangePill; +use App\Models\ProjectProposal; use Illuminate\Support\Facades\Cookie; use Illuminate\Support\Facades\Route; use Livewire\Component; @@ -136,7 +137,7 @@ class Header extends Component ->orderByDesc('date') ->take(2) ->get(), - 'projectProposals' => [], + 'projectProposals' => ProjectProposal::query()->with(['votes'])->get(), 'cities' => City::query() ->select(['latitude', 'longitude']) ->get(), diff --git a/app/Http/Livewire/ProjectProposal/Form/ProjectProposalForm.php b/app/Http/Livewire/ProjectProposal/Form/ProjectProposalForm.php index 9e5382ad..6014d063 100644 --- a/app/Http/Livewire/ProjectProposal/Form/ProjectProposalForm.php +++ b/app/Http/Livewire/ProjectProposal/Form/ProjectProposalForm.php @@ -55,6 +55,12 @@ class ProjectProposalForm extends Component $this->validate(); $this->projectProposal->save(); + if ($this->image) { + $this->projectProposal->addMedia($this->image) + ->usingFileName(md5($this->image->getClientOriginalName()).'.'.$this->image->getClientOriginalExtension()) + ->toMediaCollection('main'); + } + return redirect($this->fromUrl); } diff --git a/resources/views/livewire/frontend/navigation/association.blade.php b/resources/views/livewire/frontend/navigation/association.blade.php index c2a1039c..a4e273b8 100644 --- a/resources/views/livewire/frontend/navigation/association.blade.php +++ b/resources/views/livewire/frontend/navigation/association.blade.php @@ -67,19 +67,20 @@
-
- {{ $item->name }} -
+
{{ __('This project requires') }}
{{ number_format($item->support_in_sats, 0, ',', '.') }} {{ __('sats') }}

- + {{ $item->name }}

- {{ $item->description }} + {{ __('Yes') }}: {{ $item->votes->where('value', 1)->count() }} / {{ __('No') }}: {{ $item->votes->where('value', 0)->count() }} +

+

+ {{ __('From') }}: {{ $item->user->name }}