Merge pull request #88 from PotLock/staging

Staging => main

src/components/Inputs/SelectMultiple/SelectMultiple.tsx

@@ -15,13 +15,7 @@ const SelectMultiple = (props: Props) => {
   return (
     <Container>
       {label && <Label>{label}</Label>}
-      <Typeahead
-        options={options}
-        multiple
-        onChange={onChange}
-        placeholder={placeholder}
-        // selected={selected}
-      />
+      <Typeahead options={options} multiple onChange={onChange} placeholder={placeholder} selected={selected} />
     </Container>
   );
 };

src/pages/CreateProject/components/CreateForm/CreateForm.tsx

@@ -17,7 +17,7 @@ import validateGithubRepoUrl from "@app/utils/validateGithubRepoUrl";
 import validateNearAddress from "@app/utils/validateNearAddress";
 import { socialFields, CATEGORY_MAPPINGS, CHAIN_OPTIONS, DEFAULT_STATE } from "../../utils/fields";
 import handleCreateOrUpdateProject from "../../utils/handleCreateOrUpdateProject";
-import { projectDisabled } from "../../utils/helpers";
+import { extractRepoPath, projectDisabled } from "../../utils/helpers";
 import setSocialData from "../../utils/setSocialData";
 import AccountsStack from "../AccountsStack/AccountsStack";
 import DAOInProgress from "../DAOInProgress/DAOInProgress";
@@ -621,30 +621,13 @@ const CreateForm = (props: { edit: boolean }) => {
                           // validate link
                           const repo = state.githubRepos[index];
 
-                          const isValid =
-                            validateGithubRepoUrl(repo.value) || repo.value === "" || repo.value === undefined;
-                          // if invalid, set the error as the 2nd element of the array
-                          if (!isValid) {
-                            State.update({
-                              githubRepos: {
-                                ...state.githubRepos,
-                                [index]: {
-                                  value: repo.value,
-                                  err: "Invalid GitHub Repo URL",
-                                },
-                              },
-                            });
-                          } else {
-                            State.update({
-                              githubRepos: {
-                                ...state.githubRepos,
-                                [index]: {
-                                  value: repo.value,
-                                  err: "",
-                                },
-                              },
-                            });
-                          }
+                          const repoObj = extractRepoPath(repo.value);
+                          State.update({
+                            githubRepos: {
+                              ...state.githubRepos,
+                              [index]: repoObj,
+                            },
+                          });
                         },
                         error: state.githubRepos[index].err || "",
                       }}

src/pages/CreateProject/components/Header/Header.tsx

@@ -10,8 +10,7 @@ const Header = ({ edit }: { edit: boolean }) => {
     >
       <HeaderTitle>{edit ? "Edit" : "Register New"} Project</HeaderTitle>
       <HeaderDescription>
-        Create a profile for your impact project to receive direct donations, Qualify for funding rounds, join NEAR's
-        accelerator, and get discovered across social platforms.
+        Create a profile for your project to receive donations and qualify for funding rounds.
       </HeaderDescription>
     </HeaderContainer>
   );

src/pages/CreateProject/utils/getSocialData.ts

