Add hosting (#38)

.firebaserc

@@ -0,0 +1,5 @@
+{
+  "projects": {
+    "default": "mathflow-45dc3"
+  }
+}

.gitignore

@@ -2,4 +2,5 @@ node_modules
 .DS_Store
 dist
 *.local
-.eslintcache
+.eslintcache
+.firebase

firebase.json

@@ -0,0 +1,17 @@
+{
+  "firestore": {
+    "rules": "firestore.rules",
+    "indexes": "firestore.indexes.json"
+  },
+  "hosting": {
+    "predeploy": "npm run build",
+    "public": "dist",
+    "ignore": ["firebase.json", "**/.*", "**/node_modules/**"],
+    "rewrites": [
+      {
+        "source": "**",
+        "destination": "/index.html"
+      }
+    ]
+  }
+}

firestore.indexes.json

@@ -0,0 +1,4 @@
+{
+  "indexes": [],
+  "fieldOverrides": []
+}

firestore.rules

@@ -0,0 +1,9 @@
+rules_version = '2';
+service cloud.firestore {
+  match /databases/{database}/documents {
+    match /users/{userId}/{documents=**}{
+    	allow read, update, delete: if request.auth != null && request.auth.uid == userId;
+      allow create: if request.auth != null;
+    }
+  }
+}

src/ContextProviders/FirebaseComponentsProvider.tsx

@@ -1,6 +1,13 @@
 import { getFirestore } from "firebase/firestore"
 import { getAuth } from "firebase/auth"
-import { AuthProvider, FirestoreProvider, useFirebaseApp } from "reactfire"
+import {
+  AnalyticsProvider,
+  AuthProvider,
+  FirestoreProvider,
+  useFirebaseApp,
+  useInitPerformance,
+} from "reactfire"
+import { getAnalytics } from "firebase/analytics"
 
 export interface FirebaseComponentsProviderProps {
   children: React.ReactNode
@@ -13,10 +20,18 @@ export default ({ children }: FirebaseComponentsProviderProps) => {
   auth.useDeviceLanguage()
 
   const firestore = getFirestore(app)
+  const analytics = getAnalytics(app)
+
+  useInitPerformance(async (firebaseApp) => {
+    const { getPerformance } = await import("firebase/performance")
+    return getPerformance(firebaseApp)
+  })
 
   return (
     <AuthProvider sdk={auth}>
-      <FirestoreProvider sdk={firestore}>{children}</FirestoreProvider>
+      <FirestoreProvider sdk={firestore}>
+        <AnalyticsProvider sdk={analytics}>{children}</AnalyticsProvider>
+      </FirestoreProvider>
     </AuthProvider>
   )
 }

src/main.tsx

@@ -9,7 +9,7 @@ import FirebaseComponentsProvider from "./ContextProviders/FirebaseComponentsPro
 
 const firebaseConfig = {
   apiKey: "AIzaSyAtDkJ25eyhVCp4cqnMSBEEQzj6GXKF9B4",
-  authDomain: "mathflow-45dc3.firebaseapp.com",
+  authDomain: "mathflow.app",
   projectId: "mathflow-45dc3",
   storageBucket: "mathflow-45dc3.appspot.com",
   messagingSenderId: "917510915167",

src/math/arithmetic/basicOperations/divide.ts

@@ -8,10 +8,10 @@ export default (currentSkillLevel: SkillLevels): Challenge => {
     min = 0
     max = 10
   } else if (currentSkillLevel === "skilled") {
-    min = -10
+    min = 0
     max = 10
   } else if (currentSkillLevel === "pro") {
-    min = -15
+    min = 0
     max = 15
   } else if (currentSkillLevel === "expert") {
     min = -20

src/math/arithmetic/basicOperations/multiply.ts

@@ -8,10 +8,10 @@ export default (currentSkillLevel: SkillLevels): Challenge => {
     min = 0
     max = 10
   } else if (currentSkillLevel === "skilled") {
-    min = -10
+    min = 0
     max = 10
   } else if (currentSkillLevel === "pro") {
-    min = -15
+    min = 0
     max = 15
   } else if (currentSkillLevel === "expert") {
     min = -20

src/math/arithmetic/basicOperations/substract.ts

@@ -1,26 +1,36 @@
 import { getRandomInt } from "../../utils"
 
 export default (currentSkillLevel: SkillLevels): Challenge => {
-  let min = 0
-  let max = 10
+  let minA = 0
+  let maxA = 5
+  let minB = 5
+  let maxB = 10
 
   if (currentSkillLevel === "unknown" || currentSkillLevel === "beginner") {
-    min = 0
-    max = 10
+    minA = 5
+    maxA = 10
+    minB = 0
+    maxB = 5
   } else if (currentSkillLevel === "skilled") {
-    min = -50
-    max = 50
+    minA = 25
+    maxA = 50
+    minB = 0
+    maxB = 25
   } else if (currentSkillLevel === "pro") {
-    min = -100
-    max = 100
+    minA = 25
+    maxA = 50
+    minB = 0
+    maxB = 25
   } else if (currentSkillLevel === "expert") {
-    min = -100
-    max = 100
+    minA = 25
+    maxA = 50
+    minB = 0
+    maxB = 25
   }
 
-  const a = getRandomInt(min, max)
+  const a = getRandomInt(minA, maxA)
 
-  const b = getRandomInt(min, max)
+  const b = getRandomInt(minB, maxB)
 
   return {
     description: "Ratkaise",

src/math/arithmetic/exponentiationAndRoot/exponentiation.ts

@@ -12,14 +12,14 @@ export default (currentSkillLevel: SkillLevels): Challenge => {
     exponentMin = 1
     exponentMax = 2
   } else if (currentSkillLevel === "skilled") {
-    baseMin = -5
+    baseMin = 0
     baseMax = 5
     exponentMin = 0
     exponentMax = 3
   } else if (currentSkillLevel === "pro") {
-    baseMin = -6
-    baseMax = 6
-    exponentMin = -3
+    baseMin = 0
+    baseMax = 5
+    exponentMin = 0
     exponentMax = 3
   } else if (currentSkillLevel === "expert") {
     baseMin = -10

src/views/learningSession/LearningSession.tsx

@@ -17,7 +17,8 @@ import {
 } from "@chakra-ui/react"
 import { useEffect, useState, useRef } from "react"
 import { useNavigate, useLocation } from "react-router-dom"
-import { useFirestore } from "reactfire"
+import { useAnalytics, useFirestore } from "reactfire"
+import { logEvent } from "firebase/analytics"
 import MathDisplay from "../../sharedComponents/MathDisplay"
 import MathField from "../../sharedComponents/MathField"
 import recommendationAlgorithm, {
@@ -54,6 +55,7 @@ export default () => {
   const { mode, categoryKey, topicKey, subTopicKey } =
     (state as SubTopicViewNavigateState) || {}
 
+  const analytics = useAnalytics()
   const firestore = useFirestore()
   const user = useCurrentUser()
 
@@ -82,6 +84,7 @@ export default () => {
 
     if (subTopicRef.current === ALL_DONE) {
       alert("Wau! Oot Pro kaikessa, onnittelut!")
+      logEvent(analytics, "all_done")
       navigate("/progress")
       return
     }