chore: fix conflicts

2022-12-07 15:49:08 -03:00 · 2022-12-07 15:49:08 -03:00 · b426d718f6
parent 9cf5a5ad9e 315672243b
commit b426d718f6
18 changed files with 3322 additions and 641 deletions
--- a/.gitignore
+++ b/.gitignore
@ -6,4 +6,5 @@ cache
 artifacts

 # NPM
-package-lock.json
+package-lock.json
+artifacts 
--- a/scripts/mint.js
+++ b/scripts/mint.js
@ -1,4 +1,4 @@
-require('dotenv').config();
+// npx hardhat run scripts/mint.js --network polygonMumbai

 // TODO: make this arguments
 const contractAddress = '0x91A425C1CA320A99a09BE1bee114Fce5d30153d9';
--- a/scripts/tokenURI.js
+++ b/scripts/tokenURI.js
@ -1,4 +1,4 @@
-require('dotenv').config();
+// npx hardhat run scripts/tokenURI.js --network polygonMumbai

 // TODO: make this arguments
 const contractAddress = '0x91A425C1CA320A99a09BE1bee114Fce5d30153d9';
--- a/scripts/upgrade.js
+++ b/scripts/upgrade.js
@ -1,4 +1,4 @@
-require('dotenv').config();
+// npx hardhat run scripts/upgrade.js --network polygonMumbai

 // TODO: make this arguments
 const contractAddress = '0x91A425C1CA320A99a09BE1bee114Fce5d30153d9';
--- a/ui/.eslintignore
+++ b/ui/.eslintignore
@ -0,0 +1,2 @@
+node_modules
+public
--- a/ui/.eslintrc.js
+++ b/ui/.eslintrc.js
@ -0,0 +1,29 @@
+module.exports = {
+  env: {
+    browser: true,
+    es2021: true,
+  },
+  extends: [
+    'eslint:recommended',
+    'plugin:react/recommended',
+    'plugin:@typescript-eslint/recommended',
+    'plugin:prettier/recommended',
+  ],
+  overrides: [],
+  parser: '@typescript-eslint/parser',
+  parserOptions: {
+    ecmaVersion: 'latest',
+    sourceType: 'module',
+  },
+  plugins: ['react', '@typescript-eslint', 'simple-import-sort'],
+  rules: {
+    '@typescript-eslint/explicit-function-return-type': [
+      'error',
+      { allowExpressions: true },
+    ],
+    '@typescript-eslint/no-namespace': 'off',
+    'simple-import-sort/imports': 2,
+    '@typescript-eslint/explicit-function-return-type': 'off',
+    'no-console': 'error',
+  },
+};
--- a/ui/.gitignore
+++ b/ui/.gitignore
@ -0,0 +1 @@
+dist
--- a/ui/.prettierrc
+++ b/ui/.prettierrc
@ -0,0 +1,7 @@
+{
+  "semi": true,
+  "useTabs": false,
+  "tabWidth": 2,
+  "singleQuote": true,
+  "endOfLine": "crlf"
+}
--- a/ui/index.html
+++ b/ui/index.html
@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link
+      rel="icon"
+      type="image/svg+xml"
+      href="https://lh3.googleusercontent.com/a-/ACNPEu94rLyADmAJ80HamM8yp4ddV3AzoaMz3whdBH0D=s80-p"
+    />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta
+      name="description"
+      content="Minimal UI for Sites as NFTs. Fleek XYZ"
+    />
+    <title>Sites as NFTS</title>
+  </head>
+  <body>
+    <div id="root"></div>
+    <script type="module" src="/src/index.tsx"></script>
+  </body>
+</html>
--- a/ui/package.json
+++ b/ui/package.json
@ -0,0 +1,37 @@
+{
+  "name": "sites-as-nfts",
+  "version": "0.0.1",
+  "description": "Minimal UI for sites as NFTs",
+  "main": "index.js",
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build",
+    "preview": "vite preview"
+  },
+  "author": "Fleek",
+  "license": "ISC",
+  "dependencies": {
+    "path": "^0.12.7",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
+  },
+  "devDependencies": {
+    "@types/jest": "^29.2.3",
+    "@types/node": "^18.11.9",
+    "@types/react": "^18.0.25",
+    "@types/react-dom": "^18.0.9",
+    "@typescript-eslint/eslint-plugin": "^5.45.0",
+    "@typescript-eslint/parser": "^5.45.0",
+    "@vitejs/plugin-react": "^2.2.0",
+    "eslint": "^8.28.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-jest": "^27.1.6",
+    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-react": "^7.31.11",
+    "prettier": "^2.8.0",
+    "ts-loader": "^9.4.1",
+    "typescript": "^4.9.3",
+    "vite": "^3.2.4",
+    "vite-tsconfig-paths": "^3.6.0"
+  }
+}
--- a/ui/src/app.css
+++ b/ui/src/app.css
@ -0,0 +1,3 @@
+.main {
+  text-align: center;
+}
--- a/ui/src/app.tsx
+++ b/ui/src/app.tsx
@ -0,0 +1,10 @@
+import React from 'react';
+import './App.css';
+
+export const App = () => {
+  return (
+    <div className="main">
+      <h1>Welcome to Sites as NFTs by Fleek</h1>
+    </div>
+  );
+};
--- a/ui/src/index.css
+++ b/ui/src/index.css
@ -0,0 +1,21 @@
+:root {
+  font-family: Inter, Avenir, Helvetica, Arial, sans-serif;
+  font-size: 16px;
+  line-height: 24px;
+  font-weight: 400;
+
+  color-scheme: light dark;
+  color: rgba(255, 255, 255, 0.87);
+  background-color: #242424;
+}
+
+body {
+  margin: 0;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+h1 {
+  font-size: 3.2em;
+  line-height: 1.1;
+}
--- a/ui/src/index.tsx
+++ b/ui/src/index.tsx
@ -0,0 +1,15 @@
+import React from 'react';
+import ReactDOM from 'react-dom/client';
+import './index.css';
+import { App } from './App';
+
+const root = ReactDOM.createRoot(
+  document.getElementById('root') as HTMLElement
+);
+
+root.render(
+  <React.StrictMode>
+    <App />
+  </React.StrictMode>
+);
+
--- a/ui/tsconfig.json
+++ b/ui/tsconfig.json
@ -0,0 +1,26 @@
+{
+  "compilerOptions": {
+    "module": "ES2020",
+    "target": "ESNext",
+    "esModuleInterop": true,
+    "sourceMap": true,
+    "rootDirs": ["src"],
+    "baseUrl": "src",
+    "paths": {
+      "@/*": ["*"]
+    },
+    "forceConsistentCasingInFileNames": true,
+    "resolveJsonModule": true,
+    "moduleResolution": "node",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "jsx": "react-jsx",
+    "strict": true,
+    "noUnusedLocals": true,
+    "skipLibCheck": true,
+    "isolatedModules": true,
+    "types": ["vite/client"]
+  },
+  "include": ["./src", "./*.ts"]
+}
+
--- a/ui/vite.config.ts
+++ b/ui/vite.config.ts
@ -0,0 +1,9 @@
+import { defineConfig } from 'vite';
+import react from '@vitejs/plugin-react';
+import tsconfigPaths from 'vite-tsconfig-paths';
+
+// https://vitejs.dev/config/
+export default defineConfig({
+  plugins: [react(), tsconfigPaths()],
+});
+
--- a/ui/yarn.lock
+++ b/ui/yarn.lock
--- a/yarn.lock
+++ b/yarn.lock