Merge branch 'main' into feat/eth-season-2

TERITORI · Dec 3, 2024 · 7e9e14d · 7e9e14d
2 parents a521526 + 00a9f1f
commit 7e9e14d
Show file tree

Hide file tree

Showing 19 changed files with 766 additions and 90 deletions.
diff --git a/.gitignore b/.gitignore
@@ -107,4 +107,8 @@ artifacts
 rust/cw-contracts/*/target
 
 # cypress
-cypress/screenshots
+cypress/screenshots
+
+# multi-app
+/app-selector.js
+/app.config.js
diff --git a/app-selector.js b/app-selector.js
@@ -0,0 +1 @@
+require("./apps/teritori/index");
diff --git a/app.config.js b/app.config.js
@@ -1,79 +1 @@
-const config = {
-  expo: {
-    name: "Teritori",
-    slug: "teritori",
-    version: "1.0.3",
-    orientation: "portrait",
-    icon: "./assets/app-icon.png",
-    owner: "teritori",
-    userInterfaceStyle: "light",
-    splash: {
-      image: "./assets/splash.png",
-      resizeMode: "contain",
-      backgroundColor: "#000000",
-    },
-    updates: {
-      fallbackToCacheTimeout: 0,
-    },
-    assetBundlePatterns: ["**/*"],
-    ios: {
-      supportsTablet: true,
-      bundleIdentifier: "com.teritori",
-      buildNumber: "5",
-      infoPlist: {
-        NSBluetoothAlwaysUsageDescription: "Used for Bluetooth communications",
-        NSBluetoothPeripheralUsageDescription:
-          "Used for Bluetooth communications",
-        NSPhotoLibraryUsageDescription:
-          "Access to your photo library is required for image upload functionality.",
-        ITSAppUsesNonExemptEncryption: false,
-        UIBackgroundModes: ["audio"],
-      },
-    },
-    android: {
-      package: "com.teritori",
-      versionCode: "6",
-      permissions: [
-        "WAKE_LOCK",
-        "BLUETOOTH",
-        "BLUETOOTH_ADMIN",
-        "BLUETOOTH_ADVERTISE",
-        "BLUETOOTH_SCAN",
-        "BLUETOOTH_CONNECT",
-        "ACCESS_NETWORK_STATE",
-        "CHANGE_NETWORK_STATE",
-        "CHANGE_WIFI_STATE",
-        "ACCESS_WIFI_STATE",
-        "CHANGE_WIFI_MULTICAST_STATE",
-        "NFC",
-      ],
-    },
-    web: {
-      bundler: "metro",
-      favicon: "./assets/favicon.png",
-    },
-    extra: {
-      eas: {
-        projectId: "9ce165de-0199-478c-b3bd-8688e5ce03eb",
-      },
-    },
-    plugins: [
-      "expo-font",
-      [
-        "expo-document-picker",
-        {
-          iCloudContainerEnvironment: "Production",
-        },
-      ],
-      [
-        "react-native-vision-camera",
-        {
-          cameraPermissionText: "$(PRODUCT_NAME) needs access to your Camera.",
-          enableCodeScanner: true,
-        },
-      ],
-    ],
-  },
-};
-
-export default config;
+module.exports = require("./apps/teritori/app.config.js");
diff --git a/apps/gno-dapp/App.tsx → apps/gnotribe/App.tsx b/apps/gno-dapp/App.tsx → apps/gnotribe/App.tsx
@@ -1,3 +1,4 @@
+import logo from "@/assets/logos/gnotribe-toplogo.svg";
 import { AppConfig } from "@/context/AppConfigProvider";
 import AppRoot from "@/dapp-root/App";
 
