Changes

app/Console/Commands/Search/ReindexCommand.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace PHPMap\Console\Commands\Search;
+namespace App\Console\Commands\Search;
 
 use Illuminate\Console\Command;
-use PHPMap\User;
+use App\User;
 
 class ReindexCommand extends Command
 {

app/Console/Kernel.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace PHPMap\Console;
+namespace App\Console;
 
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;

app/Events/Users/NewFollower.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace PHPMap\Events\Users;
+namespace App\Events\Users;
 
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Broadcasting\PrivateChannel;
 use Illuminate\Broadcasting\PresenceChannel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
-use PHPMap\User;
+use App\User;
 
 class NewFollower implements ShouldBroadcast
 {

app/Exceptions/Handler.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace PHPMap\Exceptions;
+namespace App\Exceptions;
 
 use Exception;
 use Illuminate\Auth\AuthenticationException;

app/Http/Controllers/Api/Users/UserController.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace PHPMap\Http\Controllers\Api\Users;
+namespace App\Http\Controllers\Api\Users;
 
 use Illuminate\Http\Request;
 
-use PHPMap\Http\Requests;
-use PHPMap\Http\Controllers\Controller;
-use PHPMap\User;
+use App\Http\Requests;
+use App\Http\Controllers\Controller;
+use App\User;
 
 class UserController extends Controller
 {

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace PHPMap\Http\Controllers\Auth;
+namespace App\Http\Controllers\Auth;
 
-use PHPMap\Http\Controllers\Controller;
+use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
 
 class ForgotPasswordController extends Controller

app/Http/Controllers/Auth/LoginController.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace PHPMap\Http\Controllers\Auth;
+namespace App\Http\Controllers\Auth;
 
-use PHPMap\Http\Controllers\Controller;
+use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 
 class LoginController extends Controller

app/Http/Controllers/Auth/RegisterController.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace PHPMap\Http\Controllers\Auth;
+namespace App\Http\Controllers\Auth;
 
-use PHPMap\User;
+use App\User;
 use Validator;
-use PHPMap\Http\Controllers\Controller;
+use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\RegistersUsers;
 
 class RegisterController extends Controller
@@ -54,6 +54,7 @@ protected function validator(array $data)
             'password' => 'required|min:6|confirmed',
             'address' => 'required|max:255',
             'city' => 'required|max:255',
+            'country' => 'required|max:255',
         ]);
     }
 
@@ -74,6 +75,7 @@ protected function create(array $data)
             'lat' => $data['lat'],
             'lng' => $data['lng'],
             'city' => $data['city'],
+            'country' => $data['country'],
             'api_token' => str_random(20).'.'.str_random(5).'_'.str_random(15)
         ]);
     }

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace PHPMap\Http\Controllers\Auth;
+namespace App\Http\Controllers\Auth;
 
-use PHPMap\Http\Controllers\Controller;
+use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\ResetsPasswords;
 
 class ResetPasswordController extends Controller

app/Http/Controllers/Blog/ArticleController.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace PHPMap\Http\Controllers\Blog;
+namespace App\Http\Controllers\Blog;
 
 use Illuminate\Http\Request;
 
-use PHPMap\Http\Requests;
-use PHPMap\Http\Controllers\Controller;
+use App\Http\Requests;
+use App\Http\Controllers\Controller;
 
