Merge pull request #449 from hackoregon/issue-41

issue-434
hackoregon · Apr 5, 2019 · 906e226 · 906e226
2 parents 19b04af + 4c5a6d7
commit 906e226
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 35 deletions.
diff --git a/package.json b/package.json
@@ -39,8 +39,7 @@
     "pretty": "prettier --write \"./**/*.{js,jsx,css,md}\""
   },
   "husky": {
-    "hooks": {
-    }
+    "hooks": {}
   },
   "lint-staged": {
     "*.{js,jsx}": [

diff --git a/packages/2018/src/assets/LandingPage.js b/packages/2018/src/assets/LandingPage.js
@@ -5,16 +5,14 @@ import { Link } from 'react-router';
 import CanvasParticles from './CanvasParticles';
 import DataList from './DataList';
 import SearchBar from './SearchBar';
-import { Header, Footer } from '@hackoregon/component-library';
+import { Header, Footer, Logo } from '@hackoregon/component-library';
 
-import logo from '../../assets/civic-logo-animated.svg';
-import smallLogo from '../../assets/civic-logo-c.svg';
-import brain from '../../assets/brain.svg';
-import brainMobile from '../../assets/brain-mobile.svg';
-import trees from '../../assets/trees.png';
-import hackOregonLogo from '../../assets/hack-oregon-logo.png';
-import heartMail from '../../assets/heartmail.png';
-import twitterLogo from '../../assets/twitter-logo.png';
+import brain from '@hackoregon/component-library/assets/brain.svg'
+import brainMobile from '@hackoregon/component-library/assets/brain-mobile.svg'
+import trees from '@hackoregon/component-library/assets/trees.png'
+import hackOregonLogo from '@hackoregon/component-library/assets/hack-oregon-logo.png'
+import heartMail from '@hackoregon/component-library/assets/heartmail.png'
+import twitterLogo from '@hackoregon/component-library/assets/twitter-logo.png'
 
 import cities from './cities';
 import zipCodes from './zipCodes.json';
@@ -470,7 +468,7 @@ class LandingPage extends React.Component {
           <div className={aboutCivicWrapper} id="aboutCivic">
             <div className={sectionHeaderWrapper}>
               <div className={smallLogoWrapper}>
-                <img src={smallLogo} />
+                <Logo type="squareLogo"/>
               </div>
               <div className={sectionRightContainer}>
                 <div className={sectionHeaderTitle}>

diff --git a/packages/2018/src/assets/civic-logo-animated.svg b/packages/2018/src/assets/civic-logo-animated.svg
diff --git a/packages/2018/src/components/LandingPage.js b/packages/2018/src/components/LandingPage.js
@@ -5,16 +5,14 @@ import { Link } from 'react-router';
 import CanvasParticles from './CanvasParticles';
 import DataList from './DataList';
 import SearchBar from './SearchBar';
-import { Header, Footer } from '@hackoregon/component-library';
+import { Header, Footer, Logo } from '@hackoregon/component-library';
 
-import logo from '../../assets/civic-logo-animated.svg';
-import smallLogo from '../../assets/civic-logo-c.svg';
-import brain from '../../assets/brain.svg';
-import brainMobile from '../../assets/brain-mobile.svg';
-import trees from '../../assets/trees.png';
-import hackOregonLogo from '../../assets/hack-oregon-logo.png';
-import heartMail from '../../assets/heartmail.png';
-import twitterLogo from '../../assets/twitter-logo.png';
+import brain from '@hackoregon/component-library/assets/brain.svg'
+import brainMobile from '@hackoregoncomponent-library/assets/brain-mobile.svg'
+import trees from '@hackoregon/component-library/assets/trees.png'
+import hackOregonLogo from '@hackoregon/component-library/assets/hack-oregon-logo.png'
+import heartMail from '@hackoregon/component-library/assets/heartmail.png'
+import twitterLogo from '@hackoregon/component-library/assets/twitter-logo.png'
 
 import cities from './cities';
 import zipCodes from './zipCodes.json';
@@ -470,7 +468,7 @@ class LandingPage extends React.Component {
           <div className={aboutCivicWrapper} id="aboutCivic">
             <div className={sectionHeaderWrapper}>
               <div className={smallLogoWrapper}>
-                <img src={smallLogo} />
+                <Logo type="squareLogo"/>
               </div>
               <div className={sectionRightContainer}>
                 <div className={sectionHeaderTitle}>

diff --git a/packages/2018/src/components/PortlandCollectionPage.js b/packages/2018/src/components/PortlandCollectionPage.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import { css } from 'emotion';
 import { Link } from 'react-router';
+import { Logo } from '@hackoregon/component-library'
 
 const collectionPageWrapper = css`
   position: relative;
@@ -135,7 +136,7 @@ const PortlandCollectionPage = () => (
     <div className={leftContainer}>
       <div className={homeLink}>
         <Link to="/">
-          <img src={require(`../assets/civic-logo-animated.svg`)} />
+          <Logo />
         </Link>
       </div>
       <h1>Portland Collections</h1>