Merge pull request #738 from uoForms/harshank

Replaced MaleFemale image with white backgrnd #736
uoForms · Oct 17, 2023 · d2d2c8b · d2d2c8b
2 parents 8718407 + 2a08e80
commit d2d2c8b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,12 +15,12 @@ before_install:
 #Check for the JSON files for the content.
 - rm -r ./src/JSONFolder
 - mkdir ./src/JSONFolder
-- curl -L -o ./src/JSONFolder/HtmlTopic-EN.json "https://uottawa-my.sharepoint.com/personal/pnikb070_uottawa_ca/_layouts/15/guestaccess.aspx?share=EQGwcZcNR5VBi1-KUhetg1IBkf7gmt-xhyKZLOmNDrNzjQ&e=hVg61X"
-- curl -L -o ./src/JSONFolder/HtmlTopic-FR.json "https://uottawa-my.sharepoint.com/personal/pnikb070_uottawa_ca/_layouts/15/guestaccess.aspx?share=Ed3ws-SFtmhAgN8QMiggKQsBSDsfObvFLemvmaMkhJgmEg&e=J3B2z4"
-- curl -L -o ./src/JSONFolder/HtmlTest-FR.json "https://uottawa-my.sharepoint.com/personal/pnikb070_uottawa_ca/_layouts/15/guestaccess.aspx?share=EcVB_bR3i3dLt6OkaylUdwkBIpn8TPKa3KijYbdMw6XDxw&e=lwq6B0"
-- curl -L -o ./src/JSONFolder/HtmlTest-EN.json "https://uottawa-my.sharepoint.com/personal/pnikb070_uottawa_ca/_layouts/15/guestaccess.aspx?share=EZ5Pvqfwq-pPl2lpwqGzicAB9xz89vw98x45-GphBSmzvw&e=GhckmI"
-- curl -L -o ./src/JSONFolder/FilterTopic-EN.json "https://uottawa-my.sharepoint.com/personal/pnikb070_uottawa_ca/_layouts/15/guestaccess.aspx?share=EdYrDL1dSNNLgemgKUPEj4wBWPua8Orp-bNNCLxcJILa0A&e=c08Pon"
-- curl -L -o ./src/JSONFolder/FilterTopic-FR.json "https://uottawa-my.sharepoint.com/personal/pnikb070_uottawa_ca/_layouts/15/guestaccess.aspx?share=EdYrDL1dSNNLgemgKUPEj4wBWPua8Orp-bNNCLxcJILa0A&e=unUJWk"
+- curl -L -o ./src/JSONFolder/HtmlTopic-EN.json "https://uottawa-my.sharepoint.com/personal/pnikb070_uottawa_ca/_layouts/15/download.aspx?share=EQGwcZcNR5VBi1-KUhetg1IBkf7gmt-xhyKZLOmNDrNzjQ&e=hVg61X"
+- curl -L -o ./src/JSONFolder/HtmlTopic-FR.json "https://uottawa-my.sharepoint.com/personal/pnikb070_uottawa_ca/_layouts/15/download.aspx?share=Ed3ws-SFtmhAgN8QMiggKQsBSDsfObvFLemvmaMkhJgmEg&e=J3B2z4"
+- curl -L -o ./src/JSONFolder/HtmlTest-FR.json "https://uottawa-my.sharepoint.com/personal/pnikb070_uottawa_ca/_layouts/15/download.aspx?share=EcVB_bR3i3dLt6OkaylUdwkBIpn8TPKa3KijYbdMw6XDxw&e=lwq6B0"
+- curl -L -o ./src/JSONFolder/HtmlTest-EN.json "https://uottawa-my.sharepoint.com/personal/pnikb070_uottawa_ca/_layouts/15/download.aspx?share=EZ5Pvqfwq-pPl2lpwqGzicAB9xz89vw98x45-GphBSmzvw&e=GhckmI"
+- curl -L -o ./src/JSONFolder/FilterTopic-EN.json "https://uottawa-my.sharepoint.com/personal/pnikb070_uottawa_ca/_layouts/15/download.aspx?share=EdYrDL1dSNNLgemgKUPEj4wBWPua8Orp-bNNCLxcJILa0A&e=c08Pon"
+- curl -L -o ./src/JSONFolder/FilterTopic-FR.json "https://uottawa-my.sharepoint.com/personal/pnikb070_uottawa_ca/_layouts/15/download.aspx?share=EdYrDL1dSNNLgemgKUPEj4wBWPua8Orp-bNNCLxcJILa0A&e=unUJWk"
 
 #install the dependencies (mentioned in yarn.lock file) with the right versions.
 install:

diff --git a/src/Body/anatomicalView.js b/src/Body/anatomicalView.js
@@ -48,8 +48,8 @@ import TransPancreas from '../assets/TransBody/trans_pancreas.png';
 import TransStomach from '../assets/TransBody/trans_stomach.png';
 
 //import TransGenital from '../assets/Icons/male_genital.png';
-//Import male/female
-import MaleFemale from '../assets/Male-Female/femManV1.png';
+//Use following import and variable to show image on starting page (behind the Choose form)
+// import MaleFemale from '../assets/Male-Female/(insert_name).png';
 
 //Import icons
 import brainIcon from '../assets/Icons/icon_brain.png';
@@ -723,7 +723,7 @@ class Anatomy extends React.Component {
                 return (
                     <div>
                         <div className="mainRunner">
-                            <img className="body" src={MaleFemale} alt="allGenders" />
+                            {/* <img className="body" src={MaleFemale} alt="allGenders" /> */}
                             {/*TODO find organs that fits the body*/}
                             {/*<img id="Aorta" className="organ" src={FemaleAorta} alt="Aorta" />
             <img id="Bowel" className="organ" src={FemaleBowel} alt="Bowel" />
@@ -822,7 +822,7 @@ class Anatomy extends React.Component {
                 return (
                     <div>
                         <div className="mainRunner">
-                            <img className="body" src={MaleFemale} alt="MaleFemale" />;
+                            {/* <img className="body" src={MaleFemale} alt="MaleFemale" />; */}
                         </div>
                     </div>
                 );
@@ -1027,7 +1027,7 @@ class Anatomy extends React.Component {
                 return (
                     <div>
                         <div className="mainRunner">
-                            <img className="body" src={MaleFemale} alt="allGenders" />
+                            {/* <img className="body" src={MaleFemale} alt="allGenders" /> */}
                             {/*TODO find organs that fits the body*/}
                             {/*<img id="Aorta" className="organ" src={FemaleAorta} alt="Aorta" />
           <img id="Bowel" className="organ" src={FemaleBowel} alt="Bowel" />
@@ -1124,7 +1124,7 @@ class Anatomy extends React.Component {
                 return (
                     <div>
                         <div className="mainRunner">
-                            <img className="body" src={MaleFemale} alt="MaleFemale" />;
+                            {/* <img className="body" src={MaleFemale} alt="MaleFemale" />; */}
                         </div>
                     </div>
                 );

diff --git a/src/assets/Male-Female/femManV1.png b/src/assets/Male-Female/femManV1.png