Browse Source

magic code fix

master
Stephanie Gredell 3 weeks ago
parent
commit
503da2ac9d
  1. 7
      frontend/src/pages/LandingPage.tsx
  2. 7
      frontend/src/services/magicCodeService.ts

7
frontend/src/pages/LandingPage.tsx

@ -2,7 +2,7 @@ import { useState, useEffect } from 'react';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
import { OptimizedImage } from '../components/OptimizedImage/OptimizedImage'; import { OptimizedImage } from '../components/OptimizedImage/OptimizedImage';
import { MagicCodeInput } from '../components/MagicCodeInput/MagicCodeInput'; import { MagicCodeInput } from '../components/MagicCodeInput/MagicCodeInput';
import { getAppliedMagicCode } from '../services/magicCodeService'; import { getAppliedMagicCode, getMagicCodeSettings, hasActiveMagicCode } from '../services/magicCodeService';
import { getEnabledApps } from '../utils/appFilter'; import { getEnabledApps } from '../utils/appFilter';
const categoryEmojis: { [key: string]: string } = { const categoryEmojis: { [key: string]: string } = {
@ -35,11 +35,12 @@ export function LandingPage() {
const [showMagicCodeModal, setShowMagicCodeModal] = useState(false); const [showMagicCodeModal, setShowMagicCodeModal] = useState(false);
const [enabledApps, setEnabledApps] = useState(getEnabledApps()); const [enabledApps, setEnabledApps] = useState(getEnabledApps());
const appliedCode = getAppliedMagicCode(); const appliedCode = getAppliedMagicCode();
const magicCodeSettings = getMagicCodeSettings();
// Re-check enabled apps when magic code is applied/cleared // Re-check enabled apps when magic code is applied/cleared
useEffect(() => { useEffect(() => {
setEnabledApps(getEnabledApps()); setEnabledApps(getEnabledApps());
}, [appliedCode]); }, [appliedCode, magicCodeSettings?.enabledApps?.join(',')]);
return ( return (
<div className="bg-background"> <div className="bg-background">
@ -57,7 +58,7 @@ export function LandingPage() {
<section className="px-4 py-8"> <section className="px-4 py-8">
<div className="max-w-5xl mx-auto"> <div className="max-w-5xl mx-auto">
{!appliedCode && ( {!hasActiveMagicCode() && (
<div className="mb-6 text-center"> <div className="mb-6 text-center">
<button <button
onClick={() => setShowMagicCodeModal(true)} onClick={() => setShowMagicCodeModal(true)}

7
frontend/src/services/magicCodeService.ts

@ -33,6 +33,13 @@ export function getMagicCodeSettings(): MagicCodeSettings | null {
return null; return null;
} }
/**
* Returns true only if both the code and its settings exist
*/
export function hasActiveMagicCode(): boolean {
return !!(getAppliedMagicCode() && getMagicCodeSettings());
}
/** /**
* Check if a magic code is currently applied * Check if a magic code is currently applied
*/ */

Loading…
Cancel
Save