improve logo, icon and order content

bigdadz · Jul 21, 2019 · 9d58df4 · 9d58df4
1 parent f415bc8
commit 9d58df4
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 30 deletions.
diff --git a/src/components/Header.js b/src/components/Header.js
@@ -5,7 +5,7 @@ import styled from 'styled-components';
 import { SectionLinks } from 'react-scroll-section';
 import Fade from 'react-reveal/Fade';
 import RouteLink from './RouteLink';
-import Logo from './Logo/Portfolio.svg';
+import Logo from './Logo/PandaLogo.png';
 
 const capitalize = s => s && s[0].toUpperCase() + s.slice(1);
 

diff --git a/src/components/Helmet.js b/src/components/Helmet.js
@@ -11,7 +11,7 @@ const Helmet = ({ theme = {} }) => (
         contentfulAbout {
           name
           description
-          profile {
+          titleIcon {
             favicon16: resize(width: 16) {
               src
             }
@@ -29,54 +29,54 @@ const Helmet = ({ theme = {} }) => (
       }
     `}
     render={data => {
-      const { name, description, profile } = data.contentfulAbout;
+      const { name, description, titleIcon } = data.contentfulAbout;
       const title = `${name} Portfolio`;
 
       return (
         <ReactHelmet htmlAttributes={{ lang: 'en' }}>
           <meta charSet="utf-8" />
           <title>{title}</title>
           <meta name="description" content={description} />
-          <link rel="shortcut icon" href={`https:${profile.favicon32.src}`} />
+          <link rel="shortcut icon" href={`https:${titleIcon.favicon32.src}`} />
           <meta name="theme-color" content={theme.background} />
-          <meta name="image" content={`https:${profile.favicon32.src}`} />
+          <meta name="image" content={`https:${titleIcon.favicon32.src}`} />
 
           <meta itemProp="name" content={title} />
           <meta itemProp="description" content={description} />
-          <meta itemProp="image" content={`https:${profile.favicon32.src}`} />
+          <meta itemProp="image" content={`https:${titleIcon.favicon32.src}`} />
 
           <meta name="og:title" content={title} />
           <meta name="og:description" content={description} />
-          <meta name="og:image" content={`https:${profile.bigIcon.src}`} />
+          <meta name="og:image" content={`https:${titleIcon.bigIcon.src}`} />
           <meta name="og:site_name" content={title} />
           <meta name="og:locale" content="en_US" />
           <meta name="og:type" content="website" />
 
           <meta name="twitter:card" content="summary" />
           <meta name="twitter:title" content={title} />
           <meta name="twitter:description" content={description} />
-          <meta name="twitter:image" content={`https:${profile.bigIcon.src}`} />
+          <meta name="twitter:image" content={`https:${titleIcon.bigIcon.src}`} />
           <meta
             name="twitter:image:src"
-            content={`https:${profile.bigIcon.src}`}
+            content={`https:${titleIcon.bigIcon.src}`}
           />
 
           <link
             rel="apple-touch-icon"
             sizes="180x180"
-            href={`https:${profile.appleIcon.src}`}
+            href={`https:${titleIcon.appleIcon.src}`}
           />
           <link
             rel="icon"
             type="image/png"
             sizes="32x32"
-            href={`https:${profile.favicon32.src}`}
+            href={`https:${titleIcon.favicon32.src}`}
           />
           <link
             rel="icon"
             type="image/png"
             sizes="16x16"
-            href={`https:${profile.favicon16.src}`}
+            href={`https:${titleIcon.favicon16.src}`}
           />
 
           <link

diff --git a/src/components/Logo/PandaLogo.png b/src/components/Logo/PandaLogo.png
diff --git a/src/sections/Projects.js b/src/sections/Projects.js
@@ -103,11 +103,24 @@ const ProjectTag = styled.div`
   }
 `;
 
+const linkProject = (projectUrl) => {
+  if (projectUrl != '#') {
+    return(
+      <Box mx={1} fontSize={5}>
+        <SocialLink
+          name="See project"
+          fontAwesomeIcon="globe"
+          url={projectUrl}
+        />
+      </Box>
+    )
+  }
+}
+
 const Project = ({
   name,
   description,
   projectUrl,
-  repositoryUrl,
   type,
   publishedDate,
   logo,
@@ -132,21 +145,8 @@ const Project = ({
             style={{
               float: 'right',
             }}
-          >
-            <Box mx={1} fontSize={5}>
-              <SocialLink
-                name="Check repository"
-                fontAwesomeIcon="github"
-                url={repositoryUrl}
-              />
-            </Box>
-            <Box mx={1} fontSize={5}>
-              <SocialLink
-                name="See project"
-                fontAwesomeIcon="globe"
-                url={projectUrl}
-              />
-            </Box>
+          > 
+            {linkProject(projectUrl)}
           </Flex>
           <ImageSubtitle
             bg="primaryLight"
@@ -170,7 +170,6 @@ Project.propTypes = {
   name: PropTypes.string.isRequired,
   description: PropTypes.string.isRequired,
   projectUrl: PropTypes.string.isRequired,
-  repositoryUrl: PropTypes.string.isRequired,
   type: PropTypes.string.isRequired,
   publishedDate: PropTypes.string.isRequired,
   logo: PropTypes.shape({
@@ -193,7 +192,6 @@ const Projects = () => (
               name
               description
               projectUrl
-              repositoryUrl
               publishedDate(formatString: "YYYY")
               type
               logo {