Skip to content

Premium feature #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 20 commits into from
Oct 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ Groupe Slack: https://laravelcm.slack.com <br />
Nous tenons à remercier ces **entreprises extraordinaires** pour leur parrainage. Si vous souhaitez devenir sponsor, veuillez visiter <a href="https://github.com/sponsors/mckenziearts">la page Laravel.cm Github de Sponsoring</a>.

- **[Laravel Shopper](https://laravelshopper.io)**
- [Localhost Academy](https://localhostkmer.xyz)
- [Lotin Corp](https://lotincorp.biz)

## Caractéristiques Serveur

Expand Down
14 changes: 14 additions & 0 deletions app/Enums/PlanType.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?php

declare(strict_types=1);

namespace App\Enums;

use BenSampo\Enum\Enum;

final class PlanType extends Enum
{
const DEVELOPER = 'developer';

const ENTERPRISE = 'enterprise';
}
31 changes: 31 additions & 0 deletions app/Http/Controllers/Api/PremiumController.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?php

namespace App\Http\Controllers\Api;

use App\Http\Controllers\Controller;
use App\Http\Resources\PremiumUserResource;
use App\Models\User;
use Illuminate\Http\JsonResponse;
use Illuminate\Support\Facades\Cache;

class PremiumController extends Controller
{
public function users(): JsonResponse
{
$users = Cache::remember('premium_users', now()->addMonth(), function () {
return User::select('name', 'username')->limit(48)->get();
});

$premium = collect();

foreach ($users->chunk(16) as $key => $usersRow) {
$usersArray[$key] = [];
foreach ($usersRow as $user) {
array_push($usersArray[$key], new PremiumUserResource($user));
}
$premium->push($usersArray[$key]);
}

return response()->json($premium);
}
}
15 changes: 14 additions & 1 deletion app/Http/Controllers/HomeController.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,24 @@

use App\Models\Article;
use App\Models\Discussion;
use App\Models\Premium\Plan;
use App\Models\Thread;
use GuzzleHttp\Client;
use GuzzleHttp\Exception\GuzzleException;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Cache;

class HomeController extends Controller
{
public function index()
{
$plans = Cache::remember('plans', now()->addYear(), function () {
return Plan::with('features')
->developer()
->get();
});

$latestArticles = Cache::remember('latestArticles', now()->addHour(), function () {
return Article::with('tags')
->published()
Expand Down Expand Up @@ -48,7 +56,12 @@ public function index()
->twitterSite('laravelcm')
->withUrl();

return view('home', compact('latestArticles', 'latestThreads', 'latestDiscussions'));
return view('home', compact(
'latestArticles',
'latestThreads',
'latestDiscussions',
'plans'
));
}

public function slack(Request $request)
Expand Down
1 change: 0 additions & 1 deletion app/Http/Livewire/Articles/Create.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
use App\Traits\WithTagsAssociation;
use Illuminate\Contracts\View\View;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Str;
use Livewire\Component;
use Livewire\WithFileUploads;

Expand Down
23 changes: 23 additions & 0 deletions app/Http/Resources/PremiumUserResource.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?php

namespace App\Http\Resources;

use Illuminate\Http\Resources\Json\JsonResource;

class PremiumUserResource extends JsonResource
{
/**
* Transform the resource into an array.
*
* @param \Illuminate\Http\Request $request
* @return array|\Illuminate\Contracts\Support\Arrayable|\JsonSerializable
*/
public function toArray($request)
{
return [
'name' => $this->name,
'username' => $this->username,
'image' => $this->profile_photo_url,
];
}
}
2 changes: 0 additions & 2 deletions app/Markdown/MarkdownHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,8 @@ public static function parseLiquidTags($html): string

// If we find at least one liquid tag
if (preg_match_all('/{% .* %}/', $html, $matches) && $matches[0]) {

// loop through each of the liquid tags
foreach ($matches[0] as $index => $match) {

// replace multiple spaces with single space
$matchArray = explode(' ', preg_replace('!\s+!', ' ', $match));

Expand Down
11 changes: 11 additions & 0 deletions app/Models/Premium/Feature.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php

namespace App\Models\Premium;

use Illuminate\Database\Eloquent\Factories\HasFactory;
use Rinvex\Subscriptions\Models\PlanFeature as Model;

class Feature extends Model
{
use HasFactory;
}
22 changes: 22 additions & 0 deletions app/Models/Premium/Plan.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?php

namespace App\Models\Premium;

use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Rinvex\Subscriptions\Models\Plan as Model;

class Plan extends Model
{
use HasFactory;

public function scopeDeveloper(Builder $query): Builder
{
return $query->where('type', \App\Enums\PlanType::DEVELOPER);
}

public function scopeEnterprise(Builder $query): Builder
{
return $query->where('type', \App\Enums\PlanType::ENTERPRISE);
}
}
11 changes: 11 additions & 0 deletions app/Models/Premium/Subscription.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php

namespace App\Models\Premium;

use Illuminate\Database\Eloquent\Factories\HasFactory;
use Rinvex\Subscriptions\Models\PlanSubscription as Model;

class Subscription extends Model
{
use HasFactory;
}
11 changes: 11 additions & 0 deletions app/Models/Premium/SubscriptionUsage.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php

namespace App\Models\Premium;

use Illuminate\Database\Eloquent\Factories\HasFactory;
use Rinvex\Subscriptions\Models\PlanSubscriptionUsage as Model;

class SubscriptionUsage extends Model
{
use HasFactory;
}
16 changes: 9 additions & 7 deletions app/Models/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
use Illuminate\Notifications\Notification;
use Illuminate\Support\Facades\Auth;
use QCod\Gamify\Gamify;
use Rinvex\Subscriptions\Traits\HasPlanSubscriptions;
use Spatie\MediaLibrary\HasMedia;
use Spatie\MediaLibrary\InteractsWithMedia;
use Spatie\Permission\Traits\HasRoles;
Expand All @@ -23,13 +24,14 @@
*/
class User extends Authenticatable implements MustVerifyEmail, HasMedia
{
use Gamify,
HasFactory,
HasProfilePhoto,
HasRoles,
InteractsWithMedia,
Notifiable,
Reacts;
use Gamify;
use HasFactory;
use HasPlanSubscriptions;
use HasProfilePhoto;
use HasRoles;
use InteractsWithMedia;
use Notifiable;
use Reacts;

/**
* The attributes that are mass assignable.
Expand Down
5 changes: 5 additions & 0 deletions app/Providers/AppServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ class AppServiceProvider extends ServiceProvider
public function register(): void
{
$this->registerBladeDirective();

if ($this->app->environment('local')) {
$this->app->register(\Laravel\Telescope\TelescopeServiceProvider::class);
$this->app->register(TelescopeServiceProvider::class);
}
}

public function boot(): void
Expand Down
73 changes: 73 additions & 0 deletions app/Providers/TelescopeServiceProvider.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
<?php

namespace App\Providers;

use Illuminate\Support\Facades\Gate;
use Laravel\Telescope\IncomingEntry;
use Laravel\Telescope\Telescope;
use Laravel\Telescope\TelescopeApplicationServiceProvider;

class TelescopeServiceProvider extends TelescopeApplicationServiceProvider
{
/**
* Register any application services.
*
* @return void
*/
public function register()
{
// Telescope::night();

$this->hideSensitiveRequestDetails();

Telescope::filter(function (IncomingEntry $entry) {
if ($this->app->environment('local')) {
return true;
}

return $entry->isReportableException() ||
$entry->isFailedRequest() ||
$entry->isFailedJob() ||
$entry->isScheduledTask() ||
$entry->hasMonitoredTag();
});
}

/**
* Prevent sensitive request details from being logged by Telescope.
*
* @return void
*/
protected function hideSensitiveRequestDetails()
{
if ($this->app->environment('local')) {
return;
}

Telescope::hideRequestParameters(['_token']);

Telescope::hideRequestHeaders([
'cookie',
'x-csrf-token',
'x-xsrf-token',
]);
}

/**
* Register the Telescope gate.
*
* This gate determines who can access Telescope in non-local environments.
*
* @return void
*/
protected function gate()
{
Gate::define('viewTelescope', function ($user) {
return in_array($user->email, [
'monneylobe@gmail.com',
'support@laravel.cm',
'arthur@laravel.cm',
]);
});
}
}
Loading