Commit 4ab59514 authored by Patrik Kotucek's avatar Patrik Kotucek
Browse files

refactor: removing portals

parent d2ddfc17

frontend/src/routes/_protected/instructor/$exerciseId/$teamId/$channelId/form/$actionLogId.tsx

+29 −15
Original line number Diff line number Diff line 
import { useTranslationFrontend } from '@inject/locale'

import { LinkButton } from '@inject/shared'

import { createFileRoute } from '@tanstack/react-router'

import { InstructorFormChannelRoute } from '.'

import { InjectMessageView } from '../../../../../../../views/InjectMessageView'

import { LeftNavbar } from '../../../../../../../views/InstructorView/LeftNavbar'

import TeamTabs from '../../../../../../../views/InstructorView/TeamTabs'

import { useAdaptiveBack } from '../../../../../../../views/TraineeView/useAdaptiveBack'

import { InstructorFilePageRoute } from '../../../file.$fileId'



const RouteComponent = () => {

  const { teamId, exerciseId, channelId, actionLogId } =

    InstructorFormChannelActionLogRoute.useParams()

  const { t } = useTranslationFrontend()



  return (

    <>

      <LeftNavbar>

  const backNav = useAdaptiveBack(

    <LinkButton

          button={{ text: 'Back', minimal: true, icon: 'chevron-left' }}

      button={{ text: t('back'), icon: 'chevron-left', minimal: true }}

      link={{

        to: InstructorFormChannelRoute.to,

        params: {
@@ -24,7 +25,20 @@ const RouteComponent = () => { 
      }}

      end

    />

      </LeftNavbar>

  )



  return (

    <>

      <TeamTabs

        exerciseId={exerciseId}

        teamId={teamId}

        beforeTabs={backNav}

        afterTabs={

          <div style={{ visibility: 'hidden', pointerEvents: 'none' }}>

            {backNav}

          </div>

        }

      />

      <InjectMessageView

        getFileLink={fileId => ({

          to: InstructorFilePageRoute.to,

frontend/src/routes/_protected/instructor/$exerciseId/$teamId/$channelId/form/index.tsx

+30 −22
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ import { useTranslationFrontend } from '@inject/locale' 
import { Container } from '@inject/shared'

import { createFileRoute } from '@tanstack/react-router'

import { ActionLog } from '../../../../../../../actionlog/ActionLog'

import TeamTabs from '../../../../../../../views/InstructorView/TeamTabs'

import { InstructorFilePageRoute } from '../../../file.$fileId'

import { InstructorFormChannelActionLogRoute } from './$actionLogId'
@@ -11,7 +12,14 @@ const RouteComponent = () => { 
  const { t } = useTranslationFrontend()



  return (

    <Container>

    <>

      <TeamTabs

        exerciseId={exerciseId}

        teamId={teamId}

        beforeTabs={<div />}

        afterTabs={<div />}

      />

      <Container makeFullHeight>

        <ActionLog

          getFileLink={fileId => ({

            to: InstructorFilePageRoute.to,
@@ -22,7 +30,6 @@ const RouteComponent = () => { 
            },

          })}

          inInstructor

        scrollToBottom

          exerciseId={exerciseId}

          teamId={teamId}

          channelId={channelId}
@@ -36,6 +43,7 @@ const RouteComponent = () => { 
          }}

        />

      </Container>

    </>

  )

}

frontend/src/routes/_protected/instructor/$exerciseId/$teamId/$channelId/info/$actionLogId.tsx

+29 −15
Original line number Diff line number Diff line 
import { useTranslationFrontend } from '@inject/locale'

import { LinkButton } from '@inject/shared'

import { createFileRoute } from '@tanstack/react-router'

import { InstructorInfoChannelRoute } from '.'

import { InjectMessageView } from '../../../../../../../views/InjectMessageView'

import { LeftNavbar } from '../../../../../../../views/InstructorView/LeftNavbar'

import TeamTabs from '../../../../../../../views/InstructorView/TeamTabs'

import { useAdaptiveBack } from '../../../../../../../views/TraineeView/useAdaptiveBack'

import { InstructorFilePageRoute } from '../../../file.$fileId'



const RouteComponent = () => {

  const { teamId, exerciseId, channelId, actionLogId } =

    InstructorInfoChannelActionLogRoute.useParams()

  const { t } = useTranslationFrontend()



  return (

    <>

      <LeftNavbar>

  const backNav = useAdaptiveBack(

    <LinkButton

          button={{ text: 'Back', minimal: true, icon: 'chevron-left' }}

      button={{ text: t('back'), icon: 'chevron-left', minimal: true }}

      link={{

        to: InstructorInfoChannelRoute.to,

        params: {
@@ -24,7 +25,20 @@ const RouteComponent = () => { 
      }}

      end

    />

      </LeftNavbar>

  )



  return (

    <>

      <TeamTabs

        exerciseId={exerciseId}

        teamId={teamId}

        beforeTabs={backNav}

        afterTabs={

          <div style={{ visibility: 'hidden', pointerEvents: 'none' }}>

            {backNav}

          </div>

        }

      />

      <InjectMessageView

        getFileLink={fileId => ({

          to: InstructorFilePageRoute.to,

frontend/src/routes/_protected/instructor/$exerciseId/$teamId/$channelId/info/index.tsx

+26 −18
Original line number Diff line number Diff line 
import { Container } from '@inject/shared'

import { createFileRoute } from '@tanstack/react-router'

import { ActionLog } from '../../../../../../../actionlog/ActionLog'

import TeamTabs from '../../../../../../../views/InstructorView/TeamTabs'

import { InstructorFilePageRoute } from '../../../file.$fileId'

import { InstructorInfoChannelActionLogRoute } from './$actionLogId'
@@ -9,6 +10,13 @@ const RouteComponent = () => { 
    InstructorInfoChannelRoute.useParams()



  return (

    <>

      <TeamTabs

        exerciseId={exerciseId}

        teamId={teamId}

        beforeTabs={<div />}

        afterTabs={<div />}

      />

      <Container id='scrollAlog'>

        <ActionLog

          getFileLink={fileId => ({
@@ -20,7 +28,6 @@ const RouteComponent = () => { 
            },

          })}

          inInstructor

        scrollToBottom

          exerciseId={exerciseId}

          teamId={teamId}

          channelId={channelId}
@@ -30,6 +37,7 @@ const RouteComponent = () => { 
          })}

        />

      </Container>

    </>

  )

}

frontend/src/routes/_protected/instructor/$exerciseId/$teamId/$channelId/tool/$actionLogId.tsx

+19 −15
Original line number Diff line number Diff line 
import { useTranslationFrontend } from '@inject/locale'

import { LinkButton } from '@inject/shared'

import { createFileRoute } from '@tanstack/react-router'

import { InstructorToolChannelRoute } from '.'

import { InjectMessageView } from '../../../../../../../views/InjectMessageView'

import { LeftNavbar } from '../../../../../../../views/InstructorView/LeftNavbar'

import { useAdaptiveBack } from '../../../../../../../views/TraineeView/useAdaptiveBack'

import { InstructorFilePageRoute } from '../../../file.$fileId'



const RouteComponent = () => {

  const { t } = useTranslationFrontend()

  const { teamId, exerciseId, channelId, actionLogId } =

    InstructorToolChannelActionLogRoute.useParams()



  return (

    <>

      <LeftNavbar>

  const backNav = useAdaptiveBack(

    <LinkButton

          button={{ text: 'Back', minimal: true, icon: 'chevron-left' }}

      button={{ text: t('back'), icon: 'chevron-left', minimal: true }}

      link={{

        to: InstructorToolChannelRoute.to,

        params: {
@@ -24,7 +24,11 @@ const RouteComponent = () => { 
      }}

      end

    />

      </LeftNavbar>

  )



  return (

    <>

      {backNav}

      <InjectMessageView

        getFileLink={fileId => ({

          to: InstructorFilePageRoute.to,