frontend/components/project/Main.tsx

@@ -2,28 +2,23 @@
 
 import { Popover, Transition } from '@headlessui/react'
 import { ChevronDownIcon, FolderArrowDownIcon, FolderOpenIcon, FolderPlusIcon } from '@heroicons/react/20/solid'
-import { Fragment, useEffect, useState } from 'react'
+import { Fragment, useState } from 'react'
 import { useNavigation } from '../../context/Navigation/provider'
 import { mainPages } from '../../context/Navigation/types'
-// import { useProject } from '../../context/Project/provider'
+import { useProject } from '../../context/Project/provider'
 import { GetAllLocalProjects } from '../../wailsjs/wailsjs/go/ipc/Channel'
 import { entities } from '../../wailsjs/wailsjs/go/models'
 import NewProjectModal from './NewProjectModal'
 import ProjectListModal from './ProjectListModal'
-import { useDispatch, useSelector } from 'react-redux'
-import { RootState } from '../../redux/store'
-import { createNewProject, requestSelectProjectByName } from '../../redux/features/session/sessionSlice'
+
 
 const MainProject = () => {
-  const dispatch = useDispatch()
-  const { currentSession } = useSelector((state: RootState) => state.session)
-
   const [isNewProjectModalOpen, setIsNewProjectModalOpen] = useState(false)
   const [isProjectListModal, setIsProjectListModal] = useState(false)
   const [canPopoverBeOpen, setCanPopoverBeOpen] = useState(true)
 
   const [availableProjects, setAvailableProjects] = useState<entities.Project[]>([])
-  // const { createNewProject, requestSelectProjectByName } = useProject()
+  const { createNewProject, requestSelectProjectByName } = useProject()
   const { setSelectedMainPage } = useNavigation()
 
   const buttonOptions = [
@@ -62,25 +57,18 @@ const MainProject = () => {
   const onCreateNewProjectHandler = async (projectName: string) => {
     setIsNewProjectModalOpen(false)
     setCanPopoverBeOpen(true)
-    dispatch(createNewProject(projectName))
-    // setSelectedMainPage(mainPages.WORKSPACE)
+    await createNewProject(projectName)
+    setSelectedMainPage(mainPages.WORKSPACE)
   }
 
   const onSelectProjectHandler = async (name: string) => {
-    // const successfulResponse = await requestSelectProjectByName(name)
-    dispatch(requestSelectProjectByName(name))
+    const successfulResponse = await requestSelectProjectByName(name)
     setIsProjectListModal(false)
     setCanPopoverBeOpen(true)
 
-    // if (successfulResponse) setSelectedMainPage(mainPages.WORKSPACE)
-    // setSelectedMainPage(mainPages.WORKSPACE)
+    if (successfulResponse) setSelectedMainPage(mainPages.WORKSPACE)
   }
 
-  useEffect(() => {
-    console.log('useEffect: ', currentSession?.project?.id)
-    if (currentSession?.project?.id) setSelectedMainPage(mainPages.WORKSPACE)
-  }, [currentSession?.project?.id])
-
   return <main className=" text-gray-100 h-screen overflow-y-scroll">
 
     {isNewProjectModalOpen ? <NewProjectModal onCreateNewProjectHandler={onCreateNewProjectHandler} /> : ''}

frontend/components/settings/User.tsx

@@ -1,19 +1,13 @@
 import Search from '../utils/Search'
-// import { useProject } from '../../context/Project/provider'
+import { useProject } from '../../context/Project/provider'
 import { EnvelopeIcon } from '@heroicons/react/24/outline'
 import UserAvatar from '../utils/UserAvatar'
-import { useEffect, useRef, useState } from 'react'
+import { useRef, useState } from 'react'
 import { useNavigation } from '../../context/Navigation/provider'
 import { mainPages } from '../../context/Navigation/types'
-import { useDispatch, useSelector } from 'react-redux'
-import { RootState } from '../../redux/store'
-import { requestUpdateCurrentUser } from '../../redux/features/session/sessionSlice'
 
 const User = () => {
-  const dispatch = useDispatch()
-  const { currentSession } = useSelector((state: RootState) => state.session)
-
-  // const { requestUpdateCurrentUser, requestChooseUserAvatar } = useProject()
+  const { currentSession, requestUpdateCurrentUser, requestChooseUserAvatar } = useProject()
   const { setSelectedMainPage } = useNavigation()
 
   const firstNameRef = useRef<HTMLInputElement>(null)
@@ -22,20 +16,19 @@ const User = () => {
   const [avatarPath, setAvatarPath] = useState(currentSession?.user?.avatarPath || '')
 
   const onSaveButtonClickHandler = async () => {
-    dispatch(requestUpdateCurrentUser({
+    await requestUpdateCurrentUser({
       localId: currentSession?.user?.localId,
       firstName: firstNameRef?.current?.value,
       lastName: lastNameRef?.current?.value,
       email: emailRef?.current?.value,
       avatarPath: avatarPath || ''
-    }))
+    })
     setSelectedMainPage(mainPages.WORKSPACE)
   }
 
   const onAvatarSelectButtonClickHandler = async () => {
-    // TODO: needs to have requestChooseUserAvatar method made in the slice
-    // const chosenAvatarPath = await requestChooseUserAvatar()
-    // setAvatarPath(chosenAvatarPath)
+    const chosenAvatarPath = await requestChooseUserAvatar()
+    setAvatarPath(chosenAvatarPath)
   }
 
   const onAvatarRemoveButtonClickHandler = () => {

frontend/pages/index.tsx

@@ -14,7 +14,6 @@ const Home: NextPage = () => {
   const { selectedMainPage } = useNavigation()
 
   const renderSelectedMainPage = () => {
-    console.log('selectedMainPage: ', selectedMainPage)
     if (selectedMainPage === mainPages.SELECTPROJECT) return <MainProject />
     else if (selectedMainPage === mainPages.EDITUSER) return <User />
     else if ((selectedMainPage === mainPages.WORKSPACE) && currentSession?.project?.id) {

frontend/redux/features/session/sessionSlice.ts

@@ -1,53 +0,0 @@
-import { createSlice } from '@reduxjs/toolkit'
-import type { PayloadAction } from '@reduxjs/toolkit'
-import { entities } from '../../../wailsjs/wailsjs/go/models'
-import { CreateNewProject, GetCurrentSession, RequestChangeSessionProjectByName, RequestChooseUserAvatar, RequestUpdateCurrentUser } from '../../../wailsjs/wailsjs/go/ipc/Channel'
-import { UserProps } from './types'
-import { serialize } from '../../serialize'
-
-const initialState = {
-  currentSession: serialize(new entities.Session()) as entities.Session,
-}
-
-export const sessionSlice = createSlice({
-  name: 'session',
-  initialState,
-  reducers: {
-    updateSession: (state, action: PayloadAction<undefined>) => {
-      GetCurrentSession().then(response => {
-        if (response) state.currentSession = response
-      }).catch(console.error)
-    },
-    createNewProject: (state, action: PayloadAction<string>)=> {
-      const newProjectName = action.payload
-      CreateNewProject(newProjectName).then(createdSession => {
-        if (createdSession) state.currentSession = serialize(createdSession)
-      }).catch(console.error)
-    },
-    requestUpdateCurrentUser: (state, action: PayloadAction<UserProps>) => {
-      const userProps = action.payload
-      RequestUpdateCurrentUser(new entities.User(userProps)).then(updatedUser => {
-        state.currentSession.user = serialize(updatedUser)
-      }).catch(console.error)
-    },
-    requestSelectProjectByName: (state, action: PayloadAction<string>) => {
-      const projectName = action.payload
-      console.log('projectName: ', projectName)
-      RequestChangeSessionProjectByName(projectName).then(success => {
-        if (success) GetCurrentSession().then(response => {
-          console.log(response)
-          if (response) state.currentSession = serialize(response)
-        }).catch(console.error)
-      }).catch(console.error)
-    }
-  }
-})
-
-export const {
-  updateSession,
-  createNewProject,
-  requestUpdateCurrentUser,
-  requestSelectProjectByName
-} = sessionSlice.actions
-
-export default sessionSlice.reducer

frontend/redux/features/session/types.ts

@@ -1,9 +0,0 @@
-export type UserProps = {
-  id?: string,
-  localId?: string,
-  firstName?: string,
-  lastName?: string,
-  avatarPath?: string,
-  authToken?: string,
-  email?: string
-}

frontend/redux/serialize.ts

@@ -1,9 +0,0 @@
-const serialize = (value: unknown) => {
-  return JSON.parse(JSON.stringify(value))
-}
-
-const deserialize = (value: Record<string, any>, constructor: any): any => {
-  return constructor(value)
-}
-
-export { serialize, deserialize }

frontend/redux/store.ts

@@ -2,13 +2,11 @@ import { configureStore } from '@reduxjs/toolkit'
 import { setupListeners } from '@reduxjs/toolkit/dist/query'
 import notificationQueueSlice from './features/notifications/notificationQueueSlice'
 import stageSlice from './features/stage/stageSlice'
-import sessionSlice from './features/session/sessionSlice'
 
 export const store = configureStore({
   reducer: {
     notificationQueue: notificationQueueSlice,
     stage: stageSlice,
-    session: sessionSlice,
   },
   middleware: (getDefaultMiddleware) => getDefaultMiddleware(),
 })