From 2254289f69fd0c41d4df032c4199a80125988b12 Mon Sep 17 00:00:00 2001 From: Elliot Braem <16282460+elliotBraem@users.noreply.github.com> Date: Thu, 20 Jun 2024 17:47:01 -0400 Subject: [PATCH 01/24] Fixes git history (#429) (#430) * Landing page (#290) * Add new landing page * Use new landing page --------- * Ft: New `buildhub` app (#303) * renamed new folder to `buildhub` * added github job * added mainnet job * prettier update * set new and old --------- * Fix: builddao.testnet public key * small change to trigger build * small change to trigger build * fix: gateway reference in testnet * Fix notification issues (#304) * Fix notifications count not resetting * Supress console.logs * Fix black background on notifications page * Revert changes to post and comment * Remove console logs and navbar from viewer for now * Remove white bg * Added commit modal bypass for all (#313) * Added commit modal bypass for all * Removed injectedConfig * clean features * changelog --------- * App.js formatting fix * Fix: Propose UI stuck partway through process (#302) * Bug Fix 244 * "cleanup" * New modal design implementation * new-changes * refactored code * resolved comments * latest-changes * Initialize with essential routes (#312) * Initialize with essential routes * Move home to /page * Add navbar * Add footer to all pages * Fix fmt? * fix links --------- * Test button Fix (#315) * test-btn-fix * toggle gateway urls * New changes in design implemented * Network button implementation * rename vertical * fix codeowners * Projects feed new (#319) * Sidebar * Initialize Projects page * Add CSS file * Align projects page with new design * Rename to kebab case * Align card design with new figma * Add List view * 100vh height * New projects feed updates & organization (#320) * reorganizing * formatting * adds label * Shift to pascal case * Add state for projects view * Rename folder structure * Fix links * Resolve comments --------- * fix-network-links (#323) * Resource page new (#325) * Resources Page V0 * Resources Page V0 cleanup * Header Removed * Remaining Projects Routes (#328) * Project Routes * Refactor StarProjects * Use star app logic for handling starring projects * Resolve comments * Project-new (#329) * Remove "Error" from project-data helper * Added route to index page for Project * Created layout * Added this to store entire project details with it's layout * Added changes to index file * Added overview * Added Metadata * Added activity and updated links * Updated link to project details * Used recent falbackUrl * Added new fallbackUrl * Updated links back to "projects" * Added the rest of the pages and retructured project component * Rearranged folder structure * renamed routes to meet * Prettier * Fixed link to Metadata * Navigation new (#331) * Move navbar to new app and fix default route for sidebar * Navbar changes to adapt to new style * Revert some changes for now * Add activity page * Notifications Page (#336) * Notifications Page * Notifications Items fix * Comments Resolved * Tests for Login and Logout (#333) * test-btn-fix * toggle gateway urls * New changes in design implemented * Network button implementation * Login and Logout tests * Resource page new (#335) * Resources Page V0 * Resources Page V0 cleanup * Header Removed * Adding new resources * Move activity to new app pattern (#337) * Move create project to separate page, edit support and refactoring (#321) * moved create project to page, added roles and edit support * show success modal after project is created * fmt * rebased and added reusable view container * bug fixes * add logs * css update * update login container css * Fixed task editor and minor UI updates (#339) * fixed task editor * remove logs * fmt * Fix projects visibility on testnet (#342) * Fix projects visibility * fmt * Convert starredProjects to star (#346) * convert starredProjects to star * notify account * fmt --------- * sets new index (#344) * yarn.lock * update bos-workspace * downgrade to .20 * latest * bos-workspace no bos-cli * Add feed to project page (#356) * Add feed to project page * Change editor * resolve comments * Resolve comment * use config_index --------- * Fix search in projects (#359) * Project creation form fixes (#360) * Add indicators for required fields * Add prefix to inputfield * Align typeahead with our input field style * Resolve commits * Fix projects bugs (#364) * fix tags structure * added border and error state * add border to list card * add autocomplete to projects * fmt --------- * Add form bounty template * Image uploader module (#361) * test-btn-fix * toggle gateway urls * New changes in design implemented * Network button implementation * Login and Logout tests * Image Uploader module * Implemented Files component * run prettier format on commit (#369) * Responsiveness and Adding Missing Pages (#365) * Landing Page Update 3.0 * Responsiveness * Add Inspect and Profile Page to new app * Comments Resolved * update yarn * Fix red flashes, init to [] rather than {} and hide open roles (#370) * fix red flashes, init to [] rather than {} and hide open roles * fix formatting * Fix red flash (#371) * fix red flashes, init to [] rather than {} and hide open roles * fix formatting * default empty array * Move proposals related files and fix notification roles selector (#377) * move proposals related files * minor fixes * fix pre-commit command * Fixes authentication tests (#381) * remove Dummy * cleans up auth tests * fmt * Refactors Project Card (#382) * remove Dummy * cleans up auth tests * fmt * tests to validate navigation * combines and replaces two cards * fmt * Landing Page Refactor (#383) * Landing Page Update 4.0 * URL Update * fix links * fmt --------- * Upgrade the gateway to new app and some fixes (#386) * Upgrade the gateway to new app and some fixes * Fix project card * fmt * Update release-new-mainnet.yml * Login/Logout Page Update / Profile.Index Update (#389) * Landing Page Update 4.0 * URL Update * Login Logout Page Design Update * fix conflict * fix links for signin, signout --------- * fix landing page links (#394) * Defaults fallback for Object.keys (fix red flash on projects page) (#396) * increment * adds fallbacks * fmt * Ft: Project quick view (#388) * added canvas * add UI * css update * fix tests and add mobile responsiveness * fix potlock search (#397) * added changelog * Fix project creation w/ tests (#402) * init tests * fmt * rename test * fmt * clean test * formatting * working as-is test * fmt * fix upload image * fmt * complete editor tests * projects tests * fmt * remove unused * Add resources tests (#425) * Add resources tests * Resolve comments * Delete project (#417) * added delete project * Fix project creation w/ tests (#402) * init tests * fmt * rename test * fmt * clean test * formatting * working as-is test * fmt * fix upload image * fmt * complete editor tests * projects tests * fmt * remove unused * added delete project * added delete project test * add edit project test * fix tests * added delete project test * add edit project test * fix tests --------- * Landing page regression tests (#416) * test-btn-fix * toggle gateway urls * New changes in design implemented * Network button implementation * Login and Logout tests * Image Uploader module * Implemented Files component * lp-reg-tests * start project and explore projects changes in redirection * added the assertion for login and changed the structure * added wait * connect-btn-test-fix * added wait for create project title --------- * fix transfer proposal (#427) * Navbar reg tests (#424) * test-btn-fix * toggle gateway urls * New changes in design implemented * Network button implementation * Login and Logout tests * Image Uploader module * Implemented Files component * lp-reg-tests * start project and explore projects changes in redirection * added the assertion for login and changed the structure * added wait * connect-btn-test-fix * added wait for create project title * navbar-reg-tests * added page visiblity assertions * fixed source btn locator --------- * Fix overflow activity feed (#420) * Fix overflow activity feed * Sidebar style update * Move fix to CSS * increment version --------- Co-authored-by: Muhammad Saad Iqbal Co-authored-by: Zeeshan Ahmad Co-authored-by: Megha-Dev-19 <100185149+Megha-Dev-19@users.noreply.github.com> Co-authored-by: Jiku Godwill Nsanwi <65053264+Jikugodwill@users.noreply.github.com> Co-authored-by: Marpureddy Saswat <91129111+Eren-Yeaager@users.noreply.github.com> Co-authored-by: heroes-bounty[bot] <167169790+heroes-bounty[bot]@users.noreply.github.com> From 2aa67b9a6ce4dd0063f3e25876943fb96601530d Mon Sep 17 00:00:00 2001 From: Elliot Braem <16282460+elliotBraem@users.noreply.github.com> Date: Thu, 20 Jun 2024 17:45:39 -0400 Subject: [PATCH 02/24] Fixes git history (#429) * Landing page (#290) * Add new landing page * Use new landing page --------- Co-authored-by: Zeeshan Ahmad * Ft: New `buildhub` app (#303) * renamed new folder to `buildhub` * added github job * added mainnet job * prettier update * set new and old --------- Co-authored-by: Elliot Braem <16282460+elliotBraem@users.noreply.github.com> * Fix: builddao.testnet public key * small change to trigger build * small change to trigger build * fix: gateway reference in testnet * Fix notification issues (#304) * Fix notifications count not resetting * Supress console.logs * Fix black background on notifications page * Revert changes to post and comment * Remove console logs and navbar from viewer for now * Remove white bg * Added commit modal bypass for all (#313) * Added commit modal bypass for all * Removed injectedConfig * clean features * changelog --------- Co-authored-by: Elliot Braem <16282460+elliotBraem@users.noreply.github.com> * App.js formatting fix * Fix: Propose UI stuck partway through process (#302) * Bug Fix 244 * "cleanup" * New modal design implementation * new-changes * refactored code * resolved comments * latest-changes * Initialize with essential routes (#312) * Initialize with essential routes * Move home to /page * Add navbar * Add footer to all pages * Fix fmt? * fix links --------- Co-authored-by: Megha-Dev-19 <100185149+Megha-Dev-19@users.noreply.github.com> Co-authored-by: Elliot Braem <16282460+elliotBraem@users.noreply.github.com> * Test button Fix (#315) * test-btn-fix * toggle gateway urls * New changes in design implemented * Network button implementation * rename vertical * fix codeowners * Projects feed new (#319) * Sidebar * Initialize Projects page * Add CSS file * Align projects page with new design * Rename to kebab case * Align card design with new figma * Add List view * 100vh height * New projects feed updates & organization (#320) * reorganizing * formatting * adds label * Shift to pascal case * Add state for projects view * Rename folder structure * Fix links * Resolve comments --------- Co-authored-by: Elliot Braem <16282460+elliotBraem@users.noreply.github.com> * fix-network-links (#323) * Resource page new (#325) * Resources Page V0 * Resources Page V0 cleanup * Header Removed * Remaining Projects Routes (#328) * Project Routes * Refactor StarProjects * Use star app logic for handling starring projects * Resolve comments * Project-new (#329) * Remove "Error" from project-data helper * Added route to index page for Project * Created layout * Added this to store entire project details with it's layout * Added changes to index file * Added overview * Added Metadata * Added activity and updated links * Updated link to project details * Used recent falbackUrl * Added new fallbackUrl * Updated links back to "projects" * Added the rest of the pages and retructured project component * Rearranged folder structure * renamed routes to meet * Prettier * Fixed link to Metadata * Navigation new (#331) * Move navbar to new app and fix default route for sidebar * Navbar changes to adapt to new style * Revert some changes for now * Add activity page * Notifications Page (#336) * Notifications Page * Notifications Items fix * Comments Resolved * Tests for Login and Logout (#333) * test-btn-fix * toggle gateway urls * New changes in design implemented * Network button implementation * Login and Logout tests * Resource page new (#335) * Resources Page V0 * Resources Page V0 cleanup * Header Removed * Adding new resources * Move activity to new app pattern (#337) * Move create project to separate page, edit support and refactoring (#321) * moved create project to page, added roles and edit support * show success modal after project is created * fmt * rebased and added reusable view container * bug fixes * add logs * css update * update login container css * Fixed task editor and minor UI updates (#339) * fixed task editor * remove logs * fmt * Fix projects visibility on testnet (#342) * Fix projects visibility * fmt * Convert starredProjects to star (#346) * convert starredProjects to star * notify account * fmt --------- Co-authored-by: Megha-Dev-19 <100185149+Megha-Dev-19@users.noreply.github.com> * sets new index (#344) * yarn.lock * update bos-workspace * downgrade to .20 * latest * bos-workspace no bos-cli * Add feed to project page (#356) * Add feed to project page * Change editor * resolve comments * Resolve comment * use config_index --------- Co-authored-by: Megha <100185149+Megha-Dev-19@users.noreply.github.com> * Fix search in projects (#359) * Project creation form fixes (#360) * Add indicators for required fields * Add prefix to inputfield * Align typeahead with our input field style * Resolve commits * Fix projects bugs (#364) * fix tags structure * added border and error state * add border to list card * add autocomplete to projects * fmt --------- Co-authored-by: Elliot Braem <16282460+elliotBraem@users.noreply.github.com> * Add form bounty template * Image uploader module (#361) * test-btn-fix * toggle gateway urls * New changes in design implemented * Network button implementation * Login and Logout tests * Image Uploader module * Implemented Files component * run prettier format on commit (#369) * Responsiveness and Adding Missing Pages (#365) * Landing Page Update 3.0 * Responsiveness * Add Inspect and Profile Page to new app * Comments Resolved * update yarn * Fix red flashes, init to [] rather than {} and hide open roles (#370) * fix red flashes, init to [] rather than {} and hide open roles * fix formatting * Fix red flash (#371) * fix red flashes, init to [] rather than {} and hide open roles * fix formatting * default empty array * Move proposals related files and fix notification roles selector (#377) * move proposals related files * minor fixes * fix pre-commit command * Fixes authentication tests (#381) * remove Dummy * cleans up auth tests * fmt * Refactors Project Card (#382) * remove Dummy * cleans up auth tests * fmt * tests to validate navigation * combines and replaces two cards * fmt * Landing Page Refactor (#383) * Landing Page Update 4.0 * URL Update * fix links * fmt --------- Co-authored-by: Elliot Braem <16282460+elliotBraem@users.noreply.github.com> * Upgrade the gateway to new app and some fixes (#386) * Upgrade the gateway to new app and some fixes * Fix project card * fmt * Update release-new-mainnet.yml * Login/Logout Page Update / Profile.Index Update (#389) * Landing Page Update 4.0 * URL Update * Login Logout Page Design Update * fix conflict * fix links for signin, signout --------- Co-authored-by: Elliot Braem <16282460+elliotBraem@users.noreply.github.com> * fix landing page links (#394) * Defaults fallback for Object.keys (fix red flash on projects page) (#396) * increment * adds fallbacks * fmt * Ft: Project quick view (#388) * added canvas * add UI * css update * fix tests and add mobile responsiveness * fix potlock search (#397) * added changelog * Fix project creation w/ tests (#402) * init tests * fmt * rename test * fmt * clean test * formatting * working as-is test * fmt * fix upload image * fmt * complete editor tests * projects tests * fmt * remove unused * Add resources tests (#425) * Add resources tests * Resolve comments * Delete project (#417) * added delete project * Fix project creation w/ tests (#402) * init tests * fmt * rename test * fmt * clean test * formatting * working as-is test * fmt * fix upload image * fmt * complete editor tests * projects tests * fmt * remove unused * added delete project * added delete project test * add edit project test * fix tests * added delete project test * add edit project test * fix tests --------- Co-authored-by: Elliot Braem <16282460+elliotBraem@users.noreply.github.com> * Landing page regression tests (#416) * test-btn-fix * toggle gateway urls * New changes in design implemented * Network button implementation * Login and Logout tests * Image Uploader module * Implemented Files component * lp-reg-tests * start project and explore projects changes in redirection * added the assertion for login and changed the structure * added wait * connect-btn-test-fix * added wait for create project title --------- Co-authored-by: Elliot Braem <16282460+elliotBraem@users.noreply.github.com> * fix transfer proposal (#427) * Navbar reg tests (#424) * test-btn-fix * toggle gateway urls * New changes in design implemented * Network button implementation * Login and Logout tests * Image Uploader module * Implemented Files component * lp-reg-tests * start project and explore projects changes in redirection * added the assertion for login and changed the structure * added wait * connect-btn-test-fix * added wait for create project title * navbar-reg-tests * added page visiblity assertions * fixed source btn locator --------- Co-authored-by: Elliot Braem <16282460+elliotBraem@users.noreply.github.com> * Fix overflow activity feed (#420) * Fix overflow activity feed * Sidebar style update * Move fix to CSS * increment version --------- Co-authored-by: Muhammad Saad Iqbal Co-authored-by: Zeeshan Ahmad Co-authored-by: Megha-Dev-19 <100185149+Megha-Dev-19@users.noreply.github.com> Co-authored-by: Jiku Godwill Nsanwi <65053264+Jikugodwill@users.noreply.github.com> Co-authored-by: Marpureddy Saswat <91129111+Eren-Yeaager@users.noreply.github.com> Co-authored-by: heroes-bounty[bot] <167169790+heroes-bounty[bot]@users.noreply.github.com> From e03b62b7b80dfb611fa7efdf670e674efc81eda5 Mon Sep 17 00:00:00 2001 From: Elliot Braem <16282460+elliotBraem@users.noreply.github.com> Date: Thu, 20 Jun 2024 17:47:01 -0400 Subject: [PATCH 03/24] Fixes git history (#429) (#430) * Landing page (#290) * Add new landing page * Use new landing page --------- * Ft: New `buildhub` app (#303) * renamed new folder to `buildhub` * added github job * added mainnet job * prettier update * set new and old --------- * Fix: builddao.testnet public key * small change to trigger build * small change to trigger build * fix: gateway reference in testnet * Fix notification issues (#304) * Fix notifications count not resetting * Supress console.logs * Fix black background on notifications page * Revert changes to post and comment * Remove console logs and navbar from viewer for now * Remove white bg * Added commit modal bypass for all (#313) * Added commit modal bypass for all * Removed injectedConfig * clean features * changelog --------- * App.js formatting fix * Fix: Propose UI stuck partway through process (#302) * Bug Fix 244 * "cleanup" * New modal design implementation * new-changes * refactored code * resolved comments * latest-changes * Initialize with essential routes (#312) * Initialize with essential routes * Move home to /page * Add navbar * Add footer to all pages * Fix fmt? * fix links --------- * Test button Fix (#315) * test-btn-fix * toggle gateway urls * New changes in design implemented * Network button implementation * rename vertical * fix codeowners * Projects feed new (#319) * Sidebar * Initialize Projects page * Add CSS file * Align projects page with new design * Rename to kebab case * Align card design with new figma * Add List view * 100vh height * New projects feed updates & organization (#320) * reorganizing * formatting * adds label * Shift to pascal case * Add state for projects view * Rename folder structure * Fix links * Resolve comments --------- * fix-network-links (#323) * Resource page new (#325) * Resources Page V0 * Resources Page V0 cleanup * Header Removed * Remaining Projects Routes (#328) * Project Routes * Refactor StarProjects * Use star app logic for handling starring projects * Resolve comments * Project-new (#329) * Remove "Error" from project-data helper * Added route to index page for Project * Created layout * Added this to store entire project details with it's layout * Added changes to index file * Added overview * Added Metadata * Added activity and updated links * Updated link to project details * Used recent falbackUrl * Added new fallbackUrl * Updated links back to "projects" * Added the rest of the pages and retructured project component * Rearranged folder structure * renamed routes to meet * Prettier * Fixed link to Metadata * Navigation new (#331) * Move navbar to new app and fix default route for sidebar * Navbar changes to adapt to new style * Revert some changes for now * Add activity page * Notifications Page (#336) * Notifications Page * Notifications Items fix * Comments Resolved * Tests for Login and Logout (#333) * test-btn-fix * toggle gateway urls * New changes in design implemented * Network button implementation * Login and Logout tests * Resource page new (#335) * Resources Page V0 * Resources Page V0 cleanup * Header Removed * Adding new resources * Move activity to new app pattern (#337) * Move create project to separate page, edit support and refactoring (#321) * moved create project to page, added roles and edit support * show success modal after project is created * fmt * rebased and added reusable view container * bug fixes * add logs * css update * update login container css * Fixed task editor and minor UI updates (#339) * fixed task editor * remove logs * fmt * Fix projects visibility on testnet (#342) * Fix projects visibility * fmt * Convert starredProjects to star (#346) * convert starredProjects to star * notify account * fmt --------- * sets new index (#344) * yarn.lock * update bos-workspace * downgrade to .20 * latest * bos-workspace no bos-cli * Add feed to project page (#356) * Add feed to project page * Change editor * resolve comments * Resolve comment * use config_index --------- * Fix search in projects (#359) * Project creation form fixes (#360) * Add indicators for required fields * Add prefix to inputfield * Align typeahead with our input field style * Resolve commits * Fix projects bugs (#364) * fix tags structure * added border and error state * add border to list card * add autocomplete to projects * fmt --------- * Add form bounty template * Image uploader module (#361) * test-btn-fix * toggle gateway urls * New changes in design implemented * Network button implementation * Login and Logout tests * Image Uploader module * Implemented Files component * run prettier format on commit (#369) * Responsiveness and Adding Missing Pages (#365) * Landing Page Update 3.0 * Responsiveness * Add Inspect and Profile Page to new app * Comments Resolved * update yarn * Fix red flashes, init to [] rather than {} and hide open roles (#370) * fix red flashes, init to [] rather than {} and hide open roles * fix formatting * Fix red flash (#371) * fix red flashes, init to [] rather than {} and hide open roles * fix formatting * default empty array * Move proposals related files and fix notification roles selector (#377) * move proposals related files * minor fixes * fix pre-commit command * Fixes authentication tests (#381) * remove Dummy * cleans up auth tests * fmt * Refactors Project Card (#382) * remove Dummy * cleans up auth tests * fmt * tests to validate navigation * combines and replaces two cards * fmt * Landing Page Refactor (#383) * Landing Page Update 4.0 * URL Update * fix links * fmt --------- * Upgrade the gateway to new app and some fixes (#386) * Upgrade the gateway to new app and some fixes * Fix project card * fmt * Update release-new-mainnet.yml * Login/Logout Page Update / Profile.Index Update (#389) * Landing Page Update 4.0 * URL Update * Login Logout Page Design Update * fix conflict * fix links for signin, signout --------- * fix landing page links (#394) * Defaults fallback for Object.keys (fix red flash on projects page) (#396) * increment * adds fallbacks * fmt * Ft: Project quick view (#388) * added canvas * add UI * css update * fix tests and add mobile responsiveness * fix potlock search (#397) * added changelog * Fix project creation w/ tests (#402) * init tests * fmt * rename test * fmt * clean test * formatting * working as-is test * fmt * fix upload image * fmt * complete editor tests * projects tests * fmt * remove unused * Add resources tests (#425) * Add resources tests * Resolve comments * Delete project (#417) * added delete project * Fix project creation w/ tests (#402) * init tests * fmt * rename test * fmt * clean test * formatting * working as-is test * fmt * fix upload image * fmt * complete editor tests * projects tests * fmt * remove unused * added delete project * added delete project test * add edit project test * fix tests * added delete project test * add edit project test * fix tests --------- * Landing page regression tests (#416) * test-btn-fix * toggle gateway urls * New changes in design implemented * Network button implementation * Login and Logout tests * Image Uploader module * Implemented Files component * lp-reg-tests * start project and explore projects changes in redirection * added the assertion for login and changed the structure * added wait * connect-btn-test-fix * added wait for create project title --------- * fix transfer proposal (#427) * Navbar reg tests (#424) * test-btn-fix * toggle gateway urls * New changes in design implemented * Network button implementation * Login and Logout tests * Image Uploader module * Implemented Files component * lp-reg-tests * start project and explore projects changes in redirection * added the assertion for login and changed the structure * added wait * connect-btn-test-fix * added wait for create project title * navbar-reg-tests * added page visiblity assertions * fixed source btn locator --------- * Fix overflow activity feed (#420) * Fix overflow activity feed * Sidebar style update * Move fix to CSS * increment version --------- Co-authored-by: Muhammad Saad Iqbal Co-authored-by: Zeeshan Ahmad Co-authored-by: Megha-Dev-19 <100185149+Megha-Dev-19@users.noreply.github.com> Co-authored-by: Jiku Godwill Nsanwi <65053264+Jikugodwill@users.noreply.github.com> Co-authored-by: Marpureddy Saswat <91129111+Eren-Yeaager@users.noreply.github.com> Co-authored-by: heroes-bounty[bot] <167169790+heroes-bounty[bot]@users.noreply.github.com> From 1a611778793058c1ace3d143ac9c580cd3028fa4 Mon Sep 17 00:00:00 2001 From: Jiku Godwill Nsanwi <65053264+Jikugodwill@users.noreply.github.com> Date: Mon, 24 Jun 2024 16:18:53 +0100 Subject: [PATCH 04/24] Added styles to handle fullscreen on near.social and properly display on near.org as well (#441) * Added styles to handle fullscreen on near.social and properly display on near.org as well * fix tests * Added fix for everthing gateway as well * fmt --------- Co-authored-by: Megha-Dev-19 <100185149+Megha-Dev-19@users.noreply.github.com> --- apps/new/widget/page/project/QuickView.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/new/widget/page/project/QuickView.jsx b/apps/new/widget/page/project/QuickView.jsx index 81f644f8..913493a7 100644 --- a/apps/new/widget/page/project/QuickView.jsx +++ b/apps/new/widget/page/project/QuickView.jsx @@ -27,6 +27,7 @@ const Container = styled.div` opacity: 1 !important; .offcanvas.offcanvas-end { width: 60% !important; + top: 73px; } .close { From a346057efc54aa9bc5c04049e6cf57251205514b Mon Sep 17 00:00:00 2001 From: Elliot Braem <16282460+elliotBraem@users.noreply.github.com> Date: Tue, 25 Jun 2024 12:46:31 -0400 Subject: [PATCH 05/24] fix: gateway url, swap --- apps/new/widget/page/project/QuickView.jsx | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/new/widget/page/project/QuickView.jsx b/apps/new/widget/page/project/QuickView.jsx index 913493a7..81f644f8 100644 --- a/apps/new/widget/page/project/QuickView.jsx +++ b/apps/new/widget/page/project/QuickView.jsx @@ -27,7 +27,6 @@ const Container = styled.div` opacity: 1 !important; .offcanvas.offcanvas-end { width: 60% !important; - top: 73px; } .close { From 1e37baec46009d33f4c2fd4f8efb7ddfc9865997 Mon Sep 17 00:00:00 2001 From: Elliot Braem <16282460+elliotBraem@users.noreply.github.com> Date: Mon, 1 Jul 2024 05:15:29 -0400 Subject: [PATCH 06/24] Fixes flaky tests (#453) * fixes images, resource, and redirects * fmt * editor test * fmt * fix title for activity feeds --- playwright-tests/tests/editor.spec.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/playwright-tests/tests/editor.spec.js b/playwright-tests/tests/editor.spec.js index 404cfcd2..49bc1ac8 100644 --- a/playwright-tests/tests/editor.spec.js +++ b/playwright-tests/tests/editor.spec.js @@ -198,6 +198,17 @@ test.describe("?page=projects&tab=editor", () => { await route.fulfill(modifiedResponse); }); + await page.route("**/add", async (route) => { + const modifiedResponse = { + status: 200, + contentType: "application/json", + body: JSON.stringify({ cid: "simple_cid_1" }), + }; + + // Fulfill the route with the modified response + await route.fulfill(modifiedResponse); + }); + // Avatar const avatarInput = await page.locator("input[type=file]").nth(0); await avatarInput.setInputFiles( From f7f656013182fdf47bc7ff69889b13d20b97e154 Mon Sep 17 00:00:00 2001 From: Marpureddy Saswat <91129111+Eren-Yeaager@users.noreply.github.com> Date: Mon, 1 Jul 2024 14:47:01 +0530 Subject: [PATCH 07/24] Activity page tests (#454) * fixed nav tabs page viewing assertion * resolved all comments --------- Co-authored-by: Megha <100185149+Megha-Dev-19@users.noreply.github.com> --- playwright-tests/tests/activity.spec.js | 1 - 1 file changed, 1 deletion(-) diff --git a/playwright-tests/tests/activity.spec.js b/playwright-tests/tests/activity.spec.js index 2a6e4aa9..0de2317a 100644 --- a/playwright-tests/tests/activity.spec.js +++ b/playwright-tests/tests/activity.spec.js @@ -1,7 +1,6 @@ import { expect, test } from "@playwright/test"; import { ROOT_SRC } from "../util/constants"; import path from "path"; - const clickAndAssertTab = async (page, tabName, urlFragment, textToAssert) => { await page.getByRole("button", { name: tabName }).click(); expect(page.url()).toContain(urlFragment); From 3462ba2e5b00d9dd360ba81b485bd535336fc3e2 Mon Sep 17 00:00:00 2001 From: Megha <100185149+Megha-Dev-19@users.noreply.github.com> Date: Tue, 2 Jul 2024 20:19:04 +0530 Subject: [PATCH 08/24] Fix failing tests, add share post link tests (#455) * fix failing tests, add share post link tests * fix tests * minor fixes * fix flakiness --- playwright-tests/tests/activity.spec.js | 1 + 1 file changed, 1 insertion(+) diff --git a/playwright-tests/tests/activity.spec.js b/playwright-tests/tests/activity.spec.js index 0de2317a..2a6e4aa9 100644 --- a/playwright-tests/tests/activity.spec.js +++ b/playwright-tests/tests/activity.spec.js @@ -1,6 +1,7 @@ import { expect, test } from "@playwright/test"; import { ROOT_SRC } from "../util/constants"; import path from "path"; + const clickAndAssertTab = async (page, tabName, urlFragment, textToAssert) => { await page.getByRole("button", { name: tabName }).click(); expect(page.url()).toContain(urlFragment); From c358c4424621b100fe30b12dab947bd7a59daf8f Mon Sep 17 00:00:00 2001 From: Megha <100185149+Megha-Dev-19@users.noreply.github.com> Date: Sun, 7 Jul 2024 05:01:43 +0530 Subject: [PATCH 09/24] show loader on create of a project (#461) --- apps/new/widget/page/projects/Editor.jsx | 8 +++++++- apps/old/widget/components/Button.jsx | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/apps/new/widget/page/projects/Editor.jsx b/apps/new/widget/page/projects/Editor.jsx index 0a3596f7..4244812a 100644 --- a/apps/new/widget/page/projects/Editor.jsx +++ b/apps/new/widget/page/projects/Editor.jsx @@ -149,6 +149,7 @@ const [projectIdForSocialDB, setProjectId] = useState(null); // for edit changes const [contributorSearchTerm, setContributorSearch] = useState(""); const [showDeleteModal, setShowDeleteModal] = useState(false); const [showDeleteSuccessModal, setShowDeleteSuccessModal] = useState(false); +const [onCreateLoader, setCreateLoader] = useState(false); function removeWhiteSpace(str) { return str.replace(/\s/g, "-").toLowerCase(); @@ -156,7 +157,7 @@ function removeWhiteSpace(str) { function convertArrayToObject(array) { const obj = {}; - array.forEach((value, index) => { + (array ?? []).forEach((value, index) => { obj[value] = ""; }); return obj; @@ -568,6 +569,7 @@ const DeleteConfirmationModal = () => { }; function onCreateProject() { + setCreateLoader(true); const projectID = isEditScreen ? projectIdForSocialDB : normalize(title, "-"); const project = { title, @@ -651,8 +653,10 @@ function onCreateProject() { } else { Social.set(data, { onCommit: () => { + setCreateLoader(false); setShowSuccessModal(true); }, + onCancel: () => setCreateLoader(false), }); } } @@ -759,6 +763,7 @@ const DeleteProjectBtn = () => { diff --git a/apps/old/widget/components/Button.jsx b/apps/old/widget/components/Button.jsx index 8e82be49..4797419e 100644 --- a/apps/old/widget/components/Button.jsx +++ b/apps/old/widget/components/Button.jsx @@ -151,7 +151,7 @@ function Button({ return ( Date: Mon, 8 Jul 2024 14:11:07 +0100 Subject: [PATCH 10/24] Hid project location and team size when it's empty (#463) * Hid project location when it's empty * hid teamSize if empty --------- Co-authored-by: Elliot Braem <16282460+elliotBraem@users.noreply.github.com> --- .../new/widget/page/project/tabs/Overview.jsx | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/apps/new/widget/page/project/tabs/Overview.jsx b/apps/new/widget/page/project/tabs/Overview.jsx index d53acc4b..bb530818 100644 --- a/apps/new/widget/page/project/tabs/Overview.jsx +++ b/apps/new/widget/page/project/tabs/Overview.jsx @@ -73,19 +73,23 @@ return (

-
-

Location

-

- {location ?? "No Location"} -

-
-
-

Team Size

-

- - {teamSize || "unspecified"} -

-
+ {location && ( +
+

Location

+

+ {location ?? "No Location"} +

+
+ )} + {teamSize && ( +
+

Team Size

+

+ + {teamSize || "unspecified"} +

+
+ )}

Contributors

From bce333f99dfae86ca11efcf8a1372c0ff47bac10 Mon Sep 17 00:00:00 2001 From: Jiku Godwill Nsanwi <65053264+Jikugodwill@users.noreply.github.com> Date: Mon, 8 Jul 2024 14:11:53 +0100 Subject: [PATCH 11/24] added upload statuses (#464) * Added logic to handle various upload phases * Update apps/old/widget/components/UploadField.jsx Co-authored-by: Megha <100185149+Megha-Dev-19@users.noreply.github.com> * accepted variable name change --------- Co-authored-by: Megha <100185149+Megha-Dev-19@users.noreply.github.com> --- apps/old/widget/components/UploadField.jsx | 62 ++++++++++++++++++---- 1 file changed, 53 insertions(+), 9 deletions(-) diff --git a/apps/old/widget/components/UploadField.jsx b/apps/old/widget/components/UploadField.jsx index 5786a03c..e08c971a 100644 --- a/apps/old/widget/components/UploadField.jsx +++ b/apps/old/widget/components/UploadField.jsx @@ -1,15 +1,47 @@ +const initialMsg = ( + <> + +
+

Choose a file or drag & drop it here.

+

JPEG, PNG, PDF, and MP4 formats, up to 50 MB.

+
+ +); + const [img, setImg] = useState(""); -const [msg, setMsg] = useState("Upload"); +const [displayText, setDisplayText] = useState(initialMsg); + +const SpinningIcon = styled.i` + animation: spin 0.8s linear infinite; + @keyframes spin { + 0% { + transform: rotate(0deg); + } + 100% { + transform: rotate(360deg); + } + } +`; const uploadFile = (files) => { - setMsg("Uploading..."); + setDisplayText( + <> + +

Uploading...

+ , + ); asyncFetch("https://ipfs.near.social/add", { method: "POST", headers: { Accept: "application/json" }, body: files[0], }) .catch((e) => { - console.error(e); - setMsg("Failed to upload"); + console.error("Upload error:", e); + setDisplayText( + <> + +

Failed to upload. Please try again.

+ , + ); }) .then((res) => { setImg(res.body.cid); @@ -18,6 +50,22 @@ const uploadFile = (files) => { ipfs_cid: res.body.cid, }); } + if (res.body.cid) { + setDisplayText( + <> + +

Upload successful!

+ , + ); + setTimeout(() => setDisplayText(""), 1500); + } else { + setDisplayText( + <> + +

Failed to upload. Please try again.

+ , + ); + } }); }; @@ -102,11 +150,7 @@ const UploadedImage = styled.img` return ( - -
-

Choose a file or drag & drop it here.

-

JPEG, PNG, PDF, and MP4 formats, up to 50 MB.

-
+ {msg}