Feedback pt. 2

src/components/StudentCredentialsTable.tsx

@@ -15,7 +15,7 @@ import { Print as PrintIcon, SaveAlt as SaveAltIcon } from "@mui/icons-material"
 import { CopyIconButton } from "codeforlife/components"
 import { generatePath } from "react-router-dom"
 
-import CflLogo from "../images/logo_cfl.png"
+import CflLogo from "../images/CFLLogoImage.png"
 import { paths } from "../routes"
 
 function makeAutoLoginLink(

src/features/footer/Footer.tsx

@@ -9,12 +9,12 @@ import { Image } from "codeforlife/components"
 import { ThemedBox } from "codeforlife/theme"
 import { primary } from "codeforlife/theme/colors"
 
-import CflLogoPowered from "../../images/logo_cfl_powered.svg"
+import CflLogoPowered from "../../images/CFLPoweredLogoImage.svg"
 import { LINK_SKILLS_FOR_THE_FUTURE } from "../../app/env"
 import Links from "./Links"
 import RegisterToNewsletterForm from "./RegisterToNewsletterForm.tsx"
 import SocialMediaIcons from "./SocialMediaIcons"
-import TenYearAnniversary from "../../images/10_years_anniversary.png"
+import TenYearAnniversary from "../../images/10YearsAnniversaryImage.png"
 import { themeOptions } from "../../app/theme"
 
 export interface FooterProps {}

src/pages/aboutUs/AboutUs.tsx

@@ -1,7 +1,7 @@
 import * as page from "codeforlife/components/page"
 import { type FC } from "react"
 
-import AboutUsHeroImage from "../../images/about_us_hero_hexagon.png"
+import AboutUsHeroImage from "../../images/AboutUsHeroHexagonImage.png"
 import CodeForLife from "./CodeForLife"
 import Dedication from "./Dedication"
 import OcadoGroup from "./OcadoGroup"

src/pages/aboutUs/CodeForLife.tsx

@@ -1,7 +1,7 @@
 import { type FC } from "react"
 import { Typography } from "@mui/material"
 
-import AboutUsCFLImage from "../../images/about_us.jpg"
+import AboutUsCFLImage from "../../images/AboutUsImage.jpg"
 import Introduction from "../../components/Introduction"
 
 export interface CodeForLifeProps {}

src/pages/aboutUs/Dedication.tsx

@@ -2,7 +2,7 @@ import { Stack, Typography } from "@mui/material"
 import { type FC } from "react"
 import { Image } from "codeforlife/components"
 
-import SharonHarrisonImage from "../../images/sharon_harrison.jpg"
+import SharonHarrisonImage from "../../images/SharonHarrisonImage.jpg"
 
 export interface DedicationProps {}
 

src/pages/aboutUs/OcadoGroup.tsx

@@ -2,7 +2,7 @@ import { type FC } from "react"
 import { Link } from "codeforlife/components/router"
 import { Typography } from "@mui/material"
 
-import AboutUsOcadoImage from "../../images/about_us_ocado.jpg"
+import AboutUsOcadoImage from "../../images/AboutUsOcadoImage.jpg"
 import Introduction from "../../components/Introduction"
 import { LINK_SKILLS_FOR_THE_FUTURE } from "../../app/env"
 

src/pages/aboutUs/Supporters.tsx

@@ -4,14 +4,14 @@ import { Image } from "codeforlife/components"
 import { Link } from "codeforlife/components/router"
 
 import { LINK_CFL_DOCS, LINK_PORTAL_GITHUB } from "../../app/env"
-import BarefootImage from "../../images/barefoot_logo.png"
-import BcsImage from "../../images/bcs_logo.png"
-import GLAImage from "../../images/gla_logo.png"
-import HOPEImage from "../../images/hope_logo.png"
-import IclImage from "../../images/icl_logo.png"
-import Logo10xImage from "../../images/10x_logo.png"
-import MCSaatchiImage from "../../images/mc_saatchi_logo.png"
-import PressureCookerImage from "../../images/pressure_cooker_logo.png"
+import BarefootImage from "../../images/BarefootLogoImage.png"
+import BcsImage from "../../images/BCSLogoImage.png"
+import GLAImage from "../../images/GLALogoImage.png"
+import HOPEImage from "../../images/HopeLogoImage.png"
+import IclImage from "../../images/ICLLogoImage.png"
+import Logo10xImage from "../../images/10xLogoImage.png"
+import MCSaatchiImage from "../../images/MCSaatchiLogoImage.png"
+import PressureCookerImage from "../../images/PressureCookerLogoImage.png"
 
 const Supporter: FC<{
   desc: string

src/pages/codingClubs/CodingClubs.tsx

@@ -3,7 +3,7 @@ import { type FC } from "react"
 import { useTheme } from "@mui/material"
 
 import ClubAim from "./ClubAim"
-import CodeClubHeroImage from "../../images/coding_club_hero_hexagon.png"
+import CodeClubHeroImage from "../../images/CodingClubHeroHexagonImage.png"
 import Primary from "./Primary"
 import Python from "./Python"
 

src/pages/codingClubs/Primary.tsx

@@ -7,7 +7,7 @@ import {
   LINK_PRIMARY_PACK_DOWNLOAD,
   LINK_PRIMARY_PACK_GITBOOK,
 } from "../../app/env"
-import AboutUsImage from "../../images/about_us.jpg"
+import AboutUsImage from "../../images/AboutUsImage.jpg"
 import Introduction from "../../components/Introduction"
 
 export interface PrimaryProps {}

src/pages/codingClubs/Python.tsx

@@ -8,7 +8,7 @@ import {
   LINK_PYTHON_PACK_GITBOOK,
 } from "../../app/env"
 import Introduction from "../../components/Introduction"
-import PythonClubImage from "../../images/coding_club_python_pack.png"
+import PythonClubImage from "../../images/CodingClubPythonPackImage.png"
 
 export interface PythonProps {}
 

src/pages/getInvolved/GetInvolved.tsx

@@ -4,10 +4,10 @@ import { type FC } from "react"
 import { Unstable_Grid2 as Grid } from "@mui/material"
 
 import Card from "../../components/Card"
-import ClubsImg from "../../images/clubs.png"
-import GetInvolvedHero from "../../images/get_involved_hero_hexagon.png"
-import GithubImg from "../../images/github.png"
-import UniversitiesImg from "../../images/universities.png"
+import ClubsImg from "../../images/ClubsImage.png"
+import GetInvolvedHero from "../../images/GetInvolvedHeroHexagonImage.png"
+import GithubImg from "../../images/GithubImage.png"
+import UniversitiesImg from "../../images/UniversitiesImage.png"
 import { paths } from "../../routes"
 
 export interface GetInvolvedProps {}

src/pages/home/AboutUs.tsx

@@ -4,11 +4,11 @@ import { ChevronRight as ChevronRightIcon } from "@mui/icons-material"
 import { type FC } from "react"
 import { Image } from "codeforlife/components"
 
-import ControllerIcon from "../../images/icon_controller.png"
-import GlobeIcon from "../../images/icon_globe.png"
+import ControllerIcon from "../../images/ControllerIconImage.png"
+import GlobeIcon from "../../images/GlobeIconImage.png"
 import { LINK_FEMALE_GRADUATES_IN_CS } from "../../app/env"
-import PieChartIcon from "../../images/icon_piechart.png"
-import TicketIcon from "../../images/icon_free.png"
+import PieChartIcon from "../../images/PiechartIconImage.png"
+import TicketIcon from "../../images/FreeIconImage.png"
 import { paths } from "../../routes"
 
 const Column: FC<{

src/pages/home/Quotes.tsx

@@ -3,9 +3,9 @@ import { Image, type ImageProps } from "codeforlife/components"
 import { type FC } from "react"
 import { Link } from "codeforlife/components/router"
 
-import ReubenPhoto from "../../images/reuben.png"
-import RobPhoto from "../../images/rob.png"
-import SianPhoto from "../../images/sian.png"
+import ReubenPhoto from "../../images/ReubenImage.png"
+import RobPhoto from "../../images/RobImage.png"
+import SianPhoto from "../../images/SianImage.png"
 import { paths } from "../../routes"
 
 const Column: FC<{

src/pages/home/TargetAudience.tsx

@@ -4,8 +4,8 @@ import { Stack, type SxProps, Typography, useTheme } from "@mui/material"
 import { ChevronRight as ChevronRightIcon } from "@mui/icons-material"
 import { type FC } from "react"
 
-import EducateImage from "../../images/dashboard_educate.png"
-import PlayImage from "../../images/dashboard_play.png"
+import EducateImage from "../../images/DashboardEducateImage.png"
+import PlayImage from "../../images/DashboardPlayImage.png"
 import { paths } from "../../routes"
 
 export interface TargetAudienceProps {}

src/pages/homeLearning/Advanced.tsx

@@ -3,7 +3,7 @@ import { type FC } from "react"
 import { LINK_HOME_LEARNING_ADVANCED } from "../../app/env"
 import Levels from "./Levels"
 import { Link } from "codeforlife/components/router"
-import RRAdvancedImage from "../../images/rr_advanced.png"
+import RRAdvancedImage from "../../images/RRAdvancedImage.png"
 import { paths } from "../../routes"
 
 export interface AdvancedProps {}

src/pages/homeLearning/Beginner.tsx

@@ -2,7 +2,7 @@ import { type FC } from "react"
 
 import { LINK_HOME_LEARNING_BEGINNER } from "../../app/env"
 import Levels from "./Levels"
-import RRBeginnerImage from "../../images/rr_beginner.png"
+import RRBeginnerImage from "../../images/RRBeginnerImage.png"
 
 export interface BeginnerProps {}
 

src/pages/homeLearning/HomeLearning.tsx

@@ -6,7 +6,7 @@ import { Send as SendIcon } from "@mui/icons-material"
 import AboutRR from "./AboutRR"
 import Advanced from "./Advanced"
 import Beginner from "./Beginner"
-import HomeLearningHeroImage from "../../images/home_learning_hero_hexagon.png"
+import HomeLearningHeroImage from "../../images/HomeLearningHeroHexagonImage.png"
 import Intermediate from "./Intermediate"
 import { LINK_IDEAS_BOX } from "../../app/env"
 import { paths } from "../../routes"

src/pages/homeLearning/Intermediate.tsx

@@ -2,7 +2,7 @@ import { type FC } from "react"
 
 import { LINK_HOME_LEARNING_INTERMEDIATE } from "../../app/env"
 import Levels from "./Levels"
-import RRIntermediateImage from "../../images/rr_intermediate.png"
+import RRIntermediateImage from "../../images/RRIntermediateImage.png"
 
 export interface IntermediateProps {}
 

src/pages/studentDashboard/Games.tsx

@@ -2,7 +2,7 @@ import { Stack, Typography } from "@mui/material"
 import { type FC } from "react"
 
 import { Card } from "../../components"
-import RRLogoGreenImage from "../../images/RR_logo_green.svg"
+import RRLogoGreenImage from "../../images/RRGreenLogoImage.svg"
 import { paths } from "../../routes"
 
 export interface GamesProps {}

src/pages/studentDashboard/RapidRouterProgress.tsx

@@ -5,7 +5,7 @@ import { Image } from "codeforlife/components"
 import { LinkButton } from "codeforlife/components/router"
 
 // import { useRetrieveUserQuery } from "../../api/rapidRouter"
-import RRLogoImage from "../../images/RR_logo.svg"
+import RRLogoImage from "../../images/RRLogoImage.svg"
 import { paths } from "../../routes"
 
 const GetRapidRouterScores: React.FC = () => {

src/pages/teacherDashboard/classes/releaseStudents/ReleaseStudents.tsx

@@ -80,14 +80,14 @@ const ReleaseStudents: FC<ReleaseStudentsProps> = () => {
     classId,
   })
 
-  return !(state && state.studentUsers && state.studentUsers.length) ? (
-    <Navigate to={classPath} replace />
-  ) : (
+  return state && state.studentUsers && state.studentUsers.length ? (
     <_ReleaseStudents
       classId={classId}
       classPath={classPath}
       studentUsers={state.studentUsers}
     />
+  ) : (
+    <Navigate to={classPath} replace />
   )
 }
 

src/pages/teacherDashboard/classes/studentsCredentials/StudentsCredentials.tsx

@@ -71,7 +71,7 @@ const _StudentsCredentials: FC<
       <Link
         className="back-to"
         to={generatePath(paths.teacher.dashboard.tab.classes.class._, {
-          classId: classId,
+          classId,
         })}
       >
         class
@@ -100,19 +100,19 @@ const StudentsCredentials: FC<StudentsCredentialsProps> = () => {
 
   const { classId } = params
 
-  return !(state && state.students && state.students.length && state.flow) ? (
+  return state && state.students && state.students.length && state.flow ? (
+    <_StudentsCredentials
+      classId={classId}
+      flow={state.flow}
+      students={state.students}
+    />
+  ) : (
     <Navigate
       to={generatePath(paths.teacher.dashboard.tab.classes.class._, {
         classId,
       })}
       replace
     />
-  ) : (
-    <_StudentsCredentials
-      classId={classId}
-      flow={state.flow}
-      students={state.students}
-    />
   )
 }
 

src/pages/teacherDashboard/classes/transferStudents/TransferStudents.tsx

@@ -98,14 +98,14 @@ const TransferStudents: FC<TransferStudentsProps> = () => {
     classId,
   })
 
-  return !(state && state.studentUsers && state.studentUsers.length) ? (
-    <Navigate to={classPath} replace />
-  ) : (
+  return state && state.studentUsers && state.studentUsers.length ? (
     <_TransferStudents
       classId={classId}
       classPath={classPath}
       studentUsers={state.studentUsers}
     />
+  ) : (
+    <Navigate to={classPath} replace />
   )
 }