From 6f3da1b7d0fceb246f0a1756cc2dbcdcc8fb9596 Mon Sep 17 00:00:00 2001 From: Nicholas Tindle Date: Thu, 3 Apr 2025 10:52:22 -0500 Subject: [PATCH 1/5] refactor(backend): move the router files for postmark to not the v2 folder (#9597) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit One of the pull request review notes from when these were first made is that they don't belong in the v2 folder. This pr fixes where they are. ### Changes 🏗️ - Moves from v2 to routers for the postmark tooling ### Checklist 📋 #### For code changes: - [x] I have clearly listed my changes in the PR description - [x] I have made a test plan - [x] I have tested my changes according to the test plan: - [x] Check that linting and tests pass --------- Co-authored-by: Zamil Majdy --- autogpt_platform/backend/backend/server/rest_api.py | 6 +++--- .../backend/server/{v2 => routers}/postmark/__init__.py | 0 .../backend/server/{v2 => routers}/postmark/models.py | 0 .../backend/server/{v2 => routers}/postmark/postmark.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename autogpt_platform/backend/backend/server/{v2 => routers}/postmark/__init__.py (100%) rename autogpt_platform/backend/backend/server/{v2 => routers}/postmark/models.py (100%) rename autogpt_platform/backend/backend/server/{v2 => routers}/postmark/postmark.py (98%) diff --git a/autogpt_platform/backend/backend/server/rest_api.py b/autogpt_platform/backend/backend/server/rest_api.py index 1e2424c165..b1c1dcfbf5 100644 --- a/autogpt_platform/backend/backend/server/rest_api.py +++ b/autogpt_platform/backend/backend/server/rest_api.py @@ -17,13 +17,13 @@ import backend.data.db import backend.data.graph import backend.data.user import backend.server.integrations.router +import backend.server.routers.postmark.postmark import backend.server.routers.v1 import backend.server.v2.admin.store_admin_routes import backend.server.v2.library.db import backend.server.v2.library.model import backend.server.v2.library.routes import backend.server.v2.otto.routes -import backend.server.v2.postmark.postmark import backend.server.v2.store.model import backend.server.v2.store.routes import backend.util.service @@ -115,8 +115,8 @@ app.include_router( ) app.include_router( - backend.server.v2.postmark.postmark.router, - tags=["v2", "email"], + backend.server.routers.postmark.postmark.router, + tags=["v1", "email"], prefix="/api/email", ) diff --git a/autogpt_platform/backend/backend/server/v2/postmark/__init__.py b/autogpt_platform/backend/backend/server/routers/postmark/__init__.py similarity index 100% rename from autogpt_platform/backend/backend/server/v2/postmark/__init__.py rename to autogpt_platform/backend/backend/server/routers/postmark/__init__.py diff --git a/autogpt_platform/backend/backend/server/v2/postmark/models.py b/autogpt_platform/backend/backend/server/routers/postmark/models.py similarity index 100% rename from autogpt_platform/backend/backend/server/v2/postmark/models.py rename to autogpt_platform/backend/backend/server/routers/postmark/models.py diff --git a/autogpt_platform/backend/backend/server/v2/postmark/postmark.py b/autogpt_platform/backend/backend/server/routers/postmark/postmark.py similarity index 98% rename from autogpt_platform/backend/backend/server/v2/postmark/postmark.py rename to autogpt_platform/backend/backend/server/routers/postmark/postmark.py index c6348c68a3..c9ceca4e91 100644 --- a/autogpt_platform/backend/backend/server/v2/postmark/postmark.py +++ b/autogpt_platform/backend/backend/server/routers/postmark/postmark.py @@ -10,7 +10,7 @@ from backend.data.user import ( set_user_email_verification, unsubscribe_user_by_token, ) -from backend.server.v2.postmark.models import ( +from backend.server.routers.postmark.models import ( PostmarkBounceEnum, PostmarkBounceWebhook, PostmarkClickWebhook, From 3b5feb2c25b437acf9776b769dc4cc953ebf9d04 Mon Sep 17 00:00:00 2001 From: Abhimanyu Yadav <122007096+Abhi1992002@users.noreply.github.com> Date: Thu, 3 Apr 2025 21:25:20 +0530 Subject: [PATCH 2/5] fix(marketplace): Fix store card typography (#9739) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - fix #8965 ### Changes Made: - **Title**: Increased line height from 20px to 32px. - **Creator Name:** - Changed font to Geist Sans. - Updated font size to 20px and leading to 28px. - **Description**: Applied Geist Sans font. - **Stats Line:** Applied Geist Sans font. - Font Configuration Fix: > Previously, we were using font-gist, which is not defined in the tailwind config file, hence Updated to use font-sans instead. I have also fixed the height and width of the profile picture in the creator card in this PR. The issue is linked below: - #9314 ![Screenshot 2025-04-02 at 6 32 10 PM](https://github.com/user-attachments/assets/1c2d9779-0a5e-4269-b3d2-37526a0949d3) The margin is perfectly set to 24px; only the height and width of the image need to be changed. --------- Co-authored-by: Bently --- .../frontend/src/components/agptui/CreatorInfoCard.tsx | 7 ++++++- .../frontend/src/components/agptui/StoreCard.tsx | 8 ++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/autogpt_platform/frontend/src/components/agptui/CreatorInfoCard.tsx b/autogpt_platform/frontend/src/components/agptui/CreatorInfoCard.tsx index ad8e614158..48916bce74 100644 --- a/autogpt_platform/frontend/src/components/agptui/CreatorInfoCard.tsx +++ b/autogpt_platform/frontend/src/components/agptui/CreatorInfoCard.tsx @@ -27,7 +27,12 @@ export const CreatorInfoCard: React.FC = ({ >
- + {username.charAt(0)} diff --git a/autogpt_platform/frontend/src/components/agptui/StoreCard.tsx b/autogpt_platform/frontend/src/components/agptui/StoreCard.tsx index 28c29794aa..48274cb217 100644 --- a/autogpt_platform/frontend/src/components/agptui/StoreCard.tsx +++ b/autogpt_platform/frontend/src/components/agptui/StoreCard.tsx @@ -75,22 +75,22 @@ export const StoreCard: React.FC = ({ {/* Content Section */}
{/* Title and Creator */} -

+

{agentName}

{!hideAvatar && creatorName && ( -

+

by {creatorName}

)} {/* Description */} -

+

{description}

{/* Stats Row */}
-
+
{runs.toLocaleString()} runs
From adb326321177f6aa87ec7eb283558d741886c0ad Mon Sep 17 00:00:00 2001 From: Abhimanyu Yadav <122007096+Abhi1992002@users.noreply.github.com> Date: Thu, 3 Apr 2025 21:30:28 +0530 Subject: [PATCH 3/5] fix(marketplace): Reduce margin between search bar and chips to 20px (#9748) - fix #8955 Reduce the margin between the search bar and chips from 24px to 20px. --- autogpt_platform/frontend/src/components/agptui/SearchBar.tsx | 2 +- .../frontend/src/components/agptui/composite/HeroSection.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/autogpt_platform/frontend/src/components/agptui/SearchBar.tsx b/autogpt_platform/frontend/src/components/agptui/SearchBar.tsx index 5db58260f1..713ac0b075 100644 --- a/autogpt_platform/frontend/src/components/agptui/SearchBar.tsx +++ b/autogpt_platform/frontend/src/components/agptui/SearchBar.tsx @@ -44,7 +44,7 @@ export const SearchBar: React.FC = ({
{

Bringing you AI agents designed by thinkers from around the world

-
+
From 0fc423fd55ec1c6094f47efad8e53f35dd570712 Mon Sep 17 00:00:00 2001 From: Abhimanyu Yadav <122007096+Abhi1992002@users.noreply.github.com> Date: Thu, 3 Apr 2025 21:31:27 +0530 Subject: [PATCH 4/5] fix(marketplace): Fix margin between arrows and carousel (#9745) - fix #8958 Currently, the arrow button and carousel have a 16px margin, and the button is placed 12px below the top of the container. This makes the spacing appear to be 28px. Therefore, place the button and indicator at the top of the container. --- autogpt_platform/frontend/src/components/ui/carousel.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/autogpt_platform/frontend/src/components/ui/carousel.tsx b/autogpt_platform/frontend/src/components/ui/carousel.tsx index cf5ff95f20..8a391b5b39 100644 --- a/autogpt_platform/frontend/src/components/ui/carousel.tsx +++ b/autogpt_platform/frontend/src/components/ui/carousel.tsx @@ -213,7 +213,7 @@ const CarouselPrevious = React.forwardRef< className={cn( "absolute h-[52px] w-[52px] rounded-full", orientation === "horizontal" - ? "-bottom-20 right-24 -translate-y-1/2" + ? "right-24 top-0" : "-top-12 left-1/2 -translate-x-1/2 rotate-90", className, )} @@ -259,7 +259,7 @@ const CarouselNext = React.forwardRef< className={cn( "absolute h-[52px] w-[52px] rounded-full", orientation === "horizontal" - ? "-bottom-20 right-4 -translate-y-1/2" + ? "right-4 top-0" : "-bottom-12 left-1/2 -translate-x-1/2 rotate-90", className, )} @@ -302,7 +302,7 @@ const CarouselIndicator = React.forwardRef< return (
{scrollSnaps.map((_, index) => ( From 4a82edb0c34d099d1b0a854a235447cf2d5acb6c Mon Sep 17 00:00:00 2001 From: Abhimanyu Yadav <122007096+Abhi1992002@users.noreply.github.com> Date: Thu, 3 Apr 2025 21:32:03 +0530 Subject: [PATCH 5/5] fix(marketplace): Fix margin between divider and section on creators page (#9744) - fix #8998 Replace padding with margin top and update UI spacing from 32px to 25px --- .../src/components/agptui/composite/AgentsSection.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autogpt_platform/frontend/src/components/agptui/composite/AgentsSection.tsx b/autogpt_platform/frontend/src/components/agptui/composite/AgentsSection.tsx index db8f08c44c..7adb364008 100644 --- a/autogpt_platform/frontend/src/components/agptui/composite/AgentsSection.tsx +++ b/autogpt_platform/frontend/src/components/agptui/composite/AgentsSection.tsx @@ -45,9 +45,9 @@ export const AgentsSection: React.FC = ({ }; return ( -
+
-
+
{sectionTitle}
{!displayedAgents || displayedAgents.length === 0 ? (