Skip to content

Commit

Permalink
make today's name optional
Browse files Browse the repository at this point in the history
  • Loading branch information
kavigupta committed Jan 6, 2025
1 parent 6145d3d commit db1bb55
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
4 changes: 2 additions & 2 deletions react/src/components/quiz-panel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { QuizQuestionDispatch } from '../quiz/quiz-question'
import { QuizResult } from '../quiz/quiz-result'
import { useHeaderTextClass } from '../utils/responsive'

export function QuizPanel(props: { quizDescriptor: QuizDescriptor, todayName: string, todaysQuiz: QuizQuestionsModel }): ReactNode {
export function QuizPanel(props: { quizDescriptor: QuizDescriptor, todayName?: string, todaysQuiz: QuizQuestionsModel }): ReactNode {
// set a unique key for the quiz panel so that it will re-render when the quiz changes
// this is necessary because the quiz panel is a stateful component with all the questions cached.
return (
Expand All @@ -22,7 +22,7 @@ export function QuizPanel(props: { quizDescriptor: QuizDescriptor, todayName: st
)
}

function QuizPanelNoResets(props: { quizDescriptor: QuizDescriptor, todayName: string, todaysQuiz: QuizQuestionsModel }): ReactNode {
function QuizPanelNoResets(props: { quizDescriptor: QuizDescriptor, todayName?: string, todaysQuiz: QuizQuestionsModel }): ReactNode {
// We don't want to save certain quiz types, so bypass the persistent store for those
const headerClass = useHeaderTextClass()
const persistentQuizHistory = QuizLocalStorage.shared.history.use()
Expand Down
2 changes: 1 addition & 1 deletion react/src/navigation/PageDescriptor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ export type PageData =
| { kind: 'index' }
| { kind: 'about' }
| { kind: 'dataCredit' }
| { kind: 'quiz', quizDescriptor: QuizDescriptor, quiz: QuizQuestionsModel, parameters: string, todayName: string }
| { kind: 'quiz', quizDescriptor: QuizDescriptor, quiz: QuizQuestionsModel, parameters: string, todayName?: string }
| { kind: 'mapper', settings: MapSettings, view: boolean }
| {
kind: 'error'
Expand Down
12 changes: 8 additions & 4 deletions react/src/quiz/quiz-result.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export type CorrectPattern = (boolean | 0 | 1)[]

interface QuizResultProps {
quizDescriptor: QuizDescriptor
todayName: string
todayName?: string
history: {
// eslint-disable-next-line no-restricted-syntax -- Persistent data
correct_pattern: CorrectPattern
Expand Down Expand Up @@ -149,7 +149,7 @@ export function QuizResult(props: QuizResultProps): ReactNode {

interface ShareButtonProps {
buttonRef: React.RefObject<HTMLButtonElement>
todayName: string
todayName: string | undefined
correctPattern: CorrectPattern
quizKind: QuizKind
}
Expand Down Expand Up @@ -345,10 +345,14 @@ export function Summary(props: { correctPattern: CorrectPattern, quizKind: QuizK
)
}

export async function summary(juxtaColors: JuxtastatColors, todayName: string, correctPattern: CorrectPattern, quizKind: QuizKind): Promise<[string, string]> {
export async function summary(juxtaColors: JuxtastatColors, todayName: string | undefined, correctPattern: CorrectPattern, quizKind: QuizKind): Promise<[string, string]> {
// wordle-style summary
const [, summaryText] = summaryTexts(correctPattern, quizKind)
let text = `${nameOfQuizKind(quizKind)} ${todayName} ${summaryText}`
let text = nameOfQuizKind(quizKind)
if (todayName !== undefined) {
text += ` ${todayName}`
}
text += ` ${summaryText}`

text += '\n'
text += '\n'
Expand Down

0 comments on commit db1bb55

Please sign in to comment.