Merge pull request CodingCatDev#146 from CodingCatDev/bug/membership

Alex Patterson · web-flow · commit e9ecba2ce9a5 · 2021-03-25T10:03:28.000-04:00
Bug/membership
diff --git a/frontend/main/src/pages/course/[coursePath]/index.tsx b/frontend/main/src/pages/course/[coursePath]/index.tsx
@@ -59,6 +59,7 @@ export default function Post({
       combineLatest([isUserTeam$, isUserMember$, isUserCourseSub$])
         .pipe(take(1))
         .subscribe((c) => {
+          console.log(c);
           setMember(c.includes(true));
         });
     }
@@ -67,33 +68,6 @@ export default function Post({
   const content = source ? hydrate(source) : null;
   return (
     <Layout site={site}>
-      {/* Could not see where this was used. */}
-      {/* <div
-        className={`${
-          showMustSignin ? 'block' : 'hidden'
-        } fixed inset-0 z-50 overflow-hidden bg-primary-100 bg-opacity-80`}
-      >
-        <section
-          className="absolute inset-y-0 left-0 grid w-full h-full place-items-center justify-items-center"
-          aria-labelledby="slide-over-heading"
-        >
-          <OutsideClick toggle={setShowMustSignin} value={false}>
-            <section className="flex items-center p-8 m-auto space-x-20 space-between bg-primary-900 dark:bg-primary-50 rounded-xl">
-              <div className="grid gap-4 text-2xl text-primary-50 dark:text-primary-900">
-                <div>Please Sign in First.</div>
-                <Link href="/membership">
-                  <a>
-                    <button className="btn-secondary">Sign In</button>
-                  </a>
-                </Link>
-                <div>
-                  Then you can purchase courses directly, or become a member.
-                </div>
-              </div>
-            </section>
-          </OutsideClick>
-        </section>
-      </div> */}
       <section className="top-0 z-10 grid 2xl:sticky">
         <BreakBarLeft>
           <div className="grid w-full gap-4 ">
@@ -198,20 +172,25 @@ export default function Post({
               )}
               <div className="grid grid-cols-1 gap-2 p-4 justify-items-center">
                 {member ? (
-                  // start course with link instead of telling user to go down on a page?
                   <>
-                    {post.sections && (
-                      // not sure if this will get the correct slug, I think going to the first lesson here is better UX.
-                      <>
-                        {/*  <Link
-                         href={`/course/${post.sections[0].lessons[0].slug}/lesson/1`}
-                       >
-                         <a>
-                           <button className="btn-primary">Start Course</button>
-                         </a>
-                       </Link> */}
-                      </>
-                    )}
+                    {post.sections &&
+                      post.sections.map((section, i) => {
+                        return (
+                          <>
+                            {section.lessons && (
+                              <Link
+                                href={`/course/${post.slug}/lesson/${section.lessons[0].slug}`}
+                              >
+                                <a>
+                                  <button className="btn-primary">
+                                    Start Course
+                                  </button>
+                                </a>
+                              </Link>
+                            )}
+                          </>
+                        );
+                      })}
                   </>
                 ) : (
                   <>
diff --git a/frontend/main/src/pages/membership.tsx b/frontend/main/src/pages/membership.tsx
@@ -76,12 +76,12 @@ export default function Membership({
               {user && user.uid ? (
                 <div
                   className={`${
-                    user.memberships ? 'w-full' : 'mx-auto'
+                    member ? 'w-full' : 'mx-auto'
                   } "w-full relative z-0 px-8 md:px-0 md:py-16"`}
                 >
                   <div
                     className={`${
-                      user.memberships
+                      member
                         ? 'rounded'
                         : 'rounded-b md:rounded-b-none md:rounded-r'
                     } flex flex-wrap bg-white max-w-lg shadow-lg overflow-hidden mx-auto`}
@@ -104,7 +104,7 @@ export default function Membership({
                         </button>
                       </div>
                     </div>
-                    {user && !user.memberships && (
+                    {user && !member && (
                       <div className="p-8 text-xl text-primary-800">
                         <p className="p-2">
                           Welcome {user.displayName}! You are now signed in.
@@ -120,15 +120,6 @@ export default function Membership({
                         </p>
                       </div>
                     )}
-                    {user && user.memberships && (
-                      <p className="p-8 text-xl text-primary-800">
-                        Welcome Back{' '}
-                        <span className="font-bold">{user.displayName}</span>!
-                        You can see all of your information in the selections
-                        below, just click the button and a detailed table data
-                        will appear.
-                      </p>
-                    )}
                   </div>
                 </div>
               ) : (
