Merge pull request #3 from meemproject/dev

Dev -> Stage

CHANGELOG.md

@@ -1,3 +1,5 @@
+## [1.0.2](https://github.com/meemproject/epm/compare/v1.0.1...v1.0.2) (2022-08-11)
+
 ## [1.0.1](https://github.com/meemproject/epm/compare/v1.0.0...v1.0.1) (2022-07-29)
 
 

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@meemproject/epm",
-	"version": "1.0.1",
+	"version": "1.0.2",
 	"private": true,
 	"author": "Meem Project",
 	"contributors": [
@@ -44,9 +44,9 @@
 		"@mantine/next": "4.2.2",
 		"@mantine/notifications": "4.2.2",
 		"@mantine/prism": "^4.2.11",
-		"@meemproject/api": "^0.7.1",
-		"@meemproject/meem-contracts": "^0.7.1",
-		"@meemproject/react": "^0.7.1",
+		"@meemproject/api": "^0.7.6",
+		"@meemproject/meem-contracts": "^0.7.6",
+		"@meemproject/react": "^0.7.6",
 		"@next/bundle-analyzer": "^12.1.4",
 		"@types/superagent": "^4.1.15",
 		"blob-util": "^2.0.2",
@@ -94,4 +94,4 @@
 		"typechain": "^6.0.2",
 		"typescript": "4.6.3"
 	}
-}
+}

src/components/App.tsx

