diff --git a/.env.example b/.env.example index 256cca1..ac74863 100644 --- a/.env.example +++ b/.env.example @@ -2,59 +2,45 @@ APP_NAME=Laravel APP_ENV=local APP_KEY= APP_DEBUG=true -APP_LOG_LEVEL=debug APP_URL=http://localhost -FRONTEND=http://localhost:8080 LOG_CHANNEL=stack DB_CONNECTION=mysql DB_HOST=127.0.0.1 DB_PORT=3306 -DB_DATABASE=homestead -DB_USERNAME=homestead -DB_PASSWORD=secret - -FTP_HOST=ftp.example.com -FTP_USER=username -FTP_PASS=password -FTP_PORT=21 -FTP_SSL=false +DB_DATABASE=laravel +DB_USERNAME=root +DB_PASSWORD= BROADCAST_DRIVER=log CACHE_DRIVER=file +QUEUE_CONNECTION=sync SESSION_DRIVER=file SESSION_LIFETIME=120 -QUEUE_DRIVER=sync REDIS_HOST=127.0.0.1 REDIS_PASSWORD=null REDIS_PORT=6379 -MAIL_DRIVER=smtp +MAIL_MAILER=smtp MAIL_HOST=smtp.mailtrap.io MAIL_PORT=2525 MAIL_USERNAME=null MAIL_PASSWORD=null MAIL_ENCRYPTION=null +MAIL_FROM_ADDRESS=null +MAIL_FROM_NAME="${APP_NAME}" + +AWS_ACCESS_KEY_ID= +AWS_SECRET_ACCESS_KEY= +AWS_DEFAULT_REGION=us-east-1 +AWS_BUCKET= PUSHER_APP_ID= PUSHER_APP_KEY= PUSHER_APP_SECRET= PUSHER_APP_CLUSTER=mt1 -JWT_SECRET= -JWT_TTL=131500 -JWT_REFRESH_TTL=525600 -JWT_BLACKLIST_GRACE_PERIOD=30 - MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}" MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}" - -GMO_KEY="" -GMO_SECRET="" - -CONOHA_DENANT_ID="" -CONOHA_DENANT_NAME="" -CONOHA_USER_NAME="" -CONOHA_USER_PASS="" diff --git a/readme.md b/README.md similarity index 57% rename from readme.md rename to README.md index 5e90f48..3cae01e 100644 --- a/readme.md +++ b/README.md @@ -1,4 +1,4 @@ -

+

