Merge pull request #11960 from ethereum/quizzes

Add back reverted quizzes: run-a-node, scaling, solo staking

public/content/roadmap/scaling/index.md

@@ -45,3 +45,5 @@ This second step is known as [“Danksharding”](/roadmap/danksharding/). It is
 ## Current progress {#current-progress}
 
 Proto-Danksharding is likely to be one of the earlier roadmap items to be implemented. The decentralized computation steps required to set it up are already underway and several clients have implemented prototypes for handling blob data. Full Danksharding is likely several years away, as it relies upon several other roadmap items being completed first. Decentralizing rollup infrastructure is likely to be a gradual process - there are many different rollups that are building slightly different systems and will fully decentralize at different rates.
+
+<QuizWidget quizKey="scaling" />

public/content/staking/solo/index.md

@@ -202,3 +202,5 @@ To unlock and receive your entire balance back you must also complete the proces
 - [How To: Shop For Ethereum Validator Hardware](https://www.youtube.com/watch?v=C2wwu1IlhDc) - _EthStaker 2022_
 - [Step by Step: How to join the Ethereum 2.0 Testnet](https://kb.beaconcha.in/guides/tutorial-eth2-multiclient) - _Butta_
 - [Eth2 Slashing Prevention Tips](https://medium.com/prysmatic-labs/eth2-slashing-prevention-tips-f6faa5025f50) - _Raul Jordan 2020_
+
+<QuizWidget quizKey="solo-staking" />

src/components/Quiz/QuizWidget/useQuizWidget.tsx

@@ -108,7 +108,9 @@ export const useQuizWidget = ({
     if (!showResults) return
 
     updateUserStats((prevStats) => {
-      const lastScore = prevStats.completed[quizKey][1]
+      const { completed } = prevStats
+      const hasResultsSaved = !!completed[quizKey]
+      const lastScore = hasResultsSaved ? prevStats.completed[quizKey][1] : 0
 
       if (numberOfCorrectAnswers < lastScore) return prevStats
 

src/components/Quiz/useLocalQuizData.ts

@@ -1,28 +1,24 @@
-import { CompletedQuizzes, UserStats } from "@/lib/types"
-
-import allQuizzesData from "@/data/quizzes"
+import { UserStats } from "@/lib/types"
 
 import { USER_STATS_KEY } from "@/lib/constants"
 
 import { useLocalStorage } from "@/hooks/useLocalStorage"
 
-/**
- * Contains each quiz id as key and <boolean, number> to indicate if its completed and the highest score in that quiz
- *
- * Initialize all quizzes as not completed
- */
-const INITIAL_COMPLETED_QUIZZES: CompletedQuizzes = Object.keys(
-  allQuizzesData
-).reduce((object, key) => ({ ...object, [key]: [false, 0] }), {})
-
 export const INITIAL_USER_STATS: UserStats = {
   score: 0,
   average: [],
-  completed: INITIAL_COMPLETED_QUIZZES,
+  completed: {},
 }
 
 export const useLocalQuizData = () => {
   const data = useLocalStorage(USER_STATS_KEY, INITIAL_USER_STATS)
 
+  // If the user has an old version of the app, convert the
+  // `completed` value from a string to an object.
+  const [current, setCurrent] = data
+  if (typeof current.completed === "string") {
+    setCurrent({ ...current, completed: JSON.parse(current.completed) })
+  }
+
   return data
 }

src/data/quizzes/index.ts

@@ -36,6 +36,18 @@ const quizzes: RawQuizzes = {
     title: "learn-quizzes:page-assets-merge",
     questions: ["h001", "h002", "h003", "h004", "h005"],
   },
+  "solo-staking": {
+    title: "solo",
+    questions: ["j001", "j002", "j004", "j005", "j006", "j007", "j008"],
+  },
+  scaling: {
+    title: "scaling",
+    questions: ["k001", "k002", "k003", "k004"],
+  },
+  "run-a-node": {
+    title: "run-a-node",
+    questions: ["l001", "l002", "l003", "l004", "l005", "l006"],
+  },
 }
 
 export const ethereumBasicsQuizzes: QuizzesSection[] = [
@@ -74,11 +86,26 @@ export const usingEthereumQuizzes: QuizzesSection[] = [
   {
     id: "nfts",
     level: "beginner",
+    next: "scaling",
+  },
+  {
+    id: "scaling",
+    level: "intermediate",
     next: "layer-2",
   },
   {
     id: "layer-2",
     level: "intermediate",
+    next: "run-a-node",
+  },
+  {
+    id: "run-a-node",
+    level: "intermediate",
+    next: "solo-staking",
+  },
+  {
+    id: "solo-staking",
+    level: "advanced",
   },
 ]