Merge pull request #17 from yednapg/main

hackclub · Dec 5, 2024 · 8b62e0a · 8b62e0a
2 parents c65f73e + 26a450f
commit 8b62e0a
Show file tree

Hide file tree

Showing 15 changed files with 10,756 additions and 7,296 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -1 +1,2 @@
-ios/**
+ios/**
+android/**
diff --git a/App.tsx b/App.tsx
@@ -7,6 +7,7 @@ import { useState, useEffect, useCallback } from "react";
 import { StatusBar, useColorScheme } from "react-native";
 import { SafeAreaProvider } from "react-native-safe-area-context";
 import { SWRConfig } from "swr";
+import { useFonts } from 'expo-font';
 
 import AuthContext from "./src/auth";
 import { getStateFromPath } from "./src/getStateFromPath";
@@ -48,10 +49,14 @@ const linking: LinkingOptions<TabParamList> = {
 };
 
 export default function App() {
+  const [fontsLoaded] = useFonts({
+    'JetBrainsMono-Regular': require('./assets/fonts/JetBrainsMono-Regular.ttf'),
+    'JetBrainsMono-Bold': require('./assets/fonts/JetBrainsMono-Bold.ttf'),
+  });
+
   const [isLoading, setIsLoading] = useState(true);
   const [token, setToken] = useState<string | null>(null);
   const hcb = useClient(token);
-
   const scheme = useColorScheme();
 
   const fetcher = useCallback(
@@ -84,7 +89,7 @@ export default function App() {
     if (typeof token == "string") SecureStorage.setItemAsync("token", token);
   }, [token]);
 
-  if (isLoading) {
+  if (!fontsLoaded || isLoading) {
     return null;
   } else if (!token) {
     return (

diff --git a/app.config.js b/app.config.js
@@ -21,7 +21,7 @@ export default {
     ios: {
       supportsTablet: true,
       bundleIdentifier: IS_DEV ? "com.hackclub.hcb.dev" : "com.hackclub.hcb",
-      buildNumber: "1.0.0.11",
+      buildNumber: "1.0.0.12",
       config: {
         usesNonExemptEncryption: false,
       },
@@ -57,7 +57,10 @@ export default {
       [
         "expo-font",
         {
-          fonts: ["./assets/fonts/JetBrainsMono-Regular.ttf"],
+          fonts: [
+            "./assets/fonts/JetBrainsMono-Regular.ttf",
+            "./assets/fonts/JetBrainsMono-Bold.ttf",
+          ],
         },
       ],
       "expo-secure-store",

diff --git a/assets/fonts/JetBrainsMono-Bold.ttf b/assets/fonts/JetBrainsMono-Bold.ttf
diff --git a/eas.json b/eas.json
@@ -14,7 +14,7 @@
       "env": {
         "EXPO_PUBLIC_API_BASE": "https://hcb.hackclub.com/api/v4",
         "EXPO_PUBLIC_CLIENT_ID": "yt8JHmPDmmYYLUmoEiGtocYwg5fSOGCrcIY3G-vkMRs",
-        "EXPO_PUBLIC_STRIPE_API_KEY": "pk_live_UAjIP1Kss29XZ6tW0MFWkjUQ" // "pk" stands for "publishable key" you wannabe hacker
+        "EXPO_PUBLIC_STRIPE_API_KEY": "pk_live_UAjIP1Kss29XZ6tW0MFWkjUQ"
       }
     }
   },