Show email buttons

gocemitevski · Jan 26, 2024 · 9faf0b7 · 9faf0b7
1 parent 347f5d8
commit 9faf0b7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/components/SchoolItem.js b/src/components/SchoolItem.js
@@ -1,27 +1,27 @@
 import React from 'react';
 import SchoolItemLink from './SchoolItemLink';
-// import Mail from './Mail';
+import Mail from './Mail';
 
 const SchoolItem = (props) => {
 
-    //   const emails = props.data[5].split(/[\s|,|;]/);
+    const emails = props.data.email.split(/[\s|,|;]/);
 
     return (
         <article className="card school" key={props.index}>
             <div className="row no-gutters">
                 <div className="col-lg-6 p-4 d-flex flex-column">
-                    <h2 className={`h5 flex-fill ${props.data.tip ? `mb-2` : `mb-0`}`}>
+                    <h2 className={`h5 ${props.data.tip ? `mb-2` : `mb-0`}`}>
                         <SchoolItemLink {...props} data={props.data} />
                     </h2>
-                    {props.data.tip && <p className='text-muted'>{props.data.tip}</p>}
+                    {props.data.tip && <p className='text-muted flex-fill'>{props.data.tip}</p>}
                 </div>
                 <div className="col-lg-6">
                     <div className="card-body">
                         <dl className="mb-0">
                             <dt>Адреса:</dt>
                             <dd><address className="mb-0">{props.data.adresa}<br />{props.data.opstina}</address></dd>
                         </dl>
-                        {/* {emails.length > 0 && <ul className="list-inline mt-3 mb-0">{emails.map((item, key) => <Mail key={key} props={item} />)}</ul>} */}
+                        {emails.length > 0 && <ul className="list-inline mt-3 mb-0">{emails.map((item, key) => item && <Mail key={key} props={item} />)}</ul>}
                     </div>
                 </div>
             </div>

diff --git a/src/components/SchoolItemMap.js b/src/components/SchoolItemMap.js
@@ -1,11 +1,11 @@
 import React from 'react';
 import SchoolMap from './SchoolMap';
-// import Mail from './Mail';
+import Mail from './Mail';
 import NoMap from './NoMap';
 
 const SchoolItemMap = (props) => {
 
-    //   const emails = props.data[5].split(/[\s|,|;]/);
+    const emails = props.data.email.split(/[\s|,|;]/);
     const { position } = props;
 
 
@@ -19,11 +19,11 @@ const SchoolItemMap = (props) => {
                     <div className="card-body p-5 d-flex flex-column h-100">
                         <h1 className="h2 mb-3 font-weight-bold card-title">{props.data.ime}</h1>
                         {props.data.tip && <p className='text-muted'>{props.data.tip}</p>}
-                        <dl className="mb-0">
+                        <dl className="mb-0 flex-fill">
                             <dt>Адреса:</dt>
                             <dd><address className="mb-0">{props.data.adresa}<br />{props.data.opstina}</address></dd>
                         </dl>
-                        {/* {emails.length > 0 && <ul className="list-inline mb-0 mt-auto">{emails.map((item, key) => <Mail key={key} props={item} />)}</ul>} */}
+                        {emails.length > 0 && <ul className="list-inline mb-0">{emails.map((item, key) => item && <Mail key={key} props={item} />)}</ul>}
                     </div>
                 </div>
             </div>