Merge branch 'release-1.0.87'

hackforla · Nov 15, 2024 · cae0350 · cae0350
2 parents 011dbf5 + 5117d60
commit cae0350
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 34 deletions.
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "foodoasis-client",
   "description": "React Client for Food Oasis",
-  "version": "1.0.86",
+  "version": "1.0.87",
   "author": "Hack for LA",
   "license": "GPL-2.0",
   "private": true,

diff --git a/client/src/components/Admin/OrganizationEdit.jsx b/client/src/components/Admin/OrganizationEdit.jsx
@@ -33,13 +33,13 @@ import MoreDetails from "./OrganizationEdit/MoreDetails";
 import Verification from "./OrganizationEdit/Verification";
 import Label from "./ui/Label";
 import Textarea from "./ui/Textarea";
-import {
-  FACEBOOK_REGEX,
-  INSTAGRAM_REGEX,
-  LINKEDIN_REGEX,
-  PINTEREST_REGEX,
-  TWITTER_REGEX,
-} from "../../helpers/Constants";
+// import {
+//   FACEBOOK_REGEX,
+//   INSTAGRAM_REGEX,
+//   LINKEDIN_REGEX,
+//   PINTEREST_REGEX,
+//   TWITTER_REGEX,
+// } from "../../helpers/Constants";
 
 const HourSchema = Yup.object().shape({
   weekOfMonth: Yup.number().required("Interval is required"),
@@ -58,21 +58,11 @@ const validationSchema = Yup.object().shape({
   longitude: Yup.number().required("Longitude is required").min(-180).max(180),
   email: Yup.string().email("Invalid email address format"),
   hours: Yup.array().of(HourSchema),
-  instagram: Yup.string()
-    .matches(INSTAGRAM_REGEX, "Please enter a valid Instagram URL.")
-    .nullable(),
-  pinterest: Yup.string()
-    .matches(PINTEREST_REGEX, "Please enter a valid Pinterest URL.")
-    .nullable(),
-  facebook: Yup.string()
-    .matches(FACEBOOK_REGEX, "Please enter a valid Facebook URL.")
-    .nullable(),
-  linkedin: Yup.string()
-    .matches(LINKEDIN_REGEX, "Please enter a valid LinkedIn URL.")
-    .nullable(),
-  twitter: Yup.string()
-    .matches(TWITTER_REGEX, "Please enter a valid Twitter/X URL.")
-    .nullable(),
+  instagram: Yup.string().nullable(),
+  pinterest: Yup.string().nullable(),
+  facebook: Yup.string().nullable(),
+  linkedin: Yup.string().nullable(),
+  twitter: Yup.string().nullable(),
   selectedCategoryIds: Yup.array().min(
     1,
     "You must select at least one category"

diff --git a/client/src/components/Admin/OrganizationEdit/ContactDetails.jsx b/client/src/components/Admin/OrganizationEdit/ContactDetails.jsx
@@ -3,8 +3,6 @@ import { TabPanel } from "components/Admin/ui/TabPanel";
 import { TextField } from "@mui/material";
 import Label from "../ui/Label";
 
-
-
 export default function ContactDetails({
   tabPage,
   values,
@@ -21,7 +19,7 @@ export default function ContactDetails({
             <Label
               id="website"
               label="Website"
-              tooltipTitle="The organization's web address"
+              tooltipTitle="Enter the Full URL for the organization's web site, e.g., https://www.hackforla.org"
             />
             <TextField
               id="website"
@@ -40,7 +38,7 @@ export default function ContactDetails({
             <Label
               id="instagram"
               label="Instagram"
-              tooltipTitle="Enter Instagram url"
+              tooltipTitle="Enter a full Instagram URL, e.g., https://www.instagram.com/hackforla"
               href={values.instagram}
             />
             <TextField
@@ -60,7 +58,7 @@ export default function ContactDetails({
             <Label
               id="facebook"
               label="Facebook"
-              tooltipTitle="Enter your Facebook username"
+              tooltipTitle="Enter a full Facebook URL, e.g., https://www.facebook.com/hackforla"
               href={values.facebook}
             />
             <TextField
@@ -80,7 +78,7 @@ export default function ContactDetails({
             <Label
               id="twitter-label"
               label="Twitter"
-              tooltipTitle="Enter Twitter url"
+              tooltipTitle="Enter a full Twitter URL, e.g., https://www.x.com/hackforla"
               href={values.twitter}
             />
             <TextField
@@ -101,7 +99,7 @@ export default function ContactDetails({
               id="pinterest"
               label="Pinterest"
               href={values.pinterest}
-              tooltipTitle="Enter Pinterest url"
+              tooltipTitle="Enter a full Pinterest URL, e.g., https://www.pinterest.com/hackforla"
             />
             <TextField
               id="pinterest"
@@ -121,7 +119,7 @@ export default function ContactDetails({
               id="linkedin"
               label="LinkedIn"
               href={values.linkedin}
-              tooltipTitle="Enter Linkedin url"
+              tooltipTitle="Enter a full LinkedIn URL, e.g., https://www.linkedin.com/hackforla"
             />
             <TextField
               id="linkedin"

diff --git a/server/package.json b/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "foodoasis-web-api",
-  "version": "1.0.86",
+  "version": "1.0.87",
   "author": "Hack for LA",
   "description": "Web API Server for Food Oasis",
   "main": "server.js",