From 7a95f371fb510f25bcb74ebd93c4b3b5183a6620 Mon Sep 17 00:00:00 2001 From: MTG2000 Date: Tue, 23 Aug 2022 11:37:20 +0300 Subject: [PATCH 1/6] udpate gitignore --- .gitignore | 1 + envs/client/.dev.preview-server.env | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 envs/client/.dev.preview-server.env diff --git a/.gitignore b/.gitignore index 1f28034..becf0f6 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ environments/.dev.preview-server.env /.pnp .pnp.js +/envs/server # testing /coverage diff --git a/envs/client/.dev.preview-server.env b/envs/client/.dev.preview-server.env new file mode 100644 index 0000000..56ed718 --- /dev/null +++ b/envs/client/.dev.preview-server.env @@ -0,0 +1,2 @@ + +REACT_APP_API_END_POINT = https://makers-bolt-fun-preview.netlify.app/.netlify/functions \ No newline at end of file From 47acbc3777edac3932cec44e85c4eede92b0eb66 Mon Sep 17 00:00:00 2001 From: MTG2000 Date: Mon, 29 Aug 2022 18:33:58 +0300 Subject: [PATCH 2/6] fix: qr invalid code --- TODO.md | 9 +++++ envs/client/.dev.server.env | 1 - envs/client/.prod.mock-server.env | 3 -- .../{.dev.mock-server.env => mock-server.env} | 0 ....preview-server.env => preview-server.env} | 0 .../{.dev.prod-server.env => prod-server.env} | 0 package.json | 8 ++--- .../LinkingAccountModal.tsx | 35 ++++++++++++------- 8 files changed, 35 insertions(+), 21 deletions(-) create mode 100644 TODO.md delete mode 100644 envs/client/.dev.server.env delete mode 100644 envs/client/.prod.mock-server.env rename envs/client/{.dev.mock-server.env => mock-server.env} (100%) rename envs/client/{.dev.preview-server.env => preview-server.env} (100%) rename envs/client/{.dev.prod-server.env => prod-server.env} (100%) diff --git a/TODO.md b/TODO.md new file mode 100644 index 0000000..4d7f606 --- /dev/null +++ b/TODO.md @@ -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 diff --git a/envs/client/.dev.server.env b/envs/client/.dev.server.env deleted file mode 100644 index ef196c2..0000000 --- a/envs/client/.dev.server.env +++ /dev/null @@ -1 +0,0 @@ -REACT_APP_API_END_POINT = http://localhost:8888/dev \ No newline at end of file diff --git a/envs/client/.prod.mock-server.env b/envs/client/.prod.mock-server.env deleted file mode 100644 index 418c6a7..0000000 --- a/envs/client/.prod.mock-server.env +++ /dev/null @@ -1,3 +0,0 @@ - -REACT_APP_ENABLE_MOCKS= true -STORYBOOK_ENABLE_MOCKS= true \ No newline at end of file diff --git a/envs/client/.dev.mock-server.env b/envs/client/mock-server.env similarity index 100% rename from envs/client/.dev.mock-server.env rename to envs/client/mock-server.env diff --git a/envs/client/.dev.preview-server.env b/envs/client/preview-server.env similarity index 100% rename from envs/client/.dev.preview-server.env rename to envs/client/preview-server.env diff --git a/envs/client/.dev.prod-server.env b/envs/client/prod-server.env similarity index 100% rename from envs/client/.dev.prod-server.env rename to envs/client/prod-server.env diff --git a/package.json b/package.json index dd0041d..d453b69 100644 --- a/package.json +++ b/package.json @@ -90,10 +90,10 @@ "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:prod-server": "env-cmd -f ./envs/client/.prod-server.env react-scripts start", + "client:preview-server": "env-cmd -f ./envs/client/preview-server.env react-scripts start", + "client:mocks": "env-cmd -f ./envs/client/.mock-server.env react-scripts start", + "client:dev-server": "env-cmd -f ./envs/client/local-server.env react-scripts start", "server:dev": "env-cmd -f ./envs/server/local.env serverless offline", "server:preview": "env-cmd -f ./envs/server/preview.env serverless offline", "server:prod": "env-cmd -f ./envs/server/prod.env serverless offline", diff --git a/src/features/Profiles/pages/EditProfilePage/AccountCard/LinkingAccountModal/LinkingAccountModal.tsx b/src/features/Profiles/pages/EditProfilePage/AccountCard/LinkingAccountModal/LinkingAccountModal.tsx index 038040d..2c3ad78 100644 --- a/src/features/Profiles/pages/EditProfilePage/AccountCard/LinkingAccountModal/LinkingAccountModal.tsx +++ b/src/features/Profiles/pages/EditProfilePage/AccountCard/LinkingAccountModal/LinkingAccountModal.tsx @@ -86,17 +86,24 @@ export default function LinkingAccountModal({ onClose, direction, ...props }: Mo

