Skip to content

Commit

Permalink
Merge pull request #100 from Geo-Web-Project/develop
Browse files Browse the repository at this point in the history
Merge `develop` into `main`
  • Loading branch information
gravenp authored Feb 28, 2024
2 parents c25f5b0 + e1c77b9 commit 746a972
Show file tree
Hide file tree
Showing 53 changed files with 9,467 additions and 18,036 deletions.
1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
APP_ENV=testnet
15 changes: 7 additions & 8 deletions .env.mainnet
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
NEXT_PUBLIC_NETWORK_ID = 10
NEXT_PUBLIC_GRAPH_URI = https://api.thegraph.com/subgraphs/name/geo-web-project/geo-web-subgraph
NEXT_PUBLIC_CERAMIC_URI = https://ceramic.geoweb.network/
NEXT_PUBLIC_CERAMIC_CONNECT_NETWORK = "mainnet"
NEXT_PUBLIC_ANNUALRATE = 0.1
NEXT_PUBLIC_IPFS_GATEWAY = https://w3s.link
NEXT_PUBLIC_MODEL_VIEWER_IPFS_GATEWAY = https://w3s.link
NEXT_PUBLIC_IPFS_DELEGATE = "/dns4/ceramic.geoweb.network/tcp/443/https"
VITE_NETWORK_ID = 10
VITE_WORLD_ADDRESS =
VITE_WORLD_BLOCK_NUMBER =
VITE_GRAPH_URI = https://api.thegraph.com/subgraphs/name/geo-web-project/geo-web-subgraph
VITE_ANNUALRATE = 0.1
VITE_IPFS_GATEWAY = https://gateway.ipfs.io
VITE_LIVEPEER_API_KEY=8cdf71bd-3f27-46e8-991b-411a0f75b91f
15 changes: 7 additions & 8 deletions .env.testnet
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
NEXT_PUBLIC_NETWORK_ID = 420
NEXT_PUBLIC_GRAPH_URI = https://api.thegraph.com/subgraphs/name/geo-web-project/geo-web-testnet
NEXT_PUBLIC_CERAMIC_URI = https://ceramic-clay.geoweb.network/
NEXT_PUBLIC_CERAMIC_CONNECT_NETWORK = "testnet-clay"
NEXT_PUBLIC_ANNUALRATE = 0.1
NEXT_PUBLIC_IPFS_GATEWAY = https://w3s.link
NEXT_PUBLIC_MODEL_VIEWER_IPFS_GATEWAY = https://w3s.link
NEXT_PUBLIC_IPFS_DELEGATE = "/dns4/ceramic-clay.geoweb.network/tcp/443/https"
VITE_NETWORK_ID = 11155420
VITE_WORLD_ADDRESS = 0x943e0b3F1926008f2e1bEFCBc55FA2A75CeC2452
VITE_WORLD_BLOCK_NUMBER = 6992231
VITE_GRAPH_URI = https://api.studio.thegraph.com/query/51953/geo-web-op-sepolia/version/latest
VITE_ANNUALRATE = 0.1
VITE_IPFS_GATEWAY = https://gateway.ipfs.io
VITE_LIVEPEER_API_KEY=8cdf71bd-3f27-46e8-991b-411a0f75b91f
3 changes: 1 addition & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
{
"extends": ["next", "prettier"],
"extends": ["react-app", "prettier"],
"rules": {
"react-hooks/exhaustive-deps": "off",
"@next/next/no-img-element": "off",
"react/no-unescaped-entities": "off"
}
}
9 changes: 3 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,18 @@
# testing
/coverage

# Next.js build output
/.next

# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local

npm-debug.log*
yarn-debug.log*
yarn-error.log*

.envrc
.direnv

*.pem
dist/
tsconfig.tsbuildinfo
.vercel
4 changes: 2 additions & 2 deletions dec.d.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
declare module "ipfs-provider";
declare module "@orbisclub/components";
declare module "@ensdomains/content-hash";
declare module '@geo-web/mud-world-base-setup';
4 changes: 2 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
flake-utils.lib.eachDefaultSystem (system:
let pkgs = import nixpkgs {
overlays = [ (final: prev: {
nodejs = prev.nodejs-16_x;
nodejs = prev.nodejs-18_x;
}) ];
inherit system;
};
in {
devShells.default = pkgs.mkShell {
nativeBuildInputs = [ pkgs.yarn pkgs.nodejs-16_x pkgs.mkcert ];
nativeBuildInputs = [ pkgs.yarn pkgs.nodejs-18_x pkgs.mkcert ];
buildInputs = [ ];
};
});
Expand Down
17 changes: 17 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta
name="description"
content="Geospatial Browser for Accessing The Geo Web"
/>
<title>Geo Web Browser</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="react-root"></div>
<script type="module" src="/src/index.tsx"></script>
</body>
</html>
5 changes: 0 additions & 5 deletions next-env.d.ts

This file was deleted.

14 changes: 0 additions & 14 deletions next.config.js

This file was deleted.

