remove V2 folder, move client code to src/client/

MatiasSinisalo · MatiasSinisalo · commit 5d76fd5e50fc · 2026-03-18T13:33:42.000+02:00
diff --git a/src/client/AppV2.tsx b/src/client/AppV2.tsx
@@ -11,10 +11,10 @@ import { FilterContextProvider, useFilterContext } from './filterContext'
 import SidebarContent from './sideBarContent'
 import CourseRecommendations from './CourseRecommendations'
 import WelcomeModal from './WelcomeModal'
-import useApi from '../util/useApi'
+import useApi from './util/useApi'
 import CurrentFilterDisplay from './currentFilterDisplay'
 import TextFeedbackV2 from './components/TextFeedbackV2'
-import { CourseRecommendation } from '../../common/types'
+import { CourseRecommendation } from '../common/types'
 import AdminModal from './components/AdminModal'
 import LanguageSelector from './components/LanguageSelector'
 import { useTranslation } from 'react-i18next'
diff --git a/src/client/CourseRecommendationV2.tsx b/src/client/CourseRecommendationV2.tsx
@@ -1,7 +1,7 @@
-import type { CourseRecommendation as CourseRecommendationType, UserCoordinates } from '../../common/types'
+import type { CourseRecommendation as CourseRecommendationType, UserCoordinates } from '../common/types'
 import { Box, Button, Paper, Stack, Typography, IconButton, Tooltip, useMediaQuery, useTheme } from '@mui/material'
 import HelpOutlineIcon from '@mui/icons-material/HelpOutline'
-import { translateLocalizedString } from '../util/i18n'
+import { translateLocalizedString } from './util/i18n'
 import { useTranslation } from 'react-i18next'
 import { useState } from 'react'
 import RecommendationReasonsModalV2 from './components/RecommendationReasonsModalV2'
diff --git a/src/client/CourseRecommendations.tsx b/src/client/CourseRecommendations.tsx
@@ -1,5 +1,5 @@
 import { Box, Stack } from '@mui/material'
-import { CourseRecommendation } from '../../common/types'
+import { CourseRecommendation } from '../common/types'
 import CourseRecommendationV2 from './CourseRecommendationV2'
 import { useFilterContext } from './filterContext'
 import NoRecommendationsInfo from './components/NoRecommendationsInfo'
diff --git a/src/client/FilterAccordion.tsx b/src/client/FilterAccordion.tsx
diff --git a/src/client/FilterRenderer.tsx b/src/client/FilterRenderer.tsx
@@ -1,5 +1,5 @@
 import { skipToken } from '@tanstack/react-query'
-import { pickVariant, updateVariantToDisplayId } from '../hooks/useQuestions'
+import { pickVariant, updateVariantToDisplayId } from './hooks/useQuestions'
 import FilterAccordion from './FilterAccordion'
 import { useFilterContext, filterConfigMap } from './filterContext'
 import Filter from './filters/filter'
diff --git a/src/client/WelcomeModal.tsx b/src/client/WelcomeModal.tsx
@@ -2,7 +2,7 @@ import { Modal, Box, Typography, Button } from '@mui/material'
 import { FC, useEffect, useRef } from 'react'
 import { useFilterContext } from './filterContext'
 import PrimaryLanguageSpecificationV2 from './components/PrimaryLanguageSpecificationV2'
-import { Question } from '../../common/types'
+import { Question } from '../common/types'
 import RadioQuestionV2 from './components/RadioQuestionV2'
 import StudyPhaseQuestionV2 from './components/StudyPhaseQuestionV2'
 import { useTranslation } from 'react-i18next'
diff --git a/src/client/components/ActionButtonV2.tsx b/src/client/components/ActionButtonV2.tsx
diff --git a/src/client/components/AdminModal.tsx b/src/client/components/AdminModal.tsx
@@ -1,6 +1,6 @@
 import { Box, Button, Typography, Modal, FormControl, InputLabel, Select, MenuItem, Tabs, Tab, FormControlLabel, Switch } from '@mui/material'
 import TextField from '@mui/material/TextField'
-import { CourseRecommendations } from '../../../common/types'
+import { CourseRecommendations } from '../../common/types'
 import { useState } from 'react'
 import { useFilterContext } from '../filterContext'
 
diff --git a/src/client/components/ExtraInfoModalV2.tsx b/src/client/components/ExtraInfoModalV2.tsx
@@ -1,9 +1,9 @@
 import { Box, Modal, Typography } from '@mui/material'
 import { useTranslation } from 'react-i18next'
-import { Question } from '../../../common/types'
+import { Question } from '../../common/types'
 import Markdown from 'react-markdown'
 import ActionButtonV2 from './ActionButtonV2'
