-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
2.0.0 maverick #115
Open
Tjoosten
wants to merge
75
commits into
master
Choose a base branch
from
2.0.0-maverick
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
2.0.0 maverick #115
Changes from 46 commits
Commits
Show all changes
75 commits
Select commit
Hold shift + click to select a range
a0100ac
Revert repository pattern
dd67bbb
Fix PSR violations in control stuctures
c903f05
Fix #93 | Fix the contact button on the profile image
dfd96a2
Merge pull request #111 from Scouts-Sint-Joris/revert-repository
Tjoosten a770bfa
Merge pull request #112 from Scouts-Sint-Joris/PSR-control-structures
Tjoosten 531da3b
Merge pull request #113 from Scouts-Sint-Joris/patch-93
Tjoosten 4965e23
Set copyright docblocks on the seed classes
2e2729c
Fix several psr violations
afeb39b
psr violations
224d433
Merge pull request #117 from Scouts-Sint-Joris/psr-violations
Tjoosten b34082f
Merge pull request #116 from Scouts-Sint-Joris/copyright-seeds
Tjoosten 79c19c8
Fix typo
37446d1
Add class docs to the validator classes
0023116
Change phpunit config
0a9b653
Add empty test classes
047b91d
Fix #101 | Set the flash messages for the api keys -> translate
590ce55
Fix #122 | Fix typo in gitattributes file.
Tjoosten 59e830b
Update docblocks
ab03767
Update
bf2209f
Fix conflicts
b68ee87
Fix conflicts
c949e94
update
e3638b6
Register route
6ad5759
Add authorization section off the api
a6647d3
Merge branch '2.0.0-maverick' into api
Tjoosten 96d0120
Merge pull request #120 from Scouts-Sint-Joris/api
Tjoosten ab68af8
Add empty test files"
959f8ca
Add migration
779ee99
Start on the members tool
afc8c05
Implemented the countries.
01f10f9
Selected the only needed db columns
2e96707
Add the request validator class to the controller
3b4d5f7
Remove composer lock
778fc4c
Add update lock file
7e1038a
Bugfix test controller
6e345e2
Add test to the docblock
f07c917
Fix codacy issues
b05308d
Update controller
0f1efb9
Change docblocks
30f30ac
Fix merge conflicts
e891d8a
Add country table factory
ae91d7e
Bugfix factory
19be748
Add members factory
3437178
Improve testing
1a3ed62
Update
83d71ff
Implement rss feed
b03eb1e
Reformat the gitattributes file
2714b84
fixed wrong directory name in .gitattributes
d6666d4
Fix phpunit error
11e7e4d
Clean up if else statement
32725e6
Add tests for the destroy method
b2b9c90
Need TravisCi to debug phpunit"
2a1cf80
Solve phphunit error"
7973386
Add Activity insert method
f12a26b
Work on activity show"
54c9c2e
Merge pull request #129 from Scouts-Sint-Joris/subscription-module
Tjoosten bde89f3
Fix activity! show
7e52a1f
Need travis to debug
f22cb50
Add activity edit tests
8982027
Add test for activity edit -> api"
5dc54fa
Add empty test classes"
8fe5a6f
Add tests for the api activity index
d73e231
Add dynamic access to the activity model"
42d2e3f
Fix wrong return
1c570d3
Merge pull request #130 from Scouts-Sint-Joris/api-activity
Tjoosten f4a6f41
Fix phpunit"
d95e074
Fix export bug"
920f6f9
Fix another phpunit error
29b888d
Extend testing
44a5c91
Merge pull request #128 from Scouts-Sint-Joris/Sprint-1
Tjoosten 72ecf68
Add changelog
cab852f
Add fast finish
8737fac
Merge pull request #139 from Scouts-Sint-Joris/fast-finish
Tjoosten 0e3232a
Update
ab31e68
Merge branch '2.0.0-maverick' of https://github.com/Scouts-Sint-Joris…
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
<?php | ||
|
||
namespace App; | ||
|
||
use Illuminate\Database\Eloquent\Model; | ||
|
||
class Country extends Model | ||
{ | ||
/** | ||
* Mass-assign fields. | ||
* | ||
* @var array | ||
*/ | ||
protected $fillable = ['capital', 'name', 'alpha2code', 'alpha3code']; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,95 @@ | ||
<?php | ||
|
||
namespace App\Http\Controllers\Api; | ||
|
||
use App\Activity; | ||
use Chrisbjr\ApiGuard\Http\Controllers\ApiGuardController; | ||
use Illuminate\Http\Request; | ||
use App\Http\Controllers\Controller; | ||
|
||
/** | ||
* Class ActivityController | ||
* @package App\Http\Controllers\Api | ||
*/ | ||
class ActivityController extends ApiGuardController | ||
{ | ||
/** | ||
* ActivityController constructor. | ||
*/ | ||
public function __construct() | ||
{ | ||
parent::__construct(); | ||
} | ||
|
||
public function index() | ||
{ | ||
|
||
} | ||
|
||
/** | ||
* | ||
*/ | ||
public function show() | ||
{ | ||
|
||
} | ||
|
||
/** | ||
* @param Request $request | ||
* @return mixed | ||
*/ | ||
public function create(Request $request) | ||
{ | ||
|
||
} | ||
|
||
/** | ||
* Change a activity through the api. | ||
* | ||
* @param Request $input | ||
* @param int $id the activity id in the database. | ||
* @return mixed | ||
*/ | ||
public function edit(Request $input, $id) | ||
{ | ||
|
||
} | ||
|
||
/** | ||
* Destroy a activity in the database. | ||
* | ||
* @url:platform | ||
* @see:phpunit | ||
* @see:phpunit | ||
* | ||
* @param int $id The activity in the database. | ||
* @return mixed | ||
*/ | ||
public function destroy($id) | ||
{ | ||
if (! Activity::destroy($id)) { | ||
return $this->response->errorNotFound(); | ||
} | ||
|
||
return response(['message' => 'De activiteit is verwijderd'], Status::HTTP_OK) | ||
->header('Content-Type', 'application/json'); | ||
} | ||
|
||
/** | ||
* return array Validation criteria | ||
* | ||
* @return array $criteria | ||
*/ | ||
protected function validationCriteria() | ||
{ | ||
$criteria['state'] = 'required'; | ||
$criteria['group'] = 'required'; | ||
$criteria['data'] = 'required'; | ||
$criteria['start_time'] = 'required'; | ||
$criteria['end_date'] = 'required'; | ||
$criteria['description'] = 'required'; | ||
$criteria['heading'] = 'required'; | ||
|
||
return $criteria; | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Expected 1 space after FOREACH keyword; 0 found