Merge branch 'master' into dev

This commit is contained in:
MTG2000
2022-08-29 21:59:43 +03:00
10 changed files with 31 additions and 18 deletions

1
.gitignore vendored
View File

@@ -12,6 +12,7 @@ envs/server
/.pnp
.pnp.js
/envs/server
# testing
/coverage

9
TODO.md Normal file
View File

@@ -0,0 +1,9 @@
## Images Uploading
- Look for onWindow drag detection
* Check the overflow on post vote btn container
* Lazy load the bounty form on create-story-page
* Make the bg behind edit/preview translate
* Fix the localStorage not clearing after saving draft

View File

@@ -1 +0,0 @@
REACT_APP_API_END_POINT = http://localhost:8888/dev

View File

@@ -1,3 +0,0 @@
REACT_APP_ENABLE_MOCKS= true
STORYBOOK_ENABLE_MOCKS= true

View File

@@ -0,0 +1,2 @@
REACT_APP_API_END_POINT = http://192.168.1.2:8888/dev

View File

@@ -0,0 +1,2 @@
REACT_APP_API_END_POINT = https://makers-bolt-fun-preview.netlify.app/.netlify/functions

View File

@@ -91,20 +91,20 @@
"yup": "^0.32.11"
},
"scripts": {
"client:prod-server": "env-cmd -f ./envs/client/.dev.prod-server.env react-scripts start",
"client:preview-server": "env-cmd -f ./envs/client/.dev.preview-server.env react-scripts start",
"client:mocks": "env-cmd -f ./envs/client/.dev.mock-server.env react-scripts start",
"client:dev-server": "env-cmd -f ./envs/client/.dev.server.env react-scripts start",
"client:dev-server": "env-cmd -f ./envs/client/dev-server.env react-scripts start",
"server:dev": "env-cmd -f ./envs/server/local.env serverless offline",
"client:preview-server": "env-cmd -f ./envs/client/preview-server.env react-scripts start",
"server:preview": "env-cmd -f ./envs/server/preview.env serverless offline",
"client:prod-server": "env-cmd -f ./envs/client/prod-server.env react-scripts start",
"server:prod": "env-cmd -f ./envs/server/prod.env serverless offline",
"client:mocks": "env-cmd -f ./envs/client/.mock-server.env react-scripts start",
"generate-graphql": "graphql-codegen",
"storybook": "env-cmd -f ./envs/client/.dev.preview-server.env start-storybook -p 6006 -s public",
"storybook:mocks": "env-cmd -f ./envs/client/.dev.mock-server.env start-storybook -p 6006 -s public",
"build": "react-scripts build",
"build:mocks": "env-cmd -f ./envs/client/.prod.mock-server.env react-scripts build",
"build-storybook": "env-cmd -f ./envs/client/.dev.preview-server.env build-storybook -s public",
"build-storybook:mocks": "env-cmd -f ./envs/client/.prod.mock-server.env build-storybook -s public",
"build:mocks": "env-cmd -f ./envs/client/mock-server.env react-scripts build",
"build-storybook": "env-cmd -f ./envs/client/preview-server.env build-storybook -s public",
"build-storybook:mocks": "env-cmd -f ./envs/client/mock-server.env build-storybook -s public",
"test": "react-scripts test",
"eject": "react-scripts eject",
"db:migrate-dev": "prisma migrate dev",

View File

@@ -96,19 +96,20 @@ export default function LinkingAccountModal({ onClose, direction, ...props }: Mo
<p className="text-body4 text-gray-600 font-bold">Fetching Lnurl-Auth Link...</p>
</div>
else
else {
content =
<div className='flex flex-col gap-24 items-center mt-32 '>
<a href={`lightning:${lnurl}`} >
<QRCodeSVG
width={240}
height={240}
value={lnurl}
width={280}
height={280}
level='H'
value={`lightning:${lnurl}`}
bgColor='transparent'
imageSettings={{
src: '/assets/images/nut_3d.png',
width: 32,
height: 32,
width: 28,
height: 28,
excavate: true
}}
/>
@@ -132,7 +133,7 @@ export default function LinkingAccountModal({ onClose, direction, ...props }: Mo
</Button>
</div>
</div>
}
return (
@@ -144,6 +145,8 @@ export default function LinkingAccountModal({ onClose, direction, ...props }: Mo
exit='exit'
className="modal-card max-w-[442px] p-24 rounded-xl relative"
>
<IoClose className='absolute text-body2 top-24 right-24 hover:cursor-pointer' onClick={onClose} />
<h2 className='text-h5 font-bold text-center'>Connect another wallet</h2>
<IoClose className='absolute text-body2 top-24 right-24 hover:cursor-pointer' onClick={onClose} />
<h2 className='text-h5 font-bold text-center'>Connect another wallet</h2>
{content}