Changeset f457265 for app

Timestamp:

02/24/21 21:58:42 (4 years ago)

Author:

Berat Kjufliju <kufliju@…>

Branches:

master

Children:

ff9da8b

Parents:

0c07a90

Message:

ADD technoweek offer, companies

Location:

app

Files:

• Http/Controllers/Blog/BlogController.php (modified) (3 diffs)
• Http/Controllers/Dashboard/CompaniesController.php (added)
• Http/Controllers/Dashboard/IndexController.php (modified) (1 diff)
• Http/Controllers/Dashboard/UsersController.php (modified) (2 diffs)
• Http/Requests/Blog/CompanyRequest.php (added)
• Http/Requests/Dashboard/NewUserRequest.php (modified) (2 diffs)
• Models/Company.php (added)
• Models/User.php (modified) (1 diff)
• Models/UserProfile.php (modified) (1 diff)

app/Http/Controllers/Blog/BlogController.php

@@ -4 +4 @@
 
 use App\Http\Requests\Blog\CommentRequest;
+use App\Http\Requests\Blog\CompanyRequest;
 use App\Http\Requests\Blog\PostLikeRequest;
 use App\Http\Requests\Blog\PostUnlikeRequest;
+use App\Models\Company;
 use App\Models\Tag;
 use App\Models\Like;
@@ -15 +17 @@
 use App\Http\Controllers\Controller;
 use App\Notifications\NewCommentAdded;
+use Illuminate\Support\Facades\DB;
 
 class BlogController extends Controller
@@ -226 +229 @@
         ]);
     }
+
+    public function storeCompany(CompanyRequest $request)
+    {
+        DB::transaction(function () use ($request) {
+
+            $company = new Company();
+            $company->name = $request->name;
+            $company->website = $request->website;
+            $company->email = $request->email;
+
+            $company->save();
+
+            if ($company->wasRecentlyCreated) {
+                $this->disableOfferModal();
+            }
+        });
+
+        return redirect()->route("blog.index");
+    }
+
+    public function disableOffer()
+    {
+        $this->disableOfferModal();
+        return redirect()->route("blog.index");
+    }
+
+    private function disableOfferModal()
+    {
+        if (!session()->has("offer_disabled")) {
+            session()->push("offer_disabled", true);
+        }
+    }
 }

app/Http/Controllers/Dashboard/IndexController.php

@@ -36 +36 @@
             "allPosts" => Post::count(),
             "currentUserPosts" => Post::where("user_id", auth()->user()->id)->count(),
-            "users" => User::count(),
+            "users" => !is_null(auth()->user()->company) ? auth()->user()->company->users->count() : User::count(),
             "total_comments" => Comment::count(),
             "comments" => auth()->user()->comments->count()

app/Http/Controllers/Dashboard/UsersController.php

@@ -5 +5 @@
 use App\Helpers\Alert;
 use App\Http\Requests\Dashboard\NewUserRequest;
+use App\Models\Company;
 use App\Models\Role;
 use App\Models\User;
@@ -47 +48 @@
             $user->verify_token = $user->generateVerifyToken();
 
-            $user->role_id = $request->userRole;
+            if ($request->has("company_id") || !is_null(auth()->user()->company_id)) {
+                $user->company_id = $request->has("company_id") || auth()->user()->company_id;
+                $user->role_id = 1;
+            } else {
+                $user->role_id = $request->userRole;
+            }
 
             $user->save();
 
-            $user->userProfile()->create([
+            $userProfile = [
                 "profile_link" => $user->generateProfileLink($request->name, $request->surname),
                 "technoblog_email" => $user->generateTechnoblogEmail($request->name, $request->surname)
-            ]);
+            ];
+
+            if ($request->has("company_owner")) {
+                $userProfile["is_company_profile"] = true;
+            }
+
+            $user->userProfile()->create($userProfile);
 
             $user->notify(new WelcomeUser($user));
 
             Alert::flash("New user added successfully");
-
         });
 

app/Http/Requests/Dashboard/NewUserRequest.php

@@ -25 +25 @@
     public function rules()
     {
-        return [
+        $rules = [
             "name" => "required|alpha|min:2|max:255",
             "surname" => "required|alpha|min:2|max:255",
@@ -32 +32 @@
             "email" => "required|string|email|max:255|unique:users",
             "username" => "required|alpha_dash|min:8|unique:users,username",
-            "userRole" => "required|exists:roles,id"
         ];
+
+        if (!$this->has("company_id")) {
+            $rules["userRole"] = "required|exists:roles,id";
+        }
+
+        return $rules;
     }
 

app/Models/User.php

@@ -53 +53 @@
     }
 
+    public function company()
+    {
+        return $this->belongsTo(Company::class);
+    }
+
     public function userProfile()
     {

app/Models/UserProfile.php

@@ -13 +13 @@
         "technoblog_email",
         "user_id",
+        "is_company_profile",
         "profile_link",
         "short_bio",