Merge pull request #33 from markxoe/development

Version 0.14.1

.github/workflows/build-and-test.yml

@@ -1,7 +1,7 @@
 name: Test And Build
 on: [push]
 jobs:
-  doall:
+  testing:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -16,6 +16,20 @@ jobs:
         run: npm test
       - name: Building
         run: npm run build
+  buildnative:
+    needs: testing
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup Node
+        uses: actions/setup-node@v1
+        with:
+          node-version: 12
+      - name: Installing
+        run: npm ci
+      - name: Building
+        run: npm run build
       - name: Copy to native apps
         run: npx cap copy
       - name: Update Android Dependencies

android/app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "org.toastbrot.ichbineinebienemobile"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 31
-        versionName "0.14.0"
+        versionCode 32
+        versionName "0.14.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

ios/App/App.xcodeproj/project.pbxproj

@@ -353,12 +353,12 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 25;
+				CURRENT_PROJECT_VERSION = 26;
 				DEVELOPMENT_TEAM = 7BZBLBDUSX;
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 0.14.0;
+				MARKETING_VERSION = 0.14.1;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = org.toastbrot.ichbineinebienemobile;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -375,12 +375,12 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 25;
+				CURRENT_PROJECT_VERSION = 26;
 				DEVELOPMENT_TEAM = 7BZBLBDUSX;
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 0.14.0;
+				MARKETING_VERSION = 0.14.1;
 				PRODUCT_BUNDLE_IDENTIFIER = org.toastbrot.ichbineinebienemobile;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = USE_PUSH;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ichbineinebiene-mobile",
-  "version": "0.14.0",
+  "version": "0.14.1",
   "private": true,
   "dependencies": {
     "@capacitor-community/firebase-analytics": "^0.2.0",

readme.md

@@ -37,6 +37,12 @@ Mark Oude Elberink
 
 ## Changelog
 
+### [0.14.1] Chicken Cats :rooster: :cat:
+
+- Discord Link
+- Erweiterte Hall of Fame
+- Mini Bug Fix
+
 ### [0.14.0] Chicken Cats :rooster: :cat:
 
 - Warnung vor Bann

src/pages/Home.tsx

@@ -22,9 +22,16 @@ import {
   IonToolbar,
   isPlatform,
   useIonViewWillEnter,
+  IonFabList,
 } from "@ionic/react";
 import React, { useContext, useEffect, useState } from "react";
-import { refreshOutline, storefront, bug } from "ionicons/icons";
+import {
+  refreshOutline,
+  storefront,
+  bug,
+  logoDiscord,
+  planet,
+} from "ionicons/icons";
 import "./Home.css";
 import packagejs from "../../package.json";
 import releaseNotes from "../other/release-notes.json";
@@ -55,6 +62,7 @@ import {
   rotateSpeedLevel,
   nameAtHomePositions,
   uploadEvent,
+  generateToast,
 } from "../globals";
 
 import { FirebaseAnalyticsPlugin } from "@capacitor-community/firebase-analytics";
@@ -206,24 +214,35 @@ const Home: React.FC = () => {
   }, [state]);
 
   const reactivatePopup = () => {
-    const el = document.createElement("ion-alert");
-    el.header = "Goldene Biene";
-    el.subHeader = "Verliere alles und bekomme eine Goldene Bienen";
-    el.message =
-      "Du hast offiziell die Biene durchgespielt.<br/>" +
-      "Denn du hast mehr als " +
-      MAX_VALUE +
-      "Saltos!<br/>" +
-      "So geht's weiter: Du verlierst jetzt ALLE Bienen, alle Multiplier und alle Saltos.<br/>" +
-      "<b>ABER du bekommst eine goldene Biene!</b><br/>" +
-      "Goldene Bienen haben unterschiedliche Farben!<br/>" +
-      "Es gibt sowieso keine Alternative";
-    el.buttons = [
-      { text: "Erstmal Screenshot machen", role: "cancel" },
-      { text: "Let's do it!", handler: () => resetAndGoldenBee() },
-    ];
-    document.body.appendChild(el);
-    el.present();
+    if (
+      state.biene.additionalBienen.length > MAX_ARRAY_LENGTH ||
+      state.biene.multiplierLevel > MAX_VALUE ||
+      state.biene.clickCounter > MAX_VALUE
+    ) {
+      const el = document.createElement("ion-alert");
+      el.header = "Goldene Biene";
+      el.subHeader = "Verliere alles und bekomme eine Goldene Bienen";
+      el.message =
+        "Du hast offiziell die Biene durchgespielt.<br/>" +
+        "Denn du hast mehr als " +
+        MAX_VALUE +
+        "Saltos!<br/>" +
+        "So geht's weiter: Du verlierst jetzt ALLE Bienen, alle Multiplier und alle Saltos.<br/>" +
+        "<b>ABER du bekommst eine goldene Biene!</b><br/>" +
+        "Goldene Bienen haben unterschiedliche Farben!<br/>" +
+        "Es gibt sowieso keine Alternative";
+      el.buttons = [
+        { text: "Erstmal Screenshot machen", role: "cancel" },
+        { text: "Let's do it!", handler: () => resetAndGoldenBee() },
+      ];
+      document.body.appendChild(el);
+      el.present();
+    } else {
+      generateToast(
+        "Okay, irgendwas stimmt nicht! Starte die Biene bitte neu!"
+      );
+      setDisabled(false);
+    }
   };
   const resetAndGoldenBee = () => {
     uploadEvent(state, { type: "GoldenBee" });
@@ -496,30 +515,37 @@ const Home: React.FC = () => {
         </IonFab>
 
         <IonFab vertical="bottom" horizontal="start" slot="fixed">
-          <IonFabButton
-            color="light"
-            onClick={() => {
-              const el = document.createElement("ion-alert");
-              el.message =
-                "Du hast einen Bug gefunden oder neue Ideen für die Biene?<br/>Her damit!";
-              el.header = "Bug oder Idee?";
-              el.buttons = [
-                { text: "Nö", role: "cancel" },
-                {
-                  text: "Gönnung",
-                  handler: () =>
-                    Plugins.Browser.open({
-                      url:
-                        "https://github.com/markxoe/ich-bin-eine-biene-mobile/issues",
-                    }),
-                },
-              ];
-              el.translucent = true;
-              document.body.appendChild(el);
-              el.present();
-            }}>
-            <IonIcon icon={bug} />
+          <IonFabButton color="light">
+            <IonIcon icon={planet} />
           </IonFabButton>
+          <IonFabList side="top">
+            <IonFabButton
+              onClick={() => {
+                const el = document.createElement("ion-alert");
+                el.message =
+                  "Du hast einen Bug gefunden oder neue Ideen für die Biene?<br/>Her damit!";
+                el.header = "Bug oder Idee?";
+                el.buttons = [
+                  { text: "Nö", role: "cancel" },
+                  {
+                    text: "Gönnung",
+                    handler: () =>
+                      Plugins.Browser.open({
+                        url:
+                          "https://github.com/markxoe/ich-bin-eine-biene-mobile/issues",
+                      }),
+                  },
+                ];
+                el.translucent = true;
+                document.body.appendChild(el);
+                el.present();
+              }}>
+              <IonIcon icon={bug} />
+            </IonFabButton>
+            <IonFabButton href="https://ichbineinebiene.org/dc/">
+              <IonIcon icon={logoDiscord} />
+            </IonFabButton>
+          </IonFabList>
         </IonFab>
 
         <IonModal

src/pages/Leaderboard.tsx

@@ -15,6 +15,7 @@ import {
   IonToolbar,
   useIonViewWillEnter,
   IonText,
+  IonButton,
 } from "@ionic/react";
 import Axios from "axios";
 import React, { useContext, useState, useEffect } from "react";
@@ -25,7 +26,7 @@ import avatar from "../res/avatar.svg";
 import { AppContext } from "../store/State";
 
 const PageLeaderboard: React.FC = () => {
-  const showNumber = 30;
+  const [showNumber, setShowNumber] = useState<number>(30);
   const [data, setData] = useState<
     {
       level: number;
@@ -158,9 +159,16 @@ const PageLeaderboard: React.FC = () => {
               )}
             </IonItem>
           ))}