-import { pickQuestionExplanation } from '../../hooks/useQuestions'
+import { pickQuestionExplanation } from '../hooks/useQuestions'
 
 const ExtraInfoModalV2 = ({question, open, handleClose, currentVariant}: {question: Question, open: boolean, handleClose: () => void, currentVariant?: string}) => {
   const {t} = useTranslation()
diff --git a/src/client/components/LanguageSelector.tsx b/src/client/components/LanguageSelector.tsx
@@ -1,6 +1,6 @@
 import { Select, MenuItem, SelectChangeEvent } from '@mui/material'
 import { useContext } from 'react'
-import { LanguageContext } from '../../contexts/languageContext'
+import { LanguageContext } from '../contexts/languageContext'
 
 const LanguageSelector = () => {
   const { language, setAppLanguage } = useContext(LanguageContext)
diff --git a/src/client/components/NoRecommendationsInfo.tsx b/src/client/components/NoRecommendationsInfo.tsx
diff --git a/src/client/components/PrimaryLanguageSpecificationV2.tsx b/src/client/components/PrimaryLanguageSpecificationV2.tsx
@@ -4,12 +4,12 @@ import {
   Radio,
   RadioGroup,
 } from '@mui/material'
-import { Question } from '../../../common/types.ts'
+import { Question } from '../../common/types.ts'
 import QuestionTitleV2 from './QuestionTitleV2.tsx'
 import { useState } from 'react'
 import { useFilterContext } from '../filterContext.tsx'
 import ExtraInfoModalV2 from './ExtraInfoModalV2.tsx'
-import { pickVariant } from '../../hooks/useQuestions.tsx'
+import { pickVariant } from '../hooks/useQuestions.tsx'
 
 const PrimaryLanguageSpecificationV2 = ({
   question,
diff --git a/src/client/components/QuestionTitleV2.tsx b/src/client/components/QuestionTitleV2.tsx
@@ -1,6 +1,6 @@
 import { IconButton, Stack, Typography } from '@mui/material'
 import InfoIcon from '@mui/icons-material/Info'
-import { Question } from '../../../common/types'
+import { Question } from '../../common/types'
 import { useTranslation } from 'react-i18next'
 
 const MandatoryStatus = ({question}: {question: Question}) => {
diff --git a/src/client/components/RadioQuestionV2.tsx b/src/client/components/RadioQuestionV2.tsx
@@ -4,8 +4,8 @@ import {
   Radio,
   RadioGroup,
 } from '@mui/material'
-import { Question } from '../../../common/types.ts'
-import { pickVariant } from '../../hooks/useQuestions.tsx'
+import { Question } from '../../common/types.ts'
+import { pickVariant } from '../hooks/useQuestions.tsx'
 import QuestionTitleV2 from './QuestionTitleV2.tsx'
 import { useState } from 'react'
 import ExtraInfoModalV2 from './ExtraInfoModalV2.tsx'
diff --git a/src/client/components/RecommendationReasonsModalV2.tsx b/src/client/components/RecommendationReasonsModalV2.tsx
@@ -3,7 +3,7 @@ import CheckCircleOutlineIcon from '@mui/icons-material/CheckCircleOutline'
 import CancelOutlinedIcon from '@mui/icons-material/CancelOutlined'
 import CloseIcon from '@mui/icons-material/Close'
 import { useTranslation } from 'react-i18next'
-import { UserCoordinates } from '../../../common/types'
+import { UserCoordinates } from '../../common/types'
 import { filterConfigMap, useFilterContext, coordinateKeyToFilterId, getCoordinateDisplayName } from '../filterContext'
 
 interface RecommendationReasonsModalV2Props {
diff --git a/src/client/components/RecommendationReasonsPopoverContent.tsx b/src/client/components/RecommendationReasonsPopoverContent.tsx
@@ -2,7 +2,7 @@ import { Box, Typography, Stack } from '@mui/material'
 import CheckCircleOutlineIcon from '@mui/icons-material/CheckCircleOutline'
 import CancelOutlinedIcon from '@mui/icons-material/CancelOutlined'
 import { useTranslation } from 'react-i18next'
-import { UserCoordinates } from '../../../common/types'
+import { UserCoordinates } from '../../common/types'
 import { filterConfigMap, useFilterContext, coordinateKeyToFilterId, getCoordinateDisplayName } from '../filterContext'
 
 interface RecommendationReasonsPopoverContentProps {
diff --git a/src/client/components/StudyPhaseQuestionV2.tsx b/src/client/components/StudyPhaseQuestionV2.tsx
@@ -1,8 +1,8 @@
 import { Box, MenuItem, Select } from '@mui/material'
 import { useEffect, useState } from 'react'
-import { Question, User } from '../../../common/types'
+import { Question, User } from '../../common/types'
 import { useTranslation } from 'react-i18next'
-import { translateLocalizedString } from '../../util/i18n'
+import { translateLocalizedString } from '../util/i18n'
 import QuestionTitleV2 from './QuestionTitleV2'
 import ExtraInfoModalV2 from './ExtraInfoModalV2'
 import { useFilterContext } from '../filterContext'
diff --git a/src/client/components/StudyPlaceQuestionV2.tsx b/src/client/components/StudyPlaceQuestionV2.tsx
@@ -7,10 +7,10 @@ import {
   FormControl,
 } from '@mui/material'
 import { green } from '@mui/material/colors'
-import { Question } from '../../../common/types'
+import { Question } from '../../common/types'
 import QuestionTitleV2 from './QuestionTitleV2'
 import ExtraInfoModalV2 from './ExtraInfoModalV2'
-import { pickVariant } from '../../hooks/useQuestions'
+import { pickVariant } from '../hooks/useQuestions'
 import { useFilterContext } from '../filterContext'
 
 const StudyPlaceQuestionV2 = ({ question }: { question: Question }) => {
diff --git a/src/client/components/SuperToggle.tsx b/src/client/components/SuperToggle.tsx
diff --git a/src/client/currentFilterDisplay.tsx b/src/client/currentFilterDisplay.tsx
@@ -1,8 +1,8 @@
 import { Box, Typography, Button, Stack, IconButton, Chip } from '@mui/material'
 import CloseIcon from '@mui/icons-material/Close'
 import { filterConfigMap, getFilterVariant, useFilterContext } from './filterContext'
-import { getOptionDisplayTexts } from '../hooks/useQuestions'
-import { Variant } from '../../common/types'
+import { getOptionDisplayTexts } from './hooks/useQuestions'
+import { Variant } from '../common/types'
 
 
 const FilterValueRenderer = ({cfg, variant}: {cfg: any, variant: Variant | null}) => {
diff --git a/src/client/filterContext.tsx b/src/client/filterContext.tsx
@@ -1,8 +1,8 @@
 import { createContext, useContext, useState, ReactNode, useEffect } from 'react'
-import useQuestions, { pickVariant, updateVariantToDisplayId } from '../hooks/useQuestions'
-import { CourseRecommendations, Question, User } from '../../common/types'
-import useApiMutation from '../hooks/useApiMutation'
-import useApi from '../util/useApi'
+import useQuestions, { pickVariant, updateVariantToDisplayId } from './hooks/useQuestions'
+import { CourseRecommendations, Question, User } from '../common/types'
+import useApiMutation from './hooks/useApiMutation'
+import useApi from './util/useApi'
 
 export const defaultStrictFilters: string[] = ['collaboration', 'exam']
 
diff --git a/src/client/filters/DropdownFilterComponent.tsx b/src/client/filters/DropdownFilterComponent.tsx
@@ -1,7 +1,7 @@
 import { FormControl, MenuItem, Select } from '@mui/material'
-import { Question, Option } from '../../../common/types'
+import { Question, Option } from '../../common/types'
 import React from 'react'
-import { translateLocalizedString } from '../../util/i18n'
+import { translateLocalizedString } from '../util/i18n'
 
 interface DropdownFilterComponentProps {
   filter: Question
diff --git a/src/client/filters/LanguageFilter.tsx b/src/client/filters/LanguageFilter.tsx
@@ -3,8 +3,8 @@ import {
   Radio,
   RadioGroup,
 } from '@mui/material'
-import { Question } from '../../../common/types.ts'
-import { pickVariant } from '../../hooks/useQuestions.tsx'
+import { Question } from '../../common/types.ts'
+import { pickVariant } from '../hooks/useQuestions.tsx'
 
 const LanguageFilter = ({
   filter,
diff --git a/src/client/filters/MultiChoiceFilter.tsx b/src/client/filters/MultiChoiceFilter.tsx
@@ -3,8 +3,8 @@ import {
   Radio,
   RadioGroup,
 } from '@mui/material'
-import { Question } from '../../../common/types.tsx'
-import { pickVariant } from '../../hooks/useQuestions.tsx'
+import { Question } from '../../common/types.tsx'
+import { pickVariant } from '../hooks/useQuestions.tsx'
 import { useFilterContext } from '../filterContext.tsx'
 
 const MultiChoiceFilter = ({
diff --git a/src/client/filters/MultiChoiceFilterComponent.tsx b/src/client/filters/MultiChoiceFilterComponent.tsx
@@ -1,6 +1,6 @@
 import { Checkbox, FormControlLabel, FormGroup } from '@mui/material'
 import { green } from '@mui/material/colors'
-import { Question, Option } from '../../../common/types'
+import { Question, Option } from '../../common/types'
 import React from 'react'
 
 interface MultiChoiceFilterComponentProps {
diff --git a/src/client/filters/PreviouslyDoneLangFilter.tsx b/src/client/filters/PreviouslyDoneLangFilter.tsx
@@ -1,10 +1,10 @@
 import { Box, RadioGroup, Typography, Accordion, AccordionSummary, AccordionDetails } from '@mui/material'
 import ExpandMoreIcon from '@mui/icons-material/ExpandMore'
 import { useState } from 'react'
-import { Question } from '../../../common/types'
+import { Question } from '../../common/types'
 import { useTranslation } from 'react-i18next'
-import FormOption from '../../components/FormOption'
-import { pickVariant } from '../../hooks/useQuestions'
+import FormOption from '../components/FormOption'
+import { pickVariant } from '../hooks/useQuestions'
 import Markdown from 'react-markdown'
 import { useFilterContext } from '../filterContext'
 
diff --git a/src/client/filters/PrimaryLanguageSpecificationFilter.tsx b/src/client/filters/PrimaryLanguageSpecificationFilter.tsx
@@ -3,7 +3,7 @@ import {
   Radio,
   RadioGroup,
 } from '@mui/material'
-import { Question } from '../../../common/types.ts'
+import { Question } from '../../common/types.ts'
 
 const PrimaryLanguageSpecificationFilter = ({
   filter,
diff --git a/src/client/filters/SingleChoiceFilterComponent.tsx b/src/client/filters/SingleChoiceFilterComponent.tsx
@@ -1,6 +1,6 @@
 import { FormControlLabel, Radio, RadioGroup, Accordion, AccordionSummary, AccordionDetails, Typography } from '@mui/material'
 import ExpandMoreIcon from '@mui/icons-material/ExpandMore'
-import { Question, Option } from '../../../common/types'
+import { Question, Option } from '../../common/types'
 import React, { useState } from 'react'
 import Markdown from 'react-markdown'
 import { useTranslation } from 'react-i18next'
diff --git a/src/client/filters/StudyPhaseFilter.tsx b/src/client/filters/StudyPhaseFilter.tsx
@@ -1,7 +1,7 @@
 import { Box, MenuItem, Select } from '@mui/material'
 import { useEffect, useState } from 'react'
-import { Question, User } from '../../../common/types'
-import { translateLocalizedString } from '../../util/i18n'
+import { Question, User } from '../../common/types'
+import { translateLocalizedString } from '../util/i18n'
 
 const StudyPhaseFilter = ({
   filter,
diff --git a/src/client/filters/StudyPlaceFilter.tsx b/src/client/filters/StudyPlaceFilter.tsx
@@ -7,8 +7,8 @@ import {
   FormControl,
 } from '@mui/material'
 import { green } from '@mui/material/colors'
-import { Question } from '../../../common/types'
-import { pickVariant } from '../../hooks/useQuestions'
+import { Question } from '../../common/types'
+import { pickVariant } from '../hooks/useQuestions'
 import { useFilterContext } from '../filterContext'
 
 const StudyPlaceFilter = ({
diff --git a/src/client/filters/filter.tsx b/src/client/filters/filter.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react'
-import { Variant } from '../../../common/types'
+import { Variant } from '../../common/types'
 import QuestionTitleV2 from '../components/QuestionTitleV2'
 import ExtraInfoModalV2 from '../components/ExtraInfoModalV2'
 import { Box } from '@mui/material'
diff --git a/src/client/main.tsx b/src/client/main.tsx
@@ -8,7 +8,7 @@ import { LanguageContextProvider } from './contexts/languageContext.tsx'
 import initializeI18n from './util/i18n.ts'
 import { BrowserRouter as Router, Routes, Route, redirect } from 'react-router-dom'
 import AdminPage from './components/AdminPage.tsx'
-import AppV2 from './V2/AppV2.tsx'
+import AppV2 from './AppV2.tsx'
 const queryClient = new QueryClient()
 const theme = createTheme({
   palette: {
@@ -36,7 +36,6 @@ createRoot(document.getElementById('root')!).render(
           <Router>
             <Routes>
               <Route path="/" element={<AppV2 />}/>
-              <Route path="/v2" element={<AppV2 />}/>
               <Route path="/admin" element={<AdminPage/>}/>
             </Routes>
           </Router>
diff --git a/src/client/sideBarContent.tsx b/src/client/sideBarContent.tsx
