Skip to content

Commit

Permalink
Merge branch 'main' into fix-update-slider
Browse files Browse the repository at this point in the history
  • Loading branch information
WaDadidou authored Nov 25, 2024
2 parents ae5d305 + 2470e80 commit bbb8b48
Show file tree
Hide file tree
Showing 34 changed files with 819 additions and 613 deletions.
11 changes: 11 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -177,5 +177,16 @@ module.exports = {
},
files: ["packages/components/navigation/**"],
},
{
rules: {
"no-restricted-imports": [
"error",
{
patterns: [disallowScriptsImports],
},
],
},
files: ["packages/dapp-root/**", "apps/**"],
},
],
};
247 changes: 0 additions & 247 deletions Root.tsx

This file was deleted.

15 changes: 15 additions & 0 deletions apps/gno-dapp/App.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { AppConfig } from "@/context/AppConfigProvider";
import AppRoot from "@/dapp-root/App";

const config: AppConfig = {
disableBuyTokensButton: true,
disableDAppStore: true,
forceNetworkList: ["gno-test5", "gno-portal"],
forceDAppsList: ["feed", "organizations"],
defaultNetworkId: "gno-test5",
homeScreen: "Feed",
};

export const App: React.FC = () => {
return <AppRoot config={config} />;
};
8 changes: 8 additions & 0 deletions apps/gno-dapp/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { registerRootComponent } from "expo";

import { App } from "./App";

// registerRootComponent calls AppRegistry.registerComponent('main', () => App);
// It also ensures that whether you load the app in Expo Go or in a native build,
// the environment is set up appropriately
registerRootComponent(App);
9 changes: 9 additions & 0 deletions apps/gno-dapp/netlify.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[build]
command = 'sed -i "s/teritori-dapp/gno-dapp/" package.json && npm i -g sharp-cli && npx expo-optimize && npx expo export -p web'
publish = '/dist'
[build.environment]
NODE_OPTIONS = "--max_old_space_size=4096"
[[redirects]]
from = "/*"
to = "/index.html"
status = 200
11 changes: 11 additions & 0 deletions apps/teritori-dapp/App.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { AppConfig } from "@/context/AppConfigProvider";
import AppRoot from "@/dapp-root/App";

const config: AppConfig = {
defaultNetworkId: "teritori",
homeScreen: "Home",
};

export const App: React.FC = () => {
return <AppRoot config={config} />;
};
8 changes: 8 additions & 0 deletions apps/teritori-dapp/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { registerRootComponent } from "expo";

import { App } from "./App";

// registerRootComponent calls AppRegistry.registerComponent('main', () => App);
// It also ensures that whether you load the app in Expo Go or in a native build,
// the environment is set up appropriately
registerRootComponent(App);
File renamed without changes.
8 changes: 4 additions & 4 deletions gno/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
KEY = teritori-test4-seed
KEY = teritori
BASE = teritori
REMOTE = https://rpc.gno.land:443
CHAIN_ID = portal-loop
REMOTE = https://rpc.test5.gno.land
CHAIN_ID = test5

.PHONY: add_social_feeds_realm add_utf16_pkg add_ujson_pkg add_flags_index_pkg add_dao_interfaces_pkg add_social_feed all

Expand All @@ -21,7 +21,7 @@ add_social_feed:
-pkgpath "gno.land/r/${BASE}/social_feeds" \
-func="CreateFeed" \
-gas-fee="1000000ugnot" \
-gas-wanted="3000000" \
-gas-wanted="5000000" \
-remote="${REMOTE}" \
-chainid="${CHAIN_ID}" \
-broadcast \
Expand Down
20 changes: 10 additions & 10 deletions networks.json
Original file line number Diff line number Diff line change
Expand Up @@ -4615,9 +4615,9 @@
"txIndexerURL": "https://indexer.test3.gno.testnet.teritori.com"
},
{
"id": "gno-test4",
"id": "gno-test5",
"kind": "Gno",
"displayName": "Gno Test4",
"displayName": "Gno Test5",
"icon": "gno.svg",
"features": [
"SocialFeed",
Expand Down Expand Up @@ -4645,12 +4645,12 @@
}
],
"stakeCurrency": "ugnot",
"idPrefix": "gnotest4",
"chainId": "test4",
"endpoint": "https://rpc.test4.gno.land:443",
"txExplorer": "https://gnoscan.io/transactions/details?txhash=$hash&chainId=test4",
"accountExplorer": "https://gnoscan.io/accounts/$address?chainId=test4",
"contractExplorer": "https://gnoscan.io/realms/details?path=$address&chainId=test4",
"idPrefix": "gnotest5",
"chainId": "test5",
"endpoint": "https://rpc.test5.gno.land",
"txExplorer": "https://gnoscan.io/transactions/details?txhash=$hash&chainId=test5",
"accountExplorer": "https://gnoscan.io/accounts/$address?chainId=test5",
"contractExplorer": "https://gnoscan.io/realms/details?path=$address&chainId=test5",
"testnet": true,
"backendEndpoint": "https://dapp-backend.testnet.teritori.com",
"gnowebURL": "https://gno.land",
Expand All @@ -4660,8 +4660,8 @@
"socialFeedsPkgPath": "gno.land/r/teritori/social_feeds",
"socialFeedsDAOPkgPath": "gno.land/r/teritori/social_feeds_dao",
"daoInterfacesPkgPath": "gno.land/p/teritori/dao_interfaces",
"profilePkgPath": "gno.land/r/teritori/profile",
"txIndexerURL": "https://indexer.test4.gno.testnet.teritori.com"
"profilePkgPath": "gno.land/r/demo/profile",
"txIndexerURL": "https://indexer.test5.gno.testnet.teritori.com"
},
{
"id": "cosmos-registry:gravitybridge",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "teritori-dapp",
"version": "1.0.0",
"main": "node_modules/expo/AppEntry.js",
"main": "apps/teritori-dapp/index.js",
"scripts": {
"start": "expo start",
"android": "expo run:android",
Expand Down
Loading

0 comments on commit bbb8b48

Please sign in to comment.