Merge pull request CodingCatDev#386 from CodingCatDev/fix/sub-flow

codercatdev · web-flow · commit f40305ad0dd7 · 2022-04-11T15:23:15.000-04:00
fix subscription flow
diff --git a/frontend/main/src/components/user/Profile.tsx b/frontend/main/src/components/user/Profile.tsx
@@ -29,7 +29,7 @@ export default function Profile({
             <SettingsLinks />
           </section>
           <div className="flex flex-col">
-            {/* <UserMembership user={signInCheckResult.user} products={products} /> */}
+            <UserMembership user={signInCheckResult.user} products={products} />
             <UserProfile user={signInCheckResult.user} />
           </div>
         </section>
diff --git a/frontend/main/src/components/user/UserMembership.tsx b/frontend/main/src/components/user/UserMembership.tsx
@@ -8,6 +8,7 @@ import { signOut } from 'firebase/auth';
 import { StripeProduct } from '@/models/stripe.model';
 import useIsMember from '@/hooks/useIsMember';
 import { useAuth } from 'reactfire';
+import UserMembershipDetail from './UserMembershipDetail';
 
 export default function UserMembership({
   user,
@@ -30,18 +31,16 @@ export default function UserMembership({
               Or just start with courses?
             </div>
             <div className="grid grid-flow-col gap-3 justify-items-center">
-              <Link href="/user/membership">
-                <a>
-                  <div className=" btn-primary">See Membership</div>
-                </a>
-              </Link>
               <Link href="/courses">
                 <a>
                   <div className="btn-secondary">Start Courses</div>
                 </a>
               </Link>
             </div>
           </div>
+          <div className="pt-2">
+            <UserMembershipDetail />
+          </div>
         </section>
       ) : (
         <>
@@ -118,7 +117,7 @@ export default function UserMembership({
             </div>
             <MembershipCards products={products} user={user} />
           </section>
-          <section>
+          {/* <section>
             <div className="w-full py-4 text-center bg-primary-900 dark:bg-primary-900 text-basics-50 dark:text-basics-50 lg:px-4">
               <div
                 className="flex items-center p-2 leading-none lg:rounded-full lg:inline-flex"
@@ -237,7 +236,7 @@ export default function UserMembership({
                 </li>
               </ul>
             </div>
-          </section>
+          </section> */}
         </>
       )}
     </>
diff --git a/frontend/main/src/components/user/UserMembershipDetail.tsx b/frontend/main/src/components/user/UserMembershipDetail.tsx
@@ -4,7 +4,7 @@ import { useFunctions, useSigninCheck } from 'reactfire';
 import { useState } from 'react';
 import { httpsCallable } from '@firebase/functions';
 
-export default function UserMembership(): JSX.Element {
+export default function UserMembershipDetail(): JSX.Element {
   const { data: signInCheckResult } = useSigninCheck();
   const functions = useFunctions();
 
@@ -23,8 +23,7 @@ export default function UserMembership(): JSX.Element {
   return (
     <>
       {signInCheckResult?.signedIn === true && signInCheckResult.user && (
-        <section className="grid self-start justify-center gap-10 lg:grid-cols-settings">
-          <section></section>
+        <section className="">
           <div className="grid">
             <div>
               <p className="text-4xl">CodingCat.dev uses the Stripe Portal.</p>
diff --git a/frontend/main/src/pages/user/profile.tsx b/frontend/main/src/pages/user/profile.tsx
@@ -5,7 +5,6 @@ import { getAllBuilder } from '@/services/builder.server';
 import { NextSeo } from 'next-seo';
 import { getActiveMemberProducts } from '@/services/firebase.server';
 import Profile from '@/components/user/Profile';
-import UserMembership from '@/components/user/UserMembershipDetail';
 
 export async function getStaticProps({
   preview,
@@ -87,9 +86,6 @@ export default function UserProfile({
             <div className="pb-2">
               <Profile products={products} />
             </div>
-            <div className="pt-2">
-              <UserMembership />
-            </div>
           </div>
         ) : (
           <>Ask Alex to load the Stripe products please :D</>