@@ -15,25 +15,12 @@ export const App: React.FC<IProps> = ({ children }) => {
 			typeof window !== 'undefined' &&
 			['/', '/authenticate'].includes(window.location.pathname)
 
-		// console.log({
-		// 	isLoggedOutUrl,
-		// 	isConnected
-		// })
-
-		// if (!isLoggedOutUrl && !isConnected) {
-		// 	console.log('CONNECT WALLET!!!')
-		// 	setTimeout(() => {
-		// 		connectWallet()
-		// 	}, 700)
-		// }
-
 		if (!isLoggedOutUrl && loginState === LoginState.NotLoggedIn) {
 			router.push({
 				pathname: '/authenticate',
 				query: {
-					return: `${window.location.pathname}${encodeURIComponent(
-						window.location.search
-					)}`
+					r: window.location.pathname,
+					rq: JSON.stringify(router.query)
 				}
 			})
 		}

src/components/Authenticate/Authenticate.tsx

@@ -86,15 +86,13 @@ const MAuthenticate: React.FC = () => {
 
 					log.debug(`logged in successfully.`)
 
-					// Cookies.set('meemJwtToken', loginRequest.jwt)
 					wallet.setJwt(loginRequest.jwt)
 					log.debug(loginRequest.jwt)
 					log.debug(`saved JWT token as cookie.`)
 
 					router.push({
-						pathname: router.query.return
-							? decodeURIComponent(router.query.return as string)
-							: '/'
+						pathname: router.query.r as string,
+						query: JSON.parse(router.query.rq as string)
 					})
 				} catch (e) {
 					log.error(e)

yarn.lock

@@ -1932,60 +1932,63 @@
     prop-types "^15.7.2"
     react-is "^16.8.0 || ^17.0.0"
 
-"@meemproject/api@^0.7.1":
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/@meemproject/api/-/api-0.7.1.tgz#a84dd53d02e97be9d710969c0cbe7b962ad58de1"
-  integrity sha512-BuTqEkwv0jyRb2Nr2ZEjWhlOLmTqsM6OSBYfyaHZXKOQaYKZuCrNBxtnpOxuknxdQRCmC8W5X1rWgLj+6wYf8Q==
+"@meemproject/api@^0.7.6":
+  version "0.7.6"
+  resolved "https://registry.yarnpkg.com/@meemproject/api/-/api-0.7.6.tgz#615329955f44a8761d3a649f98b27bcad7f1f33e"
+  integrity sha512-nLJkTItw2FRcKsNB84ooqSu42huz/8odOR2Bl1nQd2XrhQTzFUxwmRMf63Cn0rgOvHyYa94n58R0Adq+AjbohA==
   dependencies:
     "@kengoldfarb/log" "^1.0.5"
-    "@meemproject/meem-contracts" "^0.7.1"
+    "@meemproject/meem-contracts" "^0.7.6"
     "@typechain/ethers-v5" "^10.0.0"
     "@types/js-cookie" "^3.0.1"
     "@types/luxon" "^2.3.1"
     ethers "^5.6.4"
     js-cookie "^3.0.1"
-    luxon "^2.3.1"
+    luxon "^3.0.1"
     superagent "^7.1.2"
     swr "^1.3.0"
     tsnd "^1.0.2"
     typechain "^8.0.0"
 
-"@meemproject/meem-contracts@^0.7.1":
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/@meemproject/meem-contracts/-/meem-contracts-0.7.1.tgz#ec70d904dcab44f29b11adc74246ef60c2352928"
-  integrity sha512-LUEEuG+cHl5q8HQqU6IF3H5GeOoWcFLQvhaQzMK4+NNFm7SgC5CDoYc4/HyLMgc3olJINcL1iOBLepa6Bzzm2w==
+"@meemproject/meem-contracts@^0.7.6":
+  version "0.7.6"
+  resolved "https://registry.yarnpkg.com/@meemproject/meem-contracts/-/meem-contracts-0.7.6.tgz#b3e43320fa944345db43a1633941dca928e91152"
+  integrity sha512-G8L/Q0ERfhLvm5c81zFG9MsADZi183yX4nJhDedbVw7wZd61/cGRbCZbuttpngCanGIHTYxGr77Fxv+VlEwtRg==
   dependencies:
     "@kengoldfarb/log" "^1.0.5"
     ethers "^5.6.4"
+    superagent "^8.0.0"
 
-"@meemproject/react@^0.7.1":
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/@meemproject/react/-/react-0.7.1.tgz#cf08a6c2408ae608e0e450870332b8b467ebc72c"
-  integrity sha512-JQY7xT5FfP5RdWlatpEsYhCObapr1BLcZTsFF/tzIM35IM/R/6ths+CggPuG+vCV1TKRmyH+Cd1W/tI4uCyTbQ==
+"@meemproject/react@^0.7.6":
+  version "0.7.6"
+  resolved "https://registry.yarnpkg.com/@meemproject/react/-/react-0.7.6.tgz#d90b1f4c3b0ae13c7dfd16262ae9ffb5c571c48a"
+  integrity sha512-1Bp1RiX6VoZ21a4i9wJyf+ILOSykx3awy4X1+JPnkV+beMs6KLEcLNvRSUExi03ycEEp5j1NthFpYWId0p/Iuw==
   dependencies:
     "@kengoldfarb/log" "^1.0.5"
     "@material-ui/core" "^4.12.4"
     "@material-ui/lab" "^4.0.0-alpha.61"
-    "@meemproject/api" "^0.7.1"
-    "@meemproject/meem-contracts" "^0.7.1"
-    "@meemproject/utils" "^0.7.1"
+    "@meemproject/api" "^0.7.6"
+    "@meemproject/meem-contracts" "^0.7.6"
+    "@meemproject/utils" "^0.7.6"
     "@mui/material" "^5.6.1"
     "@walletconnect/web3-provider" "^1.7.7"
     ethers "^5.6.4"
     js-cookie "^3.0.1"
+    jsonwebtoken "^8.5.1"
     lodash "^4.17.21"
     lodash-es "^4.17.21"
+    luxon "^3.0.1"
     superagent "^7.1.2"
     swr "^1.3.0"
     web3modal "^1.9.6"
 
-"@meemproject/utils@^0.7.1":
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/@meemproject/utils/-/utils-0.7.1.tgz#be025c5e88c175c405e714e56e4ca2288b5be217"
-  integrity sha512-6Omcrg3DMQ5fTATHvvQ2WwAsHjJ9J8SxGpbxsyrJQBn+vsl7uWEfe2sgzrX8P/A1HxKuzDJPbkJzxl5EXqc80g==
+"@meemproject/utils@^0.7.6":
+  version "0.7.6"
+  resolved "https://registry.yarnpkg.com/@meemproject/utils/-/utils-0.7.6.tgz#2ca715bc997c24e5c3460a40c2f0f6c33cbe3961"
+  integrity sha512-o3b7+IOi2k1Mo0RBoMow7Ng8Wa90MYQReULqSHSP5FsR+rHHctBmqJFfehYDSvvA40yqbFt3smOYeUXUrmg7rQ==
   dependencies:
     "@kengoldfarb/log" "^1.0.5"
-    "@meemproject/meem-contracts" "^0.7.1"
+    "@meemproject/meem-contracts" "^0.7.6"
     ethers "^5.6.4"
 
 "@metamask/safe-event-emitter@^2.0.0":
@@ -10981,10 +10984,10 @@ ltgt@~2.2.0:
   resolved "https://registry.yarnpkg.com/ltgt/-/ltgt-2.2.1.tgz#f35ca91c493f7b73da0e07495304f17b31f87ee5"
   integrity sha512-AI2r85+4MquTw9ZYqabu4nMwy9Oftlfa/e/52t9IjtfG+mGBbTNdAoZ3RQKLHR6r0wQnwZnPIEh/Ya6XTWAKNA==
 
-luxon@^2.3.1:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/luxon/-/luxon-2.4.0.tgz#9435806545bb32d4234dab766ab8a3d54847a765"
-  integrity sha512-w+NAwWOUL5hO0SgwOHsMBAmZ15SoknmQXhSO0hIbJCAmPKSsGeK8MlmhYh2w6Iib38IxN2M+/ooXWLbeis7GuA==
+luxon@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/luxon/-/luxon-3.0.1.tgz#6901111d10ad06fd267ad4e4128a84bef8a77299"
+  integrity sha512-hF3kv0e5gwHQZKz4wtm4c+inDtyc7elkanAsBq+fundaCdUBNJB1dHEGUZIM6SfSBUlbVFduPwEtNjFK8wLtcw==
 
 make-dir@^1.0.0:
   version "1.3.0"
@@ -14344,6 +14347,23 @@ superagent@^7.1.2, superagent@^7.1.6:
     readable-stream "^3.6.0"
     semver "^7.3.7"
 
+superagent@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/superagent/-/superagent-8.0.0.tgz#2ea4587df4b81ef023ec01ebc6e1bcb9e2344cb6"
+  integrity sha512-iudipXEel+SzlP9y29UBWGDjB+Zzag+eeA1iLosaR2YHBRr1Q1kC29iBrF2zIVD9fqVbpZnXkN/VJmwFMVyNWg==
+  dependencies:
+    component-emitter "^1.3.0"
+    cookiejar "^2.1.3"
+    debug "^4.3.4"
+    fast-safe-stringify "^2.1.1"
+    form-data "^4.0.0"
+    formidable "^2.0.1"
+    methods "^1.1.2"
+    mime "2.6.0"
+    qs "^6.10.3"
+    readable-stream "^3.6.0"
+    semver "^7.3.7"
+
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"