From a833ab68355d990c1de58646b247e83bbf1cf8e6 Mon Sep 17 00:00:00 2001 From: AVIRAL GUPTA <21f1000608@student.onlinedegree.iitm.ac.in> Date: Sun, 28 Aug 2022 11:08:33 +0530 Subject: [PATCH 1/9] domain update --- personal-portfolio/src/components/UDomain.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/personal-portfolio/src/components/UDomain.js b/personal-portfolio/src/components/UDomain.js index 523048e..e22390c 100644 --- a/personal-portfolio/src/components/UDomain.js +++ b/personal-portfolio/src/components/UDomain.js @@ -15,7 +15,7 @@ export const UDomain = () => { const uauth = new UAuth({ clientID: "1dbe95d7-dc99-443b-a07c-b7cc09da2e0a", - redirectUri: "http://localhost:3000", + redirectUri: "https://bob-dao.vercel.app/", }); const loginHandler = async () => { From bac1a630b28c6480940e8016ad12e916a60c6d2f Mon Sep 17 00:00:00 2001 From: AVIRAL GUPTA <21f1000608@student.onlinedegree.iitm.ac.in> Date: Sun, 28 Aug 2022 11:42:08 +0530 Subject: [PATCH 2/9] domain name --- personal-portfolio/src/components/UDomain.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/personal-portfolio/src/components/UDomain.js b/personal-portfolio/src/components/UDomain.js index e22390c..c08f2d9 100644 --- a/personal-portfolio/src/components/UDomain.js +++ b/personal-portfolio/src/components/UDomain.js @@ -14,7 +14,7 @@ export const UDomain = () => { }, [isLogin]); const uauth = new UAuth({ - clientID: "1dbe95d7-dc99-443b-a07c-b7cc09da2e0a", + clientID: "5d8ef622-e570-43cb-99e4-e71b12167526", redirectUri: "https://bob-dao.vercel.app/", }); From 1542a42f972177dc7403f42c8987b413133df6be Mon Sep 17 00:00:00 2001 From: Aviral <21f1000608@student.onlinedegree.iitm.ac.in> Date: Sat, 3 Sep 2022 01:21:03 +0530 Subject: [PATCH 3/9] UNSD --- .vscode/settings.json | 5 + {personal-portfolio => bob}/.gitignore | 0 {personal-portfolio => bob}/README.md | 0 .../contracts/nft1.sol | 0 {personal-portfolio => bob}/package-lock.json | 44 ++++++ {personal-portfolio => bob}/package.json | 1 + .../public/favicon.ico | Bin {personal-portfolio => bob}/public/index.html | 2 +- .../public/logo192.png | Bin .../public/logo512.png | Bin .../public/manifest.json | 0 {personal-portfolio => bob}/public/robots.txt | 0 {personal-portfolio => bob}/server.js | 0 {personal-portfolio => bob}/src/About.js | 0 {personal-portfolio => bob}/src/App.css | 5 +- {personal-portfolio => bob}/src/App.js | 4 +- {personal-portfolio => bob}/src/App.test.js | 0 {personal-portfolio => bob}/src/Create.js | 0 {personal-portfolio => bob}/src/Create1.js | 0 {personal-portfolio => bob}/src/Create2.js | 0 {personal-portfolio => bob}/src/Profile.js | 0 .../src/assets/font/CentraNo2-Bold.ttf | Bin .../src/assets/font/CentraNo2-Book.ttf | Bin .../src/assets/font/CentraNo2-Medium.ttf | Bin .../src/assets/icons8-lock.svg | 0 .../src/assets/img/arrow1.svg | 0 .../src/assets/img/arrow2.svg | 0 .../src/assets/img/banner-bg.png | Bin .../src/assets/img/color-sharp.png | Bin .../src/assets/img/color-sharp2.png | Bin .../src/assets/img/contact-img.svg | 0 .../src/assets/img/footer-bg.png | Bin .../src/assets/img/header-img.svg | 0 .../src/assets/img/logo.svg | 0 .../src/assets/img/meter1.svg | 0 .../src/assets/img/meter2.svg | 0 .../src/assets/img/meter3.svg | 0 .../src/assets/img/nav-icon1.svg | 0 .../src/assets/img/nav-icon2.svg | 0 .../src/assets/img/nav-icon3.svg | 0 .../src/assets/img/project-img1.png | Bin .../src/assets/img/project-img2.png | Bin .../src/assets/img/project-img3.png | Bin .../src/assets/meter1.svg | 0 .../src/assets/meter2.svg | 0 .../src/assets/meter3.svg | 0 .../src/backend/contracts/Marketplace.sol | 0 .../src/backend/contracts/NFT.sol | 0 .../src/backend/scripts/deploy.js | 0 .../src/backend/test/NFTMarketplace.test.js | 0 .../src/components/Banner.js | 0 .../src/components/Contact.js | 0 .../src/components/Dashboard1.js | 0 .../src/components/Footer.js | 0 .../src/components/MailchimpForm.js | 0 .../src/components/NavBar.js | 0 .../src/components/Newsletter.js | 0 bob/src/components/Portfolio.js | 130 ++++++++++++++++++ .../src/components/ProjectCard.js | 0 .../src/components/Projects.js | 0 .../src/components/Skills.js | 0 .../src/components/UDomain.js | 0 .../contractsData/Marketplace-address.json | 0 .../src/contractsData/Marketplace.json | 0 .../src/contractsData/NFT-address.json | 0 .../src/contractsData/NFT.json | 0 {personal-portfolio => bob}/src/index.css | 0 {personal-portfolio => bob}/src/index.js | 0 {personal-portfolio => bob}/src/logo.svg | 0 .../src/reportWebVitals.js | 0 {personal-portfolio => bob}/src/setupTests.js | 0 71 files changed, 187 insertions(+), 4 deletions(-) create mode 100644 .vscode/settings.json rename {personal-portfolio => bob}/.gitignore (100%) rename {personal-portfolio => bob}/README.md (100%) rename {personal-portfolio => bob}/contracts/nft1.sol (100%) rename {personal-portfolio => bob}/package-lock.json (99%) rename {personal-portfolio => bob}/package.json (98%) rename {personal-portfolio => bob}/public/favicon.ico (100%) rename {personal-portfolio => bob}/public/index.html (98%) rename {personal-portfolio => bob}/public/logo192.png (100%) rename {personal-portfolio => bob}/public/logo512.png (100%) rename {personal-portfolio => bob}/public/manifest.json (100%) rename {personal-portfolio => bob}/public/robots.txt (100%) rename {personal-portfolio => bob}/server.js (100%) rename {personal-portfolio => bob}/src/About.js (100%) rename {personal-portfolio => bob}/src/App.css (99%) rename {personal-portfolio => bob}/src/App.js (96%) rename {personal-portfolio => bob}/src/App.test.js (100%) rename {personal-portfolio => bob}/src/Create.js (100%) rename {personal-portfolio => bob}/src/Create1.js (100%) rename {personal-portfolio => bob}/src/Create2.js (100%) rename {personal-portfolio => bob}/src/Profile.js (100%) rename {personal-portfolio => bob}/src/assets/font/CentraNo2-Bold.ttf (100%) rename {personal-portfolio => bob}/src/assets/font/CentraNo2-Book.ttf (100%) rename {personal-portfolio => bob}/src/assets/font/CentraNo2-Medium.ttf (100%) rename {personal-portfolio => bob}/src/assets/icons8-lock.svg (100%) rename {personal-portfolio => bob}/src/assets/img/arrow1.svg (100%) rename {personal-portfolio => bob}/src/assets/img/arrow2.svg (100%) rename {personal-portfolio => bob}/src/assets/img/banner-bg.png (100%) rename {personal-portfolio => bob}/src/assets/img/color-sharp.png (100%) rename {personal-portfolio => bob}/src/assets/img/color-sharp2.png (100%) rename {personal-portfolio => bob}/src/assets/img/contact-img.svg (100%) rename {personal-portfolio => bob}/src/assets/img/footer-bg.png (100%) rename {personal-portfolio => bob}/src/assets/img/header-img.svg (100%) rename {personal-portfolio => bob}/src/assets/img/logo.svg (100%) rename {personal-portfolio => bob}/src/assets/img/meter1.svg (100%) rename {personal-portfolio => bob}/src/assets/img/meter2.svg (100%) rename {personal-portfolio => bob}/src/assets/img/meter3.svg (100%) rename {personal-portfolio => bob}/src/assets/img/nav-icon1.svg (100%) rename {personal-portfolio => bob}/src/assets/img/nav-icon2.svg (100%) rename {personal-portfolio => bob}/src/assets/img/nav-icon3.svg (100%) rename {personal-portfolio => bob}/src/assets/img/project-img1.png (100%) rename {personal-portfolio => bob}/src/assets/img/project-img2.png (100%) rename {personal-portfolio => bob}/src/assets/img/project-img3.png (100%) rename {personal-portfolio => bob}/src/assets/meter1.svg (100%) rename {personal-portfolio => bob}/src/assets/meter2.svg (100%) rename {personal-portfolio => bob}/src/assets/meter3.svg (100%) rename {personal-portfolio => bob}/src/backend/contracts/Marketplace.sol (100%) rename {personal-portfolio => bob}/src/backend/contracts/NFT.sol (100%) rename {personal-portfolio => bob}/src/backend/scripts/deploy.js (100%) rename {personal-portfolio => bob}/src/backend/test/NFTMarketplace.test.js (100%) rename {personal-portfolio => bob}/src/components/Banner.js (100%) rename {personal-portfolio => bob}/src/components/Contact.js (100%) rename {personal-portfolio => bob}/src/components/Dashboard1.js (100%) rename {personal-portfolio => bob}/src/components/Footer.js (100%) rename {personal-portfolio => bob}/src/components/MailchimpForm.js (100%) rename {personal-portfolio => bob}/src/components/NavBar.js (100%) rename {personal-portfolio => bob}/src/components/Newsletter.js (100%) create mode 100644 bob/src/components/Portfolio.js rename {personal-portfolio => bob}/src/components/ProjectCard.js (100%) rename {personal-portfolio => bob}/src/components/Projects.js (100%) rename {personal-portfolio => bob}/src/components/Skills.js (100%) rename {personal-portfolio => bob}/src/components/UDomain.js (100%) rename {personal-portfolio => bob}/src/contractsData/Marketplace-address.json (100%) rename {personal-portfolio => bob}/src/contractsData/Marketplace.json (100%) rename {personal-portfolio => bob}/src/contractsData/NFT-address.json (100%) rename {personal-portfolio => bob}/src/contractsData/NFT.json (100%) rename {personal-portfolio => bob}/src/index.css (100%) rename {personal-portfolio => bob}/src/index.js (100%) rename {personal-portfolio => bob}/src/logo.svg (100%) rename {personal-portfolio => bob}/src/reportWebVitals.js (100%) rename {personal-portfolio => bob}/src/setupTests.js (100%) diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..b242572 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "githubPullRequests.ignoredPullRequestBranches": [ + "main" + ] +} \ No newline at end of file diff --git a/personal-portfolio/.gitignore b/bob/.gitignore similarity index 100% rename from personal-portfolio/.gitignore rename to bob/.gitignore diff --git a/personal-portfolio/README.md b/bob/README.md similarity index 100% rename from personal-portfolio/README.md rename to bob/README.md diff --git a/personal-portfolio/contracts/nft1.sol b/bob/contracts/nft1.sol similarity index 100% rename from personal-portfolio/contracts/nft1.sol rename to bob/contracts/nft1.sol diff --git a/personal-portfolio/package-lock.json b/bob/package-lock.json similarity index 99% rename from personal-portfolio/package-lock.json rename to bob/package-lock.json index b952ebf..3b40314 100644 --- a/personal-portfolio/package-lock.json +++ b/bob/package-lock.json @@ -19,6 +19,7 @@ "@uauth/js": "^2.3.0", "@uauth/web3-react": "^2.0.0", "animate.css": "^4.1.1", + "axios": "^0.27.2", "bootstrap": "^5.1.3", "chai": "^4.3.6", "cors": "^2.8.5", @@ -6670,6 +6671,28 @@ "node": ">=12" } }, + "node_modules/axios": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz", + "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==", + "dependencies": { + "follow-redirects": "^1.14.9", + "form-data": "^4.0.0" + } + }, + "node_modules/axios/node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/axobject-query": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz", @@ -35061,6 +35084,27 @@ "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.4.2.tgz", "integrity": "sha512-LVAaGp/wkkgYJcjmHsoKx4juT1aQvJyPcW09MLCjVTh3V2cc6PnyempiLMNH5iMdfIX/zdbjUx2KDjMLCTdPeA==" }, + "axios": { + "version": "0.27.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz", + "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==", + "requires": { + "follow-redirects": "^1.14.9", + "form-data": "^4.0.0" + }, + "dependencies": { + "form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + } + } + } + }, "axobject-query": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz", diff --git a/personal-portfolio/package.json b/bob/package.json similarity index 98% rename from personal-portfolio/package.json rename to bob/package.json index c605139..aac8b99 100644 --- a/personal-portfolio/package.json +++ b/bob/package.json @@ -24,6 +24,7 @@ "react-router-dom": "^6.3.0", "react-router-hash-link": "^2.4.3", "react-scripts": "5.0.1", + "axios": "^0.27.2", "web-vitals": "^2.1.4", "@babel/preset-react": "^7.16.7", "@chainlink/contracts": "^0.4.0", diff --git a/personal-portfolio/public/favicon.ico b/bob/public/favicon.ico similarity index 100% rename from personal-portfolio/public/favicon.ico rename to bob/public/favicon.ico diff --git a/personal-portfolio/public/index.html b/bob/public/index.html similarity index 98% rename from personal-portfolio/public/index.html rename to bob/public/index.html index aa069f2..4bf316e 100644 --- a/personal-portfolio/public/index.html +++ b/bob/public/index.html @@ -24,7 +24,7 @@ work correctly both with client-side routing and a non-root public URL. Learn how to configure a non-root public URL by running `npm run build`. --> - React App + BOB DAO diff --git a/personal-portfolio/public/logo192.png b/bob/public/logo192.png similarity index 100% rename from personal-portfolio/public/logo192.png rename to bob/public/logo192.png diff --git a/personal-portfolio/public/logo512.png b/bob/public/logo512.png similarity index 100% rename from personal-portfolio/public/logo512.png rename to bob/public/logo512.png diff --git a/personal-portfolio/public/manifest.json b/bob/public/manifest.json similarity index 100% rename from personal-portfolio/public/manifest.json rename to bob/public/manifest.json diff --git a/personal-portfolio/public/robots.txt b/bob/public/robots.txt similarity index 100% rename from personal-portfolio/public/robots.txt rename to bob/public/robots.txt diff --git a/personal-portfolio/server.js b/bob/server.js similarity index 100% rename from personal-portfolio/server.js rename to bob/server.js diff --git a/personal-portfolio/src/About.js b/bob/src/About.js similarity index 100% rename from personal-portfolio/src/About.js rename to bob/src/About.js diff --git a/personal-portfolio/src/App.css b/bob/src/App.css similarity index 99% rename from personal-portfolio/src/App.css rename to bob/src/App.css index eebbf97..e7d7cee 100644 --- a/personal-portfolio/src/App.css +++ b/bob/src/App.css @@ -160,9 +160,10 @@ span.navbar-text { position: relative; background-color: transparent; transition: 0.3s ease-in-out; + z-index: 1; } .navbar-text button span { - z-index: 1; + z-index: 2; } .navbar-text button::before { content: ""; @@ -172,7 +173,7 @@ span.navbar-text { background-color: #fff; left: 0; top: 0; - z-index: -1; + z-index: 1; transition: 0.3s ease-in-out; } .navbar-text button:hover { diff --git a/personal-portfolio/src/App.js b/bob/src/App.js similarity index 96% rename from personal-portfolio/src/App.js rename to bob/src/App.js index 50a9952..6e35190 100644 --- a/personal-portfolio/src/App.js +++ b/bob/src/App.js @@ -9,6 +9,7 @@ import { Footer } from "./components/Footer"; import Create from './Create' +import Portfolio from './components/Portfolio'; // import MarketplaceAbi from '../contractsData/Marketplace.json' // import MarketplaceAddress from '../contractsData/Marketplace-address.json' @@ -57,7 +58,8 @@ function App() { - + +