Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge latest dev to main branch #307

Merged
merged 36 commits into from
Feb 18, 2025
Merged

Merge latest dev to main branch #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
6acf5f3
Check file exists
jmsm412 Nov 25, 2024
d5b32ea
Merge pull request #290 from rairprotocol/289-unpin-filebase-check
sarora180673 Nov 25, 2024
1fc11c3
Avoid undefined values
jmsm412 Nov 29, 2024
b3ca732
Merge pull request #293 from rairprotocol/291-login-issue
sarora180673 Dec 3, 2024
d8f4ea0
Create .env.sample
sarora180673 Dec 5, 2024
8e46304
Create test-util.ts
sarora180673 Dec 5, 2024
c9462c3
Create analytics.test.ts
sarora180673 Dec 5, 2024
fa817e7
Test cases for sdk testing
sarora180673 Dec 5, 2024
863b356
fix issue with redirect
SeanM322 Dec 5, 2024
bea307d
Merge pull request #296 from rairprotocol/294-url-redirect-issue-cann…
sarora180673 Dec 5, 2024
9c630be
Fix web3auth login check
jmsm412 Jan 13, 2025
28a1740
Remove NFT check
jmsm412 Jan 13, 2025
87f1e83
Merge pull request #301 from rairprotocol/300-social-login-fix
sarora180673 Jan 13, 2025
3ab8c7e
Fix
jmsm412 Jan 24, 2025
691b3fb
V4 integration
jmsm412 Jan 24, 2025
de23686
Merge pull request #302 from rairprotocol/295-no-nft-admin
sarora180673 Jan 24, 2025
6da17c3
Build fix
jmsm412 Jan 24, 2025
74ce3fb
Memory update
jmsm412 Jan 30, 2025
d4bd1c1
Merge branch 'dev' into 303-alchemy-v4-login
jmsm412 Jan 30, 2025
8e8ed98
Name update
jmsm412 Jan 30, 2025
e41a291
External rollup
jmsm412 Jan 31, 2025
b537630
Test
jmsm412 Jan 31, 2025
dcbb11b
Test
jmsm412 Jan 31, 2025
cc7dc0c
Rollback to Vite 5
jmsm412 Jan 31, 2025
1ad8b93
Update plugins
jmsm412 Jan 31, 2025
4fa218a
Package bump
jmsm412 Jan 31, 2025
a1f3f41
iframe
jmsm412 Jan 31, 2025
bd119be
Logging
jmsm412 Feb 4, 2025
4a10d61
Clear logs
jmsm412 Feb 5, 2025
d70fd1f
Cleanup
jmsm412 Feb 5, 2025
c91cb27
No email
jmsm412 Feb 6, 2025
931d94a
GitID as number
jmsm412 Feb 6, 2025
6ef5901
Double check GitId as number
jmsm412 Feb 6, 2025
ae1598a
Merge pull request #304 from rairprotocol/303-alchemy-v4-login
sarora180673 Feb 7, 2025
2ba8422
Validate undefined and V3 git ID
jmsm412 Feb 10, 2025
a4d0571
Merge pull request #306 from rairprotocol/305-error-with-social-login…
sarora180673 Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions rair-front/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ WORKDIR /usr/src/minting

EXPOSE 3001

CMD node --max-old-space-size=8192
CMD npm start
1 change: 1 addition & 0 deletions rair-front/Dockerfile.prod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ COPY yarn.lock ./
RUN yarn install
COPY . /usr/src/minting
#RUN mkdir -p node_modules/.cache && chmod -R 777 node_modules/.cache
RUN node --max-old-space-size=8192
RUN yarn build


Expand Down
1 change: 1 addition & 0 deletions rair-front/Dockerfile.prod-new
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ COPY yarn.lock ./
RUN yarn install
COPY . /usr/src/minting
#RUN mkdir -p node_modules/.cache && chmod -R 777 node_modules/.cache
RUN node --max-old-space-size=8192
RUN yarn build


