Revert pdp onboarding

Revert "pdp onboarding"

Author: jonathanmelitski

backend/courses/migrations/0069_userprofile_has_been_onboarded.py

@@ -1436,11 +1436,6 @@ class UserProfile(models.Model):
     )
     # phone field defined underneath validate_phone function below
 
-    has_been_onboarded = models.BooleanField(
-        default=False,
-        help_text="Defaults to False, changed to True once the user completes onboarding.",
-    )
-
     def validate_phone(value):
         """
         Validator to check that a phone number is in the proper form. The number must be in a

backend/courses/models.py

@@ -438,7 +438,7 @@ class Meta:
 class UserProfileSerializer(serializers.ModelSerializer):
     class Meta:
         model = UserProfile
-        fields = ["email", "phone", "push_notifications", "has_been_onboarded"]
+        fields = ["email", "phone", "push_notifications"]
 
 
 class UserSerializer(serializers.ModelSerializer):
@@ -455,7 +455,7 @@ def update(self, instance, validated_data):
             if key in validated_data:
                 setattr(instance, key, validated_data[key])
         if prof_data is not None:
-            for key in ["phone", "email", "push_notifications", "has_been_onboarded"]:
+            for key in ["phone", "email", "push_notifications"]:
                 if key in prof_data:
                     setattr(prof, key, prof_data[key])
         prof.save()

backend/courses/serializers.py

@@ -415,12 +415,6 @@ def get_queryset(self):
     def get_object(self):
         return self.request.user
 
-    def post(self, request, *args, **kwargs):
-        if request.data.get("has_seen_onboarding") is True:
-            request.user.has_seen_onboarding = True
-            request.user.save()
-        return self.partial_update(request, *args, **kwargs)
-
 
 class StatusUpdateView(generics.ListAPIView):
     """

backend/courses/views.py

@@ -1,6 +1,7 @@
+
 import styled from '@emotion/styled';
 import { DarkBlueIcon } from '../Requirements/QObject';
-import React, { useContext, useEffect, useRef } from "react";
+import React, { useContext, useEffect } from "react";
 import { useDrop } from "react-dnd";
 import { DegreePlan, DnDCourse, DockedCourse, User } from "@/types";
 import { ItemTypes } from "./dnd/constants";
@@ -14,7 +15,6 @@ import AccountIndicator from "pcx-shared-components/src/accounts/AccountIndicato
 import _ from 'lodash';
 import CourseInDock from './CourseInDock';
 import { useRouter } from 'next/router';
-import { TutorialModalContext } from '../FourYearPlan/OnboardingTutorial';
 
 const DockWrapper = styled.div`
     z-index: 1;
@@ -104,7 +104,16 @@ interface DockProps {
 const Dock = ({ user, login, logout, activeDegreeplanId  }: DockProps) => {
     const { searchPanelOpen, setSearchPanelOpen, setSearchRuleQuery, setSearchRuleId } = useContext(SearchPanelContext)
     const { createOrUpdate } = useSWRCrud<DockedCourse>(`/api/degree/docked`, { idKey: 'full_code' });
-    const { data: dockedCourses = [], isLoading } = useSWR<DockedCourse[]>(user ? `/api/degree/docked` : null);
+    const { data: dockedCourses = [], isLoading } = useSWR<DockedCourse[]>(user ? `/api/degree/docked` : null); 
+
+    // Returns a boolean that indiates whether this is the first render
+    const useIsMount = () => {
+        const isMountRef = React.useRef(true);
+        useEffect(() => {
+          isMountRef.current = false;
+        }, []);
+        return isMountRef.current;
+      };
 
     const [{ isOver, canDrop }, drop] = useDrop(() => ({
         accept: [ItemTypes.COURSE_IN_PLAN, ItemTypes.COURSE_IN_REQ, ItemTypes.COURSE_IN_SEARCH],
@@ -119,22 +128,10 @@ const Dock = ({ user, login, logout, activeDegreeplanId  }: DockProps) => {
 
     const { asPath } = useRouter();
 
-    const { tutorialModalKey, highlightedComponentRef, componentRefs } = useContext(TutorialModalContext);
-    const dockRef = React.useRef<HTMLDivElement | null>(null);
-    const isDockStep = tutorialModalKey === "courses-dock" || tutorialModalKey === "general-search";
-
-    useEffect(() => {
-        if (!componentRefs?.current || !dockRef.current) return;
-
-        componentRefs.current["dock"] = dockRef.current;
-        dockRef.current.style.zIndex = isDockStep ? "1002" : "0";
-    }, [componentRefs, isDockStep]);
-
     return (
-        <div style={{ position: "relative"}} ref={dockRef}>
-            <DockWrapper ref={drop} >
-                <DockContainer $isDroppable={canDrop} $isOver={isOver}>
-                    <AccountIndicator
+        <DockWrapper ref={drop} >
+            <DockContainer $isDroppable={canDrop} $isOver={isOver}>
+                <AccountIndicator
                     leftAligned={true}
                     user={user}
                     backgroundColor="light"
@@ -143,36 +140,35 @@ const Dock = ({ user, login, logout, activeDegreeplanId  }: DockProps) => {
                     logout={logout}
                     dropdownTop={true}
                     pathname={asPath}
-                    />
-                    <SearchIconContainer onClick={() => {
-                        setSearchRuleQuery("");
-                        setSearchRuleId(null);
-                        setSearchPanelOpen(!searchPanelOpen);
-                    }}>
-                        <DarkBlueIcon>
-                            <i className="fas fa-plus fa-lg"/>
-                        </DarkBlueIcon>
-                        <div>
-                            Add Course
-                        </div>
-                    </SearchIconContainer>
-                    <DockedCoursesWrapper>
-                        {isLoading ?
-                        <CenteringCourseDock>
-                            <DarkBlueBackgroundSkeleton width="20rem"/>
-                        </CenteringCourseDock> 
-                        :
-                        !dockedCourses.length ? <CenteringCourseDock>Drop courses in the dock for later.</CenteringCourseDock> :
-                            <DockedCourses>
-                                {dockedCourses.map((course) => 
-                                    <DockedCourseItem course={course} isDisabled={false} />
-                                )}
-                            </DockedCourses>}
-                    </DockedCoursesWrapper>
-                    <Logo src='pdp-logo.svg' width='30' height='45'/>
-                </DockContainer>
-            </DockWrapper>
-        </div>
+                />
+                <SearchIconContainer onClick={() => {
+                    setSearchRuleQuery("");
+                    setSearchRuleId(null);
+                    setSearchPanelOpen(!searchPanelOpen);
+                }}>
+                    <DarkBlueIcon>
+                        <i className="fas fa-plus fa-lg"/>
+                    </DarkBlueIcon>
+                    <div>
+                        Add Course
+                    </div>
+                </SearchIconContainer>
+                <DockedCoursesWrapper>
+                    {isLoading ?
+                    <CenteringCourseDock>
+                        <DarkBlueBackgroundSkeleton width="20rem"/>
+                    </CenteringCourseDock> 
+                    :
+                    !dockedCourses.length ? <CenteringCourseDock>Drop courses in the dock for later.</CenteringCourseDock> :
+                        <DockedCourses>
+                            {dockedCourses.map((course) => 
+                                <DockedCourseItem course={course} isDisabled={false} />
+                            )}
+                        </DockedCourses>}
+                </DockedCoursesWrapper>
+                <Logo src='pdp-logo.svg' width='30' height='45'/>
+            </DockContainer>
+        </DockWrapper>
     )
 }