Build Status @@ -9,7 +9,7 @@ ## About Laravel -Laravel is a web application framework with expressive, elegant syntax. We believe development must be an enjoyable and creative experience to be truly fulfilling. Laravel attempts to take the pain out of development by easing common tasks used in the majority of web projects, such as: +Laravel is a web application framework with expressive, elegant syntax. We believe development must be an enjoyable and creative experience to be truly fulfilling. Laravel takes the pain out of development by easing common tasks used in many web projects, such as: - [Simple, fast routing engine](https://laravel.com/docs/routing). - [Powerful dependency injection container](https://laravel.com/docs/container). @@ -19,22 +19,28 @@ Laravel is a web application framework with expressive, elegant syntax. We belie - [Robust background job processing](https://laravel.com/docs/queues). - [Real-time event broadcasting](https://laravel.com/docs/broadcasting). -Laravel is accessible, yet powerful, providing tools needed for large, robust applications. +Laravel is accessible, powerful, and provides tools required for large, robust applications. ## Learning Laravel -Laravel has the most extensive and thorough [documentation](https://laravel.com/docs) and video tutorial library of any modern web application framework, making it a breeze to get started learning the framework. +Laravel has the most extensive and thorough [documentation](https://laravel.com/docs) and video tutorial library of all modern web application frameworks, making it a breeze to get started with the framework. -If you're not in the mood to read, [Laracasts](https://laracasts.com) contains over 1100 video tutorials on a range of topics including Laravel, modern PHP, unit testing, JavaScript, and more. Boost the skill level of yourself and your entire team by digging into our comprehensive video library. +If you don't feel like reading, [Laracasts](https://laracasts.com) can help. Laracasts contains over 1500 video tutorials on a range of topics including Laravel, modern PHP, unit testing, and JavaScript. Boost your skills by digging into our comprehensive video library. ## Laravel Sponsors -We would like to extend our thanks to the following sponsors for helping fund on-going Laravel development. If you are interested in becoming a sponsor, please visit the Laravel [Patreon page](https://patreon.com/taylorotwell): +We would like to extend our thanks to the following sponsors for funding Laravel development. If you are interested in becoming a sponsor, please visit the Laravel [Patreon page](https://patreon.com/taylorotwell). - **[Vehikl](https://vehikl.com/)** - **[Tighten Co.](https://tighten.co)** - **[Kirschbaum Development Group](https://kirschbaumdevelopment.com)** -- **[British Software Development](https://www.britishsoftware.co)** +- **[64 Robots](https://64robots.com)** +- **[Cubet Techno Labs](https://cubettech.com)** +- **[Cyber-Duck](https://cyber-duck.co.uk)** +- **[Many](https://www.many.co.uk)** +- **[Webdock, Fast VPS Hosting](https://www.webdock.io/en)** +- **[DevSquad](https://devsquad.com)** +- [UserInsights](https://userinsights.com) - [Fragrantica](https://www.fragrantica.com) - [SOFTonSOFA](https://softonsofa.com/) - [User10](https://user10.com) @@ -42,14 +48,28 @@ We would like to extend our thanks to the following sponsors for helping fund on - [CodeBrisk](https://codebrisk.com) - [1Forge](https://1forge.com) - [TECPRESSO](https://tecpresso.co.jp/) -- [Pulse Storm](http://www.pulsestorm.net/) - [Runtime Converter](http://runtimeconverter.com/) - [WebL'Agence](https://weblagence.com/) +- [Invoice Ninja](https://www.invoiceninja.com) +- [iMi digital](https://www.imi-digital.de/) +- [Earthlink](https://www.earthlink.ro/) +- [Steadfast Collective](https://steadfastcollective.com/) +- [We Are The Robots Inc.](https://watr.mx/) +- [Understand.io](https://www.understand.io/) +- [Abdel Elrafa](https://abdelelrafa.com) +- [Hyper Host](https://hyper.host) +- [Appoly](https://www.appoly.co.uk) +- [OP.GG](https://op.gg) +- [云软科技](http://www.yunruan.ltd/) ## Contributing Thank you for considering contributing to the Laravel framework! The contribution guide can be found in the [Laravel documentation](https://laravel.com/docs/contributions). +## Code of Conduct + +In order to ensure that the Laravel community is welcoming to all, please review and abide by the [Code of Conduct](https://laravel.com/docs/contributions#code-of-conduct). + ## Security Vulnerabilities If you discover a security vulnerability within Laravel, please send an e-mail to Taylor Otwell via [taylor@laravel.com](mailto:taylor@laravel.com). All security vulnerabilities will be promptly addressed. diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index a8c5158..69914e9 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -24,8 +24,7 @@ class Kernel extends ConsoleKernel */ protected function schedule(Schedule $schedule) { - // $schedule->command('inspire') - // ->hourly(); + // $schedule->command('inspire')->hourly(); } /** diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 7e2563a..59c585d 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -2,8 +2,8 @@ namespace App\Exceptions; -use Exception; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; +use Throwable; class Handler extends ExceptionHandler { @@ -29,12 +29,12 @@ class Handler extends ExceptionHandler /** * Report or log an exception. * - * This is a great spot to send exceptions to Sentry, Bugsnag, etc. - * - * @param \Exception $exception + * @param \Throwable $exception * @return void + * + * @throws \Exception */ - public function report(Exception $exception) + public function report(Throwable $exception) { parent::report($exception); } @@ -43,10 +43,12 @@ class Handler extends ExceptionHandler * Render an exception into an HTTP response. * * @param \Illuminate\Http\Request $request - * @param \Exception $exception - * @return \Illuminate\Http\Response + * @param \Throwable $exception + * @return \Symfony\Component\HttpFoundation\Response + * + * @throws \Throwable */ - public function render($request, Exception $exception) + public function render($request, Throwable $exception) { return parent::render($request, $exception); } diff --git a/app/Http/Controllers/BoardController.php b/app/Http/Controllers/BoardController.php index 0a6f4e0..13ef7d4 100644 --- a/app/Http/Controllers/BoardController.php +++ b/app/Http/Controllers/BoardController.php @@ -1811,7 +1811,7 @@ class BoardController extends Controller { 'footer' => $i->footer, 'member_title' => $i->member_title, 'gender' => $i->gender, - 'avatar' => ($i->avatar ? $i->avatar : 'assets/avatars/haznoavaz.png'), + 'avatar' => ($i->avatar ? $i->avatar : '/usericon/haznoavaz.png'), 'showcol' => $showCol, 'showname' => $showName, 'showgroup' => $showGroupName, diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index ec772ea..e8768cd 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -2,10 +2,10 @@ namespace App\Http\Controllers; -use Illuminate\Foundation\Bus\DispatchesJobs; -use Illuminate\Routing\Controller as BaseController; -use Illuminate\Foundation\Validation\ValidatesRequests; use Illuminate\Foundation\Auth\Access\AuthorizesRequests; +use Illuminate\Foundation\Bus\DispatchesJobs; +use Illuminate\Foundation\Validation\ValidatesRequests; +use Illuminate\Routing\Controller as BaseController; class Controller extends BaseController { use AuthorizesRequests, DispatchesJobs, ValidatesRequests; diff --git a/app/Http/Controllers/ImageController.php b/app/Http/Controllers/ImageController.php index 41809cd..1cc4b94 100644 --- a/app/Http/Controllers/ImageController.php +++ b/app/Http/Controllers/ImageController.php @@ -68,7 +68,7 @@ class ImageController extends Controller { $res[] = array( 'id' => basename($img), - 'avatar' => $protocol.'://'.$_SERVER['SERVER_NAME'].'/'.($user[0]->avatar != '' ? $user[0]->avatar : 'assets/avatars/haznoavaz.png'), + 'avatar' => $protocol.'://'.$_SERVER['SERVER_NAME'].'/'.($user[0]->avatar != '' ? $user[0]->avatar : '/usericon/haznoavaz.png'), 'userCol' => $showCol, 'userName' => $showName ); @@ -123,7 +123,7 @@ class ImageController extends Controller { $res[] = array( 'id' => $usr[3], - 'avatar' => $protocol.'://'.$_SERVER['SERVER_NAME'].'/'.($user[0]->avatar != '' ? $user[0]->avatar : 'assets/avatars/haznoavaz.png'), + 'avatar' => $protocol.'://'.$_SERVER['SERVER_NAME'].'/'.($user[0]->avatar != '' ? $user[0]->avatar : '/usericon/haznoavaz.png'), 'name' => $img->getFilename(), 'userCol' => $showCol, 'userName' => $showName, @@ -190,7 +190,7 @@ class ImageController extends Controller { $res[] = array( 'id' => $usr[3], - 'avatar' => $protocol.'://'.$_SERVER['SERVER_NAME'].'/'.($user[0]->avatar != '' ? $user[0]->avatar : 'assets/avatars/haznoavaz.png'), + 'avatar' => $protocol.'://'.$_SERVER['SERVER_NAME'].'/'.($user[0]->avatar != '' ? $user[0]->avatar : '/usericon/haznoavaz.png'), 'name' => $img->getFilename(), 'userCol' => $showCol, 'userName' => $showName, @@ -252,7 +252,7 @@ class ImageController extends Controller { $res[] = array( 'id' => $id, - 'avatar' => $protocol.'://'.$_SERVER['SERVER_NAME'].'/'.($user[0]->avatar != '' ? $user[0]->avatar : 'assets/avatars/haznoavaz.png'), + 'avatar' => $protocol.'://'.$_SERVER['SERVER_NAME'].'/'.($user[0]->avatar != '' ? $user[0]->avatar : '/usericon/haznoavaz.png'), 'name' => $img->getFilename(), 'userCol' => $showCol, 'userName' => $showName, @@ -325,7 +325,7 @@ class ImageController extends Controller { $res[] = array( 'id' => $usr, - 'avatar' => $protocol.'://'.$_SERVER['SERVER_NAME'].'/'.($user[0]->avatar != '' ? $user[0]->avatar : 'assets/avatars/haznoavaz.png'), + 'avatar' => $protocol.'://'.$_SERVER['SERVER_NAME'].'/'.($user[0]->avatar != '' ? $user[0]->avatar : '/usericon/haznoavaz.png'), 'name' => $img->getFilename(), 'userCol' => $showCol, 'userName' => $showName, diff --git a/app/Http/Controllers/SiteController.php b/app/Http/Controllers/SiteController.php index ae36ae2..0e7d622 100644 --- a/app/Http/Controllers/SiteController.php +++ b/app/Http/Controllers/SiteController.php @@ -277,7 +277,7 @@ class SiteController extends Controller { 'isDeleted' => $i->isDeleted, 'message' => $i->message, 'ip_address' => $i->ip_address, - 'avatar' => ($i->avatar ? $i->avatar : 'assets/avatars/haznoavaz.png'), + 'avatar' => ($i->avatar ? $i->avatar : '/usericon/haznoavaz.png'), 'showcol' => $showCol, 'showname' => $showName ]); diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index d062a56..be4c223 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -33,7 +33,7 @@ class UserController extends Controller { $get = DB::table('users')->where('id', $id)->first(); $get->profile = DB::table('usr_profile')->where('user_id', $id)->first(); $get->profile->showname = (!empty($get->profile->display_name) && !is_null($get->profile->display_name) ? $get->profile->display_name : $get->username); - if (empty($get->avatar) || $get->avatar == '') $get->avatar = 'assets/avatars/haznoavaz.png'; + if (empty($get->avatar) || $get->avatar == '') $get->avatar = '/usericon/haznoavaz.png'; return $get; } @@ -59,7 +59,7 @@ class UserController extends Controller { $get->perm_id = DB::table('usr_perm_id')->where('user_id', $id)->first(); $get->perm_module = DB::table('usr_perm_module')->where('usr_perm_id', $get->perm_id->usr_per_id)->first(); if (is_null($get->profile->avatar) || empty($get->profile->avatar) || $get->profile->avatar == '') { - $get->profile->avatar = 'http'.(isset($_SERVER['HTTPS']) ? 's' : '').'://'.$_SERVER['HTTP_HOST'].'/assets/avatars/haznoavaz.png'; + $get->profile->avatar = 'http'.(isset($_SERVER['HTTPS']) ? 's' : '').'://'.$_SERVER['HTTP_HOST'].'/usericon/haznoavaz.png'; } else $get->profile->avatar = '/'.$get->profile->avatar; @@ -112,17 +112,17 @@ class UserController extends Controller { if ($valid['usr_editprofile'] == 1) { if (isset($r->filename)) { - if (!is_dir("assets/avatars/".$check)) { - if (!mkdir("assets/avatars/".$check, 0755, true)) return "Could not make folder ".$check."
"; + if (!is_dir('/usericon/'.$check)) { + if (!mkdir('/usericon/'.$check, 0755, true)) return 'Could not make folder '.$check.'
'; } - $img_dir = "assets/avatars/".$check."/"; + $img_dir = '/usericon/'.$check.'/'; $image = $img_dir . $r->filename; $imageFileType = array('image/png', 'image/jpeg', 'image/gif'); if (!in_array($r->filetype, $imageFileType)) return "Only JPG, PNG, JPEG, and GIF are allowed."; - $fname = 'assets/avatars/'.$user.'/'.$r->filename; + $fname = '/usericon/'.$user.'/'.$r->filename; $data = base64_decode(preg_replace('#^data:image/\w+;base64,#i', '', $r->thefile)); Storage::disk('public')->put($fname, $data); diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index be3e9b9..36ced13 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -14,12 +14,13 @@ class Kernel extends HttpKernel * @var array */ protected $middleware = [ - \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class, + // \App\Http\Middleware\TrustHosts::class, + \App\Http\Middleware\TrustProxies::class, + \Fruitcake\Cors\HandleCors::class, + \App\Http\Middleware\CheckForMaintenanceMode::class, \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class, \App\Http\Middleware\TrimStrings::class, \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class, - \App\Http\Middleware\TrustProxies::class, - \Barryvdh\Cors\HandleCors::class, ]; /** @@ -34,13 +35,13 @@ class Kernel extends HttpKernel \Illuminate\Session\Middleware\StartSession::class, // \Illuminate\Session\Middleware\AuthenticateSession::class, \Illuminate\View\Middleware\ShareErrorsFromSession::class, - // \App\Http\Middleware\VerifyCsrfToken::class, + \App\Http\Middleware\VerifyCsrfToken::class, \Illuminate\Routing\Middleware\SubstituteBindings::class, ], 'api' => [ 'throttle:60,1', - 'bindings', + \Illuminate\Routing\Middleware\SubstituteBindings::class, ], ]; @@ -52,13 +53,15 @@ class Kernel extends HttpKernel * @var array */ protected $routeMiddleware = [ - 'auth' => \Illuminate\Auth\Middleware\Authenticate::class, + 'auth' => \App\Http\Middleware\Authenticate::class, 'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class, 'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class, 'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class, 'can' => \Illuminate\Auth\Middleware\Authorize::class, 'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class, - 'jwt.auth' => \Tymon\JWTAuth\Middleware\GetUserFromToken::class, + 'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class, + 'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class, 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, + 'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class, ]; } diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php new file mode 100644 index 0000000..704089a --- /dev/null +++ b/app/Http/Middleware/Authenticate.php @@ -0,0 +1,21 @@ +expectsJson()) { + return route('login'); + } + } +} diff --git a/app/Http/Middleware/CheckForMaintenanceMode.php b/app/Http/Middleware/CheckForMaintenanceMode.php new file mode 100644 index 0000000..35b9824 --- /dev/null +++ b/app/Http/Middleware/CheckForMaintenanceMode.php @@ -0,0 +1,17 @@ +check()) { - return redirect('/home'); + return redirect(RouteServiceProvider::HOME); } return $next($request); diff --git a/app/Http/Middleware/TrustHosts.php b/app/Http/Middleware/TrustHosts.php new file mode 100644 index 0000000..b0550cf --- /dev/null +++ b/app/Http/Middleware/TrustHosts.php @@ -0,0 +1,20 @@ +allSubdomainsOfApplicationUrl(), + ]; + } +} diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php index d14591b..14befce 100644 --- a/app/Http/Middleware/TrustProxies.php +++ b/app/Http/Middleware/TrustProxies.php @@ -2,29 +2,22 @@ namespace App\Http\Middleware; -use Illuminate\Http\Request; use Fideloper\Proxy\TrustProxies as Middleware; +use Illuminate\Http\Request; class TrustProxies extends Middleware { /** * The trusted proxies for this application. * - * @var array + * @var array|string|null */ protected $proxies; /** * The headers that should be used to detect proxies. * - * @var string + * @var int */ protected $headers = Request::HEADER_X_FORWARDED_ALL; - // protected $headers = [ - // Request::HEADER_FORWARDED => 'FORWARDED', - // Request::HEADER_X_FORWARDED_FOR => 'X_FORWARDED_FOR', - // Request::HEADER_X_FORWARDED_HOST => 'X_FORWARDED_HOST', - // Request::HEADER_X_FORWARDED_PORT => 'X_FORWARDED_PORT', - // Request::HEADER_X_FORWARDED_PROTO => 'X_FORWARDED_PROTO', - // ]; } diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php index 6f0fdbb..0c13b85 100644 --- a/app/Http/Middleware/VerifyCsrfToken.php +++ b/app/Http/Middleware/VerifyCsrfToken.php @@ -12,7 +12,6 @@ class VerifyCsrfToken extends Middleware * @var array */ protected $except = [ - 'api/auth/*', - 'api/rpc/*' + // ]; } diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 530a2b2..ee8ca5b 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -6,6 +6,16 @@ use Illuminate\Support\ServiceProvider; class AppServiceProvider extends ServiceProvider { + /** + * Register any application services. + * + * @return void + */ + public function register() + { + // + } + /** * Bootstrap any application services. * @@ -15,16 +25,4 @@ class AppServiceProvider extends ServiceProvider { // } - - /** - * Register any application services. - * - * @return void - */ - public function register() - { - if ($this->app->environment() == 'local') { - $this->app->register(\Reliese\Coders\CodersServiceProvider::class); - } - } } diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index 9784b1a..3049068 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -2,8 +2,8 @@ namespace App\Providers; -use Illuminate\Support\Facades\Gate; use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider; +use Illuminate\Support\Facades\Gate; class AuthServiceProvider extends ServiceProvider { @@ -13,7 +13,7 @@ class AuthServiceProvider extends ServiceProvider * @var array */ protected $policies = [ - 'App\Model' => 'App\Policies\ModelPolicy', + // 'App\Model' => 'App\Policies\ModelPolicy', ]; /** diff --git a/app/Providers/BroadcastServiceProvider.php b/app/Providers/BroadcastServiceProvider.php index 352cce4..395c518 100644 --- a/app/Providers/BroadcastServiceProvider.php +++ b/app/Providers/BroadcastServiceProvider.php @@ -2,8 +2,8 @@ namespace App\Providers; -use Illuminate\Support\ServiceProvider; use Illuminate\Support\Facades\Broadcast; +use Illuminate\Support\ServiceProvider; class BroadcastServiceProvider extends ServiceProvider { diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index fca6152..723a290 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -2,8 +2,10 @@ namespace App\Providers; -use Illuminate\Support\Facades\Event; +use Illuminate\Auth\Events\Registered; +use Illuminate\Auth\Listeners\SendEmailVerificationNotification; use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider; +use Illuminate\Support\Facades\Event; class EventServiceProvider extends ServiceProvider { @@ -13,8 +15,8 @@ class EventServiceProvider extends ServiceProvider * @var array */ protected $listen = [ - 'App\Events\Event' => [ - 'App\Listeners\EventListener', + Registered::class => [ + SendEmailVerificationNotification::class, ], ]; diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 5ea48d3..540d17b 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -2,8 +2,8 @@ namespace App\Providers; -use Illuminate\Support\Facades\Route; use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider; +use Illuminate\Support\Facades\Route; class RouteServiceProvider extends ServiceProvider { @@ -16,6 +16,13 @@ class RouteServiceProvider extends ServiceProvider */ protected $namespace = 'App\Http\Controllers'; + /** + * The path to the "home" route for your application. + * + * @var string + */ + public const HOME = '/home'; + /** * Define your route model bindings, pattern filters, etc. * @@ -52,8 +59,8 @@ class RouteServiceProvider extends ServiceProvider protected function mapWebRoutes() { Route::middleware('web') - ->namespace($this->namespace) - ->group(base_path('routes/web.php')); + ->namespace($this->namespace) + ->group(base_path('routes/web.php')); } /** @@ -66,8 +73,8 @@ class RouteServiceProvider extends ServiceProvider protected function mapApiRoutes() { Route::prefix('api') - ->middleware('api') - ->namespace($this->namespace) - ->group(base_path('routes/api.php')); + ->middleware('api') + ->namespace($this->namespace) + ->group(base_path('routes/api.php')); } } diff --git a/app/User.php b/app/User.php index 245576e..e79dab7 100644 --- a/app/User.php +++ b/app/User.php @@ -3,10 +3,11 @@ namespace App; use Illuminate\Contracts\Auth\MustVerifyEmail; -use Illuminate\Notifications\Notifiable; use Illuminate\Foundation\Auth\User as Authenticatable; +use Illuminate\Notifications\Notifiable; -class User extends Authenticatable { +class User extends Authenticatable +{ use Notifiable; /** @@ -15,7 +16,7 @@ class User extends Authenticatable { * @var array */ protected $fillable = [ - 'username', 'email', 'password', + 'name', 'email', 'password', ]; /** @@ -24,7 +25,15 @@ class User extends Authenticatable { * @var array */ protected $hidden = [ - 'password', 'salt', 'remember_token', + 'password', 'remember_token', + ]; + + /** + * The attributes that should be cast to native types. + * + * @var array + */ + protected $casts = [ + 'email_verified_at' => 'datetime', ]; } -?> \ No newline at end of file diff --git a/bootstrap/app.php b/bootstrap/app.php index f2801ad..037e17d 100644 --- a/bootstrap/app.php +++ b/bootstrap/app.php @@ -12,7 +12,7 @@ */ $app = new Illuminate\Foundation\Application( - realpath(__DIR__.'/../') + $_ENV['APP_BASE_PATH'] ?? dirname(__DIR__) ); /* diff --git a/composer.json b/composer.json index 923c3a3..4e81d21 100644 --- a/composer.json +++ b/composer.json @@ -1,64 +1,63 @@ { - "name": "laravel/laravel", - "description": "The Laravel Framework.", - "keywords": ["framework", "laravel"], - "license": "MIT", - "type": "project", - "require": { - "php": ">=7.1.3", - "barryvdh/laravel-cors": "^0.11.2", - "fideloper/proxy": "^4.0", - "laravel/framework": "5.8.*", - "laravel/tinker": "^1.0.8", - "predis/predis": "^1.1.1", - "stripe/stripe-php": "^6.37" - }, - "require-dev": { - "filp/whoops": "^2.3.1", - "fzaninotto/faker": "^1.8", - "mockery/mockery": "^1.2.2", - "nunomaduro/collision": "^2.1.1", - "phpunit/phpunit": "^8.0.4", - "reliese/laravel": "^0.0.13", - "symfony/thanks": "^1.1.0" - }, - "autoload": { - "classmap": [ - "database/seeds", - "database/factories" + "name": "laravel/laravel", + "type": "project", + "description": "The Laravel Framework.", + "keywords": [ + "framework", + "laravel" ], - "psr-4": { - "App\\": "app/" + "license": "MIT", + "require": { + "php": "^7.2.5", + "fideloper/proxy": "^4.2", + "fruitcake/laravel-cors": "^1.0", + "guzzlehttp/guzzle": "^6.3", + "laravel/framework": "^7.0", + "laravel/tinker": "^2.0" + }, + "require-dev": { + "facade/ignition": "^2.0", + "fzaninotto/faker": "^1.9.1", + "mockery/mockery": "^1.3.1", + "nunomaduro/collision": "^4.1", + "phpunit/phpunit": "^8.5" + }, + "config": { + "optimize-autoloader": true, + "preferred-install": "dist", + "sort-packages": true + }, + "extra": { + "laravel": { + "dont-discover": [] + } + }, + "autoload": { + "psr-4": { + "App\\": "app/" + }, + "classmap": [ + "database/seeds", + "database/factories" + ] + }, + "autoload-dev": { + "psr-4": { + "Tests\\": "tests/" + } + }, + "minimum-stability": "dev", + "prefer-stable": true, + "scripts": { + "post-autoload-dump": [ + "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump", + "@php artisan package:discover --ansi" + ], + "post-root-package-install": [ + "@php -r \"file_exists('.env') || copy('.env.example', '.env');\"" + ], + "post-create-project-cmd": [ + "@php artisan key:generate --ansi" + ] } - }, - "autoload-dev": { - "psr-4": { - "Tests\\": "tests/" - } - }, - "extra": { - "laravel": { - "dont-discover": [ - ] - } - }, - "scripts": { - "post-root-package-install": [ - "@php -r \"file_exists('.env') || copy('.env.example', '.env');\"" - ], - "post-create-project-cmd": [ - "@php artisan key:generate" - ], - "post-autoload-dump": [ - "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump", - "@php artisan package:discover" - ] - }, - "config": { - "preferred-install": "dist", - "sort-packages": true, - "optimize-autoloader": true - }, - "minimum-stability": "dev", - "prefer-stable": true -} \ No newline at end of file +} diff --git a/config/app.php b/config/app.php index b22e189..02587a7 100644 --- a/config/app.php +++ b/config/app.php @@ -13,7 +13,7 @@ return [ | */ - 'name' => env('APP_NAME', '076 Server'), + 'name' => env('APP_NAME', 'テクニカル諏訪子'), /* |-------------------------------------------------------------------------- @@ -22,7 +22,7 @@ return [ | | This value determines the "environment" your application is currently | running in. This may determine how you prefer to configure various - | services your application utilizes. Set this in your ".env" file. + | services the application utilizes. Set this in your ".env" file. | */ @@ -39,7 +39,7 @@ return [ | */ - 'debug' => env('APP_DEBUG', false), + 'debug' => (bool) env('APP_DEBUG', false), /* |-------------------------------------------------------------------------- @@ -53,7 +53,8 @@ return [ */ 'url' => env('APP_URL', 'http://localhost'), - 'api_url' => env('APP_API_URL', 'http://localhost/api'), + + 'asset_url' => env('ASSET_URL', null), /* |-------------------------------------------------------------------------- @@ -94,6 +95,19 @@ return [ 'fallback_locale' => 'ja', + /* + |-------------------------------------------------------------------------- + | Faker Locale + |-------------------------------------------------------------------------- + | + | This locale will be used by the Faker PHP library when generating fake + | data for your database seeds. For example, this will be used to get + | localized telephone numbers, street address information and more. + | + */ + + 'faker_locale' => 'ja_JP', + /* |-------------------------------------------------------------------------- | Encryption Key @@ -109,23 +123,6 @@ return [ 'cipher' => 'AES-256-CBC', - /* - |-------------------------------------------------------------------------- - | Logging Configuration - |-------------------------------------------------------------------------- - | - | Here you may configure the log settings for your application. Out of - | the box, Laravel uses the Monolog PHP logging library. This gives - | you a variety of powerful log handlers / formatters to utilize. - | - | Available Settings: "single", "daily", "syslog", "errorlog" - | - */ - - 'log' => env('APP_LOG', 'single'), - - 'log_level' => env('APP_LOG_LEVEL', 'debug'), - /* |-------------------------------------------------------------------------- | Autoloaded Service Providers @@ -183,7 +180,7 @@ return [ /* |-------------------------------------------------------------------------- | Class Aliases - -------------------------------------------------------------------------- + |-------------------------------------------------------------------------- | | This array of class aliases will be registered when this application | is started. However, feel free to register as many as you wish as @@ -194,6 +191,7 @@ return [ 'aliases' => [ 'App' => Illuminate\Support\Facades\App::class, + 'Arr' => Illuminate\Support\Arr::class, 'Artisan' => Illuminate\Support\Facades\Artisan::class, 'Auth' => Illuminate\Support\Facades\Auth::class, 'Blade' => Illuminate\Support\Facades\Blade::class, @@ -209,6 +207,7 @@ return [ 'File' => Illuminate\Support\Facades\File::class, 'Gate' => Illuminate\Support\Facades\Gate::class, 'Hash' => Illuminate\Support\Facades\Hash::class, + 'Http' => Illuminate\Support\Facades\Http::class, 'Lang' => Illuminate\Support\Facades\Lang::class, 'Log' => Illuminate\Support\Facades\Log::class, 'Mail' => Illuminate\Support\Facades\Mail::class, @@ -223,6 +222,7 @@ return [ 'Schema' => Illuminate\Support\Facades\Schema::class, 'Session' => Illuminate\Support\Facades\Session::class, 'Storage' => Illuminate\Support\Facades\Storage::class, + 'Str' => Illuminate\Support\Str::class, 'URL' => Illuminate\Support\Facades\URL::class, 'Validator' => Illuminate\Support\Facades\Validator::class, 'View' => Illuminate\Support\Facades\View::class, diff --git a/config/auth.php b/config/auth.php index 7817501..aaf982b 100644 --- a/config/auth.php +++ b/config/auth.php @@ -44,6 +44,7 @@ return [ 'api' => [ 'driver' => 'token', 'provider' => 'users', + 'hash' => false, ], ], @@ -96,7 +97,21 @@ return [ 'provider' => 'users', 'table' => 'password_resets', 'expire' => 60, + 'throttle' => 60, ], ], + /* + |-------------------------------------------------------------------------- + | Password Confirmation Timeout + |-------------------------------------------------------------------------- + | + | Here you may define the amount of seconds before a password confirmation + | times out and the user is prompted to re-enter their password via the + | confirmation screen. By default, the timeout lasts for three hours. + | + */ + + 'password_timeout' => 10800, + ]; diff --git a/config/broadcasting.php b/config/broadcasting.php index 3ca45ea..3bba110 100644 --- a/config/broadcasting.php +++ b/config/broadcasting.php @@ -37,7 +37,7 @@ return [ 'app_id' => env('PUSHER_APP_ID'), 'options' => [ 'cluster' => env('PUSHER_APP_CLUSTER'), - 'encrypted' => true, + 'useTLS' => true, ], ], diff --git a/config/cache.php b/config/cache.php index fa12e5e..4f41fdf 100644 --- a/config/cache.php +++ b/config/cache.php @@ -1,5 +1,7 @@ [ 'driver' => 'array', + 'serialize' => false, ], 'database' => [ @@ -57,7 +61,7 @@ return [ env('MEMCACHED_PASSWORD'), ], 'options' => [ - // Memcached::OPT_CONNECT_TIMEOUT => 2000, + // Memcached::OPT_CONNECT_TIMEOUT => 2000, ], 'servers' => [ [ @@ -70,7 +74,16 @@ return [ 'redis' => [ 'driver' => 'redis', - 'connection' => 'default', + 'connection' => 'cache', + ], + + 'dynamodb' => [ + 'driver' => 'dynamodb', + 'key' => env('AWS_ACCESS_KEY_ID'), + 'secret' => env('AWS_SECRET_ACCESS_KEY'), + 'region' => env('AWS_DEFAULT_REGION', 'us-east-1'), + 'table' => env('DYNAMODB_CACHE_TABLE', 'cache'), + 'endpoint' => env('DYNAMODB_ENDPOINT'), ], ], @@ -86,9 +99,6 @@ return [ | */ - 'prefix' => env( - 'CACHE_PREFIX', - str_slug(env('APP_NAME', 'laravel'), '_').'_cache' - ), + 'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache'), ]; diff --git a/config/cors.php b/config/cors.php index e9b90f8..558369d 100644 --- a/config/cors.php +++ b/config/cors.php @@ -4,20 +4,31 @@ return [ /* |-------------------------------------------------------------------------- - | Laravel CORS + | Cross-Origin Resource Sharing (CORS) Configuration |-------------------------------------------------------------------------- | - | allowedOrigins, allowedHeaders and allowedMethods can be set to array('*') - | to accept any value. + | Here you may configure your settings for cross-origin resource sharing + | or "CORS". This determines what cross-origin operations may execute + | in web browsers. You are free to adjust these settings as needed. + | + | To learn more: https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS | */ - - 'supportsCredentials' => false, - 'allowedOrigins' => ['*'], - 'allowedOriginsPatterns' => [], - 'allowedHeaders' => ['*'], - 'allowedMethods' => ['*'], - 'exposedHeaders' => [], - 'maxAge' => 0, + + 'paths' => ['api/*'], + + 'allowed_methods' => ['*'], + + 'allowed_origins' => ['*'], + + 'allowed_origins_patterns' => [], + + 'allowed_headers' => ['*'], + + 'exposed_headers' => [], + + 'max_age' => 0, + + 'supports_credentials' => false, ]; diff --git a/config/database.php b/config/database.php index cab5d06..b42d9b3 100644 --- a/config/database.php +++ b/config/database.php @@ -1,5 +1,7 @@ [ 'driver' => 'sqlite', + 'url' => env('DATABASE_URL'), 'database' => env('DB_DATABASE', database_path('database.sqlite')), 'prefix' => '', + 'foreign_key_constraints' => env('DB_FOREIGN_KEYS', true), ], 'mysql' => [ 'driver' => 'mysql', + 'url' => env('DATABASE_URL'), 'host' => env('DB_HOST', '127.0.0.1'), 'port' => env('DB_PORT', '3306'), 'database' => env('DB_DATABASE', 'forge'), @@ -50,12 +55,17 @@ return [ 'charset' => 'utf8mb4', 'collation' => 'utf8mb4_unicode_ci', 'prefix' => '', + 'prefix_indexes' => true, 'strict' => true, 'engine' => null, + 'options' => extension_loaded('pdo_mysql') ? array_filter([ + PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'), + ]) : [], ], 'pgsql' => [ 'driver' => 'pgsql', + 'url' => env('DATABASE_URL'), 'host' => env('DB_HOST', '127.0.0.1'), 'port' => env('DB_PORT', '5432'), 'database' => env('DB_DATABASE', 'forge'), @@ -63,12 +73,14 @@ return [ 'password' => env('DB_PASSWORD', ''), 'charset' => 'utf8', 'prefix' => '', + 'prefix_indexes' => true, 'schema' => 'public', 'sslmode' => 'prefer', ], 'sqlsrv' => [ 'driver' => 'sqlsrv', + 'url' => env('DATABASE_URL'), 'host' => env('DB_HOST', 'localhost'), 'port' => env('DB_PORT', '1433'), 'database' => env('DB_DATABASE', 'forge'), @@ -76,6 +88,7 @@ return [ 'password' => env('DB_PASSWORD', ''), 'charset' => 'utf8', 'prefix' => '', + 'prefix_indexes' => true, ], ], @@ -99,20 +112,34 @@ return [ |-------------------------------------------------------------------------- | | Redis is an open source, fast, and advanced key-value store that also - | provides a richer set of commands than a typical key-value systems + | provides a richer body of commands than a typical key-value system | such as APC or Memcached. Laravel makes it easy to dig right in. | */ 'redis' => [ - 'client' => 'predis', + 'client' => env('REDIS_CLIENT', 'phpredis'), + + 'options' => [ + 'cluster' => env('REDIS_CLUSTER', 'redis'), + 'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_database_'), + ], 'default' => [ + 'url' => env('REDIS_URL'), 'host' => env('REDIS_HOST', '127.0.0.1'), 'password' => env('REDIS_PASSWORD', null), - 'port' => env('REDIS_PORT', 6379), - 'database' => 0, + 'port' => env('REDIS_PORT', '6379'), + 'database' => env('REDIS_DB', '0'), + ], + + 'cache' => [ + 'url' => env('REDIS_URL'), + 'host' => env('REDIS_HOST', '127.0.0.1'), + 'password' => env('REDIS_PASSWORD', null), + 'port' => env('REDIS_PORT', '6379'), + 'database' => env('REDIS_CACHE_DB', '1'), ], ], diff --git a/config/filesystems.php b/config/filesystems.php index d11099e..94c8112 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -37,22 +37,12 @@ return [ | may even configure multiple disks of the same driver. Defaults have | been setup for each driver as an example of the required options. | - | Supported Drivers: "local", "ftp", "sftp", "s3", "rackspace" + | Supported Drivers: "local", "ftp", "sftp", "s3" | */ 'disks' => [ - 'ftp' => [ - 'driver' => 'ftp', - 'host' => env('FTP_HOST'), - 'username' => env('FTP_USER'), - 'password' => env('FTP_PASS'), - 'port' => env('FTP_PORT'), - 'ssl' => env('FTP_SSL'), - 'root' => storage_path('app/public/store'), - ], - 'local' => [ 'driver' => 'local', 'root' => storage_path('app'), @@ -72,8 +62,24 @@ return [ 'region' => env('AWS_DEFAULT_REGION'), 'bucket' => env('AWS_BUCKET'), 'url' => env('AWS_URL'), + 'endpoint' => env('AWS_ENDPOINT'), ], ], + /* + |-------------------------------------------------------------------------- + | Symbolic Links + |-------------------------------------------------------------------------- + | + | Here you may configure the symbolic links that will be created when the + | `storage:link` Artisan command is executed. The array keys should be + | the locations of the links and the values should be their targets. + | + */ + + 'links' => [ + public_path('storage') => storage_path('app/public'), + ], + ]; diff --git a/config/hashing.php b/config/hashing.php index f929cf0..8425770 100644 --- a/config/hashing.php +++ b/config/hashing.php @@ -11,10 +11,42 @@ return [ | passwords for your application. By default, the bcrypt algorithm is | used; however, you remain free to modify this option if you wish. | - | Supported: "bcrypt", "argon" + | Supported: "bcrypt", "argon", "argon2id" | */ 'driver' => 'bcrypt', + /* + |-------------------------------------------------------------------------- + | Bcrypt Options + |-------------------------------------------------------------------------- + | + | Here you may specify the configuration options that should be used when + | passwords are hashed using the Bcrypt algorithm. This will allow you + | to control the amount of time it takes to hash the given password. + | + */ + + 'bcrypt' => [ + 'rounds' => env('BCRYPT_ROUNDS', 10), + ], + + /* + |-------------------------------------------------------------------------- + | Argon Options + |-------------------------------------------------------------------------- + | + | Here you may specify the configuration options that should be used when + | passwords are hashed using the Argon algorithm. These will allow you + | to control the amount of time it takes to hash the given password. + | + */ + + 'argon' => [ + 'memory' => 1024, + 'threads' => 2, + 'time' => 2, + ], + ]; diff --git a/config/logging.php b/config/logging.php index 902efaf..088c204 100644 --- a/config/logging.php +++ b/config/logging.php @@ -1,5 +1,9 @@ [ 'driver' => 'stack', 'channels' => ['single'], + 'ignore_exceptions' => false, ], 'single' => [ @@ -45,7 +51,7 @@ return [ 'driver' => 'daily', 'path' => storage_path('logs/laravel.log'), 'level' => 'debug', - 'days' => 7, + 'days' => 14, ], 'slack' => [ @@ -56,6 +62,25 @@ return [ 'level' => 'critical', ], + 'papertrail' => [ + 'driver' => 'monolog', + 'level' => 'debug', + 'handler' => SyslogUdpHandler::class, + 'handler_with' => [ + 'host' => env('PAPERTRAIL_URL'), + 'port' => env('PAPERTRAIL_PORT'), + ], + ], + + 'stderr' => [ + 'driver' => 'monolog', + 'handler' => StreamHandler::class, + 'formatter' => env('LOG_STDERR_FORMATTER'), + 'with' => [ + 'stream' => 'php://stderr', + ], + ], + 'syslog' => [ 'driver' => 'syslog', 'level' => 'debug', @@ -65,6 +90,15 @@ return [ 'driver' => 'errorlog', 'level' => 'debug', ], + + 'null' => [ + 'driver' => 'monolog', + 'handler' => NullHandler::class, + ], + + 'emergency' => [ + 'path' => storage_path('logs/laravel.log'), + ], ], ]; diff --git a/config/mail.php b/config/mail.php index bb92224..54299aa 100644 --- a/config/mail.php +++ b/config/mail.php @@ -4,45 +4,73 @@ return [ /* |-------------------------------------------------------------------------- - | Mail Driver + | Default Mailer |-------------------------------------------------------------------------- | - | Laravel supports both SMTP and PHP's "mail" function as drivers for the - | sending of e-mail. You may specify which one you're using throughout - | your application here. By default, Laravel is setup for SMTP mail. - | - | Supported: "smtp", "sendmail", "mailgun", "mandrill", "ses", - | "sparkpost", "log", "array" + | This option controls the default mailer that is used to send any email + | messages sent by your application. Alternative mailers may be setup + | and used as needed; however, this mailer will be used by default. | */ - 'driver' => env('MAIL_DRIVER', 'smtp'), + 'default' => env('MAIL_MAILER', 'smtp'), /* |-------------------------------------------------------------------------- - | SMTP Host Address + | Mailer Configurations |-------------------------------------------------------------------------- | - | Here you may provide the host address of the SMTP server used by your - | applications. A default option is provided that is compatible with - | the Mailgun mail service which will provide reliable deliveries. + | Here you may configure all of the mailers used by your application plus + | their respective settings. Several examples have been configured for + | you and you are free to add your own as your application requires. + | + | Laravel supports a variety of mail "transport" drivers to be used while + | sending an e-mail. You will specify which one you are using for your + | mailers below. You are free to add additional mailers as required. + | + | Supported: "smtp", "sendmail", "mailgun", "ses", + | "postmark", "log", "array" | */ - 'host' => env('MAIL_HOST', 'smtp.mailgun.org'), + 'mailers' => [ + 'smtp' => [ + 'transport' => 'smtp', + 'host' => env('MAIL_HOST', 'smtp.mailgun.org'), + 'port' => env('MAIL_PORT', 587), + 'encryption' => env('MAIL_ENCRYPTION', 'tls'), + 'username' => env('MAIL_USERNAME'), + 'password' => env('MAIL_PASSWORD'), + 'timeout' => null, + 'auth_mode' => null, + ], - /* - |-------------------------------------------------------------------------- - | SMTP Host Port - |-------------------------------------------------------------------------- - | - | This is the SMTP port used by your application to deliver e-mails to - | users of the application. Like the host we have set this value to - | stay compatible with the Mailgun e-mail application by default. - | - */ + 'ses' => [ + 'transport' => 'ses', + ], - 'port' => env('MAIL_PORT', 587), + 'mailgun' => [ + 'transport' => 'mailgun', + ], + + 'postmark' => [ + 'transport' => 'postmark', + ], + + 'sendmail' => [ + 'transport' => 'sendmail', + 'path' => '/usr/sbin/sendmail -bs', + ], + + 'log' => [ + 'transport' => 'log', + 'channel' => env('MAIL_LOG_CHANNEL'), + ], + + 'array' => [ + 'transport' => 'array', + ], + ], /* |-------------------------------------------------------------------------- @@ -60,47 +88,6 @@ return [ 'name' => env('MAIL_FROM_NAME', 'Example'), ], - /* - |-------------------------------------------------------------------------- - | E-Mail Encryption Protocol - |-------------------------------------------------------------------------- - | - | Here you may specify the encryption protocol that should be used when - | the application send e-mail messages. A sensible default using the - | transport layer security protocol should provide great security. - | - */ - - 'encryption' => env('MAIL_ENCRYPTION', 'tls'), - - /* - |-------------------------------------------------------------------------- - | SMTP Server Username - |-------------------------------------------------------------------------- - | - | If your SMTP server requires a username for authentication, you should - | set it here. This will get used to authenticate with your server on - | connection. You may also set the "password" value below this one. - | - */ - - 'username' => env('MAIL_USERNAME'), - - 'password' => env('MAIL_PASSWORD'), - - /* - |-------------------------------------------------------------------------- - | Sendmail System Path - |-------------------------------------------------------------------------- - | - | When using the "sendmail" driver to send e-mails, we will need to know - | the path to where Sendmail lives on this server. A default path has - | been provided here, which will work well on most of your systems. - | - */ - - 'sendmail' => '/usr/sbin/sendmail -bs', - /* |-------------------------------------------------------------------------- | Markdown Mail Settings diff --git a/config/queue.php b/config/queue.php index 87b1b1b..00b76d6 100644 --- a/config/queue.php +++ b/config/queue.php @@ -4,18 +4,16 @@ return [ /* |-------------------------------------------------------------------------- - | Default Queue Driver + | Default Queue Connection Name |-------------------------------------------------------------------------- | | Laravel's queue API supports an assortment of back-ends via a single | API, giving you convenient access to each back-end using the same - | syntax for each one. Here you may set the default queue driver. - | - | Supported: "sync", "database", "beanstalkd", "sqs", "redis", "null" + | syntax for every one. Here you may define a default connection. | */ - 'default' => env('QUEUE_DRIVER', 'sync'), + 'default' => env('QUEUE_CONNECTION', 'sync'), /* |-------------------------------------------------------------------------- @@ -26,6 +24,8 @@ return [ | is used by your application. A default configuration has been added | for each back-end shipped with Laravel. You are free to add more. | + | Drivers: "sync", "database", "beanstalkd", "sqs", "redis", "null" + | */ 'connections' => [ @@ -46,21 +46,23 @@ return [ 'host' => 'localhost', 'queue' => 'default', 'retry_after' => 90, + 'block_for' => 0, ], 'sqs' => [ 'driver' => 'sqs', - 'key' => env('SQS_KEY', 'your-public-key'), - 'secret' => env('SQS_SECRET', 'your-secret-key'), + 'key' => env('AWS_ACCESS_KEY_ID'), + 'secret' => env('AWS_SECRET_ACCESS_KEY'), 'prefix' => env('SQS_PREFIX', 'https://sqs.us-east-1.amazonaws.com/your-account-id'), 'queue' => env('SQS_QUEUE', 'your-queue-name'), - 'region' => env('SQS_REGION', 'us-east-1'), + 'suffix' => env('SQS_SUFFIX'), + 'region' => env('AWS_DEFAULT_REGION', 'us-east-1'), ], 'redis' => [ 'driver' => 'redis', 'connection' => 'default', - 'queue' => 'default', + 'queue' => env('REDIS_QUEUE', 'default'), 'retry_after' => 90, 'block_for' => null, ], @@ -79,6 +81,7 @@ return [ */ 'failed' => [ + 'driver' => env('QUEUE_FAILED_DRIVER', 'database'), 'database' => env('DB_CONNECTION', 'mysql'), 'table' => 'failed_jobs', ], diff --git a/config/services.php b/config/services.php index 4460f0e..2a1d616 100644 --- a/config/services.php +++ b/config/services.php @@ -8,31 +8,26 @@ return [ |-------------------------------------------------------------------------- | | This file is for storing the credentials for third party services such - | as Stripe, Mailgun, SparkPost and others. This file provides a sane - | default location for this type of information, allowing packages - | to have a conventional place to find your various credentials. + | as Mailgun, Postmark, AWS and more. This file provides the de facto + | location for this type of information, allowing packages to have + | a conventional file to locate the various service credentials. | */ 'mailgun' => [ 'domain' => env('MAILGUN_DOMAIN'), 'secret' => env('MAILGUN_SECRET'), + 'endpoint' => env('MAILGUN_ENDPOINT', 'api.mailgun.net'), + ], + + 'postmark' => [ + 'token' => env('POSTMARK_TOKEN'), ], 'ses' => [ - 'key' => env('SES_KEY'), - 'secret' => env('SES_SECRET'), - 'region' => 'us-east-1', - ], - - 'sparkpost' => [ - 'secret' => env('SPARKPOST_SECRET'), - ], - - 'stripe' => [ - 'model' => App\User::class, - 'key' => env('STRIPE_KEY'), - 'secret' => env('STRIPE_SECRET'), + 'key' => env('AWS_ACCESS_KEY_ID'), + 'secret' => env('AWS_SECRET_ACCESS_KEY'), + 'region' => env('AWS_DEFAULT_REGION', 'us-east-1'), ], ]; diff --git a/config/session.php b/config/session.php index 736fb3c..4e0f66c 100644 --- a/config/session.php +++ b/config/session.php @@ -1,5 +1,7 @@ null, + 'connection' => env('SESSION_CONNECTION', null), /* |-------------------------------------------------------------------------- @@ -90,13 +92,15 @@ return [ | Session Cache Store |-------------------------------------------------------------------------- | - | When using the "apc" or "memcached" session drivers, you may specify a - | cache store that should be used for these sessions. This value must - | correspond with one of the application's configured cache stores. + | While using one of the framework's cache driven session backends you may + | list a cache store that should be used for these sessions. This value + | must match with one of the application's configured cache "stores". + | + | Affects: "apc", "dynamodb", "memcached", "redis" | */ - 'store' => null, + 'store' => env('SESSION_STORE', null), /* |-------------------------------------------------------------------------- @@ -124,7 +128,7 @@ return [ 'cookie' => env( 'SESSION_COOKIE', - str_slug(env('APP_NAME', 'laravel'), '_').'_session' + Str::slug(env('APP_NAME', 'laravel'), '_').'_session' ), /* @@ -164,7 +168,7 @@ return [ | */ - 'secure' => env('SESSION_SECURE_COOKIE', false), + 'secure' => env('SESSION_SECURE_COOKIE'), /* |-------------------------------------------------------------------------- @@ -186,12 +190,12 @@ return [ | | This option determines how your cookies behave when cross-site requests | take place, and can be used to mitigate CSRF attacks. By default, we - | do not enable this as other CSRF protection services are in place. + | will set this value to "lax" since this is a secure default value. | - | Supported: "lax", "strict" + | Supported: "lax", "strict", "none", null | */ - 'same_site' => null, + 'same_site' => 'lax', ]; diff --git a/config/view.php b/config/view.php index 2acfd9c..22b8a18 100644 --- a/config/view.php +++ b/config/view.php @@ -28,6 +28,9 @@ return [ | */ - 'compiled' => realpath(storage_path('framework/views')), + 'compiled' => env( + 'VIEW_COMPILED_PATH', + realpath(storage_path('framework/views')) + ), ]; diff --git a/database/.gitignore b/database/.gitignore index 9b1dffd..97fc976 100644 --- a/database/.gitignore +++ b/database/.gitignore @@ -1 +1,2 @@ *.sqlite +*.sqlite-journal diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php index a2aefb4..741edea 100644 --- a/database/factories/UserFactory.php +++ b/database/factories/UserFactory.php @@ -1,6 +1,10 @@ define(App\User::class, function (Faker $faker) { +$factory->define(User::class, function (Faker $faker) { return [ - 'username' => $faker->name, + 'name' => $faker->name, 'email' => $faker->unique()->safeEmail, - 'password' => '$2y$10$TKh8H1.PfQx37YgCzwiKb.KjNyWgaHb9cbcoQgdIVFlYg7B77UdFm', // secret - 'remember_token' => str_random(10), + 'email_verified_at' => now(), + 'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password + 'remember_token' => Str::random(10), ]; }); diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php index b48ad85..621a24e 100644 --- a/database/migrations/2014_10_12_000000_create_users_table.php +++ b/database/migrations/2014_10_12_000000_create_users_table.php @@ -1,8 +1,8 @@ increments('id'); - $table->string('username'); + $table->id(); + $table->string('name'); $table->string('email')->unique(); + $table->timestamp('email_verified_at')->nullable(); $table->string('password'); - $table->string('salt'); $table->rememberToken(); $table->timestamps(); }); diff --git a/database/migrations/2014_10_12_100000_create_password_resets_table.php b/database/migrations/2014_10_12_100000_create_password_resets_table.php deleted file mode 100644 index 0d5cb84..0000000 --- a/database/migrations/2014_10_12_100000_create_password_resets_table.php +++ /dev/null @@ -1,32 +0,0 @@ -string('email')->index(); - $table->string('token'); - $table->timestamp('created_at')->nullable(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('password_resets'); - } -} diff --git a/database/migrations/2019_08_19_000000_create_failed_jobs_table.php b/database/migrations/2019_08_19_000000_create_failed_jobs_table.php new file mode 100644 index 0000000..9bddee3 --- /dev/null +++ b/database/migrations/2019_08_19_000000_create_failed_jobs_table.php @@ -0,0 +1,35 @@ +id(); + $table->text('connection'); + $table->text('queue'); + $table->longText('payload'); + $table->longText('exception'); + $table->timestamp('failed_at')->useCurrent(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('failed_jobs'); + } +} diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index e119db6..237dfc5 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -5,12 +5,12 @@ use Illuminate\Database\Seeder; class DatabaseSeeder extends Seeder { /** - * Run the database seeds. + * Seed the application's database. * * @return void */ public function run() { - // $this->call(UsersTableSeeder::class); + // $this->call(UserSeeder::class); } } diff --git a/hooks/hooks.json b/hooks/hooks.json deleted file mode 100644 index 9e26dfe..0000000 --- a/hooks/hooks.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/package.json b/package.json index fc089a4..fd564e7 100644 --- a/package.json +++ b/package.json @@ -3,32 +3,26 @@ "scripts": { "dev": "npm run development", "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", - "watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "watch": "npm run development -- --watch", "watch-poll": "npm run watch -- --watch-poll", "w": "npm run watch -- --watch-poll", - "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", + "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --disable-host-check --config=node_modules/laravel-mix/setup/webpack.config.js", "prod": "npm run production", "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", "clear": "php artisan cache:clear && php artisan view:clear && php artisan route:clear" }, "devDependencies": { - "axios": "^0.18", - "bootstrap": "^4.2.1", - "cross-env": "^5.2", - "jquery": "^3.3.1", - "laravel-mix": "^4.0.13", - "lodash": "^4.17.11", - "popper.js": "^1.14.6", - "resolve-url-loader": "^2.3.1", - "sass": "^1.15.3", - "sass-loader": "^7.1.0", - "vue": "^2.5.21", - "vue-template-compiler": "^2.5.21" + "axios": "^0.19", + "cross-env": "^7.0", + "laravel-mix": "^5.0.1", + "lodash": "^4.17.13", + "resolve-url-loader": "^3.1.0", + "sass": "^1.15.2", + "sass-loader": "^8.0.0", + "vue-template-compiler": "^2.6.11" }, "dependencies": { - "bootstrap-vue": "^2.0.4", - "browserslist": "^4.7.2", - "caniuse-lite": "^1.0.30001006", - "js-cookie": "^2.2.1" + "bootstrap": "^4.5.0", + "jquery": "^3.5.1" } } diff --git a/phpunit.xml b/phpunit.xml index bb9c4a7..964ff0c 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,21 +1,16 @@ - +> - - ./tests/Feature - - ./tests/Unit + + ./tests/Feature + @@ -23,9 +18,14 @@ - - - - + + + + + + + + + diff --git a/public/.htaccess b/public/.htaccess old mode 100755 new mode 100644 index b75525b..3aec5e2 --- a/public/.htaccess +++ b/public/.htaccess @@ -14,7 +14,7 @@ RewriteCond %{REQUEST_URI} (.+)/$ RewriteRule ^ %1 [L,R=301] - # Handle Front Controller... + # Send Requests To Front Controller... RewriteCond %{REQUEST_FILENAME} !-d RewriteCond %{REQUEST_FILENAME} !-f RewriteRule ^ index.php [L] diff --git a/public/fonts/jpserriffont.woff b/public/fonts/jpserriffont.woff old mode 100755 new mode 100644 diff --git a/public/assets/img/bash/6fd97df9bfea41748061893ce36cefee.jpeg b/public/img/bash/6fd97df9bfea41748061893ce36cefee.jpeg similarity index 100% rename from public/assets/img/bash/6fd97df9bfea41748061893ce36cefee.jpeg rename to public/img/bash/6fd97df9bfea41748061893ce36cefee.jpeg diff --git a/public/assets/img/bash/81004208_p0.jpg b/public/img/bash/81004208_p0.jpg similarity index 100% rename from public/assets/img/bash/81004208_p0.jpg rename to public/img/bash/81004208_p0.jpg diff --git a/public/assets/img/bash/app_icon.png b/public/img/bash/app_icon.png similarity index 100% rename from public/assets/img/bash/app_icon.png rename to public/img/bash/app_icon.png diff --git a/public/assets/img/bash/bottom_bg.png b/public/img/bash/bottom_bg.png similarity index 100% rename from public/assets/img/bash/bottom_bg.png rename to public/img/bash/bottom_bg.png diff --git a/public/assets/img/bash/bottom_left.png b/public/img/bash/bottom_left.png similarity index 100% rename from public/assets/img/bash/bottom_left.png rename to public/img/bash/bottom_left.png diff --git a/public/assets/img/bash/bottom_right.png b/public/img/bash/bottom_right.png similarity index 100% rename from public/assets/img/bash/bottom_right.png rename to public/img/bash/bottom_right.png diff --git a/public/assets/img/bash/left_bg.png b/public/img/bash/left_bg.png similarity index 100% rename from public/assets/img/bash/left_bg.png rename to public/img/bash/left_bg.png diff --git a/public/assets/img/bash/right_bg.png b/public/img/bash/right_bg.png similarity index 100% rename from public/assets/img/bash/right_bg.png rename to public/img/bash/right_bg.png diff --git a/public/assets/img/bash/root_bg.png b/public/img/bash/root_bg.png similarity index 100% rename from public/assets/img/bash/root_bg.png rename to public/img/bash/root_bg.png diff --git a/public/assets/img/bash/top_bg.png b/public/img/bash/top_bg.png similarity index 100% rename from public/assets/img/bash/top_bg.png rename to public/img/bash/top_bg.png diff --git a/public/assets/img/bash/top_left.png b/public/img/bash/top_left.png similarity index 100% rename from public/assets/img/bash/top_left.png rename to public/img/bash/top_left.png diff --git a/public/assets/img/bash/top_max.png b/public/img/bash/top_max.png similarity index 100% rename from public/assets/img/bash/top_max.png rename to public/img/bash/top_max.png diff --git a/public/assets/img/bash/top_max_hover.png b/public/img/bash/top_max_hover.png similarity index 100% rename from public/assets/img/bash/top_max_hover.png rename to public/img/bash/top_max_hover.png diff --git a/public/assets/img/bash/top_min.png b/public/img/bash/top_min.png similarity index 100% rename from public/assets/img/bash/top_min.png rename to public/img/bash/top_min.png diff --git a/public/assets/img/bash/top_min_hover.png b/public/img/bash/top_min_hover.png similarity index 100% rename from public/assets/img/bash/top_min_hover.png rename to public/img/bash/top_min_hover.png diff --git a/public/assets/img/bash/top_right.png b/public/img/bash/top_right.png similarity index 100% rename from public/assets/img/bash/top_right.png rename to public/img/bash/top_right.png diff --git a/public/assets/img/bash/top_right_hover.png b/public/img/bash/top_right_hover.png similarity index 100% rename from public/assets/img/bash/top_right_hover.png rename to public/img/bash/top_right_hover.png diff --git a/public/assets/img/bash/user_bg.png b/public/img/bash/user_bg.png similarity index 100% rename from public/assets/img/bash/user_bg.png rename to public/img/bash/user_bg.png diff --git a/public/assets/img/bitchute.png b/public/img/bitchute.png similarity index 100% rename from public/assets/img/bitchute.png rename to public/img/bitchute.png diff --git a/public/assets/img/discord.png b/public/img/discord.png similarity index 100% rename from public/assets/img/discord.png rename to public/img/discord.png diff --git a/public/assets/img/favicon.jpeg b/public/img/favicon.jpeg similarity index 100% rename from public/assets/img/favicon.jpeg rename to public/img/favicon.jpeg diff --git a/public/assets/flags/ASEAN.png b/public/img/flag/ASEAN.png similarity index 100% rename from public/assets/flags/ASEAN.png rename to public/img/flag/ASEAN.png diff --git a/public/assets/flags/Afghanistan.png b/public/img/flag/Afghanistan.png similarity index 100% rename from public/assets/flags/Afghanistan.png rename to public/img/flag/Afghanistan.png diff --git a/public/assets/flags/African Union(OAS).png b/public/img/flag/African Union(OAS).png similarity index 100% rename from public/assets/flags/African Union(OAS).png rename to public/img/flag/African Union(OAS).png diff --git a/public/assets/flags/Albania.png b/public/img/flag/Albania.png similarity index 100% rename from public/assets/flags/Albania.png rename to public/img/flag/Albania.png diff --git a/public/assets/flags/Algeria.png b/public/img/flag/Algeria.png similarity index 100% rename from public/assets/flags/Algeria.png rename to public/img/flag/Algeria.png diff --git a/public/assets/flags/American Samoa.png b/public/img/flag/American Samoa.png similarity index 100% rename from public/assets/flags/American Samoa.png rename to public/img/flag/American Samoa.png diff --git a/public/assets/flags/Andorra.png b/public/img/flag/Andorra.png similarity index 100% rename from public/assets/flags/Andorra.png rename to public/img/flag/Andorra.png diff --git a/public/assets/flags/Angola.png b/public/img/flag/Angola.png similarity index 100% rename from public/assets/flags/Angola.png rename to public/img/flag/Angola.png diff --git a/public/assets/flags/Anguilla.png b/public/img/flag/Anguilla.png similarity index 100% rename from public/assets/flags/Anguilla.png rename to public/img/flag/Anguilla.png diff --git a/public/assets/flags/Antarctica.png b/public/img/flag/Antarctica.png similarity index 100% rename from public/assets/flags/Antarctica.png rename to public/img/flag/Antarctica.png diff --git a/public/assets/flags/Antigua & Barbuda.png b/public/img/flag/Antigua & Barbuda.png similarity index 100% rename from public/assets/flags/Antigua & Barbuda.png rename to public/img/flag/Antigua & Barbuda.png diff --git a/public/assets/flags/Arab League.png b/public/img/flag/Arab League.png similarity index 100% rename from public/assets/flags/Arab League.png rename to public/img/flag/Arab League.png diff --git a/public/assets/flags/Argentina.png b/public/img/flag/Argentina.png similarity index 100% rename from public/assets/flags/Argentina.png rename to public/img/flag/Argentina.png diff --git a/public/assets/flags/Armenia.png b/public/img/flag/Armenia.png similarity index 100% rename from public/assets/flags/Armenia.png rename to public/img/flag/Armenia.png diff --git a/public/assets/flags/Aruba.png b/public/img/flag/Aruba.png similarity index 100% rename from public/assets/flags/Aruba.png rename to public/img/flag/Aruba.png diff --git a/public/assets/flags/Australia.png b/public/img/flag/Australia.png similarity index 100% rename from public/assets/flags/Australia.png rename to public/img/flag/Australia.png diff --git a/public/assets/flags/Austria.png b/public/img/flag/Austria.png similarity index 100% rename from public/assets/flags/Austria.png rename to public/img/flag/Austria.png diff --git a/public/assets/flags/Azerbaijan.png b/public/img/flag/Azerbaijan.png similarity index 100% rename from public/assets/flags/Azerbaijan.png rename to public/img/flag/Azerbaijan.png diff --git a/public/assets/flags/Bahamas.png b/public/img/flag/Bahamas.png similarity index 100% rename from public/assets/flags/Bahamas.png rename to public/img/flag/Bahamas.png diff --git a/public/assets/flags/Bahrain.png b/public/img/flag/Bahrain.png similarity index 100% rename from public/assets/flags/Bahrain.png rename to public/img/flag/Bahrain.png diff --git a/public/assets/flags/Bangladesh.png b/public/img/flag/Bangladesh.png similarity index 100% rename from public/assets/flags/Bangladesh.png rename to public/img/flag/Bangladesh.png diff --git a/public/assets/flags/Barbados.png b/public/img/flag/Barbados.png similarity index 100% rename from public/assets/flags/Barbados.png rename to public/img/flag/Barbados.png diff --git a/public/assets/flags/Belarus.png b/public/img/flag/Belarus.png similarity index 100% rename from public/assets/flags/Belarus.png rename to public/img/flag/Belarus.png diff --git a/public/assets/flags/Belgium.png b/public/img/flag/Belgium.png similarity index 100% rename from public/assets/flags/Belgium.png rename to public/img/flag/Belgium.png diff --git a/public/assets/flags/Belize.png b/public/img/flag/Belize.png similarity index 100% rename from public/assets/flags/Belize.png rename to public/img/flag/Belize.png diff --git a/public/assets/flags/Benin.png b/public/img/flag/Benin.png similarity index 100% rename from public/assets/flags/Benin.png rename to public/img/flag/Benin.png diff --git a/public/assets/flags/Bermuda.png b/public/img/flag/Bermuda.png similarity index 100% rename from public/assets/flags/Bermuda.png rename to public/img/flag/Bermuda.png diff --git a/public/assets/flags/Bhutan.png b/public/img/flag/Bhutan.png similarity index 100% rename from public/assets/flags/Bhutan.png rename to public/img/flag/Bhutan.png diff --git a/public/assets/flags/Bolivia.png b/public/img/flag/Bolivia.png similarity index 100% rename from public/assets/flags/Bolivia.png rename to public/img/flag/Bolivia.png diff --git a/public/assets/flags/Bosnia & Herzegovina.png b/public/img/flag/Bosnia & Herzegovina.png similarity index 100% rename from public/assets/flags/Bosnia & Herzegovina.png rename to public/img/flag/Bosnia & Herzegovina.png diff --git a/public/assets/flags/Botswana.png b/public/img/flag/Botswana.png similarity index 100% rename from public/assets/flags/Botswana.png rename to public/img/flag/Botswana.png diff --git a/public/assets/flags/Brazil.png b/public/img/flag/Brazil.png similarity index 100% rename from public/assets/flags/Brazil.png rename to public/img/flag/Brazil.png diff --git a/public/assets/flags/Brunei.png b/public/img/flag/Brunei.png similarity index 100% rename from public/assets/flags/Brunei.png rename to public/img/flag/Brunei.png diff --git a/public/assets/flags/Bulgaria.png b/public/img/flag/Bulgaria.png similarity index 100% rename from public/assets/flags/Bulgaria.png rename to public/img/flag/Bulgaria.png diff --git a/public/assets/flags/Burkina Faso.png b/public/img/flag/Burkina Faso.png similarity index 100% rename from public/assets/flags/Burkina Faso.png rename to public/img/flag/Burkina Faso.png diff --git a/public/assets/flags/Burundi.png b/public/img/flag/Burundi.png similarity index 100% rename from public/assets/flags/Burundi.png rename to public/img/flag/Burundi.png diff --git a/public/assets/flags/CARICOM.png b/public/img/flag/CARICOM.png similarity index 100% rename from public/assets/flags/CARICOM.png rename to public/img/flag/CARICOM.png diff --git a/public/assets/flags/CIS.png b/public/img/flag/CIS.png similarity index 100% rename from public/assets/flags/CIS.png rename to public/img/flag/CIS.png diff --git a/public/assets/flags/Cambodja.png b/public/img/flag/Cambodja.png similarity index 100% rename from public/assets/flags/Cambodja.png rename to public/img/flag/Cambodja.png diff --git a/public/assets/flags/Cameroon.png b/public/img/flag/Cameroon.png similarity index 100% rename from public/assets/flags/Cameroon.png rename to public/img/flag/Cameroon.png diff --git a/public/assets/flags/Canada.png b/public/img/flag/Canada.png similarity index 100% rename from public/assets/flags/Canada.png rename to public/img/flag/Canada.png diff --git a/public/assets/flags/Cape Verde.png b/public/img/flag/Cape Verde.png similarity index 100% rename from public/assets/flags/Cape Verde.png rename to public/img/flag/Cape Verde.png diff --git a/public/assets/flags/Cayman Islands.png b/public/img/flag/Cayman Islands.png similarity index 100% rename from public/assets/flags/Cayman Islands.png rename to public/img/flag/Cayman Islands.png diff --git a/public/assets/flags/Central African Republic.png b/public/img/flag/Central African Republic.png similarity index 100% rename from public/assets/flags/Central African Republic.png rename to public/img/flag/Central African Republic.png diff --git a/public/assets/flags/Chad.png b/public/img/flag/Chad.png similarity index 100% rename from public/assets/flags/Chad.png rename to public/img/flag/Chad.png diff --git a/public/assets/flags/Chile.png b/public/img/flag/Chile.png similarity index 100% rename from public/assets/flags/Chile.png rename to public/img/flag/Chile.png diff --git a/public/assets/flags/China.png b/public/img/flag/China.png similarity index 100% rename from public/assets/flags/China.png rename to public/img/flag/China.png diff --git a/public/assets/flags/Colombia.png b/public/img/flag/Colombia.png similarity index 100% rename from public/assets/flags/Colombia.png rename to public/img/flag/Colombia.png diff --git a/public/assets/flags/Commonwealth.png b/public/img/flag/Commonwealth.png similarity index 100% rename from public/assets/flags/Commonwealth.png rename to public/img/flag/Commonwealth.png diff --git a/public/assets/flags/Comoros.png b/public/img/flag/Comoros.png similarity index 100% rename from public/assets/flags/Comoros.png rename to public/img/flag/Comoros.png diff --git a/public/assets/flags/Congo-Brazzaville.png b/public/img/flag/Congo-Brazzaville.png similarity index 100% rename from public/assets/flags/Congo-Brazzaville.png rename to public/img/flag/Congo-Brazzaville.png diff --git a/public/assets/flags/Congo-Kinshasa(Zaire).png b/public/img/flag/Congo-Kinshasa(Zaire).png similarity index 100% rename from public/assets/flags/Congo-Kinshasa(Zaire).png rename to public/img/flag/Congo-Kinshasa(Zaire).png diff --git a/public/assets/flags/Cook Islands.png b/public/img/flag/Cook Islands.png similarity index 100% rename from public/assets/flags/Cook Islands.png rename to public/img/flag/Cook Islands.png diff --git a/public/assets/flags/Costa Rica.png b/public/img/flag/Costa Rica.png similarity index 100% rename from public/assets/flags/Costa Rica.png rename to public/img/flag/Costa Rica.png diff --git a/public/assets/flags/Cote d'Ivoire.png b/public/img/flag/Cote d'Ivoire.png similarity index 100% rename from public/assets/flags/Cote d'Ivoire.png rename to public/img/flag/Cote d'Ivoire.png diff --git a/public/assets/flags/Croatia.png b/public/img/flag/Croatia.png similarity index 100% rename from public/assets/flags/Croatia.png rename to public/img/flag/Croatia.png diff --git a/public/assets/flags/Cuba.png b/public/img/flag/Cuba.png similarity index 100% rename from public/assets/flags/Cuba.png rename to public/img/flag/Cuba.png diff --git a/public/assets/flags/Cyprus.png b/public/img/flag/Cyprus.png similarity index 100% rename from public/assets/flags/Cyprus.png rename to public/img/flag/Cyprus.png diff --git a/public/assets/flags/Czech Republic.png b/public/img/flag/Czech Republic.png similarity index 100% rename from public/assets/flags/Czech Republic.png rename to public/img/flag/Czech Republic.png diff --git a/public/assets/flags/Denmark.png b/public/img/flag/Denmark.png similarity index 100% rename from public/assets/flags/Denmark.png rename to public/img/flag/Denmark.png diff --git a/public/assets/flags/Djibouti.png b/public/img/flag/Djibouti.png similarity index 100% rename from public/assets/flags/Djibouti.png rename to public/img/flag/Djibouti.png diff --git a/public/assets/flags/Dominica.png b/public/img/flag/Dominica.png similarity index 100% rename from public/assets/flags/Dominica.png rename to public/img/flag/Dominica.png diff --git a/public/assets/flags/Dominican Republic.png b/public/img/flag/Dominican Republic.png similarity index 100% rename from public/assets/flags/Dominican Republic.png rename to public/img/flag/Dominican Republic.png diff --git a/public/assets/flags/Ecuador.png b/public/img/flag/Ecuador.png similarity index 100% rename from public/assets/flags/Ecuador.png rename to public/img/flag/Ecuador.png diff --git a/public/assets/flags/Egypt.png b/public/img/flag/Egypt.png similarity index 100% rename from public/assets/flags/Egypt.png rename to public/img/flag/Egypt.png diff --git a/public/assets/flags/El Salvador.png b/public/img/flag/El Salvador.png similarity index 100% rename from public/assets/flags/El Salvador.png rename to public/img/flag/El Salvador.png diff --git a/public/assets/flags/England.png b/public/img/flag/England.png similarity index 100% rename from public/assets/flags/England.png rename to public/img/flag/England.png diff --git a/public/assets/flags/Equatorial Guinea.png b/public/img/flag/Equatorial Guinea.png similarity index 100% rename from public/assets/flags/Equatorial Guinea.png rename to public/img/flag/Equatorial Guinea.png diff --git a/public/assets/flags/Eritrea.png b/public/img/flag/Eritrea.png similarity index 100% rename from public/assets/flags/Eritrea.png rename to public/img/flag/Eritrea.png diff --git a/public/assets/flags/Estonia.png b/public/img/flag/Estonia.png similarity index 100% rename from public/assets/flags/Estonia.png rename to public/img/flag/Estonia.png diff --git a/public/assets/flags/Ethiopia.png b/public/img/flag/Ethiopia.png similarity index 100% rename from public/assets/flags/Ethiopia.png rename to public/img/flag/Ethiopia.png diff --git a/public/assets/flags/European Union.png b/public/img/flag/European Union.png similarity index 100% rename from public/assets/flags/European Union.png rename to public/img/flag/European Union.png diff --git a/public/assets/flags/Faroes.png b/public/img/flag/Faroes.png similarity index 100% rename from public/assets/flags/Faroes.png rename to public/img/flag/Faroes.png diff --git a/public/assets/flags/Fiji.png b/public/img/flag/Fiji.png similarity index 100% rename from public/assets/flags/Fiji.png rename to public/img/flag/Fiji.png diff --git a/public/assets/flags/Finland.png b/public/img/flag/Finland.png similarity index 100% rename from public/assets/flags/Finland.png rename to public/img/flag/Finland.png diff --git a/public/assets/flags/France.png b/public/img/flag/France.png similarity index 100% rename from public/assets/flags/France.png rename to public/img/flag/France.png diff --git a/public/assets/flags/Gabon.png b/public/img/flag/Gabon.png similarity index 100% rename from public/assets/flags/Gabon.png rename to public/img/flag/Gabon.png diff --git a/public/assets/flags/Gambia.png b/public/img/flag/Gambia.png similarity index 100% rename from public/assets/flags/Gambia.png rename to public/img/flag/Gambia.png diff --git a/public/assets/flags/Georgia.png b/public/img/flag/Georgia.png similarity index 100% rename from public/assets/flags/Georgia.png rename to public/img/flag/Georgia.png diff --git a/public/assets/flags/Germany.png b/public/img/flag/Germany.png similarity index 100% rename from public/assets/flags/Germany.png rename to public/img/flag/Germany.png diff --git a/public/assets/flags/Ghana.png b/public/img/flag/Ghana.png similarity index 100% rename from public/assets/flags/Ghana.png rename to public/img/flag/Ghana.png diff --git a/public/assets/flags/Gibraltar.png b/public/img/flag/Gibraltar.png similarity index 100% rename from public/assets/flags/Gibraltar.png rename to public/img/flag/Gibraltar.png diff --git a/public/assets/flags/Greece.png b/public/img/flag/Greece.png similarity index 100% rename from public/assets/flags/Greece.png rename to public/img/flag/Greece.png diff --git a/public/assets/flags/Greenland.png b/public/img/flag/Greenland.png similarity index 100% rename from public/assets/flags/Greenland.png rename to public/img/flag/Greenland.png diff --git a/public/assets/flags/Grenada.png b/public/img/flag/Grenada.png similarity index 100% rename from public/assets/flags/Grenada.png rename to public/img/flag/Grenada.png diff --git a/public/assets/flags/Guadeloupe.png b/public/img/flag/Guadeloupe.png similarity index 100% rename from public/assets/flags/Guadeloupe.png rename to public/img/flag/Guadeloupe.png diff --git a/public/assets/flags/Guam.png b/public/img/flag/Guam.png similarity index 100% rename from public/assets/flags/Guam.png rename to public/img/flag/Guam.png diff --git a/public/assets/flags/Guatemala.png b/public/img/flag/Guatemala.png similarity index 100% rename from public/assets/flags/Guatemala.png rename to public/img/flag/Guatemala.png diff --git a/public/assets/flags/Guernsey.png b/public/img/flag/Guernsey.png similarity index 100% rename from public/assets/flags/Guernsey.png rename to public/img/flag/Guernsey.png diff --git a/public/assets/flags/Guinea-Bissau.png b/public/img/flag/Guinea-Bissau.png similarity index 100% rename from public/assets/flags/Guinea-Bissau.png rename to public/img/flag/Guinea-Bissau.png diff --git a/public/assets/flags/Guinea.png b/public/img/flag/Guinea.png similarity index 100% rename from public/assets/flags/Guinea.png rename to public/img/flag/Guinea.png diff --git a/public/assets/flags/Guyana.png b/public/img/flag/Guyana.png similarity index 100% rename from public/assets/flags/Guyana.png rename to public/img/flag/Guyana.png diff --git a/public/assets/flags/Haiti.png b/public/img/flag/Haiti.png similarity index 100% rename from public/assets/flags/Haiti.png rename to public/img/flag/Haiti.png diff --git a/public/assets/flags/Honduras.png b/public/img/flag/Honduras.png similarity index 100% rename from public/assets/flags/Honduras.png rename to public/img/flag/Honduras.png diff --git a/public/assets/flags/Hong Kong.png b/public/img/flag/Hong Kong.png similarity index 100% rename from public/assets/flags/Hong Kong.png rename to public/img/flag/Hong Kong.png diff --git a/public/assets/flags/Hungary.png b/public/img/flag/Hungary.png similarity index 100% rename from public/assets/flags/Hungary.png rename to public/img/flag/Hungary.png diff --git a/public/assets/flags/Iceland.png b/public/img/flag/Iceland.png similarity index 100% rename from public/assets/flags/Iceland.png rename to public/img/flag/Iceland.png diff --git a/public/assets/flags/India.png b/public/img/flag/India.png similarity index 100% rename from public/assets/flags/India.png rename to public/img/flag/India.png diff --git a/public/assets/flags/Indonesia.png b/public/img/flag/Indonesia.png similarity index 100% rename from public/assets/flags/Indonesia.png rename to public/img/flag/Indonesia.png diff --git a/public/assets/flags/Iran.png b/public/img/flag/Iran.png similarity index 100% rename from public/assets/flags/Iran.png rename to public/img/flag/Iran.png diff --git a/public/assets/flags/Iraq.png b/public/img/flag/Iraq.png similarity index 100% rename from public/assets/flags/Iraq.png rename to public/img/flag/Iraq.png diff --git a/public/assets/flags/Ireland.png b/public/img/flag/Ireland.png similarity index 100% rename from public/assets/flags/Ireland.png rename to public/img/flag/Ireland.png diff --git a/public/assets/flags/Islamic Conference.png b/public/img/flag/Islamic Conference.png similarity index 100% rename from public/assets/flags/Islamic Conference.png rename to public/img/flag/Islamic Conference.png diff --git a/public/assets/flags/Isle of Man.png b/public/img/flag/Isle of Man.png similarity index 100% rename from public/assets/flags/Isle of Man.png rename to public/img/flag/Isle of Man.png diff --git a/public/assets/flags/Israel.png b/public/img/flag/Israel.png similarity index 100% rename from public/assets/flags/Israel.png rename to public/img/flag/Israel.png diff --git a/public/assets/flags/Italy.png b/public/img/flag/Italy.png similarity index 100% rename from public/assets/flags/Italy.png rename to public/img/flag/Italy.png diff --git a/public/assets/flags/Jamaica.png b/public/img/flag/Jamaica.png similarity index 100% rename from public/assets/flags/Jamaica.png rename to public/img/flag/Jamaica.png diff --git a/public/assets/flags/Japan.png b/public/img/flag/Japan.png similarity index 100% rename from public/assets/flags/Japan.png rename to public/img/flag/Japan.png diff --git a/public/assets/flags/Jersey.png b/public/img/flag/Jersey.png similarity index 100% rename from public/assets/flags/Jersey.png rename to public/img/flag/Jersey.png diff --git a/public/assets/flags/Jordan.png b/public/img/flag/Jordan.png similarity index 100% rename from public/assets/flags/Jordan.png rename to public/img/flag/Jordan.png diff --git a/public/assets/flags/Kazakhstan.png b/public/img/flag/Kazakhstan.png similarity index 100% rename from public/assets/flags/Kazakhstan.png rename to public/img/flag/Kazakhstan.png diff --git a/public/assets/flags/Kenya.png b/public/img/flag/Kenya.png similarity index 100% rename from public/assets/flags/Kenya.png rename to public/img/flag/Kenya.png diff --git a/public/assets/flags/Kiribati.png b/public/img/flag/Kiribati.png similarity index 100% rename from public/assets/flags/Kiribati.png rename to public/img/flag/Kiribati.png diff --git a/public/assets/flags/Kosovo.png b/public/img/flag/Kosovo.png similarity index 100% rename from public/assets/flags/Kosovo.png rename to public/img/flag/Kosovo.png diff --git a/public/assets/flags/Kuwait.png b/public/img/flag/Kuwait.png similarity index 100% rename from public/assets/flags/Kuwait.png rename to public/img/flag/Kuwait.png diff --git a/public/assets/flags/Kyrgyzstan.png b/public/img/flag/Kyrgyzstan.png similarity index 100% rename from public/assets/flags/Kyrgyzstan.png rename to public/img/flag/Kyrgyzstan.png diff --git a/public/assets/flags/LIthuania.png b/public/img/flag/LIthuania.png similarity index 100% rename from public/assets/flags/LIthuania.png rename to public/img/flag/LIthuania.png diff --git a/public/assets/flags/Laos.png b/public/img/flag/Laos.png similarity index 100% rename from public/assets/flags/Laos.png rename to public/img/flag/Laos.png diff --git a/public/assets/flags/Latvia.png b/public/img/flag/Latvia.png similarity index 100% rename from public/assets/flags/Latvia.png rename to public/img/flag/Latvia.png diff --git a/public/assets/flags/Lebanon.png b/public/img/flag/Lebanon.png similarity index 100% rename from public/assets/flags/Lebanon.png rename to public/img/flag/Lebanon.png diff --git a/public/assets/flags/Lesotho.png b/public/img/flag/Lesotho.png similarity index 100% rename from public/assets/flags/Lesotho.png rename to public/img/flag/Lesotho.png diff --git a/public/assets/flags/Liberia.png b/public/img/flag/Liberia.png similarity index 100% rename from public/assets/flags/Liberia.png rename to public/img/flag/Liberia.png diff --git a/public/assets/flags/Libya.png b/public/img/flag/Libya.png similarity index 100% rename from public/assets/flags/Libya.png rename to public/img/flag/Libya.png diff --git a/public/assets/flags/Liechtenstein.png b/public/img/flag/Liechtenstein.png similarity index 100% rename from public/assets/flags/Liechtenstein.png rename to public/img/flag/Liechtenstein.png diff --git a/public/assets/flags/Luxembourg.png b/public/img/flag/Luxembourg.png similarity index 100% rename from public/assets/flags/Luxembourg.png rename to public/img/flag/Luxembourg.png diff --git a/public/assets/flags/Macao.png b/public/img/flag/Macao.png similarity index 100% rename from public/assets/flags/Macao.png rename to public/img/flag/Macao.png diff --git a/public/assets/flags/Macedonia.png b/public/img/flag/Macedonia.png similarity index 100% rename from public/assets/flags/Macedonia.png rename to public/img/flag/Macedonia.png diff --git a/public/assets/flags/Madagascar.png b/public/img/flag/Madagascar.png similarity index 100% rename from public/assets/flags/Madagascar.png rename to public/img/flag/Madagascar.png diff --git a/public/assets/flags/Malawi.png b/public/img/flag/Malawi.png similarity index 100% rename from public/assets/flags/Malawi.png rename to public/img/flag/Malawi.png diff --git a/public/assets/flags/Malaysia.png b/public/img/flag/Malaysia.png similarity index 100% rename from public/assets/flags/Malaysia.png rename to public/img/flag/Malaysia.png diff --git a/public/assets/flags/Maldives.png b/public/img/flag/Maldives.png similarity index 100% rename from public/assets/flags/Maldives.png rename to public/img/flag/Maldives.png diff --git a/public/assets/flags/Mali.png b/public/img/flag/Mali.png similarity index 100% rename from public/assets/flags/Mali.png rename to public/img/flag/Mali.png diff --git a/public/assets/flags/Malta.png b/public/img/flag/Malta.png similarity index 100% rename from public/assets/flags/Malta.png rename to public/img/flag/Malta.png diff --git a/public/assets/flags/Marshall Islands.png b/public/img/flag/Marshall Islands.png similarity index 100% rename from public/assets/flags/Marshall Islands.png rename to public/img/flag/Marshall Islands.png diff --git a/public/assets/flags/Martinique.png b/public/img/flag/Martinique.png similarity index 100% rename from public/assets/flags/Martinique.png rename to public/img/flag/Martinique.png diff --git a/public/assets/flags/Mauritania.png b/public/img/flag/Mauritania.png similarity index 100% rename from public/assets/flags/Mauritania.png rename to public/img/flag/Mauritania.png diff --git a/public/assets/flags/Mauritius.png b/public/img/flag/Mauritius.png similarity index 100% rename from public/assets/flags/Mauritius.png rename to public/img/flag/Mauritius.png diff --git a/public/assets/flags/Mexico.png b/public/img/flag/Mexico.png similarity index 100% rename from public/assets/flags/Mexico.png rename to public/img/flag/Mexico.png diff --git a/public/assets/flags/Micronesia.png b/public/img/flag/Micronesia.png similarity index 100% rename from public/assets/flags/Micronesia.png rename to public/img/flag/Micronesia.png diff --git a/public/assets/flags/Moldova.png b/public/img/flag/Moldova.png similarity index 100% rename from public/assets/flags/Moldova.png rename to public/img/flag/Moldova.png diff --git a/public/assets/flags/Monaco.png b/public/img/flag/Monaco.png similarity index 100% rename from public/assets/flags/Monaco.png rename to public/img/flag/Monaco.png diff --git a/public/assets/flags/Mongolia.png b/public/img/flag/Mongolia.png similarity index 100% rename from public/assets/flags/Mongolia.png rename to public/img/flag/Mongolia.png diff --git a/public/assets/flags/Montenegro.png b/public/img/flag/Montenegro.png similarity index 100% rename from public/assets/flags/Montenegro.png rename to public/img/flag/Montenegro.png diff --git a/public/assets/flags/Montserrat.png b/public/img/flag/Montserrat.png similarity index 100% rename from public/assets/flags/Montserrat.png rename to public/img/flag/Montserrat.png diff --git a/public/assets/flags/Morocco.png b/public/img/flag/Morocco.png similarity index 100% rename from public/assets/flags/Morocco.png rename to public/img/flag/Morocco.png diff --git a/public/assets/flags/Mozambique.png b/public/img/flag/Mozambique.png similarity index 100% rename from public/assets/flags/Mozambique.png rename to public/img/flag/Mozambique.png diff --git a/public/assets/flags/Myanmar(Burma).png b/public/img/flag/Myanmar(Burma).png similarity index 100% rename from public/assets/flags/Myanmar(Burma).png rename to public/img/flag/Myanmar(Burma).png diff --git a/public/assets/flags/NATO.png b/public/img/flag/NATO.png similarity index 100% rename from public/assets/flags/NATO.png rename to public/img/flag/NATO.png diff --git a/public/assets/flags/Namibia.png b/public/img/flag/Namibia.png similarity index 100% rename from public/assets/flags/Namibia.png rename to public/img/flag/Namibia.png diff --git a/public/assets/flags/Nauru.png b/public/img/flag/Nauru.png similarity index 100% rename from public/assets/flags/Nauru.png rename to public/img/flag/Nauru.png diff --git a/public/assets/flags/Nepal.png b/public/img/flag/Nepal.png similarity index 100% rename from public/assets/flags/Nepal.png rename to public/img/flag/Nepal.png diff --git a/public/assets/flags/Netherlands Antilles.png b/public/img/flag/Netherlands Antilles.png similarity index 100% rename from public/assets/flags/Netherlands Antilles.png rename to public/img/flag/Netherlands Antilles.png diff --git a/public/assets/flags/Netherlands.png b/public/img/flag/Netherlands.png similarity index 100% rename from public/assets/flags/Netherlands.png rename to public/img/flag/Netherlands.png diff --git a/public/assets/flags/New Caledonia.png b/public/img/flag/New Caledonia.png similarity index 100% rename from public/assets/flags/New Caledonia.png rename to public/img/flag/New Caledonia.png diff --git a/public/assets/flags/New Zealand.png b/public/img/flag/New Zealand.png similarity index 100% rename from public/assets/flags/New Zealand.png rename to public/img/flag/New Zealand.png diff --git a/public/assets/flags/Nicaragua.png b/public/img/flag/Nicaragua.png similarity index 100% rename from public/assets/flags/Nicaragua.png rename to public/img/flag/Nicaragua.png diff --git a/public/assets/flags/Niger.png b/public/img/flag/Niger.png similarity index 100% rename from public/assets/flags/Niger.png rename to public/img/flag/Niger.png diff --git a/public/assets/flags/Nigeria.png b/public/img/flag/Nigeria.png similarity index 100% rename from public/assets/flags/Nigeria.png rename to public/img/flag/Nigeria.png diff --git a/public/assets/flags/North Korea.png b/public/img/flag/North Korea.png similarity index 100% rename from public/assets/flags/North Korea.png rename to public/img/flag/North Korea.png diff --git a/public/assets/flags/Northern Cyprus.png b/public/img/flag/Northern Cyprus.png similarity index 100% rename from public/assets/flags/Northern Cyprus.png rename to public/img/flag/Northern Cyprus.png diff --git a/public/assets/flags/Northern Ireland.png b/public/img/flag/Northern Ireland.png similarity index 100% rename from public/assets/flags/Northern Ireland.png rename to public/img/flag/Northern Ireland.png diff --git a/public/assets/flags/Norway.png b/public/img/flag/Norway.png similarity index 100% rename from public/assets/flags/Norway.png rename to public/img/flag/Norway.png diff --git a/public/assets/flags/OPEC.png b/public/img/flag/OPEC.png similarity index 100% rename from public/assets/flags/OPEC.png rename to public/img/flag/OPEC.png diff --git a/public/assets/flags/Olimpic Movement.png b/public/img/flag/Olimpic Movement.png similarity index 100% rename from public/assets/flags/Olimpic Movement.png rename to public/img/flag/Olimpic Movement.png diff --git a/public/assets/flags/Oman.png b/public/img/flag/Oman.png similarity index 100% rename from public/assets/flags/Oman.png rename to public/img/flag/Oman.png diff --git a/public/assets/flags/Pakistan.png b/public/img/flag/Pakistan.png similarity index 100% rename from public/assets/flags/Pakistan.png rename to public/img/flag/Pakistan.png diff --git a/public/assets/flags/Palau.png b/public/img/flag/Palau.png similarity index 100% rename from public/assets/flags/Palau.png rename to public/img/flag/Palau.png diff --git a/public/assets/flags/Palestine.png b/public/img/flag/Palestine.png similarity index 100% rename from public/assets/flags/Palestine.png rename to public/img/flag/Palestine.png diff --git a/public/assets/flags/Panama.png b/public/img/flag/Panama.png similarity index 100% rename from public/assets/flags/Panama.png rename to public/img/flag/Panama.png diff --git a/public/assets/flags/Papua New Guinea.png b/public/img/flag/Papua New Guinea.png similarity index 100% rename from public/assets/flags/Papua New Guinea.png rename to public/img/flag/Papua New Guinea.png diff --git a/public/assets/flags/Paraguay.png b/public/img/flag/Paraguay.png similarity index 100% rename from public/assets/flags/Paraguay.png rename to public/img/flag/Paraguay.png diff --git a/public/assets/flags/Peru.png b/public/img/flag/Peru.png similarity index 100% rename from public/assets/flags/Peru.png rename to public/img/flag/Peru.png diff --git a/public/assets/flags/Philippines.png b/public/img/flag/Philippines.png similarity index 100% rename from public/assets/flags/Philippines.png rename to public/img/flag/Philippines.png diff --git a/public/assets/flags/Poland.png b/public/img/flag/Poland.png similarity index 100% rename from public/assets/flags/Poland.png rename to public/img/flag/Poland.png diff --git a/public/assets/flags/Portugal.png b/public/img/flag/Portugal.png similarity index 100% rename from public/assets/flags/Portugal.png rename to public/img/flag/Portugal.png diff --git a/public/assets/flags/Puerto Rico.png b/public/img/flag/Puerto Rico.png similarity index 100% rename from public/assets/flags/Puerto Rico.png rename to public/img/flag/Puerto Rico.png diff --git a/public/assets/flags/Qatar.png b/public/img/flag/Qatar.png similarity index 100% rename from public/assets/flags/Qatar.png rename to public/img/flag/Qatar.png diff --git a/public/assets/flags/Red Cross.png b/public/img/flag/Red Cross.png similarity index 100% rename from public/assets/flags/Red Cross.png rename to public/img/flag/Red Cross.png diff --git a/public/assets/flags/Reunion.png b/public/img/flag/Reunion.png similarity index 100% rename from public/assets/flags/Reunion.png rename to public/img/flag/Reunion.png diff --git a/public/assets/flags/Romania.png b/public/img/flag/Romania.png similarity index 100% rename from public/assets/flags/Romania.png rename to public/img/flag/Romania.png diff --git a/public/assets/flags/Russian Federation.png b/public/img/flag/Russian Federation.png similarity index 100% rename from public/assets/flags/Russian Federation.png rename to public/img/flag/Russian Federation.png diff --git a/public/assets/flags/Rwanda.png b/public/img/flag/Rwanda.png similarity index 100% rename from public/assets/flags/Rwanda.png rename to public/img/flag/Rwanda.png diff --git a/public/assets/flags/Saint Lucia.png b/public/img/flag/Saint Lucia.png similarity index 100% rename from public/assets/flags/Saint Lucia.png rename to public/img/flag/Saint Lucia.png diff --git a/public/assets/flags/Samoa.png b/public/img/flag/Samoa.png similarity index 100% rename from public/assets/flags/Samoa.png rename to public/img/flag/Samoa.png diff --git a/public/assets/flags/San Marino.png b/public/img/flag/San Marino.png similarity index 100% rename from public/assets/flags/San Marino.png rename to public/img/flag/San Marino.png diff --git a/public/assets/flags/Sao Tome & Principe.png b/public/img/flag/Sao Tome & Principe.png similarity index 100% rename from public/assets/flags/Sao Tome & Principe.png rename to public/img/flag/Sao Tome & Principe.png diff --git a/public/assets/flags/Saudi Arabia.png b/public/img/flag/Saudi Arabia.png similarity index 100% rename from public/assets/flags/Saudi Arabia.png rename to public/img/flag/Saudi Arabia.png diff --git a/public/assets/flags/Scotland.png b/public/img/flag/Scotland.png similarity index 100% rename from public/assets/flags/Scotland.png rename to public/img/flag/Scotland.png diff --git a/public/assets/flags/Senegal.png b/public/img/flag/Senegal.png similarity index 100% rename from public/assets/flags/Senegal.png rename to public/img/flag/Senegal.png diff --git a/public/assets/flags/Serbia(Yugoslavia).png b/public/img/flag/Serbia(Yugoslavia).png similarity index 100% rename from public/assets/flags/Serbia(Yugoslavia).png rename to public/img/flag/Serbia(Yugoslavia).png diff --git a/public/assets/flags/Seychelles.png b/public/img/flag/Seychelles.png similarity index 100% rename from public/assets/flags/Seychelles.png rename to public/img/flag/Seychelles.png diff --git a/public/assets/flags/Sierra Leone.png b/public/img/flag/Sierra Leone.png similarity index 100% rename from public/assets/flags/Sierra Leone.png rename to public/img/flag/Sierra Leone.png diff --git a/public/assets/flags/Singapore.png b/public/img/flag/Singapore.png similarity index 100% rename from public/assets/flags/Singapore.png rename to public/img/flag/Singapore.png diff --git a/public/assets/flags/Slovakia.png b/public/img/flag/Slovakia.png similarity index 100% rename from public/assets/flags/Slovakia.png rename to public/img/flag/Slovakia.png diff --git a/public/assets/flags/Slovenia.png b/public/img/flag/Slovenia.png similarity index 100% rename from public/assets/flags/Slovenia.png rename to public/img/flag/Slovenia.png diff --git a/public/assets/flags/Solomon Islands.png b/public/img/flag/Solomon Islands.png similarity index 100% rename from public/assets/flags/Solomon Islands.png rename to public/img/flag/Solomon Islands.png diff --git a/public/assets/flags/Somalia.png b/public/img/flag/Somalia.png similarity index 100% rename from public/assets/flags/Somalia.png rename to public/img/flag/Somalia.png diff --git a/public/assets/flags/Somaliland.png b/public/img/flag/Somaliland.png similarity index 100% rename from public/assets/flags/Somaliland.png rename to public/img/flag/Somaliland.png diff --git a/public/assets/flags/South Africa.png b/public/img/flag/South Africa.png similarity index 100% rename from public/assets/flags/South Africa.png rename to public/img/flag/South Africa.png diff --git a/public/assets/flags/South Korea.png b/public/img/flag/South Korea.png similarity index 100% rename from public/assets/flags/South Korea.png rename to public/img/flag/South Korea.png diff --git a/public/assets/flags/Spain.png b/public/img/flag/Spain.png similarity index 100% rename from public/assets/flags/Spain.png rename to public/img/flag/Spain.png diff --git a/public/assets/flags/Sri Lanka.png b/public/img/flag/Sri Lanka.png similarity index 100% rename from public/assets/flags/Sri Lanka.png rename to public/img/flag/Sri Lanka.png diff --git a/public/assets/flags/St Kitts & Nevis.png b/public/img/flag/St Kitts & Nevis.png similarity index 100% rename from public/assets/flags/St Kitts & Nevis.png rename to public/img/flag/St Kitts & Nevis.png diff --git a/public/assets/flags/St Vincent & the Grenadines.png b/public/img/flag/St Vincent & the Grenadines.png similarity index 100% rename from public/assets/flags/St Vincent & the Grenadines.png rename to public/img/flag/St Vincent & the Grenadines.png diff --git a/public/assets/flags/Sudan.png b/public/img/flag/Sudan.png similarity index 100% rename from public/assets/flags/Sudan.png rename to public/img/flag/Sudan.png diff --git a/public/assets/flags/Suriname.png b/public/img/flag/Suriname.png similarity index 100% rename from public/assets/flags/Suriname.png rename to public/img/flag/Suriname.png diff --git a/public/assets/flags/Swaziland.png b/public/img/flag/Swaziland.png similarity index 100% rename from public/assets/flags/Swaziland.png rename to public/img/flag/Swaziland.png diff --git a/public/assets/flags/Sweden.png b/public/img/flag/Sweden.png similarity index 100% rename from public/assets/flags/Sweden.png rename to public/img/flag/Sweden.png diff --git a/public/assets/flags/Switzerland.png b/public/img/flag/Switzerland.png similarity index 100% rename from public/assets/flags/Switzerland.png rename to public/img/flag/Switzerland.png diff --git a/public/assets/flags/Syria.png b/public/img/flag/Syria.png similarity index 100% rename from public/assets/flags/Syria.png rename to public/img/flag/Syria.png diff --git a/public/assets/flags/Tahiti(French Polinesia).png b/public/img/flag/Tahiti(French Polinesia).png similarity index 100% rename from public/assets/flags/Tahiti(French Polinesia).png rename to public/img/flag/Tahiti(French Polinesia).png diff --git a/public/assets/flags/Taiwan.png b/public/img/flag/Taiwan.png similarity index 100% rename from public/assets/flags/Taiwan.png rename to public/img/flag/Taiwan.png diff --git a/public/assets/flags/Tajikistan.png b/public/img/flag/Tajikistan.png similarity index 100% rename from public/assets/flags/Tajikistan.png rename to public/img/flag/Tajikistan.png diff --git a/public/assets/flags/Tanzania.png b/public/img/flag/Tanzania.png similarity index 100% rename from public/assets/flags/Tanzania.png rename to public/img/flag/Tanzania.png diff --git a/public/assets/flags/Thailand.png b/public/img/flag/Thailand.png similarity index 100% rename from public/assets/flags/Thailand.png rename to public/img/flag/Thailand.png diff --git a/public/assets/flags/Timor-Leste.png b/public/img/flag/Timor-Leste.png similarity index 100% rename from public/assets/flags/Timor-Leste.png rename to public/img/flag/Timor-Leste.png diff --git a/public/assets/flags/Togo.png b/public/img/flag/Togo.png similarity index 100% rename from public/assets/flags/Togo.png rename to public/img/flag/Togo.png diff --git a/public/assets/flags/Tonga.png b/public/img/flag/Tonga.png similarity index 100% rename from public/assets/flags/Tonga.png rename to public/img/flag/Tonga.png diff --git a/public/assets/flags/Trinidad & Tobago.png b/public/img/flag/Trinidad & Tobago.png similarity index 100% rename from public/assets/flags/Trinidad & Tobago.png rename to public/img/flag/Trinidad & Tobago.png diff --git a/public/assets/flags/Tunisia.png b/public/img/flag/Tunisia.png similarity index 100% rename from public/assets/flags/Tunisia.png rename to public/img/flag/Tunisia.png diff --git a/public/assets/flags/Turkey.png b/public/img/flag/Turkey.png similarity index 100% rename from public/assets/flags/Turkey.png rename to public/img/flag/Turkey.png diff --git a/public/assets/flags/Turkmenistan.png b/public/img/flag/Turkmenistan.png similarity index 100% rename from public/assets/flags/Turkmenistan.png rename to public/img/flag/Turkmenistan.png diff --git a/public/assets/flags/Turks and Caicos Islands.png b/public/img/flag/Turks and Caicos Islands.png similarity index 100% rename from public/assets/flags/Turks and Caicos Islands.png rename to public/img/flag/Turks and Caicos Islands.png diff --git a/public/assets/flags/Tuvalu.png b/public/img/flag/Tuvalu.png similarity index 100% rename from public/assets/flags/Tuvalu.png rename to public/img/flag/Tuvalu.png diff --git a/public/assets/flags/Uganda.png b/public/img/flag/Uganda.png similarity index 100% rename from public/assets/flags/Uganda.png rename to public/img/flag/Uganda.png diff --git a/public/assets/flags/Ukraine.png b/public/img/flag/Ukraine.png similarity index 100% rename from public/assets/flags/Ukraine.png rename to public/img/flag/Ukraine.png diff --git a/public/assets/flags/United Arab Emirates.png b/public/img/flag/United Arab Emirates.png similarity index 100% rename from public/assets/flags/United Arab Emirates.png rename to public/img/flag/United Arab Emirates.png diff --git a/public/assets/flags/United Kingdom(Great Britain).png b/public/img/flag/United Kingdom(Great Britain).png similarity index 100% rename from public/assets/flags/United Kingdom(Great Britain).png rename to public/img/flag/United Kingdom(Great Britain).png diff --git a/public/assets/flags/United Nations.png b/public/img/flag/United Nations.png similarity index 100% rename from public/assets/flags/United Nations.png rename to public/img/flag/United Nations.png diff --git a/public/assets/flags/United States of America (USA).png b/public/img/flag/United States of America (USA).png similarity index 100% rename from public/assets/flags/United States of America (USA).png rename to public/img/flag/United States of America (USA).png diff --git a/public/assets/flags/Uruguay.png b/public/img/flag/Uruguay.png similarity index 100% rename from public/assets/flags/Uruguay.png rename to public/img/flag/Uruguay.png diff --git a/public/assets/flags/Uzbekistan.png b/public/img/flag/Uzbekistan.png similarity index 100% rename from public/assets/flags/Uzbekistan.png rename to public/img/flag/Uzbekistan.png diff --git a/public/assets/flags/Vanutau.png b/public/img/flag/Vanutau.png similarity index 100% rename from public/assets/flags/Vanutau.png rename to public/img/flag/Vanutau.png diff --git a/public/assets/flags/Vatican City.png b/public/img/flag/Vatican City.png similarity index 100% rename from public/assets/flags/Vatican City.png rename to public/img/flag/Vatican City.png diff --git a/public/assets/flags/Venezuela.png b/public/img/flag/Venezuela.png similarity index 100% rename from public/assets/flags/Venezuela.png rename to public/img/flag/Venezuela.png diff --git a/public/assets/flags/Viet Nam.png b/public/img/flag/Viet Nam.png similarity index 100% rename from public/assets/flags/Viet Nam.png rename to public/img/flag/Viet Nam.png diff --git a/public/assets/flags/Virgin Islands British.png b/public/img/flag/Virgin Islands British.png similarity index 100% rename from public/assets/flags/Virgin Islands British.png rename to public/img/flag/Virgin Islands British.png diff --git a/public/assets/flags/Virgin Islands US.png b/public/img/flag/Virgin Islands US.png similarity index 100% rename from public/assets/flags/Virgin Islands US.png rename to public/img/flag/Virgin Islands US.png diff --git a/public/assets/flags/Wales.png b/public/img/flag/Wales.png similarity index 100% rename from public/assets/flags/Wales.png rename to public/img/flag/Wales.png diff --git a/public/assets/flags/Western Sahara.png b/public/img/flag/Western Sahara.png similarity index 100% rename from public/assets/flags/Western Sahara.png rename to public/img/flag/Western Sahara.png diff --git a/public/assets/flags/Yemen.png b/public/img/flag/Yemen.png similarity index 100% rename from public/assets/flags/Yemen.png rename to public/img/flag/Yemen.png diff --git a/public/assets/flags/Zambia.png b/public/img/flag/Zambia.png similarity index 100% rename from public/assets/flags/Zambia.png rename to public/img/flag/Zambia.png diff --git a/public/assets/flags/Zimbabwe.png b/public/img/flag/Zimbabwe.png similarity index 100% rename from public/assets/flags/Zimbabwe.png rename to public/img/flag/Zimbabwe.png diff --git a/public/assets/img/header.png b/public/img/header.png similarity index 100% rename from public/assets/img/header.png rename to public/img/header.png diff --git a/public/assets/img/keromayokatta.png b/public/img/keromayokatta.png similarity index 100% rename from public/assets/img/keromayokatta.png rename to public/img/keromayokatta.png diff --git a/public/assets/img/twitter.png b/public/img/twitter.png similarity index 100% rename from public/assets/img/twitter.png rename to public/img/twitter.png diff --git a/public/index.php b/public/index.php old mode 100755 new mode 100644 diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 2d60117..d17d53f 100755 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,4 +1,272 @@ { "/js/app.js": "/js/app.js", - "/css/app.css": "/css/app.css" + "/css/app.css": "/css/app.css", + "/fonts/jpserriffont.woff": "/fonts/jpserriffont.woff", + "/img/bitchute.png": "/img/bitchute.png", + "/img/discord.png": "/img/discord.png", + "/img/favicon.jpeg": "/img/favicon.jpeg", + "/img/header.png": "/img/header.png", + "/img/keromayokatta.png": "/img/keromayokatta.png", + "/img/twitter.png": "/img/twitter.png", + "/img/bash/6fd97df9bfea41748061893ce36cefee.jpeg": "/img/bash/6fd97df9bfea41748061893ce36cefee.jpeg", + "/img/bash/81004208_p0.jpg": "/img/bash/81004208_p0.jpg", + "/img/bash/app_icon.png": "/img/bash/app_icon.png", + "/img/bash/bottom_bg.png": "/img/bash/bottom_bg.png", + "/img/bash/bottom_left.png": "/img/bash/bottom_left.png", + "/img/bash/bottom_right.png": "/img/bash/bottom_right.png", + "/img/bash/left_bg.png": "/img/bash/left_bg.png", + "/img/bash/right_bg.png": "/img/bash/right_bg.png", + "/img/bash/root_bg.png": "/img/bash/root_bg.png", + "/img/bash/top_bg.png": "/img/bash/top_bg.png", + "/img/bash/top_left.png": "/img/bash/top_left.png", + "/img/bash/top_max_hover.png": "/img/bash/top_max_hover.png", + "/img/bash/top_max.png": "/img/bash/top_max.png", + "/img/bash/top_min_hover.png": "/img/bash/top_min_hover.png", + "/img/bash/top_min.png": "/img/bash/top_min.png", + "/img/bash/top_right_hover.png": "/img/bash/top_right_hover.png", + "/img/bash/top_right.png": "/img/bash/top_right.png", + "/img/bash/user_bg.png": "/img/bash/user_bg.png", + "/img/flags/Afghanistan.png": "/img/flags/Afghanistan.png", + "/img/flags/African Union(OAS).png": "/img/flags/African Union(OAS).png", + "/img/flags/Albania.png": "/img/flags/Albania.png", + "/img/flags/Algeria.png": "/img/flags/Algeria.png", + "/img/flags/American Samoa.png": "/img/flags/American Samoa.png", + "/img/flags/Andorra.png": "/img/flags/Andorra.png", + "/img/flags/Angola.png": "/img/flags/Angola.png", + "/img/flags/Anguilla.png": "/img/flags/Anguilla.png", + "/img/flags/Antarctica.png": "/img/flags/Antarctica.png", + "/img/flags/Antigua & Barbuda.png": "/img/flags/Antigua & Barbuda.png", + "/img/flags/Arab League.png": "/img/flags/Arab League.png", + "/img/flags/Argentina.png": "/img/flags/Argentina.png", + "/img/flags/Armenia.png": "/img/flags/Armenia.png", + "/img/flags/Aruba.png": "/img/flags/Aruba.png", + "/img/flags/ASEAN.png": "/img/flags/ASEAN.png", + "/img/flags/Australia.png": "/img/flags/Australia.png", + "/img/flags/Austria.png": "/img/flags/Austria.png", + "/img/flags/Azerbaijan.png": "/img/flags/Azerbaijan.png", + "/img/flags/Bahamas.png": "/img/flags/Bahamas.png", + "/img/flags/Bahrain.png": "/img/flags/Bahrain.png", + "/img/flags/Bangladesh.png": "/img/flags/Bangladesh.png", + "/img/flags/Barbados.png": "/img/flags/Barbados.png", + "/img/flags/Belarus.png": "/img/flags/Belarus.png", + "/img/flags/Belgium.png": "/img/flags/Belgium.png", + "/img/flags/Belize.png": "/img/flags/Belize.png", + "/img/flags/Benin.png": "/img/flags/Benin.png", + "/img/flags/Bermuda.png": "/img/flags/Bermuda.png", + "/img/flags/Bhutan.png": "/img/flags/Bhutan.png", + "/img/flags/Bolivia.png": "/img/flags/Bolivia.png", + "/img/flags/Bosnia & Herzegovina.png": "/img/flags/Bosnia & Herzegovina.png", + "/img/flags/Botswana.png": "/img/flags/Botswana.png", + "/img/flags/Brazil.png": "/img/flags/Brazil.png", + "/img/flags/Brunei.png": "/img/flags/Brunei.png", + "/img/flags/Bulgaria.png": "/img/flags/Bulgaria.png", + "/img/flags/Burkina Faso.png": "/img/flags/Burkina Faso.png", + "/img/flags/Burundi.png": "/img/flags/Burundi.png", + "/img/flags/Cambodja.png": "/img/flags/Cambodja.png", + "/img/flags/Cameroon.png": "/img/flags/Cameroon.png", + "/img/flags/Canada.png": "/img/flags/Canada.png", + "/img/flags/Cape Verde.png": "/img/flags/Cape Verde.png", + "/img/flags/CARICOM.png": "/img/flags/CARICOM.png", + "/img/flags/Cayman Islands.png": "/img/flags/Cayman Islands.png", + "/img/flags/Central African Republic.png": "/img/flags/Central African Republic.png", + "/img/flags/Chad.png": "/img/flags/Chad.png", + "/img/flags/Chile.png": "/img/flags/Chile.png", + "/img/flags/China.png": "/img/flags/China.png", + "/img/flags/CIS.png": "/img/flags/CIS.png", + "/img/flags/Colombia.png": "/img/flags/Colombia.png", + "/img/flags/Commonwealth.png": "/img/flags/Commonwealth.png", + "/img/flags/Comoros.png": "/img/flags/Comoros.png", + "/img/flags/Congo-Brazzaville.png": "/img/flags/Congo-Brazzaville.png", + "/img/flags/Congo-Kinshasa(Zaire).png": "/img/flags/Congo-Kinshasa(Zaire).png", + "/img/flags/Cook Islands.png": "/img/flags/Cook Islands.png", + "/img/flags/Costa Rica.png": "/img/flags/Costa Rica.png", + "/img/flags/Cote d'Ivoire.png": "/img/flags/Cote d'Ivoire.png", + "/img/flags/Croatia.png": "/img/flags/Croatia.png", + "/img/flags/Cuba.png": "/img/flags/Cuba.png", + "/img/flags/Cyprus.png": "/img/flags/Cyprus.png", + "/img/flags/Czech Republic.png": "/img/flags/Czech Republic.png", + "/img/flags/Denmark.png": "/img/flags/Denmark.png", + "/img/flags/Djibouti.png": "/img/flags/Djibouti.png", + "/img/flags/Dominica.png": "/img/flags/Dominica.png", + "/img/flags/Dominican Republic.png": "/img/flags/Dominican Republic.png", + "/img/flags/Ecuador.png": "/img/flags/Ecuador.png", + "/img/flags/Egypt.png": "/img/flags/Egypt.png", + "/img/flags/El Salvador.png": "/img/flags/El Salvador.png", + "/img/flags/England.png": "/img/flags/England.png", + "/img/flags/Equatorial Guinea.png": "/img/flags/Equatorial Guinea.png", + "/img/flags/Eritrea.png": "/img/flags/Eritrea.png", + "/img/flags/Estonia.png": "/img/flags/Estonia.png", + "/img/flags/Ethiopia.png": "/img/flags/Ethiopia.png", + "/img/flags/European Union.png": "/img/flags/European Union.png", + "/img/flags/Faroes.png": "/img/flags/Faroes.png", + "/img/flags/Fiji.png": "/img/flags/Fiji.png", + "/img/flags/Finland.png": "/img/flags/Finland.png", + "/img/flags/France.png": "/img/flags/France.png", + "/img/flags/Gabon.png": "/img/flags/Gabon.png", + "/img/flags/Gambia.png": "/img/flags/Gambia.png", + "/img/flags/Georgia.png": "/img/flags/Georgia.png", + "/img/flags/Germany.png": "/img/flags/Germany.png", + "/img/flags/Ghana.png": "/img/flags/Ghana.png", + "/img/flags/Gibraltar.png": "/img/flags/Gibraltar.png", + "/img/flags/Greece.png": "/img/flags/Greece.png", + "/img/flags/Greenland.png": "/img/flags/Greenland.png", + "/img/flags/Grenada.png": "/img/flags/Grenada.png", + "/img/flags/Guadeloupe.png": "/img/flags/Guadeloupe.png", + "/img/flags/Guam.png": "/img/flags/Guam.png", + "/img/flags/Guatemala.png": "/img/flags/Guatemala.png", + "/img/flags/Guernsey.png": "/img/flags/Guernsey.png", + "/img/flags/Guinea-Bissau.png": "/img/flags/Guinea-Bissau.png", + "/img/flags/Guinea.png": "/img/flags/Guinea.png", + "/img/flags/Guyana.png": "/img/flags/Guyana.png", + "/img/flags/Haiti.png": "/img/flags/Haiti.png", + "/img/flags/Honduras.png": "/img/flags/Honduras.png", + "/img/flags/Hong Kong.png": "/img/flags/Hong Kong.png", + "/img/flags/Hungary.png": "/img/flags/Hungary.png", + "/img/flags/Iceland.png": "/img/flags/Iceland.png", + "/img/flags/India.png": "/img/flags/India.png", + "/img/flags/Indonesia.png": "/img/flags/Indonesia.png", + "/img/flags/Iran.png": "/img/flags/Iran.png", + "/img/flags/Iraq.png": "/img/flags/Iraq.png", + "/img/flags/Ireland.png": "/img/flags/Ireland.png", + "/img/flags/Islamic Conference.png": "/img/flags/Islamic Conference.png", + "/img/flags/Isle of Man.png": "/img/flags/Isle of Man.png", + "/img/flags/Israel.png": "/img/flags/Israel.png", + "/img/flags/Italy.png": "/img/flags/Italy.png", + "/img/flags/Jamaica.png": "/img/flags/Jamaica.png", + "/img/flags/Japan.png": "/img/flags/Japan.png", + "/img/flags/Jersey.png": "/img/flags/Jersey.png", + "/img/flags/Jordan.png": "/img/flags/Jordan.png", + "/img/flags/Kazakhstan.png": "/img/flags/Kazakhstan.png", + "/img/flags/Kenya.png": "/img/flags/Kenya.png", + "/img/flags/Kiribati.png": "/img/flags/Kiribati.png", + "/img/flags/Kosovo.png": "/img/flags/Kosovo.png", + "/img/flags/Kuwait.png": "/img/flags/Kuwait.png", + "/img/flags/Kyrgyzstan.png": "/img/flags/Kyrgyzstan.png", + "/img/flags/Laos.png": "/img/flags/Laos.png", + "/img/flags/Latvia.png": "/img/flags/Latvia.png", + "/img/flags/Lebanon.png": "/img/flags/Lebanon.png", + "/img/flags/Lesotho.png": "/img/flags/Lesotho.png", + "/img/flags/Liberia.png": "/img/flags/Liberia.png", + "/img/flags/Libya.png": "/img/flags/Libya.png", + "/img/flags/Liechtenstein.png": "/img/flags/Liechtenstein.png", + "/img/flags/LIthuania.png": "/img/flags/LIthuania.png", + "/img/flags/Luxembourg.png": "/img/flags/Luxembourg.png", + "/img/flags/Macao.png": "/img/flags/Macao.png", + "/img/flags/Macedonia.png": "/img/flags/Macedonia.png", + "/img/flags/Madagascar.png": "/img/flags/Madagascar.png", + "/img/flags/Malawi.png": "/img/flags/Malawi.png", + "/img/flags/Malaysia.png": "/img/flags/Malaysia.png", + "/img/flags/Maldives.png": "/img/flags/Maldives.png", + "/img/flags/Mali.png": "/img/flags/Mali.png", + "/img/flags/Malta.png": "/img/flags/Malta.png", + "/img/flags/Marshall Islands.png": "/img/flags/Marshall Islands.png", + "/img/flags/Martinique.png": "/img/flags/Martinique.png", + "/img/flags/Mauritania.png": "/img/flags/Mauritania.png", + "/img/flags/Mauritius.png": "/img/flags/Mauritius.png", + "/img/flags/Mexico.png": "/img/flags/Mexico.png", + "/img/flags/Micronesia.png": "/img/flags/Micronesia.png", + "/img/flags/Moldova.png": "/img/flags/Moldova.png", + "/img/flags/Monaco.png": "/img/flags/Monaco.png", + "/img/flags/Mongolia.png": "/img/flags/Mongolia.png", + "/img/flags/Montenegro.png": "/img/flags/Montenegro.png", + "/img/flags/Montserrat.png": "/img/flags/Montserrat.png", + "/img/flags/Morocco.png": "/img/flags/Morocco.png", + "/img/flags/Mozambique.png": "/img/flags/Mozambique.png", + "/img/flags/Myanmar(Burma).png": "/img/flags/Myanmar(Burma).png", + "/img/flags/Namibia.png": "/img/flags/Namibia.png", + "/img/flags/NATO.png": "/img/flags/NATO.png", + "/img/flags/Nauru.png": "/img/flags/Nauru.png", + "/img/flags/Nepal.png": "/img/flags/Nepal.png", + "/img/flags/Netherlands Antilles.png": "/img/flags/Netherlands Antilles.png", + "/img/flags/Netherlands.png": "/img/flags/Netherlands.png", + "/img/flags/New Caledonia.png": "/img/flags/New Caledonia.png", + "/img/flags/New Zealand.png": "/img/flags/New Zealand.png", + "/img/flags/Nicaragua.png": "/img/flags/Nicaragua.png", + "/img/flags/Niger.png": "/img/flags/Niger.png", + "/img/flags/Nigeria.png": "/img/flags/Nigeria.png", + "/img/flags/North Korea.png": "/img/flags/North Korea.png", + "/img/flags/Northern Cyprus.png": "/img/flags/Northern Cyprus.png", + "/img/flags/Northern Ireland.png": "/img/flags/Northern Ireland.png", + "/img/flags/Norway.png": "/img/flags/Norway.png", + "/img/flags/Olimpic Movement.png": "/img/flags/Olimpic Movement.png", + "/img/flags/Oman.png": "/img/flags/Oman.png", + "/img/flags/OPEC.png": "/img/flags/OPEC.png", + "/img/flags/Pakistan.png": "/img/flags/Pakistan.png", + "/img/flags/Palau.png": "/img/flags/Palau.png", + "/img/flags/Palestine.png": "/img/flags/Palestine.png", + "/img/flags/Panama.png": "/img/flags/Panama.png", + "/img/flags/Papua New Guinea.png": "/img/flags/Papua New Guinea.png", + "/img/flags/Paraguay.png": "/img/flags/Paraguay.png", + "/img/flags/Peru.png": "/img/flags/Peru.png", + "/img/flags/Philippines.png": "/img/flags/Philippines.png", + "/img/flags/Poland.png": "/img/flags/Poland.png", + "/img/flags/Portugal.png": "/img/flags/Portugal.png", + "/img/flags/Puerto Rico.png": "/img/flags/Puerto Rico.png", + "/img/flags/Qatar.png": "/img/flags/Qatar.png", + "/img/flags/Red Cross.png": "/img/flags/Red Cross.png", + "/img/flags/Reunion.png": "/img/flags/Reunion.png", + "/img/flags/Romania.png": "/img/flags/Romania.png", + "/img/flags/Russian Federation.png": "/img/flags/Russian Federation.png", + "/img/flags/Rwanda.png": "/img/flags/Rwanda.png", + "/img/flags/Saint Lucia.png": "/img/flags/Saint Lucia.png", + "/img/flags/Samoa.png": "/img/flags/Samoa.png", + "/img/flags/San Marino.png": "/img/flags/San Marino.png", + "/img/flags/Sao Tome & Principe.png": "/img/flags/Sao Tome & Principe.png", + "/img/flags/Saudi Arabia.png": "/img/flags/Saudi Arabia.png", + "/img/flags/Scotland.png": "/img/flags/Scotland.png", + "/img/flags/Senegal.png": "/img/flags/Senegal.png", + "/img/flags/Serbia(Yugoslavia).png": "/img/flags/Serbia(Yugoslavia).png", + "/img/flags/Seychelles.png": "/img/flags/Seychelles.png", + "/img/flags/Sierra Leone.png": "/img/flags/Sierra Leone.png", + "/img/flags/Singapore.png": "/img/flags/Singapore.png", + "/img/flags/Slovakia.png": "/img/flags/Slovakia.png", + "/img/flags/Slovenia.png": "/img/flags/Slovenia.png", + "/img/flags/Solomon Islands.png": "/img/flags/Solomon Islands.png", + "/img/flags/Somalia.png": "/img/flags/Somalia.png", + "/img/flags/Somaliland.png": "/img/flags/Somaliland.png", + "/img/flags/South Africa.png": "/img/flags/South Africa.png", + "/img/flags/South Korea.png": "/img/flags/South Korea.png", + "/img/flags/Spain.png": "/img/flags/Spain.png", + "/img/flags/Sri Lanka.png": "/img/flags/Sri Lanka.png", + "/img/flags/St Kitts & Nevis.png": "/img/flags/St Kitts & Nevis.png", + "/img/flags/St Vincent & the Grenadines.png": "/img/flags/St Vincent & the Grenadines.png", + "/img/flags/Sudan.png": "/img/flags/Sudan.png", + "/img/flags/Suriname.png": "/img/flags/Suriname.png", + "/img/flags/Swaziland.png": "/img/flags/Swaziland.png", + "/img/flags/Sweden.png": "/img/flags/Sweden.png", + "/img/flags/Switzerland.png": "/img/flags/Switzerland.png", + "/img/flags/Syria.png": "/img/flags/Syria.png", + "/img/flags/Tahiti(French Polinesia).png": "/img/flags/Tahiti(French Polinesia).png", + "/img/flags/Taiwan.png": "/img/flags/Taiwan.png", + "/img/flags/Tajikistan.png": "/img/flags/Tajikistan.png", + "/img/flags/Tanzania.png": "/img/flags/Tanzania.png", + "/img/flags/Thailand.png": "/img/flags/Thailand.png", + "/img/flags/Timor-Leste.png": "/img/flags/Timor-Leste.png", + "/img/flags/Togo.png": "/img/flags/Togo.png", + "/img/flags/Tonga.png": "/img/flags/Tonga.png", + "/img/flags/Trinidad & Tobago.png": "/img/flags/Trinidad & Tobago.png", + "/img/flags/Tunisia.png": "/img/flags/Tunisia.png", + "/img/flags/Turkey.png": "/img/flags/Turkey.png", + "/img/flags/Turkmenistan.png": "/img/flags/Turkmenistan.png", + "/img/flags/Turks and Caicos Islands.png": "/img/flags/Turks and Caicos Islands.png", + "/img/flags/Tuvalu.png": "/img/flags/Tuvalu.png", + "/img/flags/Uganda.png": "/img/flags/Uganda.png", + "/img/flags/Ukraine.png": "/img/flags/Ukraine.png", + "/img/flags/United Arab Emirates.png": "/img/flags/United Arab Emirates.png", + "/img/flags/United Kingdom(Great Britain).png": "/img/flags/United Kingdom(Great Britain).png", + "/img/flags/United Nations.png": "/img/flags/United Nations.png", + "/img/flags/United States of America (USA).png": "/img/flags/United States of America (USA).png", + "/img/flags/Uruguay.png": "/img/flags/Uruguay.png", + "/img/flags/Uzbekistan.png": "/img/flags/Uzbekistan.png", + "/img/flags/Vanutau.png": "/img/flags/Vanutau.png", + "/img/flags/Vatican City.png": "/img/flags/Vatican City.png", + "/img/flags/Venezuela.png": "/img/flags/Venezuela.png", + "/img/flags/Viet Nam.png": "/img/flags/Viet Nam.png", + "/img/flags/Virgin Islands British.png": "/img/flags/Virgin Islands British.png", + "/img/flags/Virgin Islands US.png": "/img/flags/Virgin Islands US.png", + "/img/flags/Wales.png": "/img/flags/Wales.png", + "/img/flags/Western Sahara.png": "/img/flags/Western Sahara.png", + "/img/flags/Yemen.png": "/img/flags/Yemen.png", + "/img/flags/Zambia.png": "/img/flags/Zambia.png", + "/img/flags/Zimbabwe.png": "/img/flags/Zimbabwe.png" } diff --git a/public/robots.txt b/public/robots.txt old mode 100755 new mode 100644 diff --git a/public/web.config b/public/web.config old mode 100755 new mode 100644 index 624c176..d3711d7 --- a/public/web.config +++ b/public/web.config @@ -1,3 +1,8 @@ + diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js deleted file mode 100644 index d0ecd9b..0000000 --- a/resources/assets/js/app.js +++ /dev/null @@ -1,27 +0,0 @@ - -/** - * First we will load all of this project's JavaScript dependencies which - * includes Vue and other libraries. It is a great starting point when - * building robust, powerful web applications using Vue and Laravel. - */ - -require('./bootstrap'); - -window.Vue = require('vue'); -import bash from './components/bash/cli.vue'; -import tsuchi from './components/site/components/tsuchi.vue'; - -Vue.component('bash', bash); -Vue.component('tsuchi', tsuchi); - -/** - * Next, we will create a fresh Vue application instance and attach it to - * the page. Then, you may begin adding components to this application - * or customize the JavaScript scaffolding to fit your unique needs. - */ - -// Vue.component('example', require('./components/Example.vue')); - -const app = new Vue({ - el: '#app' -}); diff --git a/resources/assets/js/auth.js b/resources/assets/js/auth.js deleted file mode 100644 index 3166d98..0000000 --- a/resources/assets/js/auth.js +++ /dev/null @@ -1,39 +0,0 @@ -import Cookie from 'js-cookie' - -const LOGIN_URL = '/api/auth/login' -const SIGNUP_URL = '/api/auth/register' - -export default { - domain: '076.ne.jp', - user: { id: 0, authenticated: false }, - login (creds) { - axios.post(LOGIN_URL, creds).then(res => { - if (creds.username === res.data.username && creds.password === res.data.rawPassword) { - Cookie.set('kero_token', res.data.kero_token, { expires: 365, domain: this.domain, path: '/' }); - - this.user.authenticated = true; - window.location.reload(); - } - }); - }, - signup (creds) { axios.post(SIGNUP_URL, creds).then(res => { if (res.data[0] === '1') this.login(creds); }); }, - logout () { - Cookie.remove('kero_token', { domain: this.domain, path: '/' }); - this.user.authenticated = false; - window.location.reload(); - }, - checkAuth () { - const tok = Cookie.get('kero_token'); - - axios.post('/api/auth/checkauth', { kero_token: tok }).then(res => { - if (tok === res.data.kero_token) { - this.user.id = res.data.id; - this.user.authenticated = true; - } - else { - this.user.id = 0; - this.user.authenticated = false; - } - }) - } -} diff --git a/resources/assets/js/bootstrap.js b/resources/assets/js/bootstrap.js deleted file mode 100644 index fb0f1ed..0000000 --- a/resources/assets/js/bootstrap.js +++ /dev/null @@ -1,56 +0,0 @@ - -window._ = require('lodash'); -window.Popper = require('popper.js').default; - -/** - * We'll load jQuery and the Bootstrap jQuery plugin which provides support - * for JavaScript based Bootstrap features such as modals and tabs. This - * code may be modified to fit the specific needs of your application. - */ - -try { - window.$ = window.jQuery = require('jquery'); - - require('bootstrap'); -} catch (e) {} - -/** - * We'll load the axios HTTP library which allows us to easily issue requests - * to our Laravel back-end. This library automatically handles sending the - * CSRF token as a header based on the value of the "XSRF" token cookie. - */ - -window.axios = require('axios'); - -window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest'; - -/** - * Next we will register the CSRF Token as a common header with Axios so that - * all outgoing HTTP requests automatically have it attached. This is just - * a simple convenience so we don't have to attach every token manually. - */ - -let token = document.head.querySelector('meta[name="csrf-token"]'); - -if (token) { - window.axios.defaults.headers.common['X-CSRF-TOKEN'] = token.content; -} else { - console.error('CSRF token not found: https://laravel.com/docs/csrf#csrf-x-csrf-token'); -} - -/** - * Echo exposes an expressive API for subscribing to channels and listening - * for events that are broadcast by Laravel. Echo and event broadcasting - * allows your team to easily build robust real-time web applications. - */ - -// import Echo from 'laravel-echo' - -// window.Pusher = require('pusher-js'); - -// window.Echo = new Echo({ -// broadcaster: 'pusher', -// key: process.env.MIX_PUSHER_APP_KEY, -// cluster: process.env.MIX_PUSHER_APP_CLUSTER, -// encrypted: true -// }); diff --git a/resources/assets/js/components/bash/cli-bckp.vue b/resources/assets/js/components/bash/cli-bckp.vue deleted file mode 100644 index 446d338..0000000 --- a/resources/assets/js/components/bash/cli-bckp.vue +++ /dev/null @@ -1,238 +0,0 @@ - - - - - \ No newline at end of file diff --git a/resources/assets/js/components/bash/cli-old.vue b/resources/assets/js/components/bash/cli-old.vue deleted file mode 100644 index bd585d8..0000000 --- a/resources/assets/js/components/bash/cli-old.vue +++ /dev/null @@ -1,128 +0,0 @@ - - - - - diff --git a/resources/assets/js/components/bash/cli.vue b/resources/assets/js/components/bash/cli.vue deleted file mode 100644 index 26fa209..0000000 --- a/resources/assets/js/components/bash/cli.vue +++ /dev/null @@ -1,179 +0,0 @@ - - - - - \ No newline at end of file diff --git a/resources/assets/js/components/site/components/comment.vue b/resources/assets/js/components/site/components/comment.vue deleted file mode 100644 index 434be07..0000000 --- a/resources/assets/js/components/site/components/comment.vue +++ /dev/null @@ -1,50 +0,0 @@ - - - \ No newline at end of file diff --git a/resources/assets/js/components/site/components/navbar.vue b/resources/assets/js/components/site/components/navbar.vue deleted file mode 100644 index 5a2b75b..0000000 --- a/resources/assets/js/components/site/components/navbar.vue +++ /dev/null @@ -1,159 +0,0 @@ - - - - diff --git a/resources/assets/js/components/site/components/post.vue b/resources/assets/js/components/site/components/post.vue deleted file mode 100644 index 780d522..0000000 --- a/resources/assets/js/components/site/components/post.vue +++ /dev/null @@ -1,208 +0,0 @@ - - - - - - diff --git a/resources/assets/js/components/site/components/tsuchi.vue b/resources/assets/js/components/site/components/tsuchi.vue deleted file mode 100644 index fd11932..0000000 --- a/resources/assets/js/components/site/components/tsuchi.vue +++ /dev/null @@ -1,49 +0,0 @@ - - - diff --git a/resources/assets/js/components/site/views/index.vue b/resources/assets/js/components/site/views/index.vue deleted file mode 100644 index 318755b..0000000 --- a/resources/assets/js/components/site/views/index.vue +++ /dev/null @@ -1,32 +0,0 @@ - - - - diff --git a/resources/assets/fonts/jpserriffont.woff b/resources/fonts/jpserriffont.woff similarity index 100% rename from resources/assets/fonts/jpserriffont.woff rename to resources/fonts/jpserriffont.woff diff --git a/resources/assets/img/bash/6fd97df9bfea41748061893ce36cefee.jpeg b/resources/img/bash/6fd97df9bfea41748061893ce36cefee.jpeg similarity index 100% rename from resources/assets/img/bash/6fd97df9bfea41748061893ce36cefee.jpeg rename to resources/img/bash/6fd97df9bfea41748061893ce36cefee.jpeg diff --git a/resources/assets/img/bash/81004208_p0.jpg b/resources/img/bash/81004208_p0.jpg similarity index 100% rename from resources/assets/img/bash/81004208_p0.jpg rename to resources/img/bash/81004208_p0.jpg diff --git a/resources/img/bash/app_icon.png b/resources/img/bash/app_icon.png new file mode 100644 index 0000000..990fdb3 Binary files /dev/null and b/resources/img/bash/app_icon.png differ diff --git a/resources/assets/img/bash/bottom_bg.png b/resources/img/bash/bottom_bg.png similarity index 100% rename from resources/assets/img/bash/bottom_bg.png rename to resources/img/bash/bottom_bg.png diff --git a/resources/assets/img/bash/bottom_left.png b/resources/img/bash/bottom_left.png similarity index 100% rename from resources/assets/img/bash/bottom_left.png rename to resources/img/bash/bottom_left.png diff --git a/resources/assets/img/bash/bottom_right.png b/resources/img/bash/bottom_right.png similarity index 100% rename from resources/assets/img/bash/bottom_right.png rename to resources/img/bash/bottom_right.png diff --git a/resources/assets/img/bash/left_bg.png b/resources/img/bash/left_bg.png similarity index 100% rename from resources/assets/img/bash/left_bg.png rename to resources/img/bash/left_bg.png diff --git a/resources/assets/img/bash/right_bg.png b/resources/img/bash/right_bg.png similarity index 100% rename from resources/assets/img/bash/right_bg.png rename to resources/img/bash/right_bg.png diff --git a/resources/assets/img/bash/root_bg.png b/resources/img/bash/root_bg.png similarity index 100% rename from resources/assets/img/bash/root_bg.png rename to resources/img/bash/root_bg.png diff --git a/resources/assets/img/bash/top_bg.png b/resources/img/bash/top_bg.png similarity index 100% rename from resources/assets/img/bash/top_bg.png rename to resources/img/bash/top_bg.png diff --git a/resources/assets/img/bash/top_left.png b/resources/img/bash/top_left.png similarity index 100% rename from resources/assets/img/bash/top_left.png rename to resources/img/bash/top_left.png diff --git a/resources/assets/img/bash/top_max.png b/resources/img/bash/top_max.png similarity index 100% rename from resources/assets/img/bash/top_max.png rename to resources/img/bash/top_max.png diff --git a/resources/img/bash/top_max_hover.png b/resources/img/bash/top_max_hover.png new file mode 100644 index 0000000..d6857d3 Binary files /dev/null and b/resources/img/bash/top_max_hover.png differ diff --git a/resources/assets/img/bash/top_min.png b/resources/img/bash/top_min.png similarity index 100% rename from resources/assets/img/bash/top_min.png rename to resources/img/bash/top_min.png diff --git a/resources/img/bash/top_min_hover.png b/resources/img/bash/top_min_hover.png new file mode 100644 index 0000000..f4d74c0 Binary files /dev/null and b/resources/img/bash/top_min_hover.png differ diff --git a/resources/assets/img/bash/top_right.png b/resources/img/bash/top_right.png similarity index 100% rename from resources/assets/img/bash/top_right.png rename to resources/img/bash/top_right.png diff --git a/resources/img/bash/top_right_hover.png b/resources/img/bash/top_right_hover.png new file mode 100644 index 0000000..24b2106 Binary files /dev/null and b/resources/img/bash/top_right_hover.png differ diff --git a/resources/assets/img/bash/user_bg.png b/resources/img/bash/user_bg.png similarity index 100% rename from resources/assets/img/bash/user_bg.png rename to resources/img/bash/user_bg.png diff --git a/resources/img/bitchute.png b/resources/img/bitchute.png new file mode 100644 index 0000000..7f88f0d Binary files /dev/null and b/resources/img/bitchute.png differ diff --git a/resources/img/discord.png b/resources/img/discord.png new file mode 100644 index 0000000..972de89 Binary files /dev/null and b/resources/img/discord.png differ diff --git a/resources/img/favicon.jpeg b/resources/img/favicon.jpeg new file mode 100644 index 0000000..72d908e Binary files /dev/null and b/resources/img/favicon.jpeg differ diff --git a/resources/img/flags/ASEAN.png b/resources/img/flags/ASEAN.png new file mode 100755 index 0000000..ee121e7 Binary files /dev/null and b/resources/img/flags/ASEAN.png differ diff --git a/resources/img/flags/Afghanistan.png b/resources/img/flags/Afghanistan.png new file mode 100755 index 0000000..0402b30 Binary files /dev/null and b/resources/img/flags/Afghanistan.png differ diff --git a/resources/img/flags/African Union(OAS).png b/resources/img/flags/African Union(OAS).png new file mode 100755 index 0000000..ffed45d Binary files /dev/null and b/resources/img/flags/African Union(OAS).png differ diff --git a/resources/img/flags/Albania.png b/resources/img/flags/Albania.png new file mode 100755 index 0000000..5eea814 Binary files /dev/null and b/resources/img/flags/Albania.png differ diff --git a/resources/img/flags/Algeria.png b/resources/img/flags/Algeria.png new file mode 100755 index 0000000..fe1fc6c Binary files /dev/null and b/resources/img/flags/Algeria.png differ diff --git a/resources/img/flags/American Samoa.png b/resources/img/flags/American Samoa.png new file mode 100755 index 0000000..a24093e Binary files /dev/null and b/resources/img/flags/American Samoa.png differ diff --git a/resources/img/flags/Andorra.png b/resources/img/flags/Andorra.png new file mode 100755 index 0000000..1245d9f Binary files /dev/null and b/resources/img/flags/Andorra.png differ diff --git a/resources/img/flags/Angola.png b/resources/img/flags/Angola.png new file mode 100755 index 0000000..d1deed8 Binary files /dev/null and b/resources/img/flags/Angola.png differ diff --git a/resources/img/flags/Anguilla.png b/resources/img/flags/Anguilla.png new file mode 100755 index 0000000..68db17b Binary files /dev/null and b/resources/img/flags/Anguilla.png differ diff --git a/resources/img/flags/Antarctica.png b/resources/img/flags/Antarctica.png new file mode 100755 index 0000000..01bf5a9 Binary files /dev/null and b/resources/img/flags/Antarctica.png differ diff --git a/resources/img/flags/Antigua & Barbuda.png b/resources/img/flags/Antigua & Barbuda.png new file mode 100755 index 0000000..062aa70 Binary files /dev/null and b/resources/img/flags/Antigua & Barbuda.png differ diff --git a/resources/img/flags/Arab League.png b/resources/img/flags/Arab League.png new file mode 100755 index 0000000..0884708 Binary files /dev/null and b/resources/img/flags/Arab League.png differ diff --git a/resources/img/flags/Argentina.png b/resources/img/flags/Argentina.png new file mode 100755 index 0000000..8c8d5c9 Binary files /dev/null and b/resources/img/flags/Argentina.png differ diff --git a/resources/img/flags/Armenia.png b/resources/img/flags/Armenia.png new file mode 100755 index 0000000..8e1054e Binary files /dev/null and b/resources/img/flags/Armenia.png differ diff --git a/resources/img/flags/Aruba.png b/resources/img/flags/Aruba.png new file mode 100755 index 0000000..67a8142 Binary files /dev/null and b/resources/img/flags/Aruba.png differ diff --git a/resources/img/flags/Australia.png b/resources/img/flags/Australia.png new file mode 100755 index 0000000..b34a13a Binary files /dev/null and b/resources/img/flags/Australia.png differ diff --git a/resources/img/flags/Austria.png b/resources/img/flags/Austria.png new file mode 100755 index 0000000..3d5a4af Binary files /dev/null and b/resources/img/flags/Austria.png differ diff --git a/resources/img/flags/Azerbaijan.png b/resources/img/flags/Azerbaijan.png new file mode 100755 index 0000000..86961f7 Binary files /dev/null and b/resources/img/flags/Azerbaijan.png differ diff --git a/resources/img/flags/Bahamas.png b/resources/img/flags/Bahamas.png new file mode 100755 index 0000000..28364ad Binary files /dev/null and b/resources/img/flags/Bahamas.png differ diff --git a/resources/img/flags/Bahrain.png b/resources/img/flags/Bahrain.png new file mode 100755 index 0000000..90fe9a6 Binary files /dev/null and b/resources/img/flags/Bahrain.png differ diff --git a/resources/img/flags/Bangladesh.png b/resources/img/flags/Bangladesh.png new file mode 100755 index 0000000..8c4b72c Binary files /dev/null and b/resources/img/flags/Bangladesh.png differ diff --git a/resources/img/flags/Barbados.png b/resources/img/flags/Barbados.png new file mode 100755 index 0000000..dc5bfaa Binary files /dev/null and b/resources/img/flags/Barbados.png differ diff --git a/resources/img/flags/Belarus.png b/resources/img/flags/Belarus.png new file mode 100755 index 0000000..9c8e46c Binary files /dev/null and b/resources/img/flags/Belarus.png differ diff --git a/resources/img/flags/Belgium.png b/resources/img/flags/Belgium.png new file mode 100755 index 0000000..957705c Binary files /dev/null and b/resources/img/flags/Belgium.png differ diff --git a/resources/img/flags/Belize.png b/resources/img/flags/Belize.png new file mode 100755 index 0000000..e2a05a6 Binary files /dev/null and b/resources/img/flags/Belize.png differ diff --git a/resources/img/flags/Benin.png b/resources/img/flags/Benin.png new file mode 100755 index 0000000..202dc46 Binary files /dev/null and b/resources/img/flags/Benin.png differ diff --git a/resources/img/flags/Bermuda.png b/resources/img/flags/Bermuda.png new file mode 100755 index 0000000..0272cc6 Binary files /dev/null and b/resources/img/flags/Bermuda.png differ diff --git a/resources/img/flags/Bhutan.png b/resources/img/flags/Bhutan.png new file mode 100755 index 0000000..2d0b604 Binary files /dev/null and b/resources/img/flags/Bhutan.png differ diff --git a/resources/img/flags/Bolivia.png b/resources/img/flags/Bolivia.png new file mode 100755 index 0000000..48760e8 Binary files /dev/null and b/resources/img/flags/Bolivia.png differ diff --git a/resources/img/flags/Bosnia & Herzegovina.png b/resources/img/flags/Bosnia & Herzegovina.png new file mode 100755 index 0000000..242e214 Binary files /dev/null and b/resources/img/flags/Bosnia & Herzegovina.png differ diff --git a/resources/img/flags/Botswana.png b/resources/img/flags/Botswana.png new file mode 100755 index 0000000..c8b457d Binary files /dev/null and b/resources/img/flags/Botswana.png differ diff --git a/resources/img/flags/Brazil.png b/resources/img/flags/Brazil.png new file mode 100755 index 0000000..5a9cfd4 Binary files /dev/null and b/resources/img/flags/Brazil.png differ diff --git a/resources/img/flags/Brunei.png b/resources/img/flags/Brunei.png new file mode 100755 index 0000000..231dd4c Binary files /dev/null and b/resources/img/flags/Brunei.png differ diff --git a/resources/img/flags/Bulgaria.png b/resources/img/flags/Bulgaria.png new file mode 100755 index 0000000..6ba90af Binary files /dev/null and b/resources/img/flags/Bulgaria.png differ diff --git a/resources/img/flags/Burkina Faso.png b/resources/img/flags/Burkina Faso.png new file mode 100755 index 0000000..8bfe4b9 Binary files /dev/null and b/resources/img/flags/Burkina Faso.png differ diff --git a/resources/img/flags/Burundi.png b/resources/img/flags/Burundi.png new file mode 100755 index 0000000..a0f67f8 Binary files /dev/null and b/resources/img/flags/Burundi.png differ diff --git a/resources/img/flags/CARICOM.png b/resources/img/flags/CARICOM.png new file mode 100755 index 0000000..51bd504 Binary files /dev/null and b/resources/img/flags/CARICOM.png differ diff --git a/resources/img/flags/CIS.png b/resources/img/flags/CIS.png new file mode 100755 index 0000000..1aa10bc Binary files /dev/null and b/resources/img/flags/CIS.png differ diff --git a/resources/img/flags/Cambodja.png b/resources/img/flags/Cambodja.png new file mode 100755 index 0000000..a4b77f7 Binary files /dev/null and b/resources/img/flags/Cambodja.png differ diff --git a/resources/img/flags/Cameroon.png b/resources/img/flags/Cameroon.png new file mode 100755 index 0000000..cf2b443 Binary files /dev/null and b/resources/img/flags/Cameroon.png differ diff --git a/resources/img/flags/Canada.png b/resources/img/flags/Canada.png new file mode 100755 index 0000000..3e691be Binary files /dev/null and b/resources/img/flags/Canada.png differ diff --git a/resources/img/flags/Cape Verde.png b/resources/img/flags/Cape Verde.png new file mode 100755 index 0000000..712253e Binary files /dev/null and b/resources/img/flags/Cape Verde.png differ diff --git a/resources/img/flags/Cayman Islands.png b/resources/img/flags/Cayman Islands.png new file mode 100755 index 0000000..3961af3 Binary files /dev/null and b/resources/img/flags/Cayman Islands.png differ diff --git a/resources/img/flags/Central African Republic.png b/resources/img/flags/Central African Republic.png new file mode 100755 index 0000000..5283c59 Binary files /dev/null and b/resources/img/flags/Central African Republic.png differ diff --git a/resources/img/flags/Chad.png b/resources/img/flags/Chad.png new file mode 100755 index 0000000..d4c92bd Binary files /dev/null and b/resources/img/flags/Chad.png differ diff --git a/resources/img/flags/Chile.png b/resources/img/flags/Chile.png new file mode 100755 index 0000000..35ddcc1 Binary files /dev/null and b/resources/img/flags/Chile.png differ diff --git a/resources/img/flags/China.png b/resources/img/flags/China.png new file mode 100755 index 0000000..86ac698 Binary files /dev/null and b/resources/img/flags/China.png differ diff --git a/resources/img/flags/Colombia.png b/resources/img/flags/Colombia.png new file mode 100755 index 0000000..3686249 Binary files /dev/null and b/resources/img/flags/Colombia.png differ diff --git a/resources/img/flags/Commonwealth.png b/resources/img/flags/Commonwealth.png new file mode 100755 index 0000000..10c84c5 Binary files /dev/null and b/resources/img/flags/Commonwealth.png differ diff --git a/resources/img/flags/Comoros.png b/resources/img/flags/Comoros.png new file mode 100755 index 0000000..a7c03c5 Binary files /dev/null and b/resources/img/flags/Comoros.png differ diff --git a/resources/img/flags/Congo-Brazzaville.png b/resources/img/flags/Congo-Brazzaville.png new file mode 100755 index 0000000..88b132b Binary files /dev/null and b/resources/img/flags/Congo-Brazzaville.png differ diff --git a/resources/img/flags/Congo-Kinshasa(Zaire).png b/resources/img/flags/Congo-Kinshasa(Zaire).png new file mode 100755 index 0000000..badf083 Binary files /dev/null and b/resources/img/flags/Congo-Kinshasa(Zaire).png differ diff --git a/resources/img/flags/Cook Islands.png b/resources/img/flags/Cook Islands.png new file mode 100755 index 0000000..2e62ed8 Binary files /dev/null and b/resources/img/flags/Cook Islands.png differ diff --git a/resources/img/flags/Costa Rica.png b/resources/img/flags/Costa Rica.png new file mode 100755 index 0000000..8559d53 Binary files /dev/null and b/resources/img/flags/Costa Rica.png differ diff --git a/resources/img/flags/Cote d'Ivoire.png b/resources/img/flags/Cote d'Ivoire.png new file mode 100755 index 0000000..4c2a467 Binary files /dev/null and b/resources/img/flags/Cote d'Ivoire.png differ diff --git a/resources/img/flags/Croatia.png b/resources/img/flags/Croatia.png new file mode 100755 index 0000000..f4e7f56 Binary files /dev/null and b/resources/img/flags/Croatia.png differ diff --git a/resources/img/flags/Cuba.png b/resources/img/flags/Cuba.png new file mode 100755 index 0000000..b5d5cfb Binary files /dev/null and b/resources/img/flags/Cuba.png differ diff --git a/resources/img/flags/Cyprus.png b/resources/img/flags/Cyprus.png new file mode 100755 index 0000000..dea6953 Binary files /dev/null and b/resources/img/flags/Cyprus.png differ diff --git a/resources/img/flags/Czech Republic.png b/resources/img/flags/Czech Republic.png new file mode 100755 index 0000000..0dd2bb4 Binary files /dev/null and b/resources/img/flags/Czech Republic.png differ diff --git a/resources/img/flags/Denmark.png b/resources/img/flags/Denmark.png new file mode 100755 index 0000000..58d47d9 Binary files /dev/null and b/resources/img/flags/Denmark.png differ diff --git a/resources/img/flags/Djibouti.png b/resources/img/flags/Djibouti.png new file mode 100755 index 0000000..80c7bda Binary files /dev/null and b/resources/img/flags/Djibouti.png differ diff --git a/resources/img/flags/Dominica.png b/resources/img/flags/Dominica.png new file mode 100755 index 0000000..b8b3ce0 Binary files /dev/null and b/resources/img/flags/Dominica.png differ diff --git a/resources/img/flags/Dominican Republic.png b/resources/img/flags/Dominican Republic.png new file mode 100755 index 0000000..46edfad Binary files /dev/null and b/resources/img/flags/Dominican Republic.png differ diff --git a/resources/img/flags/Ecuador.png b/resources/img/flags/Ecuador.png new file mode 100755 index 0000000..61eb262 Binary files /dev/null and b/resources/img/flags/Ecuador.png differ diff --git a/resources/img/flags/Egypt.png b/resources/img/flags/Egypt.png new file mode 100755 index 0000000..ac4bab4 Binary files /dev/null and b/resources/img/flags/Egypt.png differ diff --git a/resources/img/flags/El Salvador.png b/resources/img/flags/El Salvador.png new file mode 100755 index 0000000..c73bf80 Binary files /dev/null and b/resources/img/flags/El Salvador.png differ diff --git a/resources/img/flags/England.png b/resources/img/flags/England.png new file mode 100755 index 0000000..044dcb7 Binary files /dev/null and b/resources/img/flags/England.png differ diff --git a/resources/img/flags/Equatorial Guinea.png b/resources/img/flags/Equatorial Guinea.png new file mode 100755 index 0000000..92b3b81 Binary files /dev/null and b/resources/img/flags/Equatorial Guinea.png differ diff --git a/resources/img/flags/Eritrea.png b/resources/img/flags/Eritrea.png new file mode 100755 index 0000000..84c0c84 Binary files /dev/null and b/resources/img/flags/Eritrea.png differ diff --git a/resources/img/flags/Estonia.png b/resources/img/flags/Estonia.png new file mode 100755 index 0000000..426ab13 Binary files /dev/null and b/resources/img/flags/Estonia.png differ diff --git a/resources/img/flags/Ethiopia.png b/resources/img/flags/Ethiopia.png new file mode 100755 index 0000000..e766a48 Binary files /dev/null and b/resources/img/flags/Ethiopia.png differ diff --git a/resources/img/flags/European Union.png b/resources/img/flags/European Union.png new file mode 100755 index 0000000..562cd42 Binary files /dev/null and b/resources/img/flags/European Union.png differ diff --git a/resources/img/flags/Faroes.png b/resources/img/flags/Faroes.png new file mode 100755 index 0000000..5cdd720 Binary files /dev/null and b/resources/img/flags/Faroes.png differ diff --git a/resources/img/flags/Fiji.png b/resources/img/flags/Fiji.png new file mode 100755 index 0000000..43f910b Binary files /dev/null and b/resources/img/flags/Fiji.png differ diff --git a/resources/img/flags/Finland.png b/resources/img/flags/Finland.png new file mode 100755 index 0000000..3a30faf Binary files /dev/null and b/resources/img/flags/Finland.png differ diff --git a/resources/img/flags/France.png b/resources/img/flags/France.png new file mode 100755 index 0000000..21d0419 Binary files /dev/null and b/resources/img/flags/France.png differ diff --git a/resources/img/flags/Gabon.png b/resources/img/flags/Gabon.png new file mode 100755 index 0000000..c83fd2a Binary files /dev/null and b/resources/img/flags/Gabon.png differ diff --git a/resources/img/flags/Gambia.png b/resources/img/flags/Gambia.png new file mode 100755 index 0000000..d4d9e52 Binary files /dev/null and b/resources/img/flags/Gambia.png differ diff --git a/resources/img/flags/Georgia.png b/resources/img/flags/Georgia.png new file mode 100755 index 0000000..5e2944c Binary files /dev/null and b/resources/img/flags/Georgia.png differ diff --git a/resources/img/flags/Germany.png b/resources/img/flags/Germany.png new file mode 100755 index 0000000..a35292a Binary files /dev/null and b/resources/img/flags/Germany.png differ diff --git a/resources/img/flags/Ghana.png b/resources/img/flags/Ghana.png new file mode 100755 index 0000000..b558e78 Binary files /dev/null and b/resources/img/flags/Ghana.png differ diff --git a/resources/img/flags/Gibraltar.png b/resources/img/flags/Gibraltar.png new file mode 100755 index 0000000..2502ad8 Binary files /dev/null and b/resources/img/flags/Gibraltar.png differ diff --git a/resources/img/flags/Greece.png b/resources/img/flags/Greece.png new file mode 100755 index 0000000..654f92d Binary files /dev/null and b/resources/img/flags/Greece.png differ diff --git a/resources/img/flags/Greenland.png b/resources/img/flags/Greenland.png new file mode 100755 index 0000000..d1a4189 Binary files /dev/null and b/resources/img/flags/Greenland.png differ diff --git a/resources/img/flags/Grenada.png b/resources/img/flags/Grenada.png new file mode 100755 index 0000000..7ced8c8 Binary files /dev/null and b/resources/img/flags/Grenada.png differ diff --git a/resources/img/flags/Guadeloupe.png b/resources/img/flags/Guadeloupe.png new file mode 100755 index 0000000..65bfca8 Binary files /dev/null and b/resources/img/flags/Guadeloupe.png differ diff --git a/resources/img/flags/Guam.png b/resources/img/flags/Guam.png new file mode 100755 index 0000000..ea3eb76 Binary files /dev/null and b/resources/img/flags/Guam.png differ diff --git a/resources/img/flags/Guatemala.png b/resources/img/flags/Guatemala.png new file mode 100755 index 0000000..d20df5a Binary files /dev/null and b/resources/img/flags/Guatemala.png differ diff --git a/resources/img/flags/Guernsey.png b/resources/img/flags/Guernsey.png new file mode 100755 index 0000000..617895b Binary files /dev/null and b/resources/img/flags/Guernsey.png differ diff --git a/resources/img/flags/Guinea-Bissau.png b/resources/img/flags/Guinea-Bissau.png new file mode 100755 index 0000000..b3e1673 Binary files /dev/null and b/resources/img/flags/Guinea-Bissau.png differ diff --git a/resources/img/flags/Guinea.png b/resources/img/flags/Guinea.png new file mode 100755 index 0000000..c5fbfa5 Binary files /dev/null and b/resources/img/flags/Guinea.png differ diff --git a/resources/img/flags/Guyana.png b/resources/img/flags/Guyana.png new file mode 100755 index 0000000..48db75f Binary files /dev/null and b/resources/img/flags/Guyana.png differ diff --git a/resources/img/flags/Haiti.png b/resources/img/flags/Haiti.png new file mode 100755 index 0000000..cec06f8 Binary files /dev/null and b/resources/img/flags/Haiti.png differ diff --git a/resources/img/flags/Honduras.png b/resources/img/flags/Honduras.png new file mode 100755 index 0000000..575430e Binary files /dev/null and b/resources/img/flags/Honduras.png differ diff --git a/resources/img/flags/Hong Kong.png b/resources/img/flags/Hong Kong.png new file mode 100755 index 0000000..b5f8420 Binary files /dev/null and b/resources/img/flags/Hong Kong.png differ diff --git a/resources/img/flags/Hungary.png b/resources/img/flags/Hungary.png new file mode 100755 index 0000000..8ec9069 Binary files /dev/null and b/resources/img/flags/Hungary.png differ diff --git a/resources/img/flags/Iceland.png b/resources/img/flags/Iceland.png new file mode 100755 index 0000000..f6b5d75 Binary files /dev/null and b/resources/img/flags/Iceland.png differ diff --git a/resources/img/flags/India.png b/resources/img/flags/India.png new file mode 100755 index 0000000..ac001d6 Binary files /dev/null and b/resources/img/flags/India.png differ diff --git a/resources/img/flags/Indonesia.png b/resources/img/flags/Indonesia.png new file mode 100755 index 0000000..d72a4a4 Binary files /dev/null and b/resources/img/flags/Indonesia.png differ diff --git a/resources/img/flags/Iran.png b/resources/img/flags/Iran.png new file mode 100755 index 0000000..071fe8c Binary files /dev/null and b/resources/img/flags/Iran.png differ diff --git a/resources/img/flags/Iraq.png b/resources/img/flags/Iraq.png new file mode 100755 index 0000000..4fbdaa0 Binary files /dev/null and b/resources/img/flags/Iraq.png differ diff --git a/resources/img/flags/Ireland.png b/resources/img/flags/Ireland.png new file mode 100755 index 0000000..9cba32b Binary files /dev/null and b/resources/img/flags/Ireland.png differ diff --git a/resources/img/flags/Islamic Conference.png b/resources/img/flags/Islamic Conference.png new file mode 100755 index 0000000..9752bd6 Binary files /dev/null and b/resources/img/flags/Islamic Conference.png differ diff --git a/resources/img/flags/Isle of Man.png b/resources/img/flags/Isle of Man.png new file mode 100755 index 0000000..8b9412d Binary files /dev/null and b/resources/img/flags/Isle of Man.png differ diff --git a/resources/img/flags/Israel.png b/resources/img/flags/Israel.png new file mode 100755 index 0000000..c156286 Binary files /dev/null and b/resources/img/flags/Israel.png differ diff --git a/resources/img/flags/Italy.png b/resources/img/flags/Italy.png new file mode 100755 index 0000000..18de857 Binary files /dev/null and b/resources/img/flags/Italy.png differ diff --git a/resources/img/flags/Jamaica.png b/resources/img/flags/Jamaica.png new file mode 100755 index 0000000..1342c33 Binary files /dev/null and b/resources/img/flags/Jamaica.png differ diff --git a/resources/img/flags/Japan.png b/resources/img/flags/Japan.png new file mode 100755 index 0000000..67020df Binary files /dev/null and b/resources/img/flags/Japan.png differ diff --git a/resources/img/flags/Jersey.png b/resources/img/flags/Jersey.png new file mode 100755 index 0000000..4858701 Binary files /dev/null and b/resources/img/flags/Jersey.png differ diff --git a/resources/img/flags/Jordan.png b/resources/img/flags/Jordan.png new file mode 100755 index 0000000..bd81547 Binary files /dev/null and b/resources/img/flags/Jordan.png differ diff --git a/resources/img/flags/Kazakhstan.png b/resources/img/flags/Kazakhstan.png new file mode 100755 index 0000000..7d2a26e Binary files /dev/null and b/resources/img/flags/Kazakhstan.png differ diff --git a/resources/img/flags/Kenya.png b/resources/img/flags/Kenya.png new file mode 100755 index 0000000..8db89fb Binary files /dev/null and b/resources/img/flags/Kenya.png differ diff --git a/resources/img/flags/Kiribati.png b/resources/img/flags/Kiribati.png new file mode 100755 index 0000000..6ee33b2 Binary files /dev/null and b/resources/img/flags/Kiribati.png differ diff --git a/resources/img/flags/Kosovo.png b/resources/img/flags/Kosovo.png new file mode 100755 index 0000000..cf87be1 Binary files /dev/null and b/resources/img/flags/Kosovo.png differ diff --git a/resources/img/flags/Kuwait.png b/resources/img/flags/Kuwait.png new file mode 100755 index 0000000..2ece850 Binary files /dev/null and b/resources/img/flags/Kuwait.png differ diff --git a/resources/img/flags/Kyrgyzstan.png b/resources/img/flags/Kyrgyzstan.png new file mode 100755 index 0000000..6f46e03 Binary files /dev/null and b/resources/img/flags/Kyrgyzstan.png differ diff --git a/resources/img/flags/LIthuania.png b/resources/img/flags/LIthuania.png new file mode 100755 index 0000000..5854c7d Binary files /dev/null and b/resources/img/flags/LIthuania.png differ diff --git a/resources/img/flags/Laos.png b/resources/img/flags/Laos.png new file mode 100755 index 0000000..0851e89 Binary files /dev/null and b/resources/img/flags/Laos.png differ diff --git a/resources/img/flags/Latvia.png b/resources/img/flags/Latvia.png new file mode 100755 index 0000000..fa83119 Binary files /dev/null and b/resources/img/flags/Latvia.png differ diff --git a/resources/img/flags/Lebanon.png b/resources/img/flags/Lebanon.png new file mode 100755 index 0000000..e71fc2c Binary files /dev/null and b/resources/img/flags/Lebanon.png differ diff --git a/resources/img/flags/Lesotho.png b/resources/img/flags/Lesotho.png new file mode 100755 index 0000000..abadd95 Binary files /dev/null and b/resources/img/flags/Lesotho.png differ diff --git a/resources/img/flags/Liberia.png b/resources/img/flags/Liberia.png new file mode 100755 index 0000000..27f2006 Binary files /dev/null and b/resources/img/flags/Liberia.png differ diff --git a/resources/img/flags/Libya.png b/resources/img/flags/Libya.png new file mode 100755 index 0000000..afd14b4 Binary files /dev/null and b/resources/img/flags/Libya.png differ diff --git a/resources/img/flags/Liechtenstein.png b/resources/img/flags/Liechtenstein.png new file mode 100755 index 0000000..109c752 Binary files /dev/null and b/resources/img/flags/Liechtenstein.png differ diff --git a/resources/img/flags/Luxembourg.png b/resources/img/flags/Luxembourg.png new file mode 100755 index 0000000..09328c0 Binary files /dev/null and b/resources/img/flags/Luxembourg.png differ diff --git a/resources/img/flags/Macao.png b/resources/img/flags/Macao.png new file mode 100755 index 0000000..099097b Binary files /dev/null and b/resources/img/flags/Macao.png differ diff --git a/resources/img/flags/Macedonia.png b/resources/img/flags/Macedonia.png new file mode 100755 index 0000000..0154725 Binary files /dev/null and b/resources/img/flags/Macedonia.png differ diff --git a/resources/img/flags/Madagascar.png b/resources/img/flags/Madagascar.png new file mode 100755 index 0000000..5c92205 Binary files /dev/null and b/resources/img/flags/Madagascar.png differ diff --git a/resources/img/flags/Malawi.png b/resources/img/flags/Malawi.png new file mode 100755 index 0000000..54bccd4 Binary files /dev/null and b/resources/img/flags/Malawi.png differ diff --git a/resources/img/flags/Malaysia.png b/resources/img/flags/Malaysia.png new file mode 100755 index 0000000..0adbfe0 Binary files /dev/null and b/resources/img/flags/Malaysia.png differ diff --git a/resources/img/flags/Maldives.png b/resources/img/flags/Maldives.png new file mode 100755 index 0000000..345d21e Binary files /dev/null and b/resources/img/flags/Maldives.png differ diff --git a/resources/img/flags/Mali.png b/resources/img/flags/Mali.png new file mode 100755 index 0000000..f93bffd Binary files /dev/null and b/resources/img/flags/Mali.png differ diff --git a/resources/img/flags/Malta.png b/resources/img/flags/Malta.png new file mode 100755 index 0000000..e0bf47d Binary files /dev/null and b/resources/img/flags/Malta.png differ diff --git a/resources/img/flags/Marshall Islands.png b/resources/img/flags/Marshall Islands.png new file mode 100755 index 0000000..02fbde6 Binary files /dev/null and b/resources/img/flags/Marshall Islands.png differ diff --git a/resources/img/flags/Martinique.png b/resources/img/flags/Martinique.png new file mode 100755 index 0000000..e6b06c3 Binary files /dev/null and b/resources/img/flags/Martinique.png differ diff --git a/resources/img/flags/Mauritania.png b/resources/img/flags/Mauritania.png new file mode 100755 index 0000000..b091eef Binary files /dev/null and b/resources/img/flags/Mauritania.png differ diff --git a/resources/img/flags/Mauritius.png b/resources/img/flags/Mauritius.png new file mode 100755 index 0000000..b09576f Binary files /dev/null and b/resources/img/flags/Mauritius.png differ diff --git a/resources/img/flags/Mexico.png b/resources/img/flags/Mexico.png new file mode 100755 index 0000000..e6c2c83 Binary files /dev/null and b/resources/img/flags/Mexico.png differ diff --git a/resources/img/flags/Micronesia.png b/resources/img/flags/Micronesia.png new file mode 100755 index 0000000..8321229 Binary files /dev/null and b/resources/img/flags/Micronesia.png differ diff --git a/resources/img/flags/Moldova.png b/resources/img/flags/Moldova.png new file mode 100755 index 0000000..0e342f1 Binary files /dev/null and b/resources/img/flags/Moldova.png differ diff --git a/resources/img/flags/Monaco.png b/resources/img/flags/Monaco.png new file mode 100755 index 0000000..d72a4a4 Binary files /dev/null and b/resources/img/flags/Monaco.png differ diff --git a/resources/img/flags/Mongolia.png b/resources/img/flags/Mongolia.png new file mode 100755 index 0000000..aadc11e Binary files /dev/null and b/resources/img/flags/Mongolia.png differ diff --git a/resources/img/flags/Montenegro.png b/resources/img/flags/Montenegro.png new file mode 100755 index 0000000..ad067f1 Binary files /dev/null and b/resources/img/flags/Montenegro.png differ diff --git a/resources/img/flags/Montserrat.png b/resources/img/flags/Montserrat.png new file mode 100755 index 0000000..779babd Binary files /dev/null and b/resources/img/flags/Montserrat.png differ diff --git a/resources/img/flags/Morocco.png b/resources/img/flags/Morocco.png new file mode 100755 index 0000000..4cb8c4f Binary files /dev/null and b/resources/img/flags/Morocco.png differ diff --git a/resources/img/flags/Mozambique.png b/resources/img/flags/Mozambique.png new file mode 100755 index 0000000..f50ae6b Binary files /dev/null and b/resources/img/flags/Mozambique.png differ diff --git a/resources/img/flags/Myanmar(Burma).png b/resources/img/flags/Myanmar(Burma).png new file mode 100755 index 0000000..1ae147c Binary files /dev/null and b/resources/img/flags/Myanmar(Burma).png differ diff --git a/resources/img/flags/NATO.png b/resources/img/flags/NATO.png new file mode 100755 index 0000000..5904306 Binary files /dev/null and b/resources/img/flags/NATO.png differ diff --git a/resources/img/flags/Namibia.png b/resources/img/flags/Namibia.png new file mode 100755 index 0000000..7ae4759 Binary files /dev/null and b/resources/img/flags/Namibia.png differ diff --git a/resources/img/flags/Nauru.png b/resources/img/flags/Nauru.png new file mode 100755 index 0000000..7aaf39c Binary files /dev/null and b/resources/img/flags/Nauru.png differ diff --git a/resources/img/flags/Nepal.png b/resources/img/flags/Nepal.png new file mode 100755 index 0000000..327eb5f Binary files /dev/null and b/resources/img/flags/Nepal.png differ diff --git a/resources/img/flags/Netherlands Antilles.png b/resources/img/flags/Netherlands Antilles.png new file mode 100755 index 0000000..c7644f8 Binary files /dev/null and b/resources/img/flags/Netherlands Antilles.png differ diff --git a/resources/img/flags/Netherlands.png b/resources/img/flags/Netherlands.png new file mode 100755 index 0000000..9073f2c Binary files /dev/null and b/resources/img/flags/Netherlands.png differ diff --git a/resources/img/flags/New Caledonia.png b/resources/img/flags/New Caledonia.png new file mode 100755 index 0000000..e9e4242 Binary files /dev/null and b/resources/img/flags/New Caledonia.png differ diff --git a/resources/img/flags/New Zealand.png b/resources/img/flags/New Zealand.png new file mode 100755 index 0000000..498bca3 Binary files /dev/null and b/resources/img/flags/New Zealand.png differ diff --git a/resources/img/flags/Nicaragua.png b/resources/img/flags/Nicaragua.png new file mode 100755 index 0000000..67b1f5c Binary files /dev/null and b/resources/img/flags/Nicaragua.png differ diff --git a/resources/img/flags/Niger.png b/resources/img/flags/Niger.png new file mode 100755 index 0000000..c1fdcd1 Binary files /dev/null and b/resources/img/flags/Niger.png differ diff --git a/resources/img/flags/Nigeria.png b/resources/img/flags/Nigeria.png new file mode 100755 index 0000000..9310f19 Binary files /dev/null and b/resources/img/flags/Nigeria.png differ diff --git a/resources/img/flags/North Korea.png b/resources/img/flags/North Korea.png new file mode 100755 index 0000000..403624e Binary files /dev/null and b/resources/img/flags/North Korea.png differ diff --git a/resources/img/flags/Northern Cyprus.png b/resources/img/flags/Northern Cyprus.png new file mode 100755 index 0000000..9f5577a Binary files /dev/null and b/resources/img/flags/Northern Cyprus.png differ diff --git a/resources/img/flags/Northern Ireland.png b/resources/img/flags/Northern Ireland.png new file mode 100755 index 0000000..bf93ec8 Binary files /dev/null and b/resources/img/flags/Northern Ireland.png differ diff --git a/resources/img/flags/Norway.png b/resources/img/flags/Norway.png new file mode 100755 index 0000000..9717bbf Binary files /dev/null and b/resources/img/flags/Norway.png differ diff --git a/resources/img/flags/OPEC.png b/resources/img/flags/OPEC.png new file mode 100755 index 0000000..c879c4f Binary files /dev/null and b/resources/img/flags/OPEC.png differ diff --git a/resources/img/flags/Olimpic Movement.png b/resources/img/flags/Olimpic Movement.png new file mode 100755 index 0000000..bede610 Binary files /dev/null and b/resources/img/flags/Olimpic Movement.png differ diff --git a/resources/img/flags/Oman.png b/resources/img/flags/Oman.png new file mode 100755 index 0000000..65901cf Binary files /dev/null and b/resources/img/flags/Oman.png differ diff --git a/resources/img/flags/Pakistan.png b/resources/img/flags/Pakistan.png new file mode 100755 index 0000000..aab99bf Binary files /dev/null and b/resources/img/flags/Pakistan.png differ diff --git a/resources/img/flags/Palau.png b/resources/img/flags/Palau.png new file mode 100755 index 0000000..5afec54 Binary files /dev/null and b/resources/img/flags/Palau.png differ diff --git a/resources/img/flags/Palestine.png b/resources/img/flags/Palestine.png new file mode 100755 index 0000000..0d25538 Binary files /dev/null and b/resources/img/flags/Palestine.png differ diff --git a/resources/img/flags/Panama.png b/resources/img/flags/Panama.png new file mode 100755 index 0000000..afb4ca9 Binary files /dev/null and b/resources/img/flags/Panama.png differ diff --git a/resources/img/flags/Papua New Guinea.png b/resources/img/flags/Papua New Guinea.png new file mode 100755 index 0000000..a239b74 Binary files /dev/null and b/resources/img/flags/Papua New Guinea.png differ diff --git a/resources/img/flags/Paraguay.png b/resources/img/flags/Paraguay.png new file mode 100755 index 0000000..73ff28b Binary files /dev/null and b/resources/img/flags/Paraguay.png differ diff --git a/resources/img/flags/Peru.png b/resources/img/flags/Peru.png new file mode 100755 index 0000000..96dc7ef Binary files /dev/null and b/resources/img/flags/Peru.png differ diff --git a/resources/img/flags/Philippines.png b/resources/img/flags/Philippines.png new file mode 100755 index 0000000..f626ed9 Binary files /dev/null and b/resources/img/flags/Philippines.png differ diff --git a/resources/img/flags/Poland.png b/resources/img/flags/Poland.png new file mode 100755 index 0000000..088a766 Binary files /dev/null and b/resources/img/flags/Poland.png differ diff --git a/resources/img/flags/Portugal.png b/resources/img/flags/Portugal.png new file mode 100755 index 0000000..630a85c Binary files /dev/null and b/resources/img/flags/Portugal.png differ diff --git a/resources/img/flags/Puerto Rico.png b/resources/img/flags/Puerto Rico.png new file mode 100755 index 0000000..79a3c61 Binary files /dev/null and b/resources/img/flags/Puerto Rico.png differ diff --git a/resources/img/flags/Qatar.png b/resources/img/flags/Qatar.png new file mode 100755 index 0000000..cd0905c Binary files /dev/null and b/resources/img/flags/Qatar.png differ diff --git a/resources/img/flags/Red Cross.png b/resources/img/flags/Red Cross.png new file mode 100755 index 0000000..223cffa Binary files /dev/null and b/resources/img/flags/Red Cross.png differ diff --git a/resources/img/flags/Reunion.png b/resources/img/flags/Reunion.png new file mode 100755 index 0000000..500f9a1 Binary files /dev/null and b/resources/img/flags/Reunion.png differ diff --git a/resources/img/flags/Romania.png b/resources/img/flags/Romania.png new file mode 100755 index 0000000..f815958 Binary files /dev/null and b/resources/img/flags/Romania.png differ diff --git a/resources/img/flags/Russian Federation.png b/resources/img/flags/Russian Federation.png new file mode 100755 index 0000000..980c585 Binary files /dev/null and b/resources/img/flags/Russian Federation.png differ diff --git a/resources/img/flags/Rwanda.png b/resources/img/flags/Rwanda.png new file mode 100755 index 0000000..0659c26 Binary files /dev/null and b/resources/img/flags/Rwanda.png differ diff --git a/resources/img/flags/Saint Lucia.png b/resources/img/flags/Saint Lucia.png new file mode 100755 index 0000000..fea98e3 Binary files /dev/null and b/resources/img/flags/Saint Lucia.png differ diff --git a/resources/img/flags/Samoa.png b/resources/img/flags/Samoa.png new file mode 100755 index 0000000..ba47ee7 Binary files /dev/null and b/resources/img/flags/Samoa.png differ diff --git a/resources/img/flags/San Marino.png b/resources/img/flags/San Marino.png new file mode 100755 index 0000000..bde1c4e Binary files /dev/null and b/resources/img/flags/San Marino.png differ diff --git a/resources/img/flags/Sao Tome & Principe.png b/resources/img/flags/Sao Tome & Principe.png new file mode 100755 index 0000000..6a9da68 Binary files /dev/null and b/resources/img/flags/Sao Tome & Principe.png differ diff --git a/resources/img/flags/Saudi Arabia.png b/resources/img/flags/Saudi Arabia.png new file mode 100755 index 0000000..839d0d9 Binary files /dev/null and b/resources/img/flags/Saudi Arabia.png differ diff --git a/resources/img/flags/Scotland.png b/resources/img/flags/Scotland.png new file mode 100755 index 0000000..033de25 Binary files /dev/null and b/resources/img/flags/Scotland.png differ diff --git a/resources/img/flags/Senegal.png b/resources/img/flags/Senegal.png new file mode 100755 index 0000000..bf45518 Binary files /dev/null and b/resources/img/flags/Senegal.png differ diff --git a/resources/img/flags/Serbia(Yugoslavia).png b/resources/img/flags/Serbia(Yugoslavia).png new file mode 100755 index 0000000..b6b0822 Binary files /dev/null and b/resources/img/flags/Serbia(Yugoslavia).png differ diff --git a/resources/img/flags/Seychelles.png b/resources/img/flags/Seychelles.png new file mode 100755 index 0000000..d36d909 Binary files /dev/null and b/resources/img/flags/Seychelles.png differ diff --git a/resources/img/flags/Sierra Leone.png b/resources/img/flags/Sierra Leone.png new file mode 100755 index 0000000..ff21325 Binary files /dev/null and b/resources/img/flags/Sierra Leone.png differ diff --git a/resources/img/flags/Singapore.png b/resources/img/flags/Singapore.png new file mode 100755 index 0000000..2c0df6e Binary files /dev/null and b/resources/img/flags/Singapore.png differ diff --git a/resources/img/flags/Slovakia.png b/resources/img/flags/Slovakia.png new file mode 100755 index 0000000..a3f0881 Binary files /dev/null and b/resources/img/flags/Slovakia.png differ diff --git a/resources/img/flags/Slovenia.png b/resources/img/flags/Slovenia.png new file mode 100755 index 0000000..0cf8890 Binary files /dev/null and b/resources/img/flags/Slovenia.png differ diff --git a/resources/img/flags/Solomon Islands.png b/resources/img/flags/Solomon Islands.png new file mode 100755 index 0000000..c1d6b0c Binary files /dev/null and b/resources/img/flags/Solomon Islands.png differ diff --git a/resources/img/flags/Somalia.png b/resources/img/flags/Somalia.png new file mode 100755 index 0000000..8ca6c8f Binary files /dev/null and b/resources/img/flags/Somalia.png differ diff --git a/resources/img/flags/Somaliland.png b/resources/img/flags/Somaliland.png new file mode 100755 index 0000000..6f182cc Binary files /dev/null and b/resources/img/flags/Somaliland.png differ diff --git a/resources/img/flags/South Africa.png b/resources/img/flags/South Africa.png new file mode 100755 index 0000000..dc17e66 Binary files /dev/null and b/resources/img/flags/South Africa.png differ diff --git a/resources/img/flags/South Korea.png b/resources/img/flags/South Korea.png new file mode 100755 index 0000000..0e3d706 Binary files /dev/null and b/resources/img/flags/South Korea.png differ diff --git a/resources/img/flags/Spain.png b/resources/img/flags/Spain.png new file mode 100755 index 0000000..a4177e9 Binary files /dev/null and b/resources/img/flags/Spain.png differ diff --git a/resources/img/flags/Sri Lanka.png b/resources/img/flags/Sri Lanka.png new file mode 100755 index 0000000..99ae232 Binary files /dev/null and b/resources/img/flags/Sri Lanka.png differ diff --git a/resources/img/flags/St Kitts & Nevis.png b/resources/img/flags/St Kitts & Nevis.png new file mode 100755 index 0000000..1451f19 Binary files /dev/null and b/resources/img/flags/St Kitts & Nevis.png differ diff --git a/resources/img/flags/St Vincent & the Grenadines.png b/resources/img/flags/St Vincent & the Grenadines.png new file mode 100755 index 0000000..0b36139 Binary files /dev/null and b/resources/img/flags/St Vincent & the Grenadines.png differ diff --git a/resources/img/flags/Sudan.png b/resources/img/flags/Sudan.png new file mode 100755 index 0000000..3ba6c4e Binary files /dev/null and b/resources/img/flags/Sudan.png differ diff --git a/resources/img/flags/Suriname.png b/resources/img/flags/Suriname.png new file mode 100755 index 0000000..e3d79c8 Binary files /dev/null and b/resources/img/flags/Suriname.png differ diff --git a/resources/img/flags/Swaziland.png b/resources/img/flags/Swaziland.png new file mode 100755 index 0000000..5926859 Binary files /dev/null and b/resources/img/flags/Swaziland.png differ diff --git a/resources/img/flags/Sweden.png b/resources/img/flags/Sweden.png new file mode 100755 index 0000000..d62df2a Binary files /dev/null and b/resources/img/flags/Sweden.png differ diff --git a/resources/img/flags/Switzerland.png b/resources/img/flags/Switzerland.png new file mode 100755 index 0000000..b62f04b Binary files /dev/null and b/resources/img/flags/Switzerland.png differ diff --git a/resources/img/flags/Syria.png b/resources/img/flags/Syria.png new file mode 100755 index 0000000..a0babec Binary files /dev/null and b/resources/img/flags/Syria.png differ diff --git a/resources/img/flags/Tahiti(French Polinesia).png b/resources/img/flags/Tahiti(French Polinesia).png new file mode 100755 index 0000000..f733ac1 Binary files /dev/null and b/resources/img/flags/Tahiti(French Polinesia).png differ diff --git a/resources/img/flags/Taiwan.png b/resources/img/flags/Taiwan.png new file mode 100755 index 0000000..5feb7ee Binary files /dev/null and b/resources/img/flags/Taiwan.png differ diff --git a/resources/img/flags/Tajikistan.png b/resources/img/flags/Tajikistan.png new file mode 100755 index 0000000..829fa7b Binary files /dev/null and b/resources/img/flags/Tajikistan.png differ diff --git a/resources/img/flags/Tanzania.png b/resources/img/flags/Tanzania.png new file mode 100755 index 0000000..59eee14 Binary files /dev/null and b/resources/img/flags/Tanzania.png differ diff --git a/resources/img/flags/Thailand.png b/resources/img/flags/Thailand.png new file mode 100755 index 0000000..62b8cce Binary files /dev/null and b/resources/img/flags/Thailand.png differ diff --git a/resources/img/flags/Timor-Leste.png b/resources/img/flags/Timor-Leste.png new file mode 100755 index 0000000..93a45af Binary files /dev/null and b/resources/img/flags/Timor-Leste.png differ diff --git a/resources/img/flags/Togo.png b/resources/img/flags/Togo.png new file mode 100755 index 0000000..a32a0c2 Binary files /dev/null and b/resources/img/flags/Togo.png differ diff --git a/resources/img/flags/Tonga.png b/resources/img/flags/Tonga.png new file mode 100755 index 0000000..dac83d8 Binary files /dev/null and b/resources/img/flags/Tonga.png differ diff --git a/resources/img/flags/Trinidad & Tobago.png b/resources/img/flags/Trinidad & Tobago.png new file mode 100755 index 0000000..f5e185e Binary files /dev/null and b/resources/img/flags/Trinidad & Tobago.png differ diff --git a/resources/img/flags/Tunisia.png b/resources/img/flags/Tunisia.png new file mode 100755 index 0000000..8869233 Binary files /dev/null and b/resources/img/flags/Tunisia.png differ diff --git a/resources/img/flags/Turkey.png b/resources/img/flags/Turkey.png new file mode 100755 index 0000000..dc33119 Binary files /dev/null and b/resources/img/flags/Turkey.png differ diff --git a/resources/img/flags/Turkmenistan.png b/resources/img/flags/Turkmenistan.png new file mode 100755 index 0000000..1860480 Binary files /dev/null and b/resources/img/flags/Turkmenistan.png differ diff --git a/resources/img/flags/Turks and Caicos Islands.png b/resources/img/flags/Turks and Caicos Islands.png new file mode 100755 index 0000000..63d711e Binary files /dev/null and b/resources/img/flags/Turks and Caicos Islands.png differ diff --git a/resources/img/flags/Tuvalu.png b/resources/img/flags/Tuvalu.png new file mode 100755 index 0000000..9c85af4 Binary files /dev/null and b/resources/img/flags/Tuvalu.png differ diff --git a/resources/img/flags/Uganda.png b/resources/img/flags/Uganda.png new file mode 100755 index 0000000..eb91362 Binary files /dev/null and b/resources/img/flags/Uganda.png differ diff --git a/resources/img/flags/Ukraine.png b/resources/img/flags/Ukraine.png new file mode 100755 index 0000000..46f59cb Binary files /dev/null and b/resources/img/flags/Ukraine.png differ diff --git a/resources/img/flags/United Arab Emirates.png b/resources/img/flags/United Arab Emirates.png new file mode 100755 index 0000000..5957c42 Binary files /dev/null and b/resources/img/flags/United Arab Emirates.png differ diff --git a/resources/img/flags/United Kingdom(Great Britain).png b/resources/img/flags/United Kingdom(Great Britain).png new file mode 100755 index 0000000..82cf5f1 Binary files /dev/null and b/resources/img/flags/United Kingdom(Great Britain).png differ diff --git a/resources/img/flags/United Nations.png b/resources/img/flags/United Nations.png new file mode 100755 index 0000000..aaa739c Binary files /dev/null and b/resources/img/flags/United Nations.png differ diff --git a/resources/img/flags/United States of America (USA).png b/resources/img/flags/United States of America (USA).png new file mode 100755 index 0000000..5e4b4d9 Binary files /dev/null and b/resources/img/flags/United States of America (USA).png differ diff --git a/resources/img/flags/Uruguay.png b/resources/img/flags/Uruguay.png new file mode 100755 index 0000000..f174217 Binary files /dev/null and b/resources/img/flags/Uruguay.png differ diff --git a/resources/img/flags/Uzbekistan.png b/resources/img/flags/Uzbekistan.png new file mode 100755 index 0000000..304c0bd Binary files /dev/null and b/resources/img/flags/Uzbekistan.png differ diff --git a/resources/img/flags/Vanutau.png b/resources/img/flags/Vanutau.png new file mode 100755 index 0000000..10fc79e Binary files /dev/null and b/resources/img/flags/Vanutau.png differ diff --git a/resources/img/flags/Vatican City.png b/resources/img/flags/Vatican City.png new file mode 100755 index 0000000..049f341 Binary files /dev/null and b/resources/img/flags/Vatican City.png differ diff --git a/resources/img/flags/Venezuela.png b/resources/img/flags/Venezuela.png new file mode 100755 index 0000000..03a1fca Binary files /dev/null and b/resources/img/flags/Venezuela.png differ diff --git a/resources/img/flags/Viet Nam.png b/resources/img/flags/Viet Nam.png new file mode 100755 index 0000000..f6aaa60 Binary files /dev/null and b/resources/img/flags/Viet Nam.png differ diff --git a/resources/img/flags/Virgin Islands British.png b/resources/img/flags/Virgin Islands British.png new file mode 100755 index 0000000..f6c33a3 Binary files /dev/null and b/resources/img/flags/Virgin Islands British.png differ diff --git a/resources/img/flags/Virgin Islands US.png b/resources/img/flags/Virgin Islands US.png new file mode 100755 index 0000000..1aa55d3 Binary files /dev/null and b/resources/img/flags/Virgin Islands US.png differ diff --git a/resources/img/flags/Wales.png b/resources/img/flags/Wales.png new file mode 100755 index 0000000..409b22b Binary files /dev/null and b/resources/img/flags/Wales.png differ diff --git a/resources/img/flags/Western Sahara.png b/resources/img/flags/Western Sahara.png new file mode 100755 index 0000000..d6fc4b7 Binary files /dev/null and b/resources/img/flags/Western Sahara.png differ diff --git a/resources/img/flags/Yemen.png b/resources/img/flags/Yemen.png new file mode 100755 index 0000000..b2358ed Binary files /dev/null and b/resources/img/flags/Yemen.png differ diff --git a/resources/img/flags/Zambia.png b/resources/img/flags/Zambia.png new file mode 100755 index 0000000..3684007 Binary files /dev/null and b/resources/img/flags/Zambia.png differ diff --git a/resources/img/flags/Zimbabwe.png b/resources/img/flags/Zimbabwe.png new file mode 100755 index 0000000..74b99fe Binary files /dev/null and b/resources/img/flags/Zimbabwe.png differ diff --git a/resources/img/header.png b/resources/img/header.png new file mode 100755 index 0000000..429516c Binary files /dev/null and b/resources/img/header.png differ diff --git a/resources/img/keromayokatta.png b/resources/img/keromayokatta.png new file mode 100755 index 0000000..71cb84a Binary files /dev/null and b/resources/img/keromayokatta.png differ diff --git a/resources/img/twitter.png b/resources/img/twitter.png new file mode 100644 index 0000000..a349c50 Binary files /dev/null and b/resources/img/twitter.png differ diff --git a/resources/js/app.js b/resources/js/app.js new file mode 100644 index 0000000..40c55f6 --- /dev/null +++ b/resources/js/app.js @@ -0,0 +1 @@ +require('./bootstrap'); diff --git a/resources/js/bootstrap.js b/resources/js/bootstrap.js new file mode 100644 index 0000000..6922577 --- /dev/null +++ b/resources/js/bootstrap.js @@ -0,0 +1,28 @@ +window._ = require('lodash'); + +/** + * We'll load the axios HTTP library which allows us to easily issue requests + * to our Laravel back-end. This library automatically handles sending the + * CSRF token as a header based on the value of the "XSRF" token cookie. + */ + +window.axios = require('axios'); + +window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest'; + +/** + * Echo exposes an expressive API for subscribing to channels and listening + * for events that are broadcast by Laravel. Echo and event broadcasting + * allows your team to easily build robust real-time web applications. + */ + +// import Echo from 'laravel-echo'; + +// window.Pusher = require('pusher-js'); + +// window.Echo = new Echo({ +// broadcaster: 'pusher', +// key: process.env.MIX_PUSHER_APP_KEY, +// cluster: process.env.MIX_PUSHER_APP_CLUSTER, +// forceTLS: true +// }); diff --git a/resources/lang/en/passwords.php b/resources/lang/en/passwords.php index e5544d2..2345a56 100644 --- a/resources/lang/en/passwords.php +++ b/resources/lang/en/passwords.php @@ -13,10 +13,10 @@ return [ | */ - 'password' => 'Passwords must be at least six characters and match the confirmation.', 'reset' => 'Your password has been reset!', - 'sent' => 'We have e-mailed your password reset link!', + 'sent' => 'We have emailed your password reset link!', + 'throttled' => 'Please wait before retrying.', 'token' => 'This password reset token is invalid.', - 'user' => "We can't find a user with that e-mail address.", + 'user' => "We can't find a user with that email address.", ]; diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index edc036d..a65914f 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -13,80 +13,110 @@ return [ | */ - 'accepted' => 'The :attribute must be accepted.', - 'active_url' => 'The :attribute is not a valid URL.', - 'after' => 'The :attribute must be a date after :date.', - 'after_or_equal' => 'The :attribute must be a date after or equal to :date.', - 'alpha' => 'The :attribute may only contain letters.', - 'alpha_dash' => 'The :attribute may only contain letters, numbers, and dashes.', - 'alpha_num' => 'The :attribute may only contain letters and numbers.', - 'array' => 'The :attribute must be an array.', - 'before' => 'The :attribute must be a date before :date.', - 'before_or_equal' => 'The :attribute must be a date before or equal to :date.', - 'between' => [ + 'accepted' => 'The :attribute must be accepted.', + 'active_url' => 'The :attribute is not a valid URL.', + 'after' => 'The :attribute must be a date after :date.', + 'after_or_equal' => 'The :attribute must be a date after or equal to :date.', + 'alpha' => 'The :attribute may only contain letters.', + 'alpha_dash' => 'The :attribute may only contain letters, numbers, dashes and underscores.', + 'alpha_num' => 'The :attribute may only contain letters and numbers.', + 'array' => 'The :attribute must be an array.', + 'before' => 'The :attribute must be a date before :date.', + 'before_or_equal' => 'The :attribute must be a date before or equal to :date.', + 'between' => [ 'numeric' => 'The :attribute must be between :min and :max.', - 'file' => 'The :attribute must be between :min and :max kilobytes.', - 'string' => 'The :attribute must be between :min and :max characters.', - 'array' => 'The :attribute must have between :min and :max items.', + 'file' => 'The :attribute must be between :min and :max kilobytes.', + 'string' => 'The :attribute must be between :min and :max characters.', + 'array' => 'The :attribute must have between :min and :max items.', ], - 'boolean' => 'The :attribute field must be true or false.', - 'confirmed' => 'The :attribute confirmation does not match.', - 'date' => 'The :attribute is not a valid date.', - 'date_format' => 'The :attribute does not match the format :format.', - 'different' => 'The :attribute and :other must be different.', - 'digits' => 'The :attribute must be :digits digits.', - 'digits_between' => 'The :attribute must be between :min and :max digits.', - 'dimensions' => 'The :attribute has invalid image dimensions.', - 'distinct' => 'The :attribute field has a duplicate value.', - 'email' => 'The :attribute must be a valid email address.', - 'exists' => 'The selected :attribute is invalid.', - 'file' => 'The :attribute must be a file.', - 'filled' => 'The :attribute field must have a value.', - 'image' => 'The :attribute must be an image.', - 'in' => 'The selected :attribute is invalid.', - 'in_array' => 'The :attribute field does not exist in :other.', - 'integer' => 'The :attribute must be an integer.', - 'ip' => 'The :attribute must be a valid IP address.', - 'ipv4' => 'The :attribute must be a valid IPv4 address.', - 'ipv6' => 'The :attribute must be a valid IPv6 address.', - 'json' => 'The :attribute must be a valid JSON string.', - 'max' => [ + 'boolean' => 'The :attribute field must be true or false.', + 'confirmed' => 'The :attribute confirmation does not match.', + 'date' => 'The :attribute is not a valid date.', + 'date_equals' => 'The :attribute must be a date equal to :date.', + 'date_format' => 'The :attribute does not match the format :format.', + 'different' => 'The :attribute and :other must be different.', + 'digits' => 'The :attribute must be :digits digits.', + 'digits_between' => 'The :attribute must be between :min and :max digits.', + 'dimensions' => 'The :attribute has invalid image dimensions.', + 'distinct' => 'The :attribute field has a duplicate value.', + 'email' => 'The :attribute must be a valid email address.', + 'ends_with' => 'The :attribute must end with one of the following: :values.', + 'exists' => 'The selected :attribute is invalid.', + 'file' => 'The :attribute must be a file.', + 'filled' => 'The :attribute field must have a value.', + 'gt' => [ + 'numeric' => 'The :attribute must be greater than :value.', + 'file' => 'The :attribute must be greater than :value kilobytes.', + 'string' => 'The :attribute must be greater than :value characters.', + 'array' => 'The :attribute must have more than :value items.', + ], + 'gte' => [ + 'numeric' => 'The :attribute must be greater than or equal :value.', + 'file' => 'The :attribute must be greater than or equal :value kilobytes.', + 'string' => 'The :attribute must be greater than or equal :value characters.', + 'array' => 'The :attribute must have :value items or more.', + ], + 'image' => 'The :attribute must be an image.', + 'in' => 'The selected :attribute is invalid.', + 'in_array' => 'The :attribute field does not exist in :other.', + 'integer' => 'The :attribute must be an integer.', + 'ip' => 'The :attribute must be a valid IP address.', + 'ipv4' => 'The :attribute must be a valid IPv4 address.', + 'ipv6' => 'The :attribute must be a valid IPv6 address.', + 'json' => 'The :attribute must be a valid JSON string.', + 'lt' => [ + 'numeric' => 'The :attribute must be less than :value.', + 'file' => 'The :attribute must be less than :value kilobytes.', + 'string' => 'The :attribute must be less than :value characters.', + 'array' => 'The :attribute must have less than :value items.', + ], + 'lte' => [ + 'numeric' => 'The :attribute must be less than or equal :value.', + 'file' => 'The :attribute must be less than or equal :value kilobytes.', + 'string' => 'The :attribute must be less than or equal :value characters.', + 'array' => 'The :attribute must not have more than :value items.', + ], + 'max' => [ 'numeric' => 'The :attribute may not be greater than :max.', - 'file' => 'The :attribute may not be greater than :max kilobytes.', - 'string' => 'The :attribute may not be greater than :max characters.', - 'array' => 'The :attribute may not have more than :max items.', + 'file' => 'The :attribute may not be greater than :max kilobytes.', + 'string' => 'The :attribute may not be greater than :max characters.', + 'array' => 'The :attribute may not have more than :max items.', ], - 'mimes' => 'The :attribute must be a file of type: :values.', - 'mimetypes' => 'The :attribute must be a file of type: :values.', - 'min' => [ + 'mimes' => 'The :attribute must be a file of type: :values.', + 'mimetypes' => 'The :attribute must be a file of type: :values.', + 'min' => [ 'numeric' => 'The :attribute must be at least :min.', - 'file' => 'The :attribute must be at least :min kilobytes.', - 'string' => 'The :attribute must be at least :min characters.', - 'array' => 'The :attribute must have at least :min items.', + 'file' => 'The :attribute must be at least :min kilobytes.', + 'string' => 'The :attribute must be at least :min characters.', + 'array' => 'The :attribute must have at least :min items.', ], - 'not_in' => 'The selected :attribute is invalid.', - 'numeric' => 'The :attribute must be a number.', - 'present' => 'The :attribute field must be present.', - 'regex' => 'The :attribute format is invalid.', - 'required' => 'The :attribute field is required.', - 'required_if' => 'The :attribute field is required when :other is :value.', - 'required_unless' => 'The :attribute field is required unless :other is in :values.', - 'required_with' => 'The :attribute field is required when :values is present.', - 'required_with_all' => 'The :attribute field is required when :values is present.', - 'required_without' => 'The :attribute field is required when :values is not present.', + 'not_in' => 'The selected :attribute is invalid.', + 'not_regex' => 'The :attribute format is invalid.', + 'numeric' => 'The :attribute must be a number.', + 'password' => 'The password is incorrect.', + 'present' => 'The :attribute field must be present.', + 'regex' => 'The :attribute format is invalid.', + 'required' => 'The :attribute field is required.', + 'required_if' => 'The :attribute field is required when :other is :value.', + 'required_unless' => 'The :attribute field is required unless :other is in :values.', + 'required_with' => 'The :attribute field is required when :values is present.', + 'required_with_all' => 'The :attribute field is required when :values are present.', + 'required_without' => 'The :attribute field is required when :values is not present.', 'required_without_all' => 'The :attribute field is required when none of :values are present.', - 'same' => 'The :attribute and :other must match.', - 'size' => [ + 'same' => 'The :attribute and :other must match.', + 'size' => [ 'numeric' => 'The :attribute must be :size.', - 'file' => 'The :attribute must be :size kilobytes.', - 'string' => 'The :attribute must be :size characters.', - 'array' => 'The :attribute must contain :size items.', + 'file' => 'The :attribute must be :size kilobytes.', + 'string' => 'The :attribute must be :size characters.', + 'array' => 'The :attribute must contain :size items.', ], - 'string' => 'The :attribute must be a string.', - 'timezone' => 'The :attribute must be a valid zone.', - 'unique' => 'The :attribute has already been taken.', - 'uploaded' => 'The :attribute failed to upload.', - 'url' => 'The :attribute format is invalid.', + 'starts_with' => 'The :attribute must start with one of the following: :values.', + 'string' => 'The :attribute must be a string.', + 'timezone' => 'The :attribute must be a valid zone.', + 'unique' => 'The :attribute has already been taken.', + 'uploaded' => 'The :attribute failed to upload.', + 'url' => 'The :attribute format is invalid.', + 'uuid' => 'The :attribute must be a valid UUID.', /* |-------------------------------------------------------------------------- @@ -110,9 +140,9 @@ return [ | Custom Validation Attributes |-------------------------------------------------------------------------- | - | The following language lines are used to swap attribute place-holders - | with something more reader friendly such as E-Mail Address instead - | of "email". This simply helps us make messages a little cleaner. + | The following language lines are used to swap our attribute placeholder + | with something more reader friendly such as "E-Mail Address" instead + | of "email". This simply helps us make our message more expressive. | */ diff --git a/resources/assets/sass/_variables.scss b/resources/sass/_variables.scss similarity index 100% rename from resources/assets/sass/_variables.scss rename to resources/sass/_variables.scss diff --git a/resources/assets/sass/app.scss b/resources/sass/app.scss similarity index 91% rename from resources/assets/sass/app.scss rename to resources/sass/app.scss index 098bb37..d2d9388 100644 --- a/resources/assets/sass/app.scss +++ b/resources/sass/app.scss @@ -9,10 +9,6 @@ src: url('../fonts/jpserriffont.woff'); } - html { - // cursor: text; - } - body { font-family: jpserriffont; text-align: center; @@ -64,7 +60,7 @@ .konsole_top_left { height: 30px; width: 30px; - background: url('/assets/img/bash/top_left.png') no-repeat; + background: url('/img/bash/top_left.png') no-repeat; position: absolute; top: 0; left: 0; @@ -72,7 +68,7 @@ .konsole_top { height: 30px; - background: url('/assets/img/bash/top_bg.png') repeat-x; + background: url('/img/bash/top_bg.png') repeat-x; position: absolute; top: 0; left: 30px; @@ -87,56 +83,56 @@ .konsole_top_right { height: 30px; width: 28px; - background: url('/assets/img/bash/top_right.png') no-repeat; + background: url('/img/bash/top_right.png') no-repeat; position: absolute; top: 0; right: 0; } .konsole_top_right:hover { - background: url('/assets/img/bash/top_right_hover.png') no-repeat; + background: url('/img/bash/top_right_hover.png') no-repeat; cursor: default; } .konsole_top_max { height: 30px; width: 23px; - background: url('/assets/img/bash/top_max.png') no-repeat; + background: url('/img/bash/top_max.png') no-repeat; position: absolute; top: 0; right: 28px; } .konsole_top_max:hover { - background: url('/assets/img/bash/top_max_hover.png') no-repeat; + background: url('/img/bash/top_max_hover.png') no-repeat; cursor: default; } .konsole_top_min { height: 30px; width: 23px; - background: url('/assets/img/bash/top_min.png') no-repeat; + background: url('/img/bash/top_min.png') no-repeat; position: absolute; top: 0; right: 51px; } .konsole_top_min:hover { - background: url('/assets/img/bash/top_min_hover.png') no-repeat; + background: url('/img/bash/top_min_hover.png') no-repeat; cursor: default; } .konsole_left { width: 2px; - background: url('/assets/img/bash/left_bg.png') repeat-y; + background: url('/img/bash/left_bg.png') repeat-y; position: absolute; top: 30px; left: 0; height: 325px; } - .konsoleuser { background: url('/assets/img/bash/user_bg.png') repeat; } - .konsoleroot { background: url('/assets/img/bash/root_bg.png') repeat; } + .konsoleuser { background: url('/img/bash/user_bg.png') repeat; } + .konsoleroot { background: url('/img/bash/root_bg.png') repeat; } .konsoleuser, .konsoleroot { background-size: cover; @@ -155,7 +151,7 @@ .konsole_right { width: 2px; - background: url('/assets/img/bash/right_bg.png') repeat-y; + background: url('/img/bash/right_bg.png') repeat-y; position: absolute; height: 325px; top: 30px; @@ -165,7 +161,7 @@ .konsole_bottom_left { width: 3px; height: 3px; - background: url('/assets/img/bash/bottom_left.png') no-repeat; + background: url('/img/bash/bottom_left.png') no-repeat; position: absolute; bottom: 0; left: 0; @@ -173,7 +169,7 @@ .konsole_bottom { height: 2px; - background: url('/assets/img/bash/bottom_bg.png') repeat-x; + background: url('/img/bash/bottom_bg.png') repeat-x; position: absolute; bottom: 0; left: 2px; @@ -183,7 +179,7 @@ .konsole_bottom_right { height: 3px; width: 3px; - background: url('/assets/img/bash/bottom_right.png') no-repeat; + background: url('/img/bash/bottom_right.png') no-repeat; position: absolute; right: 0; bottom: 0; diff --git a/resources/assets/sass/jpserriffont.scss b/resources/sass/jpserriffont.scss similarity index 100% rename from resources/assets/sass/jpserriffont.scss rename to resources/sass/jpserriffont.scss diff --git a/resources/views/layouts/bash.blade.php b/resources/views/layouts/bash.blade.php index d272472..1493b98 100644 --- a/resources/views/layouts/bash.blade.php +++ b/resources/views/layouts/bash.blade.php @@ -12,7 +12,7 @@ + + +

