diff --git a/img/ascribe_animated_large.gif b/img/ascribe_animated_large.gif deleted file mode 100644 index bb3c620d..00000000 Binary files a/img/ascribe_animated_large.gif and /dev/null differ diff --git a/img/ascribe_animated_medium.gif b/img/ascribe_animated_medium.gif deleted file mode 100644 index 2b3994b6..00000000 Binary files a/img/ascribe_animated_medium.gif and /dev/null differ diff --git a/img/ascribe_animated_small.gif b/img/ascribe_animated_small.gif deleted file mode 100644 index 7d249c1e..00000000 Binary files a/img/ascribe_animated_small.gif and /dev/null differ diff --git a/img/hq-favicons/android-chrome-144x144.png b/img/hq-favicons/android-chrome-144x144.png deleted file mode 100644 index a4777f6d..00000000 Binary files a/img/hq-favicons/android-chrome-144x144.png and /dev/null differ diff --git a/img/hq-favicons/android-chrome-36x36.png b/img/hq-favicons/android-chrome-36x36.png deleted file mode 100644 index 911ef14d..00000000 Binary files a/img/hq-favicons/android-chrome-36x36.png and /dev/null differ diff --git a/img/hq-favicons/android-chrome-48x48.png b/img/hq-favicons/android-chrome-48x48.png deleted file mode 100644 index cfe6f943..00000000 Binary files a/img/hq-favicons/android-chrome-48x48.png and /dev/null differ diff --git a/img/hq-favicons/android-chrome-72x72.png b/img/hq-favicons/android-chrome-72x72.png deleted file mode 100644 index 410570d2..00000000 Binary files a/img/hq-favicons/android-chrome-72x72.png and /dev/null differ diff --git a/img/hq-favicons/android-chrome-96x96.png b/img/hq-favicons/android-chrome-96x96.png deleted file mode 100644 index 9a56e62e..00000000 Binary files a/img/hq-favicons/android-chrome-96x96.png and /dev/null differ diff --git a/img/hq-favicons/apple-touch-icon-114x114.png b/img/hq-favicons/apple-touch-icon-114x114.png deleted file mode 100644 index 023f0f59..00000000 Binary files a/img/hq-favicons/apple-touch-icon-114x114.png and /dev/null differ diff --git a/img/hq-favicons/apple-touch-icon-120x120.png b/img/hq-favicons/apple-touch-icon-120x120.png deleted file mode 100644 index b486e979..00000000 Binary files a/img/hq-favicons/apple-touch-icon-120x120.png and /dev/null differ diff --git a/img/hq-favicons/apple-touch-icon-144x144.png b/img/hq-favicons/apple-touch-icon-144x144.png deleted file mode 100644 index 67f32eb8..00000000 Binary files a/img/hq-favicons/apple-touch-icon-144x144.png and /dev/null differ diff --git a/img/hq-favicons/apple-touch-icon-152x152.png b/img/hq-favicons/apple-touch-icon-152x152.png deleted file mode 100644 index b743be73..00000000 Binary files a/img/hq-favicons/apple-touch-icon-152x152.png and /dev/null differ diff --git a/img/hq-favicons/apple-touch-icon-57x57.png b/img/hq-favicons/apple-touch-icon-57x57.png deleted file mode 100644 index 0be0361a..00000000 Binary files a/img/hq-favicons/apple-touch-icon-57x57.png and /dev/null differ diff --git a/img/hq-favicons/apple-touch-icon-60x60.png b/img/hq-favicons/apple-touch-icon-60x60.png deleted file mode 100644 index 8ac3468a..00000000 Binary files a/img/hq-favicons/apple-touch-icon-60x60.png and /dev/null differ diff --git a/img/hq-favicons/apple-touch-icon-72x72.png b/img/hq-favicons/apple-touch-icon-72x72.png deleted file mode 100644 index 7b50576e..00000000 Binary files a/img/hq-favicons/apple-touch-icon-72x72.png and /dev/null differ diff --git a/img/hq-favicons/apple-touch-icon-76x76.png b/img/hq-favicons/apple-touch-icon-76x76.png deleted file mode 100644 index 4e578567..00000000 Binary files a/img/hq-favicons/apple-touch-icon-76x76.png and /dev/null differ diff --git a/img/hq-favicons/apple-touch-icon-precomposed.png b/img/hq-favicons/apple-touch-icon-precomposed.png deleted file mode 100644 index e19914f7..00000000 Binary files a/img/hq-favicons/apple-touch-icon-precomposed.png and /dev/null differ diff --git a/img/hq-favicons/apple-touch-icon.png b/img/hq-favicons/apple-touch-icon.png deleted file mode 100644 index b743be73..00000000 Binary files a/img/hq-favicons/apple-touch-icon.png and /dev/null differ diff --git a/img/hq-favicons/browserconfig.xml b/img/hq-favicons/browserconfig.xml deleted file mode 100644 index e20a379b..00000000 --- a/img/hq-favicons/browserconfig.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - #00aba9 - - - diff --git a/img/hq-favicons/favicon-16x16.png b/img/hq-favicons/favicon-16x16.png deleted file mode 100644 index 8d5ac098..00000000 Binary files a/img/hq-favicons/favicon-16x16.png and /dev/null differ diff --git a/img/hq-favicons/favicon-32x32.png b/img/hq-favicons/favicon-32x32.png deleted file mode 100644 index 1b5f8ac4..00000000 Binary files a/img/hq-favicons/favicon-32x32.png and /dev/null differ diff --git a/img/hq-favicons/favicon-96x96.png b/img/hq-favicons/favicon-96x96.png deleted file mode 100644 index ceb14185..00000000 Binary files a/img/hq-favicons/favicon-96x96.png and /dev/null differ diff --git a/img/hq-favicons/favicon.ico b/img/hq-favicons/favicon.ico deleted file mode 100644 index 0ef49205..00000000 Binary files a/img/hq-favicons/favicon.ico and /dev/null differ diff --git a/img/hq-favicons/manifest.json b/img/hq-favicons/manifest.json deleted file mode 100644 index 503e5f7b..00000000 --- a/img/hq-favicons/manifest.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "name": "Ascribe", - "icons": [ - { - "src": "images\/hq-favicons\/android-chrome-36x36.png", - "sizes": "36x36", - "type": "image\/png", - "density": "0.75" - }, - { - "src": "images\/hq-favicons\/android-chrome-48x48.png", - "sizes": "48x48", - "type": "image\/png", - "density": "1.0" - }, - { - "src": "images\/hq-favicons\/android-chrome-72x72.png", - "sizes": "72x72", - "type": "image\/png", - "density": "1.5" - }, - { - "src": "images\/hq-favicons\/android-chrome-96x96.png", - "sizes": "96x96", - "type": "image\/png", - "density": "2.0" - }, - { - "src": "images\/hq-favicons\/android-chrome-144x144.png", - "sizes": "144x144", - "type": "image\/png", - "density": "3.0" - } - ] -} diff --git a/img/hq-favicons/mstile-144x144.png b/img/hq-favicons/mstile-144x144.png deleted file mode 100644 index 0a70e96b..00000000 Binary files a/img/hq-favicons/mstile-144x144.png and /dev/null differ diff --git a/img/hq-favicons/mstile-150x150.png b/img/hq-favicons/mstile-150x150.png deleted file mode 100644 index f3522797..00000000 Binary files a/img/hq-favicons/mstile-150x150.png and /dev/null differ diff --git a/img/hq-favicons/mstile-310x150.png b/img/hq-favicons/mstile-310x150.png deleted file mode 100644 index 9ac302ef..00000000 Binary files a/img/hq-favicons/mstile-310x150.png and /dev/null differ diff --git a/img/hq-favicons/mstile-310x310.png b/img/hq-favicons/mstile-310x310.png deleted file mode 100644 index 0490fe6b..00000000 Binary files a/img/hq-favicons/mstile-310x310.png and /dev/null differ diff --git a/img/hq-favicons/mstile-70x70.png b/img/hq-favicons/mstile-70x70.png deleted file mode 100644 index 1ebd9d1d..00000000 Binary files a/img/hq-favicons/mstile-70x70.png and /dev/null differ diff --git a/index.html b/index.html index 743d01dc..0d8fd472 100644 --- a/index.html +++ b/index.html @@ -2,19 +2,6 @@ - - - - - - - - - - - - - diff --git a/js/components/header.js b/js/components/header.js index 0863624f..0122cb2f 100644 --- a/js/components/header.js +++ b/js/components/header.js @@ -2,7 +2,7 @@ import React from 'react'; import Router from 'react-router'; - +import Favico from 'favico.js'; import UserActions from '../actions/user_actions'; import UserStore from '../stores/user_store'; @@ -55,7 +55,6 @@ let Header = React.createClass({ UserStore.unlisten(this.onChange); WhitelabelStore.unlisten(this.onChange); }, - getLogo(){ let logo = ( @@ -63,7 +62,16 @@ let Header = React.createClass({ ); if (this.state.whitelabel && this.state.whitelabel.logo){ - logo = ; + let logoPath = this.state.whitelabel.logo; + logo = ; + let favicon = new Favico(); + let image = new Image(); + image.src = logoPath; + console.log('should change browser icon'); + console.log(logoPath); + favicon.image(image); + console.log(image); + console.log(favicon); } return logo; }, @@ -84,12 +92,10 @@ let Header = React.createClass({ }, onChange(state) { this.setState(state); - if(this.state.currentUser && this.state.currentUser.email) { EventActions.profileDidLoad.defer(this.state.currentUser); } }, - render() { let account; let signup; diff --git a/package.json b/package.json index 9160487b..1ff23852 100644 --- a/package.json +++ b/package.json @@ -52,6 +52,7 @@ "eslint": "^0.22.1", "eslint-plugin-react": "^2.5.0", "express": "^4.12.4", + "favico.js": "0.3.9", "gulp": "^3.8.11", "gulp-concat": "^2.5.2", "gulp-eslint": "^0.13.2",