-use PHPMap\User;
-use PHPMap\Models\BlogEntry;
+use App\User;
+use App\Models\BlogEntry;
 
 class ArticleController extends Controller
 {

app/Http/Controllers/Blog/UserController.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace PHPMap\Http\Controllers\Blog;
+namespace App\Http\Controllers\Blog;
 
 use Illuminate\Http\Request;
 
-use PHPMap\Http\Requests;
-use PHPMap\Http\Controllers\Controller;
+use App\Http\Requests;
+use App\Http\Controllers\Controller;
 
-use PHPMap\User;
+use App\User;
 
 class UserController extends Controller
 {

app/Http/Controllers/Controller.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace PHPMap\Http\Controllers;
+namespace App\Http\Controllers;
 
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Routing\Controller as BaseController;

app/Http/Controllers/Intern/Profile/InfoController.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Controllers\Intern\Profile;
+
+use App\User;
+use Illuminate\Http\Request;
+
+use App\Http\Requests;
+use App\Http\Controllers\Controller;
+
+class InfoController extends Controller
+{
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
+    public function update(Request $request)
+    {
+//        return $request->get('intro');
+        $user = User::find(auth()->user()->id);
+        $user->update([
+            'intro' => $request->get('intro')
+        ]);
+
+        $user->save();
+    }
+}

app/Http/Controllers/Intern/Profile/PostController.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace PHPMap\Http\Controllers\Intern\Profile;
+namespace App\Http\Controllers\Intern\Profile;
 
 use Illuminate\Http\Request;
 
-use PHPMap\Http\Requests;
-use PHPMap\Http\Controllers\Controller;
-use PHPMap\Models\UserPost;
+use App\Http\Requests;
+use App\Http\Controllers\Controller;
+use App\Models\UserPost;
 
 class PostController extends Controller
 {

app/Http/Controllers/Intern/Users/FollowController.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Http\Controllers\Intern\Users;
+
+use Illuminate\Http\Request;
+
+use App\Http\Requests;
+use App\Http\Controllers\Controller;
+use App\User;
+
+class FollowController extends Controller
+{
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
+    public function follow(Request $request, $id)
+    {
+        $user = User::find($id);
+
+        if ($request->user()->id === $user->id) {
+            return response()->json('You cannot follow yourself', 422);
+        }
+
+        if ($request->user()->followers->contains($user)) {
+            $request->user()->followtoggle($user);
+            return response()->json('You are not longer following '. $user->username, 200);
+        }
+
+        $request->user()->followtoggle($user);
+        return response()->json('You are now following '. $user->username, 200);
+    }
+}

app/Http/Controllers/Intern/Users/PostController.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace PHPMap\Http\Controllers\Intern\Users;
+namespace App\Http\Controllers\Intern\Users;
 
 use Illuminate\Http\Request;
 
-use PHPMap\Http\Requests;
-use PHPMap\Http\Controllers\Controller;
-use PHPMap\User;
+use App\Http\Requests;
+use App\Http\Controllers\Controller;
+use App\User;
 
 class PostController extends Controller
 {

app/Http/Controllers/Intern/Users/UserController.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace PHPMap\Http\Controllers\Intern\Users;
+namespace App\Http\Controllers\Intern\Users;
 
 use Illuminate\Http\Request;
 
-use PHPMap\Http\Requests;
-use PHPMap\Http\Controllers\Controller;
-use PHPMap\User;
+use App\Http\Requests;
+use App\Http\Controllers\Controller;
+use App\User;
 
 class UserController extends Controller
 {

app/Http/Controllers/Profile/ProfileController.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace PHPMap\Http\Controllers\Profile;
+namespace App\Http\Controllers\Profile;
 
 use Illuminate\Http\Request;
 
-use PHPMap\Http\Requests;
-use PHPMap\Http\Controllers\Controller;
+use App\Http\Requests;
+use App\Http\Controllers\Controller;
 
 class ProfileController extends Controller
 {

app/Http/Controllers/Users/UserController.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace PHPMap\Http\Controllers\Users;
+namespace App\Http\Controllers\Users;
 
 use Illuminate\Http\Request;
 
-use PHPMap\Http\Requests;
-use PHPMap\Http\Controllers\Controller;
-use PHPMap\Models\UserPost;
-use PHPMap\User;
+use App\Http\Requests;
+use App\Http\Controllers\Controller;
+use App\Models\UserPost;
+use App\User;
 
 class UserController extends Controller
 {

app/Http/Kernel.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace PHPMap\Http;
+namespace App\Http;
 
 use Illuminate\Foundation\Http\Kernel as HttpKernel;
 
@@ -24,11 +24,11 @@ class Kernel extends HttpKernel
      */
     protected $middlewareGroups = [
         'web' => [
-            \PHPMap\Http\Middleware\EncryptCookies::class,
+            \App\Http\Middleware\EncryptCookies::class,
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
             \Illuminate\Session\Middleware\StartSession::class,
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
-            \PHPMap\Http\Middleware\VerifyCsrfToken::class,
+            \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
 
@@ -50,8 +50,8 @@ class Kernel extends HttpKernel
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
         'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
         'can' => \Illuminate\Auth\Middleware\Authorize::class,
-        'guest' => \PHPMap\Http\Middleware\RedirectIfAuthenticated::class,
+        'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
-        'role' => \PHPMap\Http\Middleware\RoleMiddleware::class,
+        'role' => \App\Http\Middleware\RoleMiddleware::class,
     ];
 }

app/Http/Middleware/EncryptCookies.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace PHPMap\Http\Middleware;
+namespace App\Http\Middleware;
 
 use Illuminate\Cookie\Middleware\EncryptCookies as BaseEncrypter;
 

app/Http/Middleware/RedirectIfAuthenticated.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace PHPMap\Http\Middleware;
+namespace App\Http\Middleware;
 
 use Closure;
 use Illuminate\Support\Facades\Auth;

app/Http/Middleware/RoleMiddleware.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace PHPMap\Http\Middleware;
+namespace App\Http\Middleware;
 
 use Closure;
 use Illuminate\Support\Facades\Auth;

app/Http/Middleware/VerifyCsrfToken.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace PHPMap\Http\Middleware;
+namespace App\Http\Middleware;
 
 use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as BaseVerifier;
 

app/Http/Requests/Request.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace PHPMap\Http\Requests;
+namespace App\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;