60 changes: 32 additions & 28 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,48 +4,46 @@
"private": true,
"dependencies": {
"@apollo/client": "^3.7.16",
"@ceramicnetwork/blockchain-utils-linking": "^2.0.7",
"@ceramicnetwork/common": "^2.4.1",
"@ceramicnetwork/http-client": "^1.0.0",
"@ceramicnetwork/stream-tile": "^2.1.3",
"@geo-web/content": "^0.7.2",
"@geo-web/sdk": "^4.2.0",
"@augmented-worlds/system-babylonjs": "^0.1.16",
"@ensdomains/content-hash": "2.5.7",
"@geo-web/mud-world-base-contracts": "0.1.0",
"@geo-web/mud-world-base-setup": "0.1.2",
"@geo-web/sdk": "^4.4.0",
"@geo-web/types": "^0.2.0",
"@glazed/datamodel": "^0.3.1",
"@glazed/did-datastore": "^0.3.2",
"@glazed/did-session": "^0.1.1",
"@google/model-viewer": "^3.2.1",
"@livepeer/react": "^2.8.3",
"@material-ui/core": "^4.11.3",
"@material-ui/icons": "^4.11.2",
"@orbisclub/components": "^0.1.63",
"augmented-worlds": "^0.1.7",
"bn.js": "^5.2.1",
"bootstrap": "^5.2.3",
"caip": "^1.1.0",
"dotenv": "^16.0.3",
"ethereum-blockies-base64": "^1.0.2",
"ethers": "^5.0.27",
"graphql": "^15.8.0",
"ipfs-core": "^0.15.4",
"ipfs-http-client": "^59.0.0",
"ipfs-provider": "^2.1.0",
"next": "^12.2.5",
"multiformats": "^11.0.2",
"react": "^18.2.0",
"react-bootstrap": "^2.7.4",
"react-dom": "^18.2.0",
"typescript": "^4.7.4"
"react-router-dom": "^6.16.0",
"sass": "^1.62.1",
"swiper": "^10.2.0",
"three": "^0.156.1",
"typescript": "5.1.6",
"ua-parser-js": "^1.0.35"
},
"scripts": {
"dev-https": "local-ssl-proxy --key localhost-key.pem --cert localhost.pem --source 3001 --target 3000",
"dev": "next dev",
"build": "next build",
"export": "next export",
"start": "next start",
"lint": "next lint",
"build": "vite build --mode $APP_ENV",
"dev": "source .env && vite --mode $APP_ENV",
"preview": "vite preview",
"test": "tsc --noEmit",
"typecheck": "tsc --noEmit",
"lint": "eslint src",
"prettier": "prettier -w src/**"
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"production": [">0.2%", "not dead", "not op_mini all"],
"development": [
">0.2%",
"not dead",
Expand All @@ -56,17 +54,23 @@
]
},
"devDependencies": {
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"@testing-library/jest-dom": "^5.11.10",
"@testing-library/react": "^11.2.6",
"@testing-library/user-event": "^12.8.3",
"@types/debug": "^4.1.8",
"@types/jest": "^28.1.4",
"@types/node": "^18.0.3",
"@types/react": "^18.0.27",
"@types/react-dom": "^18.0.10",
"@types/ua-parser-js": "^0.7.36",
"@vitejs/plugin-react": "^4.0.4",
"eslint": "^7.32.0",
"eslint-config-next": "12.2.5",
"eslint-config-prettier": "^8.5.0",
"eslint-config-react-app": "^7.0.1",
"local-ssl-proxy": "^1.3.0",
"prettier": "^2.8.4"
"prettier": "^2.8.4",
"vite": "^4.4.9",
"vite-plugin-eslint": "^1.8.1"
}
}
Binary file removed public/3d/doge.glb
Binary file not shown.
3 changes: 3 additions & 0 deletions public/assets/ar-unavailable.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/assets/ar.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/assets/copy-dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/assets/copy-light.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
45 changes: 0 additions & 45 deletions public/index.html

This file was deleted.

31 changes: 31 additions & 0 deletions src/App.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
$primary: #2fc1c1;
$secondary: #4b5588;
$dark: #202333;
$purple: rgba(75, 85, 136, 0.25);
$info: #707179;
$gray: #e6e7ee;
$danger: #dc3545;
$light: #f8f9fa;
$success: #28a745;
$warning: #f7bdbd;

$theme-colors: (
"primary": $primary,
"secondary": $secondary,
"dark": $dark,
"purple": $purple,
"info": $info,
"gray": $gray,
"danger": $danger,
"light": $light,
"success": $success,
"warning": $warning,
);

$font-family-base: "Abel";

// @import "~bootstrap/scss/bootstrap";

body {
background: #202333;
}
55 changes: 55 additions & 0 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
import { useState, useEffect } from "react";
import GWLoader from "../src/components/common/Loader/Loader";
import GWS from "../src/container/GeoWebSystem/GWS";
import LandingModal from "../src/components/common/LandingModal/LandingModal";
import { LIVEPEER_API_KEY } from "../src/lib/constants";
import {
LivepeerConfig,
ThemeConfig,
createReactClient,
studioProvider,
} from "@livepeer/react";

import "../src/App.css";
import "../src/App.scss";
import "@augmented-worlds/system-babylonjs/styles.css";
import "swiper/css";
import "swiper/css/navigation";

const livepeerTheme: ThemeConfig = {
colors: {
accent: "#2fc1c1",
containerBorderColor: "rgba(0, 145, 255, 0.9)",
},
fonts: {
display: "Abel",
},
};

export function App() {
const [hasAgreedModal, setHasAgreedModal] = useState<boolean | null>(null);

const client = createReactClient({
provider: studioProvider({ apiKey: LIVEPEER_API_KEY }),
});

useEffect(() => {
(async () => {
setHasAgreedModal(
localStorage.getItem("gwHasAgreedModal") ? true : false
);
})();
}, []);

if (hasAgreedModal === null) {
return <GWLoader />;
} else if (hasAgreedModal) {
return (
<LivepeerConfig client={client} theme={livepeerTheme}>
<GWS />
</LivepeerConfig>
);
} else {
return <LandingModal setHasAgreedModal={setHasAgreedModal} />;
}
}
Loading

0 comments on commit 746a972

Please sign in to comment.