Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
131 commits
Select commit Hold shift + click to select a range
aee92a4
Update Readme
MohamedSwilam Jul 6, 2019
e801b86
Finished all user crud
MohamedSwilam Jul 8, 2019
e366fa4
Merge pull request #1 from EquineSolutions/users
MohamedSwilam Jul 8, 2019
4636433
finished frontend crud of roles
MohamedSwilam Jul 8, 2019
4fc5887
fixed tooltip issue
MohamedSwilam Jul 10, 2019
ada7d9f
Merge pull request #2 from EquineSolutions/roles
MohamedSwilam Jul 10, 2019
d8e2ad3
settings
Jul 10, 2019
c2fd9c4
settings
Jul 10, 2019
81a1687
finished (create, read and delete role), refactored validation way an…
MohamedSwilam Jul 11, 2019
411f4c4
Merge pull request #3 from EquineSolutions/roles
MohamedSwilam Jul 11, 2019
3abe2a0
added image to user back-end
MohamedSwilam Jul 12, 2019
b95f852
created profile branch
MohamedSwilam Jul 13, 2019
ee830bf
Merge pull request #4 from EquineSolutions/profile
MohamedSwilam Jul 13, 2019
9a68ce0
need to role back
Jul 13, 2019
909809d
need to role back
Jul 13, 2019
4caec10
jjjjjjjjj
Jul 13, 2019
de67066
jjjjjjjjj
Jul 13, 2019
d5f3a06
finished profile front and finished all crud operations of user and role
MohamedSwilam Jul 13, 2019
878150f
finished profile front and finished all crud operations of user and role
MohamedSwilam Jul 13, 2019
8089428
finished profile task and solved console errors
MohamedSwilam Jul 14, 2019
338d090
finished profile task and solved console errors
MohamedSwilam Jul 14, 2019
9f06272
output handled
Jul 15, 2019
fafc7cb
output handled
Jul 15, 2019
f4516c8
changed responses to fractal
MohamedSwilam Jul 17, 2019
9d16ae1
changed responses to fractal
MohamedSwilam Jul 17, 2019
411b025
updated gitignore
MohamedSwilam Jul 17, 2019
409c4d9
updated gitignore
MohamedSwilam Jul 17, 2019
e67ed5f
merged with profile
MohamedSwilam Jul 17, 2019
adc6d02
merged with profile
MohamedSwilam Jul 17, 2019
55219ef
Merge pull request #6 from EquineSolutions/refact_output_response
MohamedSwilam Jul 17, 2019
d2af2f5
Merge pull request #6 from EquineSolutions/refact_output_response
MohamedSwilam Jul 17, 2019
7325750
-logout handle ......
Jul 18, 2019
68a985f
-logout handle ......
Jul 18, 2019
649afda
-logout handle ...... CRUD feature
Jul 18, 2019
d8e8b49
-logout handle ...... CRUD feature
Jul 18, 2019
f0675ca
-logout handle ...... CRUD feature
Jul 18, 2019
f60adda
-logout handle ...... CRUD feature
Jul 18, 2019
48f9883
finished logout, handling catch for all api requests, default user ph…
MohamedSwilam Jul 20, 2019
073afb6
finished logout, handling catch for all api requests, default user ph…
MohamedSwilam Jul 20, 2019
c32d785
handle response
Jul 20, 2019
e5a6cd3
handle response
Jul 20, 2019
aa1d3e7
finished all frontend apis validations
MohamedSwilam Jul 20, 2019
016fc93
finished all frontend apis validations
MohamedSwilam Jul 20, 2019
12e1ca0
Merge branch 'develop' of https://github.com/EquineSolutions/smartsta…
EngMFawzy Jul 20, 2019
f0f9e81
Merge branch 'develop' of https://github.com/EquineSolutions/smartsta…
EngMFawzy Jul 20, 2019
11297fe
Merge pull request #7 from EquineSolutions/final_base
MohamedSwilam Jul 20, 2019
23e03d9
Merge pull request #7 from EquineSolutions/final_base
MohamedSwilam Jul 20, 2019
f7db4a5
local changes
EngMFawzy Jul 20, 2019
b1ab00a
local changes
EngMFawzy Jul 20, 2019
280d2f3
Merge branch 'develop' of https://github.com/EquineSolutions/smartsta…
EngMFawzy Jul 20, 2019
cb55704
Merge branch 'develop' of https://github.com/EquineSolutions/smartsta…
EngMFawzy Jul 20, 2019
3d2ec95
Update README.md
MohamedSwilam Jul 20, 2019
d0bb29f
Merge remote-tracking branch 'origin/refact_output_response' into ref…
EngMFawzy Jul 20, 2019
5a9a818
Merge remote-tracking branch 'origin/refact_output_response' into ref…
EngMFawzy Jul 20, 2019
3afcde5
local changes
EngMFawzy Jul 20, 2019
e8d5cd6
local changes
EngMFawzy Jul 20, 2019
900e1e0
fixed merging problems
MohamedSwilam Jul 20, 2019
072a3fa
fixed merging problems
MohamedSwilam Jul 20, 2019
24e1e6e
solved conflicts
MohamedSwilam Jul 20, 2019
762d5b6
solved conflicts
MohamedSwilam Jul 20, 2019
c69f179
added beauty name to role and group name
rashmelon Jul 20, 2019
1867862
added beauty name to role and group name
rashmelon Jul 20, 2019
720546a
solved issues
MohamedSwilam Jul 21, 2019
a82ca3a
solved issues
MohamedSwilam Jul 21, 2019
41da761
'test'
MohamedSwilam Jul 21, 2019
f73b30d
'test'
MohamedSwilam Jul 21, 2019
340c174
finished customizing adding roles, added and modified permissions names
MohamedSwilam Jul 21, 2019
d3fe2f6
finished customizing adding roles, added and modified permissions names
MohamedSwilam Jul 21, 2019
4e1df0b
Merge pull request #9 from EquineSolutions/beautify-role
MohamedSwilam Jul 27, 2019
0fe4659
Merge pull request #9 from EquineSolutions/beautify-role
MohamedSwilam Jul 27, 2019
0c9df88
feature and packages with edit
Aug 14, 2019
4e5c94b
feature and packages with edit
Aug 14, 2019
c639cc0
feature and packages with edit
Aug 14, 2019
77fec3b
feature and packages with edit
Aug 14, 2019
845216a
public
Aug 14, 2019
99d4082
public
Aug 14, 2019
18215a1
public
Aug 14, 2019
4c35c8a
public
Aug 14, 2019
7b101c5
here...
Aug 17, 2019
a3047d5
here...
Aug 17, 2019
d1551ad
No changes
Aug 17, 2019
a33e4c0
No changes
Aug 17, 2019
e38517a
new club!!
Aug 17, 2019
610cfa0
new club!!
Aug 17, 2019
1dd4682
Merge branch 'packages' into new_club
Aug 17, 2019
c3d040b
Merge branch 'packages' into new_club
Aug 17, 2019
0e1c264
create new club with all transcations
Sep 2, 2019
395173f
create new club with all transcations
Sep 2, 2019
4c7874d
handle ckub db
Sep 7, 2019
f3e3726
edit storage
Sep 28, 2019
c556bf1
create new club
Sep 30, 2019
4df8c66
install npm & vendor
Sep 30, 2019
2e61bbd
install npm & vendor
Sep 30, 2019
f95fab2
update
Sep 30, 2019
76cb8df
club.zip
Sep 30, 2019
8568fe4
Merge branch 'develop' of https://github.com/EquineSolutions/smartsta…
Sep 30, 2019
e823ce3
create new club
Sep 30, 2019
6a1a457
handle ..
Sep 30, 2019
e8a5b8b
"handle club folder..
Sep 30, 2019
39b338e
solve conflict
Oct 1, 2019
7a3b1da
solve conflict
Oct 1, 2019
0f3088e
conflict
Oct 1, 2019
2da0cdd
conflict
Oct 1, 2019
4877f11
conflict
Oct 1, 2019
abdb7dc
changes..
Oct 2, 2019
9f36e5e
changes..
Oct 2, 2019
b3c944d
public create club
Oct 5, 2019
2961135
verify mail && fill data
Oct 5, 2019
a0674b8
validation
Oct 5, 2019
6d097da
sign up club
Oct 26, 2019
aade7e0
Payment successful!
Nov 2, 2019
b544846
edit storage
Nov 2, 2019
419d15f
edit storage
Nov 2, 2019
759d970
edit storage
Nov 2, 2019
5a9dcde
handle two ways
Nov 2, 2019
fe15029
Merge remote-tracking branch 'origin/self_sign' into develop
Nov 2, 2019
e8b2c67
Merge remote-tracking branch 'origin/self_sign' into develop
Nov 2, 2019
a1e7712
Merge remote-tracking branch 'origin/self_sign' into develop
Nov 2, 2019
e607261
handle error
Nov 16, 2019
8188ed6
handle package error
Nov 23, 2019
559c46c
Update PackageController.php
MaramRamadan Nov 23, 2019
34d2fff
Update PackageController.php
MaramRamadan Nov 23, 2019
386e80a
Update PackageController.php
MaramRamadan Nov 23, 2019
8cf8c79
Update PackageController.php
MaramRamadan Nov 23, 2019
101560f
trace
Nov 23, 2019
c5cfad8
Merge branch 'develop' of https://github.com/EquineSolutions/smartsta…
Nov 23, 2019
442684d
trace
Nov 23, 2019
8f011f8
handle hosting errors
Nov 26, 2019
728791e
changes
Nov 26, 2019
907bdcd
solve conflict
Nov 26, 2019
3086553
hash some row
Nov 30, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Empty file modified .DS_Store
100644 → 100755
Empty file.
Empty file modified .babelrc
100644 → 100755
Empty file.
Empty file modified .editorconfig
100644 → 100755
Empty file.
Empty file modified .env.example
100644 → 100755
Empty file.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.zip filter=lfs diff=lfs merge=lfs -text
2 changes: 2 additions & 0 deletions .gitignore
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
/public/hot
/public/storage
/storage/*.key
/public/uploads/
/vendor
/.idea
/.vscode
Expand All @@ -12,3 +13,4 @@ npm-debug.log
yarn-error.log
.env
.phpunit.result.cache

Empty file modified README.md
100644 → 100755
Empty file.
3 changes: 3 additions & 0 deletions SmartStableClub-master.zip
Git LFS file not shown
22 changes: 22 additions & 0 deletions app/Club.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?php

namespace App;

use Illuminate\Database\Eloquent\Model;

class Club extends Model
{
protected $fillable = [
'first_name', 'last_name', 'middle_name', 'email', 'phone', 'business_name','business_type'
];

public function packages()
{
return $this->belongsToMany(\App\Package::class , 'club_packages');
}

public function verifyClub()
{
return $this->hasOne('App\VerifyClub');
}
}
10 changes: 10 additions & 0 deletions app/ClubPackage.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?php

namespace App;

use Illuminate\Database\Eloquent\Model;

class ClubPackage extends Model
{
//
}
Empty file modified app/Console/Kernel.php
100644 → 100755
Empty file.
38 changes: 38 additions & 0 deletions app/Events/ClubProcess.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<?php

namespace App\Events;

use Illuminate\Broadcasting\Channel;
use Illuminate\Queue\SerializesModels;
use Illuminate\Broadcasting\PrivateChannel;
use Illuminate\Broadcasting\PresenceChannel;
use Illuminate\Foundation\Events\Dispatchable;
use Illuminate\Broadcasting\InteractsWithSockets;
use Illuminate\Contracts\Broadcasting\ShouldBroadcast;

class ClubProcess
{
use Dispatchable, InteractsWithSockets, SerializesModels;
public $club;

/**
* Create a new event instance.
*
* @return void
*/
public function __construct($club)
{


}

/**
* Get the channels the event should broadcast on.
*
* @return \Illuminate\Broadcasting\Channel|array
*/
public function broadcastOn()
{
return new PrivateChannel('channel-name');
}
}
Empty file modified app/Exceptions/Handler.php
100644 → 100755
Empty file.
17 changes: 17 additions & 0 deletions app/Feature.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?php

namespace App;

use Illuminate\Database\Eloquent\Model;

class Feature extends Model
{
/**
* The attributes that are mass assignable.
*
* @var array
*/
protected $fillable = [
'name', 'description', 'key', 'enable', 'priority'
];
}
Loading