Skip to content
This repository was archived by the owner on Nov 26, 2024. It is now read-only.

Commit 5425504

Browse files
authored
Merge pull request #1 from osinitiative/develop
Merge Develop into Master
2 parents 2acd176 + 0544141 commit 5425504

File tree

121 files changed

+3404
-204
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+3404
-204
lines changed

.env.example

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,6 @@ MAIL_ENCRYPTION=null
3232
PUSHER_APP_ID=
3333
PUSHER_APP_KEY=
3434
PUSHER_APP_SECRET=
35+
36+
DOCUMENT_REFERENCE_PREFIX=DOCUMENT
37+
DOCUMENT_SEQUENCE_LENGTH=6

README.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Web Application Boilerplate
2+
3+
A boilerplate to speed up development.
4+
5+
# Packages
6+
7+
Most of the packages from Spatie.
8+
9+
1. Laravel Permission
10+
2. Laravel Media Library
11+
3. Laravel Activity
12+
4. Laravel Newsletter
13+
5. Laravel Analytics
14+
6. Laravel Response Cache
15+
7. Laravel Sluggable
16+
8. Laravel Menu
17+
9. Laravel Collection Macros
18+
10. Laravel Google Calendar
19+
11. Laravel Html
20+
12. Image Optimizer
21+
22+
# Google API
23+
24+
Create [Google Service Account Credentials](https://console.developers.google.com/apis/dashboard?project=karnival-usahawan-desa) for:
25+
26+
1. [Google Calendar](https://github.com/spatie/laravel-google-calendar#how-to-obtain-the-credentials-to-communicate-with-google-calendar)
27+
2. [Google Analytic](https://github.com/spatie/laravel-analytics#how-to-obtain-the-credentials-to-communicate-with-google-analytics)
28+
29+
# TODO
30+
31+
1. Media Library for User

app/Console/Kernel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace App\Console;
3+
namespace OSI\Console;
44

55
use Illuminate\Console\Scheduling\Schedule;
66
use Illuminate\Foundation\Console\Kernel as ConsoleKernel;

app/Contracts/MacroContract.php

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?php
2+
3+
namespace OSI\Contracts;
4+
5+
/**
6+
* MacroContract
7+
*/
8+
interface MacroContract
9+
{
10+
public static function registerMacros();
11+
}

app/Exceptions/Handler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace App\Exceptions;
3+
namespace OSI\Exceptions;
44

55
use Exception;
66
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;

app/Http/Controllers/Auth/ForgotPasswordController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php
22

3-
namespace App\Http\Controllers\Auth;
3+
namespace OSI\Http\Controllers\Auth;
44

5-
use App\Http\Controllers\Controller;
5+
use OSI\Http\Controllers\Controller;
66
use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
77

88
class ForgotPasswordController extends Controller

app/Http/Controllers/Auth/LoginController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php
22

3-
namespace App\Http\Controllers\Auth;
3+
namespace OSI\Http\Controllers\Auth;
44

5-
use App\Http\Controllers\Controller;
5+
use OSI\Http\Controllers\Controller;
66
use Illuminate\Foundation\Auth\AuthenticatesUsers;
77

88
class LoginController extends Controller

app/Http/Controllers/Auth/RegisterController.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?php
22

3-
namespace App\Http\Controllers\Auth;
3+
namespace OSI\Http\Controllers\Auth;
44

5-
use App\User;
6-
use App\Http\Controllers\Controller;
7-
use Illuminate\Support\Facades\Validator;
5+
use OSI\Http\Controllers\Controller;
6+
use OSI\Models\User;
87
use Illuminate\Foundation\Auth\RegistersUsers;
8+
use Illuminate\Support\Facades\Validator;
99

1010
class RegisterController extends Controller
1111
{
@@ -18,7 +18,7 @@ class RegisterController extends Controller
1818
| validation and creation. By default this controller uses a trait to
1919
| provide this functionality without requiring any additional code.
2020
|
21-
*/
21+
*/
2222

2323
use RegistersUsers;
2424

@@ -48,8 +48,8 @@ public function __construct()
4848
protected function validator(array $data)
4949
{
5050
return Validator::make($data, [
51-
'name' => 'required|string|max:255',
52-
'email' => 'required|string|email|max:255|unique:users',
51+
'name' => 'required|string|max:255',
52+
'email' => 'required|string|email|max:255|unique:users',
5353
'password' => 'required|string|min:6|confirmed',
5454
]);
5555
}
@@ -58,13 +58,13 @@ protected function validator(array $data)
5858
* Create a new user instance after a valid registration.
5959
*
6060
* @param array $data
61-
* @return \App\User
61+
* @return \OSI\Models\User
6262
*/
6363
protected function create(array $data)
6464
{
6565
return User::create([
66-
'name' => $data['name'],
67-
'email' => $data['email'],
66+
'name' => $data['name'],
67+
'email' => $data['email'],
6868
'password' => bcrypt($data['password']),
6969
]);
7070
}

app/Http/Controllers/Auth/ResetPasswordController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php
22

3-
namespace App\Http\Controllers\Auth;
3+
namespace OSI\Http\Controllers\Auth;
44

5-
use App\Http\Controllers\Controller;
5+
use OSI\Http\Controllers\Controller;
66
use Illuminate\Foundation\Auth\ResetsPasswords;
77

88
class ResetPasswordController extends Controller

app/Http/Controllers/Controller.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace App\Http\Controllers;
3+
namespace OSI\Http\Controllers;
44

55
use Illuminate\Foundation\Bus\DispatchesJobs;
66
use Illuminate\Routing\Controller as BaseController;

0 commit comments

Comments
 (0)