favicon

sheldonlynn · Nov 9, 2017 · 16d377e · 16d377e
1 parent b9c19e3
commit 16d377e
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 4 deletions.
diff --git a/client/components/TrumpHead.js b/client/components/TrumpHead.js
@@ -1,5 +1,5 @@
-const headAnimated = require('../public/images/trump.gif');
-const headStill = require('../public/images/trump-still.gif');
+const headAnimated = require('../../public/images/trump.gif');
+const headStill = require('../../public/images/trump-still.gif');
 import React from 'react';
 
 export default class TrumpHead extends React.Component {

diff --git a/client/containers/App.jsx b/client/containers/App.jsx
@@ -18,7 +18,7 @@ export default class App extends React.Component {
 
     this.url = process.env.NODE_ENV === 'production' ? 'http://165.227.22.2/api/trumpthat' : 'http://localhost:3001/api/trumpthat';
 
-    this.url = 'http://165.227.22.2/api/trumpthat';
+    // this.url = 'http://165.227.22.2/api/trumpthat';
 
     this.trumpify = this.trumpify.bind(this);
     this.handleInputChange = this.handleInputChange.bind(this);
@@ -75,7 +75,7 @@ export default class App extends React.Component {
 
   shareTweet() {
     let text = encodeURIComponent(this.state.trumped);
-    let shareUrl = 'https://twitter.com/intent/tweet?url=' + 'http://www.trumpthattweet.com' + '&text=' + text;
+    let shareUrl = 'https://twitter.com/intent/tweet?url=' + 'www.trumpthattweet.com' + '&text=' + text;
     let win = window.open(shareUrl, 'ShareOnTwitter', this.getWindowOptions());
     win.opener = null; // 2
   }

diff --git a/client/index.html b/client/index.html
@@ -3,6 +3,8 @@
 <head>
     <meta charset="utf-8">
     <title>Trump That Tweet</title>
+    <link rel="shortcut icon" href="../public/favicon.ico" type="image/x-icon">
+    <link rel="icon" href="../public/favicon.ico" type="image/x-icon">
 </head>
 <body>
     <div id="root">

diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/client/public/images/trump-still.gif → public/images/trump-still.gif b/client/public/images/trump-still.gif → public/images/trump-still.gif
diff --git a/client/public/images/trump.gif → public/images/trump.gif b/client/public/images/trump.gif → public/images/trump.gif
diff --git a/server.js b/server.js
@@ -6,6 +6,7 @@ const bodyParser = require('body-parser');
 const parseTweet = require('./server/parseTweet');
 const Ddos = require('ddos');
 
+
 const app = express();
 const router = express.Router();
 const ddos = new Ddos({burst:3, limit:5});