+ @if (Route::has('login')) +
+ @auth + Home + @else + Login + + @if (Route::has('register')) + Register + @endif + @endauth +
+ @endif + +
+
+ Laravel +
+ +
+ Docs + Laracasts + News + Blog + Nova + Forge + Vapor + GitHub +
+
+
+ + diff --git a/routes/api.php b/routes/api.php index 0f37e00..bcb8b18 100644 --- a/routes/api.php +++ b/routes/api.php @@ -1,6 +1,7 @@ get('/user', function (Request $request) { + return $request->user(); +}); diff --git a/routes/channels.php b/routes/channels.php index f16a20b..963b0d2 100644 --- a/routes/channels.php +++ b/routes/channels.php @@ -1,5 +1,7 @@ make(Kernel::class)->bootstrap(); - Hash::driver('bcrypt')->setRounds(4); - return $app; } } diff --git a/tests/Feature/ExampleTest.php b/tests/Feature/ExampleTest.php index f31e495..cdb5111 100644 --- a/tests/Feature/ExampleTest.php +++ b/tests/Feature/ExampleTest.php @@ -2,8 +2,8 @@ namespace Tests\Feature; -use Tests\TestCase; use Illuminate\Foundation\Testing\RefreshDatabase; +use Tests\TestCase; class ExampleTest extends TestCase { diff --git a/tests/Unit/ExampleTest.php b/tests/Unit/ExampleTest.php index e9fe19c..358cfc8 100644 --- a/tests/Unit/ExampleTest.php +++ b/tests/Unit/ExampleTest.php @@ -2,8 +2,7 @@ namespace Tests\Unit; -use Tests\TestCase; -use Illuminate\Foundation\Testing\RefreshDatabase; +use PHPUnit\Framework\TestCase; class ExampleTest extends TestCase { diff --git a/webpack.mix.js b/webpack.mix.js index 72fdbb1..8984ba9 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -1,4 +1,4 @@ -let mix = require('laravel-mix'); +const mix = require('laravel-mix'); /* |-------------------------------------------------------------------------- @@ -11,5 +11,9 @@ let mix = require('laravel-mix'); | */ -mix.js('resources/assets/js/app.js', 'public/js') - .sass('resources/assets/sass/app.scss', 'public/css'); +mix.js('resources/js/app.js', 'public/js') + .sass('resources/sass/app.scss', 'public/css') + .copy('resources/fonts/*', 'public/fonts') + .copy('resources/img/*', 'public/img') + .copy('resources/img/bash/*', 'public/img/bash') + .copy('resources/img/flag/*', 'public/img/flag');