@@ -26,7 +26,7 @@ const getSocialData = () => {
       plSmartContracts: formattedSmartContracts ? JSON.stringify(formattedSmartContracts) : null,
       plGithubRepos: JSON.stringify(
         Object.values(state.githubRepos)
-          .map(({ value, err }: any) => (err ? false : value))
+          .map(({ value, err }: any) => (err ? false : "github.com/" + value))
           .filter((val: any) => val),
       ),
       plFundingSources: JSON.stringify(state.fundingSources),

src/pages/CreateProject/utils/handleCreateOrUpdateProject.ts

@@ -31,6 +31,7 @@ const handleCreateOrUpdateProject = (e: any) => {
     return;
   }
   const socialData = getSocialData();
+
   if (state.backgroundImage) {
     socialData.profile.backgroundImage = state.backgroundImage;
   }

src/pages/CreateProject/utils/helpers.ts

@@ -56,3 +56,27 @@ export const projectDisabled = () =>
   (state.hasReceivedFunding && !state.fundingSources.length) ||
   !state.categories.length ||
   state.categoriesError;
+
+export function extractRepoPath(url: string) {
+  if (url) {
+    // Define a regular expression pattern to match GitHub repository URLs
+    const pattern = /^(?:https?:\/\/)?(?:www\.)?github\.com\/([^\/]+\/[^\/]+(?:\/.*)?)\/?$/;
+    // Execute the regular expression on the URL
+    const match = url.match(pattern);
+    // If a match is found, return the extracted repository path; otherwise, return null
+    return match
+      ? {
+          value: match[1],
+          err: "",
+        }
+      : {
+          value: url,
+          err: "",
+        };
+  } else {
+    return {
+      value: "",
+      err: "",
+    };
+  }
+}

src/pages/CreateProject/utils/setSocialData.ts

@@ -1,6 +1,11 @@
 import { Near, State } from "alem";
 import getTeamMembersFromSocialProfileData from "@app/utils/getTeamMembersFromSocialProfileData";
 import { CATEGORY_MAPPINGS } from "./fields";
+import { extractRepoPath } from "./helpers";
+
+interface GithubRepos {
+  [idx: string]: { value: string; err: string };
+}
 
 const setSocialData = (accountId: string, shouldSetTeamMembers?: any) => {
   Near.asyncView("social.near", "get", { keys: [`${accountId}/**`] })
@@ -26,6 +31,7 @@ const setSocialData = (accountId: string, shouldSetTeamMembers?: any) => {
       const description = profileData.description || "";
       const publicGoodReason = profileData.plPublicGoodReason || "";
       let categories = [];
+
       if (profileData.plCategories) {
         categories = JSON.parse(profileData.plCategories);
       } else if (profileData.category) {
@@ -53,11 +59,16 @@ const setSocialData = (accountId: string, shouldSetTeamMembers?: any) => {
       const hasSmartContracts = smartContracts.length > 0;
       smartContracts.push(["", ""]); // Add an empty string to the end of the array to allow for adding new contracts
 
-      const githubRepos = profileData.plGithubRepos
-        ? JSON.parse(profileData.plGithubRepos).map((repo: any) => [repo])
-        : [];
+      const githubRepos: GithubRepos = {};
+
+      if (profileData.plGithubRepos) {
+        JSON.parse(profileData.plGithubRepos).forEach((repo: string, idx: string) => {
+          githubRepos[idx] = extractRepoPath(repo);
+        });
+      }
+
       const originalGithubRepos = githubRepos;
-      githubRepos.push([""]); // Add an empty string to the end of the array to allow for adding new repos
+      // githubRepos.push([""]); // Add an empty string to the end of the array to allow for adding new repos
 
       const fundingSources = profileData.plFundingSources ? JSON.parse(profileData.plFundingSources) : [];
       const hasReceivedFunding = fundingSources.length > 0;

src/pages/Project/NavPages/About/About.tsx

@@ -32,11 +32,21 @@ const About = ({ projectId, accountId }: Props) => {
 
   const githubRepos = profile.plGithubRepos ? JSON.parse(profile.plGithubRepos) : [];
 
+  function convertToGitHubURL(path: string) {
+    const prefix = "https://github.com/";
+    // If the path starts with "github.com/", return it as it is
+    if (path.startsWith("github.com/")) {
+      return `https://${path}`;
+    }
+    // If the path does not contain "github.com/", assume it's a repository path and prepend the prefix
+    return `${prefix}${path}`;
+  }
+
   const Github = () =>
     githubRepos.length > 0 ? (
       <GithubWrapper>
         {githubRepos.map((url: string) => (
-          <a href={url} target="_blank">
+          <a href={convertToGitHubURL(url)} target="_blank">
             <svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
               <path d="M1.5 0.5V2.5H10.09L0.5 12.09L1.91 13.5L11.5 3.91V12.5H13.5V0.5H1.5Z" fill="#7B7B7B" />
             </svg>