+
         <IonItem hidden={data.length < showNumber}>
           Und noch {data.length - showNumber} weitere...
         </IonItem>
+        <IonItem hidden={data.length < showNumber}>
+          <IonButton onClick={() => setShowNumber((i) => i + 20)}>
+            20 mehr anzeigen
+          </IonButton>
+        </IonItem>
+
         <IonCard>
           <IonCardHeader>
             <IonCardTitle>So wirst du Erster</IonCardTitle>
@@ -172,7 +180,7 @@ const PageLeaderboard: React.FC = () => {
             <br />
             Multiplier zählen weniger als eine Biene
             <br />
-            Goldene Bienen bringen 10000 Punkte
+            Goldene Bienen bringen 100000 Punkte
           </IonCardContent>
         </IonCard>
       </IonContent>

src/pages/Settings.tsx

@@ -365,7 +365,9 @@ const PageSettings: React.FC = () => {
               </a>
             </p>
             <p>
-              <a className="no-decoration" href="https://moritz-lerch.de">
+              <a
+                className="no-decoration"
+                href="https://github.com/MoritzLerch">
                 Moritz
               </a>
             </p>

src/pages/Store.tsx

@@ -55,11 +55,13 @@ import Confetti from "react-confetti";
 import { FirebaseAnalyticsPlugin } from "@capacitor-community/firebase-analytics";
 import { generateName } from "../functions/namegenerator";
 import { MAX_VALUE } from "../other/const";
+import { useLocation } from "react-router";
 const Firebase = Plugins.FirebaseAnalytics as FirebaseAnalyticsPlugin;
 
 const StorePage: React.FC = () => {
   const { state, dispatch } = useContext(AppContext);
   const [showThx, setShowThx] = useState<boolean>(false);
+  const location = useLocation();
 
   const additionalBeePrice = getAdditionalBeePrice(state);
   const rotateSpeedLevelPrice = getRotateSpeedLevelPrice(state);
@@ -74,14 +76,15 @@ const StorePage: React.FC = () => {
   });
 
   useEffect(() => {
-    if (state.dataLoadedFromMemory) uploadData(state);
+    if (state.dataLoadedFromMemory && location.pathname.includes("store"))
+      uploadData(state);
     // Generate Random Name, if User has no Name
     if (!state.userName && state.dataLoadedFromMemory)
       dispatch({
         type: "setUserName",
         payload: generateName(),
       });
-  }, [state, dispatch]);
+  }, [state, dispatch, location.pathname]);
 
   useEffect(() => {
     const _values: { name: string; value: string }[] = [