make template cleaner

dannysrod · Dec 14, 2023 · b2f8fb4 · b2f8fb4
1 parent 6e8fb18
commit b2f8fb4
Show file tree

Hide file tree

Showing 22 changed files with 92 additions and 331 deletions.
diff --git a/app/.env.server.example b/app/.env.server.example
@@ -19,7 +19,7 @@ GOOGLE_CLIENT_ID=722...
 GOOGLE_CLIENT_SECRET=GOC...
 
 # get your sendgrid api key at https://app.sendgrid.com/settings/api_keys
-SENDGRID_API_KEY=
+SENDGRID_API_KEY=test...
 # if not explicitly set to true, emails will be logged to console but not actually sent during development
 SEND_EMAILS_IN_DEVELOPMENT=false
 

diff --git a/app/main.wasp b/app/main.wasp
@@ -13,11 +13,11 @@ app SaaSTemplate {
         "<meta name='twitter:image:height' content='400' />",
         "<meta name='twitter:card' content='summary_large_image' />",
         // you can put your analytics scripts here
-        "<script defer data-domain='opensaas.sh' src='https://plausible.apps.twoducks.dev/js/script.js'></script>",
-        // plausible has script extension `script.local.js` for local development TODO: remove before deploying
-        "<script defer data-domain='opensaas.sh' src='https://plausible.apps.twoducks.dev/js/script.local.js'></script>",
+        "<script defer data-domain='<your-site-id>' src='https://plausible.io/js/script.js'></script>",
+        // plausible has script extension `script.local.js` for local development
+        "<script defer data-domain='<your-site-id>' src='https://plausible.io/js/script.local.js'></script>",
         // google analytics only needs one script and will automatically detect if you are in dev mode 
-        "<!-- Google tag (gtag.js) --><script async src='https://www.googletagmanager.com/gtag/js?id=G-H3LSJCK95H'></script><script>window.dataLayer = window.dataLayer || [];function gtag(){dataLayer.push(arguments);}gtag('js', new Date());gtag('config', 'G-H3LSJCK95H');</script>"
+        "<!-- Google tag (gtag.js) --><script>...</script>"
   ],
   // 🔐 Auth out of the box! https://wasp-lang.dev/docs/auth/overview
   auth: {
@@ -33,7 +33,7 @@ app SaaSTemplate {
       //   fromField: {
       //     name: "Open SaaS App",
       //     // make sure this address is the same you registered your SendGrid or MailGun account with!
-      //     email: "vince@wasp-lang.dev" 
+      //     email: "me@example.com" 
       //   },
       //   emailVerification: {
       //     clientRoute: EmailVerificationRoute,
@@ -46,9 +46,9 @@ app SaaSTemplate {
       // },
     },
     signup: {
-      additionalFields: import setAdminUsers from "@server/auth/setAdminUsers.js",
+      additionalFields: import setIsAdminViaEmailSignup from "@server/auth/setIsAdminViaEmailSignup.js",
     },
-    onAuthFailedRedirectTo: "/",
+    onAuthFailedRedirectTo: "/login",
     onAuthSucceededRedirectTo: "/gpt",
   },
   db: { 
@@ -63,9 +63,9 @@ app SaaSTemplate {
   emailSender: {
     provider: SendGrid,
     defaultFrom: {
-      name: "SaaS App",
+      name: "Open SaaS App",
       // make sure this address is the same you registered your SendGrid or MailGun account with!
-      email: "vince@wasp-lang.dev" // TODO change to generic email before pushing to github
+      email: "me@example.com" 
     },
   },
   // add your dependencies here. the quickest way to find the latest version is `npm view <package-name> version`

diff --git a/app/migrations/20231211161119_init/migration.sql b/app/migrations/20231211161119_init/migration.sql
diff --git a/app/migrations/20231211163814_username/migration.sql b/app/migrations/20231211163814_username/migration.sql
diff --git a/app/migrations/migration_lock.toml b/app/migrations/migration_lock.toml
diff --git a/app/src/client/admin/components/TotalRevenueCard.tsx b/app/src/client/admin/components/TotalRevenueCard.tsx
@@ -13,7 +13,7 @@ const TotalRevenueCard = ({dailyStats, weeklyStats, isLoading}: DailyStatsProps)
     if ( weeklyStats[1]?.totalRevenue === 0 || weeklyStats[0]?.totalRevenue === 0 ) return 0;
 
     weeklyStats.sort((a, b) => b.id - a.id);
-    console.log('weeklyStats[1]?.totalRevenue; ', !!weeklyStats && weeklyStats)
+
     const percentage = ((weeklyStats[0].totalRevenue - weeklyStats[1]?.totalRevenue) / weeklyStats[1]?.totalRevenue) * 100;
     return Math.floor(percentage);
   }, [weeklyStats]);

diff --git a/app/src/client/app/GptPage.tsx b/app/src/client/app/GptPage.tsx
@@ -10,7 +10,7 @@ export default function GptPage() {
   const { data: user } = useAuth();
 
   const onSubmit = async ({ instructions, command, temperature }: any) => {
-    console.log('user, ', !!user);
+
     if (!user) {
       alert('You must be logged in to use this feature.');
       return;
@@ -19,7 +19,6 @@ export default function GptPage() {
       const response = await generateGptResponse({ instructions, command, temperature });
       if (response) {
         setResponse(response.split('\n'));
-        console.log(response);
       }
     } catch (error: any) {
       alert(error.message);
@@ -111,7 +110,6 @@ export default function GptPage() {
                     step='0.1'
                     {...register('temperature', {
                       onChange: (e) => {
-                        console.log(e.target.value);
                         setTemperature(Number(e.target.value));
                       },
                       required: 'This is required',

diff --git a/app/src/client/components/AppNavBar.tsx b/app/src/client/components/AppNavBar.tsx
@@ -48,11 +48,8 @@ export default function AppNavBar() {
         </div>
         <div className='hidden lg:flex lg:flex-1 lg:justify-end lg:align-end'>
           {isUserLoading ? null : !user ? (
-            <a
-              href={!user ? '/login' : '/account'}
-              className='flex justify-end items-center text-sm  font-semibold leading-6 '
-            >
-              <div className='duration-300 ease-in-out text-gray-900 hover:text-yellow-500'>
+            <a href={!user ? '/login' : '/account'} className='text-sm  font-semibold leading-6 '>
+              <div className='flex justify-end items-center duration-300 ease-in-out text-gray-900 hover:text-yellow-500'>
                 Log in <BiLogIn size='1.1rem' className='ml-1 mt-[0.1rem]' />
               </div>
             </a>