diff --git a/app/Http/Controllers/App/AnalyticsController.php b/app/Http/Controllers/App/AnalyticsController.php index aee64aad..919486bf 100644 --- a/app/Http/Controllers/App/AnalyticsController.php +++ b/app/Http/Controllers/App/AnalyticsController.php @@ -42,6 +42,8 @@ public function index(Request $request): Response { $workspace = $request->user()->currentWorkspace; + $this->authorize('view', $workspace); + $accounts = $workspace->socialAccounts() ->where('is_active', true) ->whereIn('platform', self::SUPPORTED_PLATFORMS) diff --git a/app/Http/Controllers/App/AutomationController.php b/app/Http/Controllers/App/AutomationController.php index e691eb8c..474cc140 100644 --- a/app/Http/Controllers/App/AutomationController.php +++ b/app/Http/Controllers/App/AutomationController.php @@ -48,6 +48,8 @@ class AutomationController extends Controller { public function index(ListAutomations $list): Response { + $this->authorize('viewAny', Automation::class); + $workspace = request()->user()->currentWorkspace; $automations = Inertia::scroll(fn () => AutomationResource::collection( @@ -61,6 +63,8 @@ public function index(ListAutomations $list): Response public function store(StoreAutomationRequest $request, CreateAutomation $create): RedirectResponse { + $this->authorize('create', Automation::class); + $automation = $create( $request->user()->currentWorkspace, $request->user(), @@ -71,6 +75,8 @@ public function store(StoreAutomationRequest $request, CreateAutomation $create) public function show(Automation $automation): RedirectResponse { + $this->authorize('view', $automation); + return redirect()->route('app.automations.workflow', $automation->id); } diff --git a/app/Http/Controllers/App/PostController.php b/app/Http/Controllers/App/PostController.php index 65576b9c..a573f8da 100644 --- a/app/Http/Controllers/App/PostController.php +++ b/app/Http/Controllers/App/PostController.php @@ -180,7 +180,9 @@ public function store(StorePostRequest $request): RedirectResponse|\Symfony\Comp session()->flash('flash.banner', __('posts.flash.connect_first')); session()->flash('flash.bannerStyle', 'danger'); - return redirect()->route('app.accounts'); + return $request->user()->can('manageAccounts', $workspace) + ? redirect()->route('app.accounts') + : redirect()->route('app.calendar'); } $post = CreatePost::execute($workspace, $request->user(), [ @@ -232,13 +234,15 @@ public function edit(Request $request, Post $post): Response|RedirectResponse return redirect()->route('app.workspaces.create'); } - $this->authorize('update', $post); + $this->authorize('view', $post); if (PostStatusRules::blocksEditing($post)) { return redirect()->route('app.posts.show', $post); } - SyncPostPlatforms::execute($post); + if ($request->user()->can('update', $post)) { + SyncPostPlatforms::execute($post); + } $post->load(['postPlatforms.socialAccount', 'labels']); $socialAccounts = $workspace->socialAccounts()->active()->get(); diff --git a/app/Http/Controllers/Auth/SocialController.php b/app/Http/Controllers/Auth/SocialController.php index ec9c5009..bd4a68cd 100644 --- a/app/Http/Controllers/Auth/SocialController.php +++ b/app/Http/Controllers/Auth/SocialController.php @@ -41,7 +41,7 @@ public function index(Request $request): Response|RedirectResponse return redirect()->route('app.workspaces.create'); } - $this->authorize('view', $workspace); + $this->authorize('manageAccounts', $workspace); $platforms = collect(SocialPlatform::enabled())->map(fn ($platform) => [ 'value' => $platform->value, diff --git a/app/Policies/AutomationPolicy.php b/app/Policies/AutomationPolicy.php index 736147e8..5c1e5bdc 100644 --- a/app/Policies/AutomationPolicy.php +++ b/app/Policies/AutomationPolicy.php @@ -21,17 +21,20 @@ public function view(User $user, Automation $automation): bool public function create(User $user): bool { - return $user->currentWorkspace !== null; + return $user->currentWorkspace !== null + && $user->can('createPost', $user->currentWorkspace); } public function update(User $user, Automation $automation): bool { - return $automation->workspace_id === $user->current_workspace_id; + return $automation->workspace_id === $user->current_workspace_id + && $user->can('createPost', $user->currentWorkspace); } public function delete(User $user, Automation $automation): bool { - return $automation->workspace_id === $user->current_workspace_id; + return $automation->workspace_id === $user->current_workspace_id + && $user->can('createPost', $user->currentWorkspace); } public function activate(User $user, Automation $automation): bool diff --git a/app/Policies/PostPolicy.php b/app/Policies/PostPolicy.php index c89f8267..0949d812 100644 --- a/app/Policies/PostPolicy.php +++ b/app/Policies/PostPolicy.php @@ -25,7 +25,8 @@ public function view(User $user, Post $post): bool|Response } /** - * Authorize updating a post. Same workspace-tenancy guard as `view`. + * Authorize updating a post: tenancy guard (404 across tenants) then the + * role gate — viewers are read-only (403). */ public function update(User $user, Post $post): bool|Response { @@ -33,11 +34,12 @@ public function update(User $user, Post $post): bool|Response return Response::denyAsNotFound(); } - return true; + return $user->can('createPost', $user->currentWorkspace); } /** - * Authorize deleting a post. Same workspace-tenancy guard as `view`. + * Authorize deleting a post: tenancy guard (404 across tenants) then the + * same role gate as `update` — viewers are read-only (403). */ public function delete(User $user, Post $post): bool|Response { @@ -45,7 +47,7 @@ public function delete(User $user, Post $post): bool|Response return Response::denyAsNotFound(); } - return true; + return $user->can('createPost', $user->currentWorkspace); } /** diff --git a/lang/en/posts.php b/lang/en/posts.php index f0034ec4..09e66b58 100644 --- a/lang/en/posts.php +++ b/lang/en/posts.php @@ -388,6 +388,7 @@ ], 'status' => [ + 'pending' => 'Pending', 'scheduled' => 'Scheduled', 'published' => 'Published', 'publishing' => 'Publishing...', diff --git a/lang/en/sidebar.php b/lang/en/sidebar.php index 2892a5f6..f9cddbd6 100644 --- a/lang/en/sidebar.php +++ b/lang/en/sidebar.php @@ -24,7 +24,7 @@ 'groups' => [ 'posts' => 'Posts', 'workspace' => 'Workspace', - 'support' => 'Support', + 'others' => 'Others', ], 'analytics' => 'Analytics', @@ -54,9 +54,8 @@ 'no_notifications' => 'No notifications', 'support' => [ - 'discord' => 'Discord', - 'share_feedback' => 'Share feedback', - 'last_updates' => 'Last Updates', 'docs' => 'Documentation', + 'referral' => 'Earn 30% referral', + 'stay_updated' => 'Stay updated', ], ]; diff --git a/lang/es/posts.php b/lang/es/posts.php index 69376882..cbe0df58 100644 --- a/lang/es/posts.php +++ b/lang/es/posts.php @@ -388,6 +388,7 @@ ], 'status' => [ + 'pending' => 'Pendiente', 'scheduled' => 'Programado', 'published' => 'Publicado', 'publishing' => 'Publicando...', diff --git a/lang/es/sidebar.php b/lang/es/sidebar.php index 291ec360..c6f768d4 100644 --- a/lang/es/sidebar.php +++ b/lang/es/sidebar.php @@ -24,7 +24,7 @@ 'groups' => [ 'posts' => 'Posts', 'workspace' => 'Workspace', - 'support' => 'Soporte', + 'others' => 'Otros', ], 'analytics' => 'Analytics', @@ -54,9 +54,8 @@ 'no_notifications' => 'Sin notificaciones', 'support' => [ - 'discord' => 'Discord', - 'share_feedback' => 'Dar feedback', - 'last_updates' => 'Últimas actualizaciones', 'docs' => 'Documentación', + 'referral' => 'Gana 30% de comisión', + 'stay_updated' => 'Mantente al día', ], ]; diff --git a/lang/pt-BR/posts.php b/lang/pt-BR/posts.php index 333c5e97..ade99dd0 100644 --- a/lang/pt-BR/posts.php +++ b/lang/pt-BR/posts.php @@ -388,6 +388,7 @@ ], 'status' => [ + 'pending' => 'Pendente', 'scheduled' => 'Agendado', 'published' => 'Publicado', 'publishing' => 'Publicando...', diff --git a/lang/pt-BR/sidebar.php b/lang/pt-BR/sidebar.php index e4178c6e..0717d621 100644 --- a/lang/pt-BR/sidebar.php +++ b/lang/pt-BR/sidebar.php @@ -24,7 +24,7 @@ 'groups' => [ 'posts' => 'Posts', 'workspace' => 'Workspace', - 'support' => 'Suporte', + 'others' => 'Outros', ], 'analytics' => 'Analytics', @@ -54,9 +54,8 @@ 'no_notifications' => 'Sem notificações', 'support' => [ - 'discord' => 'Discord', - 'share_feedback' => 'Enviar feedback', - 'last_updates' => 'Últimas Atualizações', 'docs' => 'Documentação', + 'referral' => 'Ganhe 30% de indicação', + 'stay_updated' => 'Fique por dentro', ], ]; diff --git a/resources/js/components/AppSidebar.vue b/resources/js/components/AppSidebar.vue index f472b314..d7b66dd7 100644 --- a/resources/js/components/AppSidebar.vue +++ b/resources/js/components/AppSidebar.vue @@ -4,13 +4,16 @@ import { IconAffiliate, IconAlertTriangle, IconBolt, + IconBrandX, IconCalendar, IconChartBar, IconChevronRight, IconClock, IconFileCheck, IconFileText, + IconGift, IconHash, + IconLifebuoy, IconPhoto, IconPencil, IconPlus, @@ -22,6 +25,7 @@ import { computed } from 'vue'; import { create as createPost, index as postsIndex } from '@/actions/App/Http/Controllers/App/PostController'; import NavMain from '@/components/NavMain.vue'; +import NavSupport from '@/components/NavSupport.vue'; import NavUser from '@/components/NavUser.vue'; import { Avatar } from '@/components/ui/avatar'; import { Button } from '@/components/ui/button'; @@ -43,6 +47,7 @@ import { SidebarMenuItem, } from '@/components/ui/sidebar'; import { useActiveUrl } from '@/composables/useActiveUrl'; +import { useWorkspaceRole } from '@/composables/useWorkspaceRole'; import { accounts, analytics, calendar, settings as settingsHub } from '@/routes/app'; import { index as assets } from '@/routes/app/assets'; import { index as automations } from '@/routes/app/automations'; @@ -63,6 +68,8 @@ const currentWorkspace = computed(() => page.props.auth.curren const workspaces = computed(() => page.props.auth.workspaces as Workspace[]); const subscriptionPastDue = computed(() => Boolean(page.props.auth.subscriptionPastDue)); +const { canCreatePost, canManageAccounts, canManageAutomations, canCreateWorkspace } = useWorkspaceRole(); + const mainNavItems = computed(() => [ { title: trans('sidebar.posts.calendar'), @@ -74,12 +81,16 @@ const mainNavItems = computed(() => [ href: analytics.url(), icon: IconChartBar, }, - { - title: trans('sidebar.automations'), - href: automations.url(), - icon: IconBolt, - badge: 'Beta', - }, + ...(canManageAutomations.value + ? [ + { + title: trans('sidebar.automations'), + href: automations.url(), + icon: IconBolt, + badge: 'Beta', + }, + ] + : []), ]); const postsNavItems = computed(() => [ @@ -107,25 +118,51 @@ const postsNavItems = computed(() => [ ]); const workspaceNavItems = computed(() => [ + ...(canManageAccounts.value + ? [ + { + title: trans('sidebar.workspace.connections'), + href: accounts.url(), + icon: IconAffiliate, + }, + ] + : []), + ...(canCreatePost.value + ? [ + { + title: trans('sidebar.workspace.signatures'), + href: signatures.url(), + icon: IconHash, + }, + { + title: trans('sidebar.workspace.labels'), + href: labels.url(), + icon: IconTag, + }, + { + title: trans('sidebar.workspace.assets'), + href: assets.url(), + icon: IconPhoto, + }, + ] + : []), +]); + +const supportNavItems = computed(() => [ { - title: trans('sidebar.workspace.connections'), - href: accounts.url(), - icon: IconAffiliate, + title: trans('sidebar.support.referral'), + href: 'https://affiliates.trypost.it/', + icon: IconGift, }, { - title: trans('sidebar.workspace.signatures'), - href: signatures.url(), - icon: IconHash, + title: trans('sidebar.support.stay_updated'), + href: 'https://x.com/trypostit', + icon: IconBrandX, }, { - title: trans('sidebar.workspace.labels'), - href: labels.url(), - icon: IconTag, - }, - { - title: trans('sidebar.workspace.assets'), - href: assets.url(), - icon: IconPhoto, + title: trans('sidebar.support.docs'), + href: 'https://docs.trypost.it', + icon: IconLifebuoy, }, ]); @@ -176,20 +213,22 @@ const handleCreateWorkspace = () => { {{ workspace.name }} - - - - {{ $t('sidebar.create_workspace') }} - + - + -
+
-
+
@@ -432,7 +437,8 @@ const canRegenerateWithAi = (item: MediaItem): boolean => props.allowAiRegenerat