Fix mainnet deploy (#390)

* Landing page (#290) * Add new landing page * Use new landing page --------- Co-authored-by: Zeeshan Ahmad <itexpert120@outlook.com> * 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> --------- Co-authored-by: Muhammad Saad Iqbal <saadiqbal.dev@outlook.com> Co-authored-by: Zeeshan Ahmad <itexpert120@outlook.com> 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>
NEARBuilders · Jun 14, 2024 · e08123d · e08123d
1 parent 8a8d074
commit e08123d
Show file tree

Hide file tree

Showing 9 changed files with 286 additions and 56 deletions.
diff --git a/.github/workflows/release-new-mainnet.yml b/.github/workflows/release-new-mainnet.yml
@@ -15,6 +15,6 @@ jobs:
       app-name: "new"
       deploy-account-address: "builddao.near"
       signer-account-address: "builddao.near"
-      signer-public-key: ""
+      signer-public-key: "ed25519:ELLHoQ4DDwFCf8eHxcy1NDwd3qLvVzPxUzuXPBdX7cpQ"
     secrets:
       SIGNER_PRIVATE_KEY: ${{ secrets.BOS_BUILDDAO_SIGNER_PRIVATE_KEY }}
diff --git a/apps/new/widget/page/login/Index.jsx b/apps/new/widget/page/login/Index.jsx
@@ -0,0 +1,100 @@
+const { Button } = VM.require("${alias_old}/widget/components") || {
+  Button: () => <></>,
+};
+
+const LoginContainer = styled.div`
+  background-color: #000000;
+  color: #fff;
+  height: 100vh;
+
+  position: relative;
+
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  .card {
+    z-index: 5;
+    background: transparent;
+    display: flex;
+    max-width: 500px;
+    width: 100%;
+    max-height: 550px;
+    padding: 80px 24px;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    gap: 40px;
+
+    img {
+      width: auto;
+      height: 54px;
+      object-fit: cover;
+    }
+
+    h1 {
+      color: var(--white-100, #fff);
+      text-align: center;
+
+      /* H1/small */
+      font-size: 2rem;
+      font-style: normal;
+      font-weight: 300;
+      line-height: 100%; /* 32px */
+
+      span {
+        font-weight: 600;
+      }
+    }
+  }
+`;
+
+const TopImage = styled.img`
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  object-fit: cover;
+  object-position: center top;
+`;
+
+const BottomImage = styled.img`
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  opacity: 0.3;
+  object-fit: cover;
+  object-position: center bottom;
+`;
+
+const LoginView = () => {
+  return (
+    <LoginContainer>
+      <TopImage src="https://ipfs.near.social/ipfs/bafkreielasf3vjasnx2hfnjjbhcl7gd37f33ideteqekflo4exrwm7jjvm" />
+      <div className="card">
+        <img
+          src="https://ipfs.near.social/ipfs/bafkreidij5nptpfck3xcppnp6qg6qqeq6lwgf2egyup44hxhgvx6bjnw5e"
+          alt="Build DAO Logo"
+        />
+        <h1>
+          Designed to <span> connect and empower builders </span>in a
+          multi-chain ecosystem
+        </h1>
+        <Button
+          style={{
+            padding: "8px 20px",
+            width: "200px",
+          }}
+          variant="primary"
+          onClick={props.requestSignIn}
+        >
+          Login
+        </Button>
+      </div>
+      <BottomImage src="https://ipfs.near.social/ipfs/bafkreigsfqkniqq5le4e7dawmibmy3qpoo7bz6ldmuhdgzoqmbckda7nty" />
+    </LoginContainer>
+  );
+};
+
+return <LoginView />;
diff --git a/apps/new/widget/page/logout/Index.jsx b/apps/new/widget/page/logout/Index.jsx
@@ -0,0 +1,92 @@
+const { Button } = VM.require("${alias_old}/widget/components") || {
+  Button: () => <></>,
+};
+
+const LogoutContainer = styled.div`
+  background-color: #000000;
+  color: #fff;
+  height: 100vh;
+
+  position: relative;
+
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  .card {
+    z-index: 5;
+    background: transparent;
+    display: flex;
+    max-width: 500px;
+    width: 100%;
+    max-height: 550px;
+    padding: 80px 24px;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    gap: 40px;
+
+    img {
+      width: auto;
+      height: 54px;
+      object-fit: cover;
+    }
+
+    h1 {
+      color: var(--white-100, #fff);
+      text-align: center;
+
+      /* H1/small */
+      font-size: 2rem;
+      font-style: normal;
+      font-weight: 500;
+      line-height: 100%; /* 32px */
+    }
+  }
+`;
+
+const TopImage = styled.img`
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  object-fit: cover;
+  object-position: center top;
+`;
+
+const BottomImage = styled.img`
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  opacity: 0.3;
+  object-fit: cover;
+  object-position: center bottom;
+`;
+
+const LogoutView = () => {
+  return (
+    <LogoutContainer>
+      <TopImage src="https://ipfs.near.social/ipfs/bafkreielasf3vjasnx2hfnjjbhcl7gd37f33ideteqekflo4exrwm7jjvm" />
+      <div className="card">
+        <img
+          src="https://ipfs.near.social/ipfs/bafkreidij5nptpfck3xcppnp6qg6qqeq6lwgf2egyup44hxhgvx6bjnw5e"
+          alt="Build DAO Logo"
+        />
+        <Button
+          style={{
+            padding: "8px 20px",
+            width: "200px",
+          }}
+          variant="primary"
+          onClick={props.logOut}
+        >
+          Sign Out
+        </Button>
+      </div>
+      <BottomImage src="https://ipfs.near.social/ipfs/bafkreigsfqkniqq5le4e7dawmibmy3qpoo7bz6ldmuhdgzoqmbckda7nty" />
+    </LogoutContainer>
+  );
+};
+
+return <LogoutView />;
diff --git a/apps/new/widget/page/notifications/Index.jsx b/apps/new/widget/page/notifications/Index.jsx
@@ -1,4 +1,4 @@
-const { Button } = VM.require("buildhub.near/widget/components") || {
+const { Button } = VM.require("${alias_old}/widget/components") || {
   Button: () => <></>,
 };
 

diff --git a/apps/old/widget/login.jsx b/apps/old/widget/login.jsx
@@ -1,25 +1,18 @@
+const { Button } = VM.require("${alias_old}/widget/components") || {
+  Button: () => <></>,
+};
+
 const LoginContainer = styled.div`
   background-color: #000000;
   color: #fff;
-  height: 100%;
+  height: 100vh;
 
   position: relative;
 
   display: flex;
   align-items: center;
   justify-content: center;
 
-  img {
-    width: 100%;
-    max-height: 100vh;
-    object-fit: cover;
-    object-position: center top;
-    position: absolute;
-    top: 0%;
-    left: 50%;
-    transform: translateX(-50%);
-  }
-
   .card {
     z-index: 5;
     background: transparent;
@@ -46,54 +39,60 @@ const LoginContainer = styled.div`
       /* H1/small */
       font-size: 2rem;
       font-style: normal;
-      font-weight: 500;
+      font-weight: 300;
       line-height: 100%; /* 32px */
-    }
-
-    button {
-      all: unset;
-      cursor: pointer;
-      display: flex;
-      padding: 16px 20px;
-      justify-content: center;
-      align-items: center;
-      gap: 4px;
-      align-self: stretch;
-
-      border-radius: 8px;
-      background: #eca227;
 
-      &:hover {
-        background: #e49b48;
+      span {
+        font-weight: 600;
       }
-
-      color: var(--black-100, #000);
-
-      font-size: 14px;
-      font-style: normal;
-      font-weight: 500;
-      line-height: normal;
     }
   }
 `;
 
+const TopImage = styled.img`
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  object-fit: cover;
+  object-position: center top;
+`;
+
+const BottomImage = styled.img`
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  opacity: 0.3;
+  object-fit: cover;
+  object-position: center bottom;
+`;
+
 const LoginView = () => {
   return (
     <LoginContainer>
+      <TopImage src="https://ipfs.near.social/ipfs/bafkreielasf3vjasnx2hfnjjbhcl7gd37f33ideteqekflo4exrwm7jjvm" />
       <div className="card">
         <img
-          src="https://ipfs.near.social/ipfs/bafkreihbwho3qfvnu4yss3eh5jrx6uxhrlzdgtdjyzyjrpa6odro6wdxya"
+          src="https://ipfs.near.social/ipfs/bafkreidij5nptpfck3xcppnp6qg6qqeq6lwgf2egyup44hxhgvx6bjnw5e"
           alt="Build DAO Logo"
         />
         <h1>
-          Designed to connect and empower builders in a multi-chain ecosystem
+          Designed to <span> connect and empower builders </span>in a
+          multi-chain ecosystem
         </h1>
-        <button onClick={props.requestSignIn}>Login</button>
+        <Button
+          style={{
+            padding: "8px 20px",
+            width: "200px",
+          }}
+          variant="primary"
+          onClick={props.requestSignIn}
+        >
+          Login
+        </Button>
       </div>
-      <img
-        src="https://ipfs.near.social/ipfs/bafybeibqnkvafyflci4iap73prugmjw4wlwmrazbiudvnsyr34yzmk75i4"
-        alt="Preview of Profiles"
-      />
+      <BottomImage src="https://ipfs.near.social/ipfs/bafkreigsfqkniqq5le4e7dawmibmy3qpoo7bz6ldmuhdgzoqmbckda7nty" />
     </LoginContainer>
   );
 };