Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jordan/1894 favicons #1923

Merged
merged 5 commits into from
Feb 4, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- [\#1804](https://github.com/cosmos/voyager/issues/1804) Moved Voyager to the web @faboweb
- [\#1835](https://github.com/cosmos/voyager/issues/1835) allow user to use different signing methods @faboweb
- [\#1338](https://github.com/cosmos/voyager/issues/1338) Add Ledger Nano S support for signing transactions @fedekunze
- [\#1894](https://github.com/cosmos/voyager/issues/1894) Added favicons for all the browsers and devices @jbibla

### Changed

Expand Down
Binary file removed app/icons/icon.icns
Binary file not shown.
Binary file removed app/icons/icon.ico
Binary file not shown.
30 changes: 20 additions & 10 deletions app/index.ejs
Original file line number Diff line number Diff line change
@@ -1,16 +1,26 @@
<!DOCTYPE html>
<html lang="en" dir="ltr">

<head>
<meta name=viewport content="width=device-width, user-scalable=no">
<meta charset="utf-8">
<title>Cosmos Voyager</title>
<% if (htmlWebpackPlugin.options.appModules) { %>
<% } %>
<head>
<meta name=viewport content="width=device-width, user-scalable=no">
<meta charset="utf-8">
<meta name="msapplication-TileColor" content="#603cba">
<meta name="theme-color" content="#ffffff">
<title>Cosmos Voyager</title>

<body style="background: #15182d">
<script async src='https://www.google-analytics.com/analytics.js'></script>
<div id="app" style="background: #15182d"></div>
</body>
<link rel="apple-touch-icon" sizes="180x180" href="static/icons/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="static/icons/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="static/icons/favicon-16x16.png">
<link rel="manifest" href="static/icons/site.webmanifest">
<link rel="mask-icon" href="static/icons/safari-pinned-tab.svg" color="#5bbad5">

<% if (htmlWebpackPlugin.options.appModules) { %>
<% } %>
</head>

<body style="background: #15182d">
<script async src='https://www.google-analytics.com/analytics.js'></script>
<div id="app" style="background: #15182d"></div>
</body>

</html>
Binary file added app/static/icons/android-chrome-192x192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/static/icons/android-chrome-512x512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/static/icons/apple-touch-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions app/static/icons/browserconfig.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<browserconfig>
<msapplication>
<tile>
<square150x150logo src="/static/icons/mstile-150x150.png"/>
<TileColor>#603cba</TileColor>
</tile>
</msapplication>
</browserconfig>
Binary file added app/static/icons/favicon-16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/static/icons/favicon-32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/static/icons/favicon.ico
Binary file not shown.
Binary file added app/static/icons/mstile-150x150.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
38 changes: 38 additions & 0 deletions app/static/icons/safari-pinned-tab.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions app/static/icons/site.webmanifest
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"name": "Voyager",
"short_name": "Voyager",
"icons": [
{
"src": "/static/icons/android-chrome-192x192.png",
"sizes": "192x192",
"type": "image/png"
},
{
"src": "/static/icons/android-chrome-512x512.png",
"sizes": "512x512",
"type": "image/png"
}
],
"theme_color": "#ffffff",
"background_color": "#ffffff",
"display": "standalone"
}
9 changes: 6 additions & 3 deletions webpack.renderer.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ const rendererConfig = {
loader: `url-loader`,
query: {
limit: 10000,
name: `imgs/[name].[ext]`
name: `images/[name].[ext]`
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i don't know how / if this was working before - but imgs wasn't an actual path

Copy link
Contributor

@sabau sabau Feb 1, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

webpack was moving the files in the imgs folder and fixing the references where needed (css js or ejs files), but this renaming iswas confusing and does not add value at all 👍 good cleanup

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

screenshot 2019-02-01 at 19 42 35

}
}
]
Expand All @@ -73,15 +73,18 @@ const rendererConfig = {
new VueLoaderPlugin(),
// the global.GENTLY below fixes a compile issue with superagent + webpack
// https://github.com/visionmedia/superagent/issues/672
new webpack.DefinePlugin({ "global.GENTLY": false }),
new webpack.DefinePlugin({
"global.GENTLY": false
}),
new HtmlWebpackPlugin({
filename: `index.html`,
template: `./app/index.ejs`,
appModules:
process.env.NODE_ENV !== `production`
? path.resolve(__dirname, `app/node_modules`)
: false,
styles: fs.readFileSync(`./app/src/renderer/styles/index.css`, `utf8`)
styles: fs.readFileSync(`./app/src/renderer/styles/index.css`, `utf8`),
favicon: `./app/static/icons/favicon.ico`
}),
new webpack.NoEmitOnErrorsPlugin(),
// warnings caused by websocket-stream, which has a server-part that is unavailable on the the client
Expand Down