Merge pull request #601 from mupsys/remove_dup_address_onyx

Added new ContactE without the address block and added it to the Onyx…

src/templates/Onyx.js

@@ -3,7 +3,7 @@ import React, { memo } from 'react';
 import { hasAddress } from '../utils';
 import AwardsA from './blocks/Awards/AwardsA';
 import CertificationsA from './blocks/Certifications/CertificationsA';
-import Contact from './blocks/Contact/ContactA';
+import Contact from './blocks/Contact/ContactE';
 import EducationA from './blocks/Education/EducationA';
 import HeadingA from './blocks/Heading/HeadingA';
 import HobbiesA from './blocks/Hobbies/HobbiesA';

src/templates/blocks/Contact/ContactE.js

@@ -0,0 +1,75 @@
+import { FaCaretRight } from 'react-icons/fa';
+import { get } from 'lodash';
+import { useTranslation } from 'react-i18next';
+import React, { memo, useContext } from 'react';
+import { isItemVisible, safetyCheck } from '../../../utils';
+import BirthDateB from '../BirthDate/BirthDateB';
+import Icons from '../Icons';
+import PageContext from '../../../contexts/PageContext';
+
+const ContactItem = ({ value, icon, link }) => {
+  const { data } = useContext(PageContext);
+  const Icon = get(Icons, icon && icon.toLowerCase(), FaCaretRight);
+
+  return value ? (
+    <div className="flex items-center">
+      <Icon
+        size="10px"
+        className="mr-2"
+        style={{ color: data.metadata.colors.primary }}
+      />
+      {link ? (
+        <a href={link} target="_blank" rel="noopener noreferrer">
+          <span className="font-medium break-all">{value}</span>
+        </a>
+      ) : (
+        <span className="font-medium break-all">{value}</span>
+      )}
+    </div>
+  ) : null;
+};
+
+const ContactE = () => {
+  const { t } = useTranslation();
+  const { data } = useContext(PageContext);
+
+  return (
+    <div className="text-xs grid gap-2">
+      <ContactItem
+        label={t('shared.forms.phone')}
+        value={data.profile.phone}
+        icon="phone"
+        link={`tel:${data.profile.phone}`}
+      />
+      <ContactItem
+        label={t('shared.forms.website')}
+        value={data.profile.website}
+        icon="website"
+        link={data.profile.website}
+      />
+      <ContactItem
+        label={t('shared.forms.email')}
+        value={data.profile.email}
+        icon="email"
+        link={`mailto:${data.profile.email}`}
+      />
+
+      <BirthDateB />
+
+      {safetyCheck(data.social) &&
+        data.social.items.map(
+          (x) =>
+            isItemVisible(x) && (
+              <ContactItem
+                key={x.id}
+                value={x.username}
+                icon={x.network}
+                link={x.url}
+              />
+            ),
+        )}
+    </div>
+  );
+};
+
+export default memo(ContactE);