added subscription model

Dhruv-Techapps · Aug 21, 2024 · fc3ae92 · fc3ae92
1 parent 70300aa
commit fc3ae92
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 31 deletions.
diff --git a/apps/acf-options-page/proxy.conf.json b/apps/acf-options-page/proxy.conf.json
@@ -1,7 +1,8 @@
-{
-  "/locales": {
+[
+  {
+    "context": ["/locales"],
     "target": "http://localhost:3333",
     "secure": false,
     "changeOrigin": true
   }
-}
+]
diff --git a/apps/acf-options-page/src/app/footer.tsx b/apps/acf-options-page/src/app/footer.tsx
@@ -11,7 +11,7 @@ function Footer() {
 
   let imageURL = 'https://getautoclicker.com/favicons/favicon48.png';
   if (/(DEV|BETA)/.test(process.env.NX_PUBLIC_VARIANT ?? '')) {
-    imageURL = `https://getautoclicker.com/icons/${process.env.NX_PUBLIC_VARIANT?.toLocaleLowerCase()}_icon48.png.png`;
+    imageURL = `https://getautoclicker.com/icons/${process.env.NX_PUBLIC_VARIANT?.toLocaleLowerCase()}_icon48.png`;
   }
 
   return (

diff --git a/apps/acf-options-page/src/app/header_google.tsx b/apps/acf-options-page/src/app/header_google.tsx
@@ -1,10 +1,11 @@
 import { Nav, NavDropdown } from 'react-bootstrap';
 import { useAppDispatch, useAppSelector } from '../hooks';
 import { firebaseLogoutAPI, firebaseSelector, switchFirebaseLoginModal } from '../store/firebase';
+import { switchSubscribeModal } from '../store/subscribe';
 
 export const HeaderGoogle = () => {
   const dispatch = useAppDispatch();
-  const { user } = useAppSelector(firebaseSelector);
+  const { user, role } = useAppSelector(firebaseSelector);
 
   /*
   const onPortalLink = async () => {
@@ -30,21 +31,19 @@ export const HeaderGoogle = () => {
     }
   };
   */
-
+  console.log(role);
   return (
     <div>
       {user ? (
         <NavDropdown title={user.displayName} id='subscription-nav-dropdown' align='end'>
-          {/*{role ? (
-            <NavDropdown.Item onClick={onPortalLink} disabled={isPortalLinkLoading}>
-              Manage Subscription
-            </NavDropdown.Item>
-          ) : (
-            <NavDropdown.Item title='subscribe' onClick={() => dispatch(switchSubscribeModal())}>
-              Subscribe
-            </NavDropdown.Item>
+          {!role && (
+            <>
+              <NavDropdown.Item title='subscribe' onClick={() => dispatch(switchSubscribeModal())}>
+                Subscribe
+              </NavDropdown.Item>
+              <NavDropdown.Divider />
+            </>
           )}
-          <NavDropdown.Divider />*/}
           <NavDropdown.Item title='logout' onClick={() => dispatch(firebaseLogoutAPI())}>
             Logout
           </NavDropdown.Item>

diff --git a/apps/acf-options-page/src/modal/subscribe.modal.tsx b/apps/acf-options-page/src/modal/subscribe.modal.tsx
@@ -2,7 +2,7 @@
 import { Button, ButtonGroup, Card, CardBody, Col, Form, Modal, Row, ToggleButton } from 'react-bootstrap';
 import { useAppDispatch, useAppSelector } from '../hooks';
 
-import { subscribe, subscribeSelector, switchSubscribeModal } from '../store/subscribe';
+import { subscribeSelector, switchSubscribeModal } from '../store/subscribe';
 
 import * as React from 'react';
 import { AwardFill, Discord, Fire, Star } from '../util';
@@ -63,18 +63,17 @@ const SubscribeModal = () => {
                         {yearly}
                       </small>
                     </div>
-                    <Button variant='primary' disabled={isSubscribing} className='px-5 py-2 mt-3 w-100' onClick={() => dispatch(subscribe('asd'))}>
+                    <Button variant='primary' href='https://getautoclicker.com/docs/4.x/about/subscription/' disabled={isSubscribing} className='px-5 py-2 mt-3 w-100'>
                       {isSubscribing && <span className='spinner-border spinner-border-sm me-3' aria-hidden='true'></span>}
                       Upgrade to Pro
                     </Button>
                   </div>
                   <div>
                     <p className='p-0 m-0'>This includes:</p>
                     <ul style={{ listStyle: 'none' }}>
-                      <li>Google Sheets</li>
-                      <li>Google Backup</li>
-                      <li>Discord Messaging</li>
-                      <li>Captcha resolver</li>
+                      <li>Unlimited Google Sheets</li>
+                      <li>Unlimited Discord Messaging</li>
+                      <li>Captcha resolver (Coming Soon)</li>
                       <li>No Ads</li>
                       <li>
                         <Discord /> VIP Assistance over Discord

diff --git a/libs/shared/google-sheets/src/lib/google-sheets-cs.ts b/libs/shared/google-sheets/src/lib/google-sheets-cs.ts
@@ -46,18 +46,23 @@ export class GoogleSheetsCS {
   }
 
   async getValues(sheets: Map<string, Set<string> | string>, spreadsheetId?: string): Promise<Sheets | undefined> {
-    if (spreadsheetId) {
-      this.transformSheets(sheets);
-      const result = await GoogleSheetsService.getSheets(
-        spreadsheetId,
-        Array.from(sheets, ([sheetName, range]) => `${sheetName}!${range}`)
-      );
-      if (result) {
-        return this.transformResult(result);
+    try {
+      if (spreadsheetId) {
+        this.transformSheets(sheets);
+        const result = await GoogleSheetsService.getSheets(
+          spreadsheetId,
+          Array.from(sheets, ([sheetName, range]) => `${sheetName}!${range}`)
+        );
+        if (result) {
+          return this.transformResult(result);
+        }
+        console.debug('Google Sheets', result);
+        return result;
       }
-      console.debug('Google Sheets', result);
-      return result;
+    } catch (error) {
+      console.warn('Google Sheets', error);
     }
+
     return undefined;
   }
 }