Expand Down
62 changes: 33 additions & 29 deletions rair-front/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,49 +13,51 @@
"prepare": "cd ../ && husky install ./minting-marketplace/.husky"
},
"dependencies": {
"@account-kit/core": "^4.11.0",
"@account-kit/infra": "^4.11.0",
"@account-kit/signer": "^4.11.0",
"@alchemy/aa-accounts": "^3.19.0",
"@alchemy/aa-alchemy": "^3.19.0",
"@alchemy/aa-core": "^3.19.0",
"@alchemy/aa-ethers": "^3.19.0",
"@alchemy/aa-signers": "^3.19.0",
"@analytics/google-analytics": "^1.0.7",
"@emotion/is-prop-valid": "^1.3.0",
"@emotion/react": "^11.13.3",
"@emotion/styled": "^11.13.0",
"@fortawesome/fontawesome-svg-core": "^6.6.0",
"@fortawesome/free-brands-svg-icons": "^6.6.0",
"@fortawesome/free-regular-svg-icons": "^6.6.0",
"@fortawesome/free-solid-svg-icons": "^6.6.0",
"@emotion/is-prop-valid": "^1.3.1",
"@fortawesome/fontawesome-svg-core": "^6.7.2",
"@fortawesome/free-brands-svg-icons": "^6.7.2",
"@fortawesome/free-regular-svg-icons": "^6.7.2",
"@fortawesome/free-solid-svg-icons": "^6.7.2",
"@fortawesome/react-fontawesome": "^0.2.2",
"@getyoti/react-face-capture": "^2.3.1",
"@metamask/onboarding": "^1.0.1",
"@metamask/providers": "^14.0.2",
"@mui/icons-material": "^5.16.7",
"@mui/material": "^5.16.7",
"@reduxjs/toolkit": "^2.2.7",
"@reduxjs/toolkit": "^2.5.1",
"@sentry/browser": "^7.85.0",
"@sentry/react": "^7.85.0",
"@wagmi/core": "^2.16.3",
"@walletconnect/sign-client": "^2.14.0",
"@walletconnect/utils": "^2.14.0",
"@web3auth/base": "^8.12.4",
"@web3auth/modal": "^8.12.4",
"@web3auth/base": "^9.5.3",
"@web3auth/modal": "^9.5.3",
"alchemy-sdk": "^3.4.1",
"analytics": "^0.8.14",
"axios": "^1.7.5",
"axios": "^1.7.9",
"bootstrap": "^5.3.3",
"ethers": "^6.13.2",
"ethers": "^6.13.5",
"global": "^4.4.0",
"moment-timezone": "^0.5.45",
"prettier": "^3.3.3",
"prettier": "^3.4.2",
"react": "^18.3.1",
"react-accessible-accordion": "^5.0.0",
"react-dom": "^18.3.1",
"react-dropzone": "^14.2.3",
"react-dropzone": "^14.3.5",
"react-ga": "^3.3.1",
"react-helmet-async": "^2.0.5",
"react-hook-form": "^7.52.2",
"react-hot-toast": "^2.4.1",
"react-modal": "^3.16.1",
"react-hook-form": "^7.54.2",
"react-hot-toast": "^2.5.1",
"react-modal": "^3.16.3",
"react-moment": "^1.1.3",
"react-multi-carousel": "^2.8.5",
"react-player": "^2.16.0",
Expand All @@ -67,20 +69,22 @@
"react-webcam": "^7.2.0",
"reactjs-popup": "^2.0.6",
"slick-carousel": "^1.8.1",
"socket.io-client": "^4.7.5",
"styled-components": "^6.1.12",
"socket.io-client": "^4.8.1",
"styled-components": "^6.1.14",
"sweetalert2": "^11.10.1",
"sweetalert2-react-content": "^5.0.7",
"use-debounce": "^10.0.3",
"sweetalert2-react-content": "^5.1.0",
"use-debounce": "^10.0.4",
"use-state-if-mounted": "^1.0.7",
"uuid": "^10.0.0",
"uuid": "^11.0.4",
"video.js": "^8.17.3",
"videojs-contrib-quality-levels": "^4.0.0",
"videojs-hls-quality-selector": "^1.1.4",
"viem": "^2.20.0",
"viem": "^2.22.17",
"vite-plugin-radar": "^0.9.6",
"vite-plugin-svgr": "^4.2.0",
"wicg-inert": "^3.1.3"
"wagmi": "^2.14.9",
"wicg-inert": "^3.1.3",
"zustand": "^5.0.3"
},
"devDependencies": {
"@types/react": "^18.3.4",
Expand All @@ -93,17 +97,17 @@
"@types/uuid": "^10.0.0",
"@typescript-eslint/eslint-plugin": "^6.14.0",
"@typescript-eslint/parser": "^6.14.0",
"@vitejs/plugin-react": "^4.3.1",
"@vitejs/plugin-react": "^4.3.4",
"eslint": "^8.55.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-react": "^7.35.0",
"eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-react-refresh": "^0.4.9",
"eslint-plugin-simple-import-sort": "^12.1.1",
"husky": "^9.1.5",
"typescript": "^5.5.4",
"vite": "^5.4.2",
"vite-plugin-node-polyfills": "^0.22.0"
"husky": "^9.1.7",
"typescript": "^5.7.3",
"vite": "^6.0.11",
"vite-plugin-node-polyfills": "^0.23.0"
}
}
1 change: 1 addition & 0 deletions rair-front/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,7 @@ function App() {
*/}
<MainBlockApp isSplashPage={isSplashPage} showAlert={showAlert}>
<div className="col-12 blockchain-switcher" />
<div id="rair-asif" className="d-none" />
<div className="col-12 mt-3">
<SentryRoutes>
{/*
Expand Down
2 changes: 1 addition & 1 deletion rair-front/src/components/SplashPage/ImmersiVerse/ImmersiVerseSplashPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ const ImmersiVerseSplashPage: FC<SplashPageProps> = ({ setIsSplashPage }) => {
const [carousel, setCarousel] = useState<boolean>(carousel_match.matches);
window.addEventListener('resize', () => setCarousel(carousel_match.matches));

let subtitle: Modal;
const [subtitle] = useState<Modal>();

function afterOpenModal() {
if (subtitle?.props?.style?.content) {
Expand Down
2 changes: 1 addition & 1 deletion rair-front/src/components/SplashPage/Nipseyverse/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ const SplashPage: FC<SplashPageProps> = ({ setIsSplashPage }) => {
const targetBlockchain = '0x5';
// const nipseyAddress = '0xCB0252EeD5056De450Df4D8D291B4c5E8Af1D9A6';

let subtitle: Modal;
const [subtitle] = useState<Modal>();
const [modalIsOpen, setIsOpen] = useState<boolean>(false);
const [active, setActive] = useState<TSplashPageIsActive>({
policy: false,
Expand Down
Loading