@@ -64,7 +64,9 @@ |
||
| 64 | 64 | * |
| 65 | 65 | * @param $imageFile - the file to upload |
| 66 | 66 | * @param $imageName - the file name |
| 67 | - * @param $imageSubdir - the subdir in /storage/app/public/images/.. |
|
| 67 | + * @param string $imageSubdir - the subdir in /storage/app/public/images/.. |
|
| 68 | + * @param string $imageWidth |
|
| 69 | + * @param string $thumbWidth |
|
| 68 | 70 | * @return void |
| 69 | 71 | */ |
| 70 | 72 | public function uploadImageOnServer($imageFile, $imageName, $imageSubdir, $imageWidth, $thumbWidth) |
@@ -3,11 +3,11 @@ |
||
| 3 | 3 | namespace App\Http\Controllers; |
| 4 | 4 | |
| 5 | 5 | use App\User; |
| 6 | -use Illuminate\Support\Facades\Auth; |
|
| 6 | +use Illuminate\Foundation\Auth\Access\AuthorizesRequests; |
|
| 7 | 7 | use Illuminate\Foundation\Bus\DispatchesJobs; |
| 8 | -use Illuminate\Routing\Controller as BaseController; |
|
| 9 | 8 | use Illuminate\Foundation\Validation\ValidatesRequests; |
| 10 | -use Illuminate\Foundation\Auth\Access\AuthorizesRequests; |
|
| 9 | +use Illuminate\Routing\Controller as BaseController; |
|
| 10 | +use Illuminate\Support\Facades\Auth; |
|
| 11 | 11 | use Mcamara\LaravelLocalization\Facades\LaravelLocalization; |
| 12 | 12 | |
| 13 | 13 | class Controller extends BaseController |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | * Store a newly created resource in storage. |
| 49 | 49 | * |
| 50 | 50 | * @param \Illuminate\Http\Request $request |
| 51 | - * @return \Illuminate\Http\Response |
|
| 51 | + * @return \Illuminate\Http\RedirectResponse |
|
| 52 | 52 | */ |
| 53 | 53 | public function store(Request $request) |
| 54 | 54 | { |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | * |
| 97 | 97 | * @param \Illuminate\Http\Request $request |
| 98 | 98 | * @param \App\EventCategory $eventCategory |
| 99 | - * @return \Illuminate\Http\Response |
|
| 99 | + * @return \Illuminate\Http\RedirectResponse |
|
| 100 | 100 | */ |
| 101 | 101 | public function update(Request $request, EventCategory $eventCategory) |
| 102 | 102 | { |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | * Remove the specified resource from storage. |
| 115 | 115 | * |
| 116 | 116 | * @param \App\EventCategory $eventCategory |
| 117 | - * @return \Illuminate\Http\Response |
|
| 117 | + * @return \Illuminate\Http\RedirectResponse |
|
| 118 | 118 | */ |
| 119 | 119 | public function destroy(EventCategory $eventCategory) |
| 120 | 120 | { |
@@ -2,12 +2,12 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace App\Http\Controllers; |
| 4 | 4 | |
| 5 | -use Validator; |
|
| 6 | 5 | use App\EventCategory; |
| 7 | -use Illuminate\Support\Str; |
|
| 8 | 6 | use Illuminate\Http\Request; |
| 9 | 7 | use Illuminate\Support\Facades\DB; |
| 8 | +use Illuminate\Support\Str; |
|
| 10 | 9 | use Mcamara\LaravelLocalization\Facades\LaravelLocalization; |
| 10 | +use Validator; |
|
| 11 | 11 | |
| 12 | 12 | class EventCategoryController extends Controller |
| 13 | 13 | { |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | * Store a newly created resource in storage. |
| 46 | 46 | * |
| 47 | 47 | * @param \Illuminate\Http\Request $request |
| 48 | - * @return \Illuminate\Http\Response |
|
| 48 | + * @return \Illuminate\Http\RedirectResponse |
|
| 49 | 49 | */ |
| 50 | 50 | public function store(Request $request) |
| 51 | 51 | { |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | * Update the specified resource in storage. |
| 106 | 106 | * |
| 107 | 107 | * @param \Illuminate\Http\Request $request |
| 108 | - * @return \Illuminate\Http\Response |
|
| 108 | + * @return \Illuminate\Http\RedirectResponse |
|
| 109 | 109 | */ |
| 110 | 110 | public function update(Request $request) |
| 111 | 111 | { |
@@ -127,8 +127,8 @@ discard block |
||
| 127 | 127 | /** |
| 128 | 128 | * Remove the specified resource from storage. |
| 129 | 129 | * |
| 130 | - * @param \App\EventCategoryTranslation $eventCategoryTranslation |
|
| 131 | - * @return \Illuminate\Http\Response |
|
| 130 | + * @param \App\EventCategoryTranslation $eventCategoryTranslationId |
|
| 131 | + * @return \Illuminate\Http\RedirectResponse |
|
| 132 | 132 | */ |
| 133 | 133 | public function destroy($eventCategoryTranslationId) |
| 134 | 134 | { |
@@ -2,10 +2,10 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace App\Http\Controllers; |
| 4 | 4 | |
| 5 | -use Validator; |
|
| 6 | -use Illuminate\Support\Str; |
|
| 7 | -use Illuminate\Http\Request; |
|
| 8 | 5 | use App\EventCategoryTranslation; |
| 6 | +use Illuminate\Http\Request; |
|
| 7 | +use Illuminate\Support\Str; |
|
| 8 | +use Validator; |
|
| 9 | 9 | |
| 10 | 10 | class EventCategoryTranslationController extends Controller |
| 11 | 11 | { |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | * Store a newly created resource in storage. |
| 127 | 127 | * |
| 128 | 128 | * @param \Illuminate\Http\Request $request |
| 129 | - * @return \Illuminate\Http\Response |
|
| 129 | + * @return \Illuminate\Http\RedirectResponse |
|
| 130 | 130 | */ |
| 131 | 131 | public function store(Request $request) |
| 132 | 132 | { |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | * Display the specified resource. |
| 150 | 150 | * |
| 151 | 151 | * @param \App\Event $event |
| 152 | - * @param $firstRpDates |
|
| 152 | + * @param EventRepetition $firstRpDates |
|
| 153 | 153 | * @return \Illuminate\Http\Response |
| 154 | 154 | */ |
| 155 | 155 | public function show(Event $event, $firstRpDates) |
@@ -284,7 +284,7 @@ discard block |
||
| 284 | 284 | * |
| 285 | 285 | * @param \Illuminate\Http\Request $request |
| 286 | 286 | * @param \App\Event $event |
| 287 | - * @return \Illuminate\Http\Response |
|
| 287 | + * @return \Illuminate\Http\RedirectResponse |
|
| 288 | 288 | */ |
| 289 | 289 | public function update(Request $request, Event $event) |
| 290 | 290 | { |
@@ -306,7 +306,7 @@ discard block |
||
| 306 | 306 | * Remove the specified resource from storage. |
| 307 | 307 | * |
| 308 | 308 | * @param \App\Event $event |
| 309 | - * @return \Illuminate\Http\Response |
|
| 309 | + * @return \Illuminate\Http\RedirectResponse |
|
| 310 | 310 | */ |
| 311 | 311 | public function destroy(Event $event) |
| 312 | 312 | { |
@@ -383,10 +383,9 @@ discard block |
||
| 383 | 383 | * $dayOfTheWeek: 1|2|3|4|5|6|7 (MONDAY-SUNDAY) |
| 384 | 384 | * https://stackoverflow.com/questions/2045736/getting-all-dates-for-mondays-and-tuesdays-for-the-next-year. |
| 385 | 385 | * |
| 386 | - * @param \App\Event $event |
|
| 387 | 386 | * @param string $date |
| 388 | 387 | * @param int $dayOfTheWeek |
| 389 | - * @return void |
|
| 388 | + * @return boolean |
|
| 390 | 389 | */ |
| 391 | 390 | public function isWeekDay($date, $dayOfTheWeek) |
| 392 | 391 | { |
@@ -540,7 +539,7 @@ discard block |
||
| 540 | 539 | * Send the Misuse mail. |
| 541 | 540 | * |
| 542 | 541 | * @param \Illuminate\Http\Request $request |
| 543 | - * @return \Illuminate\Http\Response |
|
| 542 | + * @return \Illuminate\Http\RedirectResponse |
|
| 544 | 543 | */ |
| 545 | 544 | public function reportMisuse(Request $request) |
| 546 | 545 | { |
@@ -583,7 +582,7 @@ discard block |
||
| 583 | 582 | * Send the mail to the Organizer (from the event modal in the event show view). |
| 584 | 583 | * |
| 585 | 584 | * @param \Illuminate\Http\Request $request |
| 586 | - * @return \Illuminate\Http\Response |
|
| 585 | + * @return \Illuminate\Http\RedirectResponse |
|
| 587 | 586 | */ |
| 588 | 587 | public function mailToOrganizer(Request $request) |
| 589 | 588 | { |
@@ -612,7 +611,6 @@ discard block |
||
| 612 | 611 | /** |
| 613 | 612 | * Display the thank you view after the mail to the organizer is sent (called by /mailToOrganizer/sent route). |
| 614 | 613 | * |
| 615 | - * @param \App\Event $event |
|
| 616 | 614 | * @return \Illuminate\Http\Response |
| 617 | 615 | */ |
| 618 | 616 | public function mailToOrganizerSent() |
@@ -2,26 +2,26 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace App\Http\Controllers; |
| 4 | 4 | |
| 5 | -use App\User; |
|
| 6 | -use DateTime; |
|
| 7 | -use App\Event; |
|
| 8 | -use Validator; |
|
| 9 | -use DatePeriod; |
|
| 10 | 5 | use App\Country; |
| 11 | -use App\Teacher; |
|
| 12 | -use DateInterval; |
|
| 13 | -use App\Organizer; |
|
| 14 | -use App\EventVenue; |
|
| 6 | +use App\Event; |
|
| 15 | 7 | use App\EventCategory; |
| 16 | 8 | use App\EventRepetition; |
| 9 | +use App\EventVenue; |
|
| 10 | +use App\Mail\ContactOrganizer; |
|
| 17 | 11 | use App\Mail\ReportMisuse; |
| 18 | -use Illuminate\Support\Str; |
|
| 12 | +use App\Organizer; |
|
| 13 | +use App\Teacher; |
|
| 14 | +use App\User; |
|
| 15 | +use DateInterval; |
|
| 16 | +use DatePeriod; |
|
| 17 | +use DateTime; |
|
| 19 | 18 | use Illuminate\Http\Request; |
| 20 | -use App\Mail\ContactOrganizer; |
|
| 21 | -use Illuminate\Validation\Rule; |
|
| 22 | -use Illuminate\Support\Facades\DB; |
|
| 23 | 19 | use Illuminate\Support\Facades\Auth; |
| 20 | +use Illuminate\Support\Facades\DB; |
|
| 24 | 21 | use Illuminate\Support\Facades\Mail; |
| 22 | +use Illuminate\Support\Str; |
|
| 23 | +use Illuminate\Validation\Rule; |
|
| 24 | +use Validator; |
|
| 25 | 25 | |
| 26 | 26 | class EventController extends Controller |
| 27 | 27 | { |
@@ -58,7 +58,6 @@ discard block |
||
| 58 | 58 | /** |
| 59 | 59 | * Show the form for editing the specified resource. |
| 60 | 60 | * |
| 61 | - * @param \App\EventRepetition $eventCategory |
|
| 62 | 61 | * @return \Illuminate\Http\Response |
| 63 | 62 | */ |
| 64 | 63 | public function edit(EventRepetition $eventRepetition) |
@@ -88,7 +87,6 @@ discard block |
||
| 88 | 87 | /** |
| 89 | 88 | * Remove the specified resource from storage. |
| 90 | 89 | * |
| 91 | - * @param \App\EventCategory $eventCategory |
|
| 92 | 90 | * @return \Illuminate\Http\Response |
| 93 | 91 | */ |
| 94 | 92 | public function destroy(EventCategory $eventRepetition) |
@@ -2,16 +2,16 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace App\Http\Controllers; |
| 4 | 4 | |
| 5 | -use App\Event; |
|
| 6 | -use App\Country; |
|
| 7 | -use App\Teacher; |
|
| 5 | +use App\BackgroundImage; |
|
| 8 | 6 | use App\Continent; |
| 9 | -use App\EventVenue; |
|
| 7 | +use App\Country; |
|
| 8 | +use App\Event; |
|
| 10 | 9 | use App\EventCategory; |
| 11 | -use App\BackgroundImage; |
|
| 10 | +use App\EventVenue; |
|
| 11 | +use App\Http\Resources\Continent as ContinentResource; |
|
| 12 | +use App\Teacher; |
|
| 12 | 13 | use Illuminate\Http\Request; |
| 13 | 14 | use Illuminate\Support\Facades\Cache; |
| 14 | -use App\Http\Resources\Continent as ContinentResource; |
|
| 15 | 15 | |
| 16 | 16 | class EventSearchController extends Controller |
| 17 | 17 | { |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | * Store a newly created resource in storage. |
| 96 | 96 | * |
| 97 | 97 | * @param \Illuminate\Http\Request $request |
| 98 | - * @return \Illuminate\Http\Response |
|
| 98 | + * @return \Illuminate\Http\RedirectResponse |
|
| 99 | 99 | */ |
| 100 | 100 | public function store(Request $request) |
| 101 | 101 | { |
@@ -163,7 +163,7 @@ discard block |
||
| 163 | 163 | * |
| 164 | 164 | * @param \Illuminate\Http\Request $request |
| 165 | 165 | * @param \App\EventVenue $eventVenue |
| 166 | - * @return \Illuminate\Http\Response |
|
| 166 | + * @return \Illuminate\Http\RedirectResponse |
|
| 167 | 167 | */ |
| 168 | 168 | public function update(Request $request, EventVenue $eventVenue) |
| 169 | 169 | { |
@@ -186,7 +186,7 @@ discard block |
||
| 186 | 186 | * Remove the specified resource from storage. |
| 187 | 187 | * |
| 188 | 188 | * @param \App\EventVenue $eventVenue |
| 189 | - * @return \Illuminate\Http\Response |
|
| 189 | + * @return \Illuminate\Http\RedirectResponse |
|
| 190 | 190 | */ |
| 191 | 191 | public function destroy(EventVenue $eventVenue) |
| 192 | 192 | { |
@@ -201,7 +201,8 @@ discard block |
||
| 201 | 201 | /** |
| 202 | 202 | * Save the record on DB. |
| 203 | 203 | * |
| 204 | - * @param \App\Teacher $teacher |
|
| 204 | + * @param Request $request |
|
| 205 | + * @param EventVenue $eventVenue |
|
| 205 | 206 | * @return \Illuminate\Http\Response |
| 206 | 207 | */ |
| 207 | 208 | public function saveOnDb($request, $eventVenue) |
@@ -264,6 +265,7 @@ discard block |
||
| 264 | 265 | /** |
| 265 | 266 | * Return the Venue validator with all the defined constraint. |
| 266 | 267 | * |
| 268 | + * @param Request $request |
|
| 267 | 269 | * @return \Illuminate\Validation\Validator |
| 268 | 270 | */ |
| 269 | 271 | public function eventsVenueValidator($request) |
@@ -2,15 +2,15 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace App\Http\Controllers; |
| 4 | 4 | |
| 5 | -use App\User; |
|
| 6 | -use Validator; |
|
| 7 | 5 | use App\Country; |
| 8 | 6 | use App\EventVenue; |
| 9 | -use Illuminate\Support\Str; |
|
| 7 | +use App\User; |
|
| 10 | 8 | use Illuminate\Http\Request; |
| 11 | -use Illuminate\Support\Facades\DB; |
|
| 12 | 9 | use Illuminate\Support\Facades\Auth; |
| 13 | 10 | use Illuminate\Support\Facades\Cache; |
| 11 | +use Illuminate\Support\Facades\DB; |
|
| 12 | +use Illuminate\Support\Str; |
|
| 13 | +use Validator; |
|
| 14 | 14 | |
| 15 | 15 | class EventVenueController extends Controller |
| 16 | 16 | { |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | * Store a newly created resource in storage. |
| 78 | 78 | * |
| 79 | 79 | * @param \Illuminate\Http\Request $request |
| 80 | - * @return \Illuminate\Http\Response |
|
| 80 | + * @return \Illuminate\Http\RedirectResponse |
|
| 81 | 81 | */ |
| 82 | 82 | public function store(Request $request) |
| 83 | 83 | { |
@@ -136,7 +136,7 @@ discard block |
||
| 136 | 136 | * |
| 137 | 137 | * @param \Illuminate\Http\Request $request |
| 138 | 138 | * @param \App\Organizer $organizer |
| 139 | - * @return \Illuminate\Http\Response |
|
| 139 | + * @return \Illuminate\Http\RedirectResponse |
|
| 140 | 140 | */ |
| 141 | 141 | public function update(Request $request, Organizer $organizer) |
| 142 | 142 | { |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | * Remove the specified resource from storage. |
| 159 | 159 | * |
| 160 | 160 | * @param \App\Organizer $organizer |
| 161 | - * @return \Illuminate\Http\Response |
|
| 161 | + * @return \Illuminate\Http\RedirectResponse |
|
| 162 | 162 | */ |
| 163 | 163 | public function destroy(Organizer $organizer) |
| 164 | 164 | { |
@@ -210,7 +210,7 @@ discard block |
||
| 210 | 210 | * Store a newly created organizer from the create event view modal in storage. |
| 211 | 211 | * |
| 212 | 212 | * @param \Illuminate\Http\Request $request |
| 213 | - * @return \Illuminate\Http\Response |
|
| 213 | + * @return \Illuminate\Http\RedirectResponse |
|
| 214 | 214 | */ |
| 215 | 215 | public function storeFromModal(Request $request) |
| 216 | 216 | { |
@@ -2,13 +2,13 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace App\Http\Controllers; |
| 4 | 4 | |
| 5 | -use App\User; |
|
| 6 | -use Validator; |
|
| 7 | 5 | use App\Organizer; |
| 8 | -use Illuminate\Support\Str; |
|
| 6 | +use App\User; |
|
| 9 | 7 | use Illuminate\Http\Request; |
| 10 | -use Illuminate\Support\Facades\DB; |
|
| 11 | 8 | use Illuminate\Support\Facades\Auth; |
| 9 | +use Illuminate\Support\Facades\DB; |
|
| 10 | +use Illuminate\Support\Str; |
|
| 11 | +use Validator; |
|
| 12 | 12 | |
| 13 | 13 | class OrganizerController extends Controller |
| 14 | 14 | { |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | * Store a newly created resource in storage. |
| 113 | 113 | * |
| 114 | 114 | * @param \Illuminate\Http\Request $request |
| 115 | - * @return \Illuminate\Http\Response |
|
| 115 | + * @return \Illuminate\Http\RedirectResponse |
|
| 116 | 116 | */ |
| 117 | 117 | public function store(Request $request) |
| 118 | 118 | { |
@@ -198,7 +198,7 @@ discard block |
||
| 198 | 198 | * |
| 199 | 199 | * @param \Illuminate\Http\Request $request |
| 200 | 200 | * @param \App\Teacher $teacher |
| 201 | - * @return \Illuminate\Http\Response |
|
| 201 | + * @return \Illuminate\Http\RedirectResponse |
|
| 202 | 202 | */ |
| 203 | 203 | public function update(Request $request, Teacher $teacher) |
| 204 | 204 | { |
@@ -220,7 +220,7 @@ discard block |
||
| 220 | 220 | * Remove the specified resource from storage. |
| 221 | 221 | * |
| 222 | 222 | * @param \App\Teacher $teacher |
| 223 | - * @return \Illuminate\Http\Response |
|
| 223 | + * @return \Illuminate\Http\RedirectResponse |
|
| 224 | 224 | */ |
| 225 | 225 | public function destroy(Teacher $teacher) |
| 226 | 226 | { |
@@ -236,6 +236,7 @@ discard block |
||
| 236 | 236 | * Save the record on DB. |
| 237 | 237 | * |
| 238 | 238 | * @param \App\Teacher $teacher |
| 239 | + * @param Request $request |
|
| 239 | 240 | * @return \Illuminate\Http\Response |
| 240 | 241 | */ |
| 241 | 242 | public function saveOnDb($request, $teacher) |
@@ -293,7 +294,7 @@ discard block |
||
| 293 | 294 | * Store a newly created teacher from the create event view modal in storage. |
| 294 | 295 | * |
| 295 | 296 | * @param \Illuminate\Http\Request $request |
| 296 | - * @return \Illuminate\Http\Response |
|
| 297 | + * @return \Illuminate\Http\RedirectResponse |
|
| 297 | 298 | */ |
| 298 | 299 | public function storeFromModal(Request $request) |
| 299 | 300 | { |
@@ -315,7 +316,6 @@ discard block |
||
| 315 | 316 | /** |
| 316 | 317 | * Return the teacher by SLUG. (eg. http://websitename.com/teacher/xxxx). |
| 317 | 318 | * |
| 318 | - * @param \App\Teacher $post |
|
| 319 | 319 | * @return \Illuminate\Http\Response |
| 320 | 320 | */ |
| 321 | 321 | public function teacherBySlug($slug) |
@@ -2,20 +2,19 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace App\Http\Controllers; |
| 4 | 4 | |
| 5 | -use App\User; |
|
| 6 | -use App\Event; |
|
| 7 | -use Validator; |
|
| 8 | 5 | use App\Country; |
| 9 | -use App\Teacher; |
|
| 10 | -use Carbon\Carbon; |
|
| 11 | 6 | use App\EventCategory; |
| 12 | 7 | use App\EventRepetition; |
| 13 | -use Illuminate\Support\Str; |
|
| 8 | +use App\Teacher; |
|
| 9 | +use App\User; |
|
| 10 | +use Carbon\Carbon; |
|
| 14 | 11 | use Illuminate\Http\Request; |
| 15 | -use Illuminate\Support\Facades\DB; |
|
| 16 | 12 | use Illuminate\Support\Facades\Auth; |
| 17 | 13 | use Illuminate\Support\Facades\Cache; |
| 14 | +use Illuminate\Support\Facades\DB; |
|
| 18 | 15 | use Illuminate\Support\Facades\Route; |
| 16 | +use Illuminate\Support\Str; |
|
| 17 | +use Validator; |
|
| 19 | 18 | |
| 20 | 19 | class TeacherController extends Controller |
| 21 | 20 | { |