@@ -8,6 +9,7 @@ const config: AppConfig = {
   forceDAppsList: ["feed", "organizations"],
   defaultNetworkId: "gno-test5",
   homeScreen: "Feed",
+  logo,
 };
 
 export const App: React.FC = () => {

diff --git a/apps/gnotribe/app.config.js b/apps/gnotribe/app.config.js
@@ -0,0 +1,77 @@
+module.exports = {
+  expo: {
+    name: "Gnotribe",
+    slug: "gnotribe",
+    version: "1.0.3",
+    orientation: "portrait",
+    icon: "./apps/gnotribe/icon.png",
+    owner: "gnotribe",
+    userInterfaceStyle: "light",
+    splash: {
+      image: "./assets/splash.png",
+      resizeMode: "contain",
+      backgroundColor: "#000000",
+    },
+    updates: {
+      fallbackToCacheTimeout: 0,
+    },
+    assetBundlePatterns: ["**/*"],
+    ios: {
+      supportsTablet: true,
+      bundleIdentifier: "com.teritori.gnotribe",
+      buildNumber: "5",
+      infoPlist: {
+        NSBluetoothAlwaysUsageDescription: "Used for Bluetooth communications",
+        NSBluetoothPeripheralUsageDescription:
+          "Used for Bluetooth communications",
+        NSPhotoLibraryUsageDescription:
+          "Access to your photo library is required for image upload functionality.",
+        ITSAppUsesNonExemptEncryption: false,
+        UIBackgroundModes: ["audio"],
+      },
+    },
+    android: {
+      package: "com.teritori.gnotribe",
+      versionCode: 6,
+      permissions: [
+        "WAKE_LOCK",
+        "BLUETOOTH",
+        "BLUETOOTH_ADMIN",
+        "BLUETOOTH_ADVERTISE",
+        "BLUETOOTH_SCAN",
+        "BLUETOOTH_CONNECT",
+        "ACCESS_NETWORK_STATE",
+        "CHANGE_NETWORK_STATE",
+        "CHANGE_WIFI_STATE",
+        "ACCESS_WIFI_STATE",
+        "CHANGE_WIFI_MULTICAST_STATE",
+        "NFC",
+      ],
+    },
+    web: {
+      bundler: "metro",
+      favicon: "./apps/gnotribe/icon.png",
+    },
+    extra: {
+      eas: {
+        projectId: "9ce165de-0199-478c-b3bd-8688e5ce03eb",
+      },
+    },
+    plugins: [
+      "expo-font",
+      [
+        "expo-document-picker",
+        {
+          iCloudContainerEnvironment: "Production",
+        },
+      ],
+      [
+        "react-native-vision-camera",
+        {
+          cameraPermissionText: "$(PRODUCT_NAME) needs access to your Camera.",
+          enableCodeScanner: true,
+        },
+      ],
+    ],
+  },
+};
diff --git a/apps/gnotribe/icon.png b/apps/gnotribe/icon.png
diff --git a/apps/gno-dapp/index.js → apps/gnotribe/index.js b/apps/gno-dapp/index.js → apps/gnotribe/index.js
diff --git a/apps/teritori-dapp/netlify.toml → apps/gnotribe/netlify.toml b/apps/teritori-dapp/netlify.toml → apps/gnotribe/netlify.toml
@@ -1,5 +1,5 @@
 [build]
-command = 'npm i -g sharp-cli && npx expo-optimize && npx expo export -p web'
+command = 'npx tsx packages/scripts/switch-app gnotribe && npm i -g sharp-cli && npx expo-optimize && npx expo export -p web'
 publish = '/dist'
 [build.environment]
 NODE_OPTIONS = "--max_old_space_size=4096"

diff --git a/apps/teritori-dapp/App.tsx → apps/teritori/App.tsx b/apps/teritori-dapp/App.tsx → apps/teritori/App.tsx
diff --git a/apps/teritori/app.config.js b/apps/teritori/app.config.js
@@ -0,0 +1,77 @@
+module.exports = {
+  expo: {
+    name: "Teritori",
+    slug: "teritori",
+    version: "1.0.3",
+    orientation: "portrait",
+    icon: "./assets/app-icon.png",
+    owner: "teritori",
+    userInterfaceStyle: "light",
+    splash: {
+      image: "./assets/splash.png",
+      resizeMode: "contain",
+      backgroundColor: "#000000",
+    },
+    updates: {
+      fallbackToCacheTimeout: 0,
+    },
+    assetBundlePatterns: ["**/*"],
+    ios: {
+      supportsTablet: true,
+      bundleIdentifier: "com.teritori",
+      buildNumber: "5",
+      infoPlist: {
+        NSBluetoothAlwaysUsageDescription: "Used for Bluetooth communications",
+        NSBluetoothPeripheralUsageDescription:
+          "Used for Bluetooth communications",
+        NSPhotoLibraryUsageDescription:
+          "Access to your photo library is required for image upload functionality.",
+        ITSAppUsesNonExemptEncryption: false,
+        UIBackgroundModes: ["audio"],
+      },
+    },
+    android: {
+      package: "com.teritori",
+      versionCode: 6,
+      permissions: [
+        "WAKE_LOCK",
+        "BLUETOOTH",
+        "BLUETOOTH_ADMIN",
+        "BLUETOOTH_ADVERTISE",
+        "BLUETOOTH_SCAN",
+        "BLUETOOTH_CONNECT",
+        "ACCESS_NETWORK_STATE",
+        "CHANGE_NETWORK_STATE",
+        "CHANGE_WIFI_STATE",
+        "ACCESS_WIFI_STATE",
+        "CHANGE_WIFI_MULTICAST_STATE",
+        "NFC",
+      ],
+    },
+    web: {
+      bundler: "metro",
+      favicon: "./assets/favicon.png",
+    },
+    extra: {
+      eas: {
+        projectId: "9ce165de-0199-478c-b3bd-8688e5ce03eb",
+      },
+    },
+    plugins: [
+      "expo-font",
+      [
+        "expo-document-picker",
+        {
+          iCloudContainerEnvironment: "Production",
+        },
+      ],
+      [
+        "react-native-vision-camera",
+        {
+          cameraPermissionText: "$(PRODUCT_NAME) needs access to your Camera.",
+          enableCodeScanner: true,
+        },
+      ],
+    ],
+  },
+};
diff --git a/apps/teritori-dapp/index.js → apps/teritori/index.js b/apps/teritori-dapp/index.js → apps/teritori/index.js
diff --git a/apps/gno-dapp/netlify.toml → apps/teritori/netlify.toml b/apps/gno-dapp/netlify.toml → apps/teritori/netlify.toml
@@ -1,5 +1,5 @@
 [build]
-command = 'sed -i "s/teritori-dapp/gno-dapp/" package.json && npm i -g sharp-cli && npx expo-optimize && npx expo export -p web'
+command = 'npx tsx packages/scripts/switch-app teritori && npm i -g sharp-cli && npx expo-optimize && npx expo export -p web'
 publish = '/dist'
 [build.environment]
 NODE_OPTIONS = "--max_old_space_size=4096"