From 5fbaf357b41128c436f624173425bf2932f5ae49 Mon Sep 17 00:00:00 2001
From: Harish Mohan Raj <harish@airt.ai>
Date: Mon, 15 Apr 2024 10:41:54 +0530
Subject: [PATCH 1/5] Polish website copy

---
 README.md                                      |  2 +-
 app/src/client/components/AppNavBar.tsx        |  3 ++-
 app/src/client/components/Footer.tsx           |  1 +
 app/src/client/components/LoadingComponent.tsx | 18 ++++--------------
 app/src/client/components/UserActionButton.tsx |  2 +-
 app/src/client/landing-page/LandingPage.tsx    |  2 +-
 app/src/client/landing-page/contentSections.ts |  8 ++++----
 7 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/README.md b/README.md
index 8b7634e..845cff1 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,2 @@
-# fastagency.ai
+# FastAgency
 Hey 🧙‍♂️! This is a sneak peek at my product's evolving homepage. Get ready for an amazing launch soon!
\ No newline at end of file
diff --git a/app/src/client/components/AppNavBar.tsx b/app/src/client/components/AppNavBar.tsx
index 7c1dd4e..b2b174b 100644
--- a/app/src/client/components/AppNavBar.tsx
+++ b/app/src/client/components/AppNavBar.tsx
@@ -9,6 +9,7 @@ import logo from '../static/logo.svg';
 import DropdownUser from './DropdownUser';
 import { DOCS_URL, BLOG_URL } from '../../shared/constants';
 import DarkModeSwitcher from '../admin/components/DarkModeSwitcher';
+import UserActionButton from '../components/UserActionButton';
 import { UserMenuItems } from '../components/UserMenuItems';
 import { navigation } from '../landing-page/contentSections';
 
