Skip to content

Commit

Permalink
Merge pull request #307 from rairprotocol/dev
Browse files Browse the repository at this point in the history 
Merge latest dev to main  branch
  • Loading branch information
@RAIReth
RAIReth authored Feb 18, 2025
2 parents 5d7c3e0 + a4d0571 commit 1cf4d0f
Show file tree
Hide file tree
Showing 41 changed files with 1,093 additions and 204 deletions.
1 change: 1 addition & 0 deletions rair-front/Dockerfile
View file
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
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
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
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
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
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
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

0 comments on commit 1cf4d0f

Please sign in to comment.