Fetching Lnurl-Auth...

- else + else { content = - <> -

- Link your account ⚡ -

- +
+ + +

Scan this code or copy + paste it to your other lightning wallet to be able to login later with it to this account.
@@ -121,8 +128,8 @@ export default function LinkingAccountModal({ onClose, direction, ...props }: Mo Done?

- - + + } return ( @@ -132,8 +139,10 @@ export default function LinkingAccountModal({ onClose, direction, ...props }: Mo initial='initial' animate="animate" exit='exit' - className="modal-card w-full max-w-[326px] bg-white border-2 border-gray-200 rounded-16 p-16 flex flex-col gap-16 items-center" + className="modal-card max-w-[442px] p-24 rounded-xl relative" > + +

Connect another ⚡️ wallet

{content} ) From 164368480e730f75affe933d17232b2f685f58ff Mon Sep 17 00:00:00 2001 From: MTG2000 Date: Mon, 29 Aug 2022 18:56:14 +0300 Subject: [PATCH 3/6] update env --- envs/client/dev-server.env | 2 ++ package.json | 14 +++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 envs/client/dev-server.env diff --git a/envs/client/dev-server.env b/envs/client/dev-server.env new file mode 100644 index 0000000..11350da --- /dev/null +++ b/envs/client/dev-server.env @@ -0,0 +1,2 @@ + +REACT_APP_API_END_POINT = http://192.168.1.2:8888/dev \ No newline at end of file diff --git a/package.json b/package.json index d453b69..88f84a0 100644 --- a/package.json +++ b/package.json @@ -90,20 +90,20 @@ "yup": "^0.32.11" }, "scripts": { - "client:prod-server": "env-cmd -f ./envs/client/.prod-server.env react-scripts start", - "client:preview-server": "env-cmd -f ./envs/client/preview-server.env react-scripts start", - "client:mocks": "env-cmd -f ./envs/client/.mock-server.env react-scripts start", - "client:dev-server": "env-cmd -f ./envs/client/local-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", From 105f94f86961ac57bf10072b13dc486a1dcfe4ca Mon Sep 17 00:00:00 2001 From: MTG2000 Date: Mon, 29 Aug 2022 19:01:08 +0300 Subject: [PATCH 4/6] remove todos file --- TODO.md | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 TODO.md diff --git a/TODO.md b/TODO.md deleted file mode 100644 index 4d7f606..0000000 --- a/TODO.md +++ /dev/null @@ -1,9 +0,0 @@ -## 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 From 679d1fb39cb01e3d1ac5f58c556d4a25f6793e02 Mon Sep 17 00:00:00 2001 From: MTG2000 Date: Mon, 29 Aug 2022 19:01:44 +0300 Subject: [PATCH 5/6] update: local dev env url --- envs/client/dev-server.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/envs/client/dev-server.env b/envs/client/dev-server.env index 11350da..08c47f2 100644 --- a/envs/client/dev-server.env +++ b/envs/client/dev-server.env @@ -1,2 +1,2 @@ -REACT_APP_API_END_POINT = http://192.168.1.2:8888/dev \ No newline at end of file +REACT_APP_API_END_POINT = http://localhost:8888/dev \ No newline at end of file From 4af10c204101f01a8d0bb8c1b71272e4b1fda86e Mon Sep 17 00:00:00 2001 From: MTG2000 Date: Mon, 29 Aug 2022 19:11:49 +0300 Subject: [PATCH 6/6] fix: remove extra title --- .../PreferencesTab/LinkingAccountModal/LinkingAccountModal.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/features/Profiles/pages/EditProfilePage/PreferencesTab/LinkingAccountModal/LinkingAccountModal.tsx b/src/features/Profiles/pages/EditProfilePage/PreferencesTab/LinkingAccountModal/LinkingAccountModal.tsx index 14f7d5e..e4bc49f 100644 --- a/src/features/Profiles/pages/EditProfilePage/PreferencesTab/LinkingAccountModal/LinkingAccountModal.tsx +++ b/src/features/Profiles/pages/EditProfilePage/PreferencesTab/LinkingAccountModal/LinkingAccountModal.tsx @@ -145,8 +145,6 @@ export default function LinkingAccountModal({ onClose, direction, ...props }: Mo exit='exit' className="modal-card max-w-[442px] p-24 rounded-xl relative" > - -

Connect another ⚡️ wallet

Connect another ⚡️ wallet

{content}