@@ -55,7 +56,7 @@ export default function AppNavBar() {
           {/* <ul className='flex justify-center items-center gap-2 sm:gap-4'>
             <DarkModeSwitcher />
           </ul> */}
-
+          <UserActionButton user={user} renderGoToChat={false} theme='light' />
           {isUserLoading ? null : !user ? (
             <a href={!user ? '/login' : '/account'} className='text-sm font-semibold leading-6 ml-4'>
               <div className='flex items-center duration-300 ease-in-out text-airt-font-base hover:text-airt-secondary dark:text-white'>
diff --git a/app/src/client/components/Footer.tsx b/app/src/client/components/Footer.tsx
index 3c9fcd1..3f08943 100644
--- a/app/src/client/components/Footer.tsx
+++ b/app/src/client/components/Footer.tsx
@@ -37,6 +37,7 @@ export default function Footer() {
                   <a
                     href={item.href}
                     className='text-sm leading-6 text-airt-font-base hover:text-airt-font-base dark:text-white'
+                    target={`${item.name === 'airt' ? '_blank' : '_self'}`}
                   >
                     {item.name}
                   </a>
diff --git a/app/src/client/components/LoadingComponent.tsx b/app/src/client/components/LoadingComponent.tsx
index ca780d1..9e37aed 100644
--- a/app/src/client/components/LoadingComponent.tsx
+++ b/app/src/client/components/LoadingComponent.tsx
@@ -15,19 +15,12 @@ const commonMessageStyles = {
 
 const MessageIcon = () => (
   <svg
-    className='animate-spin -ml-1 mr-3 h-5 w-5 text-captn-dark-blue'
+    className='animate-spin -ml-1 mr-3 h-5 w-5 text-airt-font-base'
     xmlns='http://www.w3.org/2000/svg'
     fill='none'
     viewBox='0 0 24 24'
   >
-    <circle
-      className='opacity-25'
-      cx='12'
-      cy='12'
-      r='10'
-      stroke='currentColor'
-      strokeWidth='4'
-    ></circle>
+    <circle className='opacity-25' cx='12' cy='12' r='10' stroke='currentColor' strokeWidth='4'></circle>
     <path
       className='opacity-75'
       fill='currentColor'
@@ -39,15 +32,12 @@ const MessageIcon = () => (
 export default function LoadingComponent() {
   return (
     <div style={wrapperStyles}>
-      <div
-        className='bg-captn-light-cream text-captn-dark-blue'
-        style={commonMessageStyles}
-      >
+      <div className='text-airt-font-base' style={commonMessageStyles}>
         <div className='relative rounded-xl overflow-auto p-8'>
           <div className='flex items-center justify-center'>
             <button
               type='button'
-              className='inline-flex items-center px-4 py-2 leading-6 text-sm shadow rounded-md transition ease-in-out duration-150 cursor-not-allowed border border-captn-dark-blue'
+              className='inline-flex items-center px-4 py-2 leading-6 text-sm shadow rounded-md transition ease-in-out duration-150 cursor-not-allowed border border-airt-font-base'
               disabled
             >
               <MessageIcon /> Loading...
diff --git a/app/src/client/components/UserActionButton.tsx b/app/src/client/components/UserActionButton.tsx
index d93564b..d361a7c 100644
--- a/app/src/client/components/UserActionButton.tsx
+++ b/app/src/client/components/UserActionButton.tsx
@@ -15,7 +15,7 @@ const UserActionButton: React.FC<UserActionButtonProps> = ({ user, renderGoToCha
     return (
       <Link
         to='/signup'
-        className={`rounded-md px-3.5 py-2.5 text-sm  ${themeClass}   hover:bg-opacity-85 shadow-sm focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600`}
+        className={`rounded-md px-3.5 pt-2 pb-2.5 text-sm  ${themeClass}   hover:bg-opacity-85 shadow-sm focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600`}
       >
         Create an account
       </Link>
diff --git a/app/src/client/landing-page/LandingPage.tsx b/app/src/client/landing-page/LandingPage.tsx
index a35a3ce..536090f 100644
--- a/app/src/client/landing-page/LandingPage.tsx
+++ b/app/src/client/landing-page/LandingPage.tsx
@@ -133,7 +133,7 @@ export default function LandingPage() {
             <div className='mx-auto max-w-8xl px-6 lg:px-8'>
               <div className='lg:mb-18 mx-auto max-w-5xl text-center'>
                 <h1 className='text-4xl font-rubik text-airt-font-base sm:text-6xl dark:text-white'>
-                  FastAgency.ai: A framework for building <span className='italic'>multi-agent </span> AI services.
+                  FastAgency: A framework for building <span className='italic'>multi-agent </span> AI services.
                 </h1>
                 <p className='mt-6 mx-auto max-w-2xl text-lg leading-8 text-airt-font-base dark:text-white'>
                   Quickly build scalable SaaS solutions using our powerful, multi-agent AI framework that streamlines
diff --git a/app/src/client/landing-page/contentSections.ts b/app/src/client/landing-page/contentSections.ts
index 2576b94..3419d38 100644
--- a/app/src/client/landing-page/contentSections.ts
+++ b/app/src/client/landing-page/contentSections.ts
@@ -11,7 +11,7 @@ export const features = [
   {
     name: 'Build with Your Own APIs: Integrate Seamlessly with Custom Agent Design',
     description:
-      'Integrate your existing systems seamlessly by defining agents with your own REST APIs. FastAgency.ai allows you to craft bespoke agents tailored to your specific business processes, enabling a personalized approach to AI-driven solutions. This flexibility ensures that you can create highly specialized services that address unique challenges effectively.',
+      'Integrate your existing systems seamlessly by defining agents with your own REST APIs. FastAgency allows you to craft bespoke agents tailored to your specific business processes, enabling a personalized approach to AI-driven solutions. This flexibility ensures that you can create highly specialized services that address unique challenges effectively.',
     icon: '⚙️', //'🤝',
     href: '',
   },
@@ -25,14 +25,14 @@ export const features = [
   {
     name: 'Launch Faster Than Ever: Accelerate Time-to-Market with Rapid Deployment',
     description:
-      "Accelerate your time-to-market with FastAgency.ai's streamlined deployment process. Our framework is designed for speed, allowing you to move from concept to launch in record time. This rapid deployment capability ensures that you can quickly adapt to market changes and gain a competitive edge.",
+      "Accelerate your time-to-market with FastAgency's streamlined deployment process. Our framework is designed for speed, allowing you to move from concept to launch in record time. This rapid deployment capability ensures that you can quickly adapt to market changes and gain a competitive edge.",
     icon: '⚡',
     href: '',
   },
   {
     name: 'Start Collecting Revenue in Just a Week with Rapid Monetization',
     description:
-      'Dive into the market swiftly with FastAgency.ai. Our platform enables you to go from setup to sales within a week, allowing you to start generating revenue almost immediately. This rapid monetization feature is designed to give businesses a significant head start, accelerating the return on investment and enabling you to capitalize on AI-driven opportunities faster than ever.',
+      'Dive into the market swiftly with FastAgency. Our platform enables you to go from setup to sales within a week, allowing you to start generating revenue almost immediately. This rapid monetization feature is designed to give businesses a significant head start, accelerating the return on investment and enabling you to capitalize on AI-driven opportunities faster than ever.',
     icon: '💸',
     href: '',
   },
@@ -75,7 +75,7 @@ export const footerNavigation = {
   //   { name: 'Blog', href: BLOG_URL },
   // ],
   company: [
-    { name: 'About', href: 'https://airt.ai/' },
+    { name: 'airt', href: 'https://airt.ai/' },
     { name: 'Privacy', href: '/privacy' },
     { name: 'Terms of Service', href: '/toc' },
   ],

From 27f53ff11a802657efc6a228cf677de2153ee271 Mon Sep 17 00:00:00 2001
From: Kumaran Rajendhiran <kumaran@airt.ai>
Date: Tue, 16 Apr 2024 12:39:55 +0530
Subject: [PATCH 2/5] Add job to allow only dev branch to be merged to main
 (#22)

---
 .github/workflows/enforcer.yaml | 15 +++++++++++++++
 .github/workflows/pipeline.yml  |  1 -
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/enforcer.yaml

diff --git a/.github/workflows/enforcer.yaml b/.github/workflows/enforcer.yaml
new file mode 100644
index 0000000..fbee4f9
--- /dev/null
+++ b/.github/workflows/enforcer.yaml
@@ -0,0 +1,15 @@
+name: 'Check Branch'
+
+on:
+  pull_request:
+  merge_group:
+
+jobs:
+  check_branch:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check branch
+        if: github.base_ref == 'main' && github.head_ref != 'dev'
+        run: |
+          echo "ERROR: You can only merge to main from dev."
+          exit 1
diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
index e5befc0..84d33f9 100644
--- a/.github/workflows/pipeline.yml
+++ b/.github/workflows/pipeline.yml
@@ -96,7 +96,6 @@ jobs:
             GOOGLE_CLIENT_SECRET: ${{ github.ref_name == 'main' && secrets.PROD_GOOGLE_CLIENT_SECRET || secrets.STAGING_GOOGLE_CLIENT_SECRET }}
             ADMIN_EMAILS: ${{ vars.ADMIN_EMAILS }}
 
-            WASP_SERVER_URL: ${{ github.ref_name == 'main' && vars.PROD_WASP_SERVER_URL || vars.STAGING_WASP_SERVER_URL }}
             ADS_SERVER_URL: ${{ github.ref_name == 'main' && vars.PROD_ADS_SERVER_URL || vars.STAGING_ADS_SERVER_URL }}
             BACKEND_DOMAIN: ${{ github.ref_name == 'main' && vars.PROD_BACKEND_DOMAIN || vars.STAGING_BACKEND_DOMAIN }}
             WASP_WEB_CLIENT_URL: ${{ github.ref_name == 'main' && vars.PROD_WASP_WEB_CLIENT_URL || vars.STAGING_WASP_WEB_CLIENT_URL }}

From 952266e8243e9882373010b0eb075a3f30762a6d Mon Sep 17 00:00:00 2001
From: Kumaran Rajendhiran <kumaran@airt.ai>
Date: Tue, 16 Apr 2024 13:25:08 +0530
Subject: [PATCH 3/5] Run deploy only after unit test and docker build (#23)

---
 .github/workflows/pipeline.yml | 2 ++
 scripts/deploy_backend.sh      | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
index 84d33f9..224e171 100644
--- a/.github/workflows/pipeline.yml
+++ b/.github/workflows/pipeline.yml
@@ -86,6 +86,7 @@ jobs:
         defaults:
             run:
                 shell: bash
+        needs: [docker_build_push]
         if: github.ref_name == 'main' || github.ref_name == 'dev'
         env:
             GITHUB_USERNAME: ${{ github.actor }}
@@ -132,6 +133,7 @@ jobs:
         runs-on: ubuntu-22.04
         permissions:
             contents: write
+        needs: [docker_build_push]
         if: github.ref_name == 'main' || github.ref_name == 'dev'
         env:
           STAGING_BACKEND_DOMAIN: ${{ vars.STAGING_BACKEND_DOMAIN }}
diff --git a/scripts/deploy_backend.sh b/scripts/deploy_backend.sh
index 2d7b39c..426f845 100755
--- a/scripts/deploy_backend.sh
+++ b/scripts/deploy_backend.sh
@@ -17,7 +17,6 @@ check_variable "BACKEND_DOMAIN"
 check_variable "PORT"
 check_variable "DATABASE_URL"
 check_variable "WASP_WEB_CLIENT_URL"
-check_variable "WASP_SERVER_URL"
 check_variable "JWT_SECRET"
 check_variable "STRIPE_KEY"
 check_variable "PRO_SUBSCRIPTION_PRICE_ID"
@@ -61,7 +60,6 @@ $ssh_command "docker run --name $container_name -p $PORT:$PORT -e PORT='$PORT' \
     -e DATABASE_URL='$DATABASE_URL' -e WASP_WEB_CLIENT_URL='$WASP_WEB_CLIENT_URL' \
 	-e JWT_SECRET='$JWT_SECRET' -e GOOGLE_CLIENT_ID='$GOOGLE_CLIENT_ID' \
 	-e GOOGLE_CLIENT_SECRET='$GOOGLE_CLIENT_SECRET' \
-    -e WASP_SERVER_URL='$WASP_SERVER_URL' \
 	-e STRIPE_KEY='$STRIPE_KEY' -e PRO_SUBSCRIPTION_PRICE_ID='$PRO_SUBSCRIPTION_PRICE_ID' \
 	-e STRIPE_WEBHOOK_SECRET='$STRIPE_WEBHOOK_SECRET' -e ADMIN_EMAILS='$ADMIN_EMAILS' \
 	-d ghcr.io/$GITHUB_REPOSITORY:$TAG"

From ff59e8d60e85df9596edb8af636e5e5b9b702b21 Mon Sep 17 00:00:00 2001
From: Harish Mohan Raj <harish@airt.ai>
Date: Tue, 16 Apr 2024 14:19:54 +0530
Subject: [PATCH 4/5] Add staging stripe customer portal link env var (#25)

---
 .github/workflows/pipeline.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
index 224e171..3bf37b4 100644
--- a/.github/workflows/pipeline.yml
+++ b/.github/workflows/pipeline.yml
@@ -92,7 +92,7 @@ jobs:
             GITHUB_USERNAME: ${{ github.actor }}
             GITHUB_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
             PORT: ${{ vars.PORT }}
-            REACT_APP_CUSTOMER_PORTAL_LINK: ${{ vars.REACT_APP_CUSTOMER_PORTAL_LINK }}
+            REACT_APP_CUSTOMER_PORTAL_LINK: ${{ github.ref_name == 'main' && vars.PROD_REACT_APP_CUSTOMER_PORTAL_LINK || vars.STAGING_REACT_APP_CUSTOMER_PORTAL_LINK }}
             GOOGLE_CLIENT_ID: ${{ github.ref_name == 'main' && secrets.PROD_GOOGLE_CLIENT_ID || secrets.STAGING_GOOGLE_CLIENT_ID }}
             GOOGLE_CLIENT_SECRET: ${{ github.ref_name == 'main' && secrets.PROD_GOOGLE_CLIENT_SECRET || secrets.STAGING_GOOGLE_CLIENT_SECRET }}
             ADMIN_EMAILS: ${{ vars.ADMIN_EMAILS }}
@@ -138,7 +138,7 @@ jobs:
         env:
           STAGING_BACKEND_DOMAIN: ${{ vars.STAGING_BACKEND_DOMAIN }}
           STAGING_SSH_KEY: ${{ secrets.STAGING_SSH_KEY }}
-          REACT_APP_CUSTOMER_PORTAL_LINK: ${{ vars.REACT_APP_CUSTOMER_PORTAL_LINK }}
+          REACT_APP_CUSTOMER_PORTAL_LINK: ${{ github.ref_name == 'main' && vars.PROD_REACT_APP_CUSTOMER_PORTAL_LINK || vars.STAGING_REACT_APP_CUSTOMER_PORTAL_LINK }}
           REACT_APP_API_URL: ${{ github.ref_name == 'main' && vars.PROD_REACT_APP_API_URL || vars.STAGING_REACT_APP_API_URL }}
         steps:
             - name: Checkout repository

From cf075f86fd512debfce5568d3cb07bf118f8186e Mon Sep 17 00:00:00 2001
From: Harish Mohan Raj <harish@airt.ai>
Date: Tue, 16 Apr 2024 15:22:41 +0530
Subject: [PATCH 5/5] Add missing env variable (#26)

---
 .github/workflows/pipeline.yml | 2 +-
 scripts/deploy_backend.sh      | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
index 3bf37b4..e6d40ce 100644
--- a/.github/workflows/pipeline.yml
+++ b/.github/workflows/pipeline.yml
@@ -96,7 +96,7 @@ jobs:
             GOOGLE_CLIENT_ID: ${{ github.ref_name == 'main' && secrets.PROD_GOOGLE_CLIENT_ID || secrets.STAGING_GOOGLE_CLIENT_ID }}
             GOOGLE_CLIENT_SECRET: ${{ github.ref_name == 'main' && secrets.PROD_GOOGLE_CLIENT_SECRET || secrets.STAGING_GOOGLE_CLIENT_SECRET }}
             ADMIN_EMAILS: ${{ vars.ADMIN_EMAILS }}
-
+            WASP_SERVER_URL: ${{ github.ref_name == 'main' && vars.PROD_WASP_SERVER_URL || vars.STAGING_WASP_SERVER_URL }}
             ADS_SERVER_URL: ${{ github.ref_name == 'main' && vars.PROD_ADS_SERVER_URL || vars.STAGING_ADS_SERVER_URL }}
             BACKEND_DOMAIN: ${{ github.ref_name == 'main' && vars.PROD_BACKEND_DOMAIN || vars.STAGING_BACKEND_DOMAIN }}
             WASP_WEB_CLIENT_URL: ${{ github.ref_name == 'main' && vars.PROD_WASP_WEB_CLIENT_URL || vars.STAGING_WASP_WEB_CLIENT_URL }}
diff --git a/scripts/deploy_backend.sh b/scripts/deploy_backend.sh
index 426f845..1bca2c4 100755
--- a/scripts/deploy_backend.sh
+++ b/scripts/deploy_backend.sh
@@ -23,6 +23,7 @@ check_variable "PRO_SUBSCRIPTION_PRICE_ID"
 check_variable "STRIPE_WEBHOOK_SECRET"
 check_variable "GOOGLE_CLIENT_ID"
 check_variable "GOOGLE_CLIENT_SECRET"
+check_variable "WASP_SERVER_URL"
 
 
 
@@ -60,6 +61,7 @@ $ssh_command "docker run --name $container_name -p $PORT:$PORT -e PORT='$PORT' \
     -e DATABASE_URL='$DATABASE_URL' -e WASP_WEB_CLIENT_URL='$WASP_WEB_CLIENT_URL' \
 	-e JWT_SECRET='$JWT_SECRET' -e GOOGLE_CLIENT_ID='$GOOGLE_CLIENT_ID' \
 	-e GOOGLE_CLIENT_SECRET='$GOOGLE_CLIENT_SECRET' \
+    -e WASP_SERVER_URL='$WASP_SERVER_URL' \
 	-e STRIPE_KEY='$STRIPE_KEY' -e PRO_SUBSCRIPTION_PRICE_ID='$PRO_SUBSCRIPTION_PRICE_ID' \
 	-e STRIPE_WEBHOOK_SECRET='$STRIPE_WEBHOOK_SECRET' -e ADMIN_EMAILS='$ADMIN_EMAILS' \
 	-d ghcr.io/$GITHUB_REPOSITORY:$TAG"