ui fixes

UniversityOfHelsinkiCS · Oct 22, 2024 · f146575 · f146575
1 parent 3306fc1
commit f146575
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/client/components/ReportPage/FilterTray.js b/client/components/ReportPage/FilterTray.js
@@ -5,7 +5,6 @@ import DoctoralSchoolFilter from 'Components/Generic/DoctoralSchoolFilter'
 import LevelFilter from 'Components/Generic/LevelFilter'
 import FacultyFilter from 'Components/Generic/FacultyFilter'
 import ProgrammeFilter from 'Components/Generic/ProgrammeFilter'
-import YearSelector from 'Components/Generic/YearSelector'
 import FormFilter from 'Components/Generic/FormFilter'
 import { useTranslation } from 'react-i18next'
 import '../Generic/Generic.scss'
@@ -55,7 +54,6 @@ const FilterTray = ({ filter, setFilter }) => {
 
   return (
     <>
-      <YearSelector size="small" />
       <FormFilter />
       {usersProgrammes && usersProgrammes.length > 5 && (
         <>

diff --git a/client/components/ReportPage/index.js b/client/components/ReportPage/index.js
@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from 'react'
 import { useDispatch, useSelector } from 'react-redux'
 import { Link } from 'react-router-dom'
-import { Accordion, Button, Icon, Grid, Tab } from 'semantic-ui-react'
+import { Accordion, Button, Icon, Grid, Tab, Menu } from 'semantic-ui-react'
 import { useTranslation } from 'react-i18next'
 
 import { getAllTempAnswersAction } from 'Utilities/redux/tempAnswersReducer'
@@ -13,6 +13,7 @@ import { setForm } from 'Utilities/redux/filterReducer'
 import QuestionList from 'Components/Generic/QuestionList'
 import { answersByYear, filteredProgrammes, modifiedQuestions, answersByQuestions } from 'Utilities/common'
 import useDebounce from 'Utilities/useDebounce'
+import YearSelector from 'Components/Generic/YearSelector'
 import FilterTray from './FilterTray'
 import ColorAnswers from './ColorAnswers'
 import WrittenAnswers from './WrittenAnswers'
@@ -149,13 +150,22 @@ export default () => {
   return (
     <div className="report">
       <div className="info-header noprint" />
-      <Grid doubling columns={2} padded="vertically" className="filter-container noprint">
-        <Grid.Column width={10}>
-          <Button as={Link} to="/yearly" icon labelPosition="left" size="small" style={{ marginBottom: '3em' }}>
+      <Menu secondary>
+        <Menu.Item>
+          <Button as={Link} to="/yearly" icon labelPosition="left" size="small">
             <Icon name="arrow left" />
             {t('backToFrontPage')}
           </Button>
+        </Menu.Item>
+        <Menu.Item>
           <h1>{t('report:reportPage')}</h1>
+        </Menu.Item>
+        <Menu.Item>
+          <YearSelector size="small" />
+        </Menu.Item>
+      </Menu>
+      <Grid doubling columns={2} padded="vertically" className="filter-container noprint">
+        <Grid.Column width={10}>
           <FilterTray filter={filter} setFilter={setFilter} />
           <Accordion fluid styled className="question-filter">
             <Accordion.Title active onClick={() => setOpenQuestions(!openQuestions)}>