Skip to content
This repository has been archived by the owner on Jan 5, 2021. It is now read-only.

Commit

Permalink
Desktop Wallet 1.5
Browse files Browse the repository at this point in the history
- new UI/UX
- translation into 11 languages
- stability upgrades
  • Loading branch information
Varunram committed Jun 29, 2018
1 parent 98bfd00 commit 37d6307
Show file tree
Hide file tree
Showing 18 changed files with 77 additions and 106 deletions.
Binary file added 1.5.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 10 additions & 4 deletions README.md
Expand Up @@ -6,6 +6,8 @@ The official Musicoin Desktop Wallet
[![license](https://img.shields.io/github/license/musicoin/desktop.svg?style=for-the-badge)](https://github.com/Musicoin/desktop/blob/master/LICENSE)
[![Github All Releases](https://img.shields.io/github/downloads/Musicoin/desktop/total.svg?style=for-the-badge)](https://github.com/Musicoin/desktop/releases)

![Musicoin Wallet 1.5](1.5.png)

## Nightly Builds

Nightly builds for all supported Operating Systems can be found over at [builder.musicoin.org](https://builder.musicoin.org/)
Expand Down Expand Up @@ -46,12 +48,12 @@ Prerequisites:
`yarn build-x86`
-or-
`yarn build-x64`
To build all of the packages, for windows, mac, and linux. This is meant for testing or development and releasing.
5. `yarn run build -m --x64 ./` - This will build for MacOS x64. -m, -l, or -w determine the os and kind of app.
to build all packages for windows, mac, and linux. This is meant for testing or development and packaging.
5. `yarn run build -m --x64 ./` - for packaging MacOS x64. `-m`, `-l`, or `-w` determines the os and architecture.

## Testing new interface builds

This repo contains the UI modules in accordance with the last release version. To make changes, edit the files at `interface/` and issue a PR to the [desktop-interface]([desktop-interface](https://github.com/Musicoin/desktop-interface) repo. Please note that PRs towards interface changes will not be accepted on this repo.
This repo contains the UI modules in accordance with the last release version. To suggest changes, edit the files at `interface/` and issue a PR to the [desktop-interface]([desktop-interface](https://github.com/Musicoin/desktop-interface) repo. Please note that PRs towards interface changes will not be accepted here.

## Contributing

Expand All @@ -64,4 +66,8 @@ The Wallet repo makes use of the following submodules:

## Bounty program

Specific Issues are earmarked for bounty and carry a bounty label with them. More information regarding the bounty program can be found over at [BOUNTY](BOUNTY.md).
Specific Issues are earmarked for bounty and carry a bounty label with them. More information regarding the bounty program can be found over at [BOUNTY](docs/BOUNTY.md).

## License

MIT
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file added interface/1.5.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion interface/README.md
Expand Up @@ -15,4 +15,4 @@ Default UX Module for [Musicoin Desktop Client](https://github.com/Musicoin/desk
At this point the desktop client should popup and run. From here on out you should be able to run 'yarn debug' to see the desktop client in action.

## Screenshot
![https://srandd.com/wp-content/uploads/2018/06/Screenshot-from-2018-06-22-21-58-53.png](https://srandd.com/wp-content/uploads/2018/06/Screenshot-from-2018-06-22-21-58-53.png)
![Musicoin Wallet 1.5](1.5.png)
7 changes: 6 additions & 1 deletion interface/elements/msc-profile-view/msc-profile-view.css
Expand Up @@ -10,7 +10,7 @@
}

*{
font-family: 'Lato', sans-serif;
font-family: 'Ubuntu', sans-serif !important;
}

h2{
Expand Down Expand Up @@ -745,3 +745,8 @@ paper-dialog {
a {
color: white;
}

.wrapper-dropdown.msc-profile-view .dropdown.msc-profile-view {
background: : black !important;
color: #D8DBDF;
}
13 changes: 7 additions & 6 deletions interface/elements/msc-profile-view/msc-profile-view.html
@@ -1,6 +1,7 @@
<dom-module id="msc-profile-view">
<link rel="import" type="css" href="../../styles/shared-styles.html">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
<link href="https://fonts.googleapis.com/css?family=Ubuntu" rel="stylesheet">
<link rel="import" type="css" href="msc-profile-view.css">
<script type="text/javascript" src="../../scripts/jquery.min.js"></script>
<template>
Expand Down Expand Up @@ -30,7 +31,7 @@
</div>
</div>
</div>
<div style="width: 250px;">
<div style="width: 240px;">
<button class="tablinks" style="border: 1px white; display: inline-block;background: none;; width: 50px; position: relative ; top: 5px;" id="mute" on-tap="muteAudio">
<img src="/interface/images/icons/audio-volume.svg">
</button>
Expand All @@ -47,7 +48,7 @@
<img src="/interface/images/icons/minimize.svg">
</button>

<span onclick="activeTabsSpecial()" class="left_col_btn_txt spl-button" style="width: 130px; position:relative; margin-left: 0px; top: 4px">{{echo('profileViewHtml_Tab_Play_Music')}}</span>
<span onclick="activeTabsSpecial()" class="left_col_btn_txt spl-button" style="width: 120px; position:relative; margin-left: 0px; top: 4px">{{echo('profileViewHtml_Tab_Play_Music')}}</span>
</div>
</nav>
<div id="wallet" class="tabcontent">
Expand Down Expand Up @@ -107,7 +108,7 @@
<div class="flexbox_typ">
<div class="wrapper-dropdown">
<span class="text-icon">&#8942;</span>
<ul class="dropdown" style="width: 155px;">
<ul class="dropdown" style="width: 160px; background: black">
<li on-tap="backupAccount">
<span>
<iron-icon icon="icons:backup" class="clickable" title={{echo('profileViewHtml_Backup_Account')}}>
Expand Down Expand Up @@ -168,7 +169,7 @@

<paper-dialog id="showAccountDetailsDialog" style="max-height: 550px;">
<img src={{userImage}} style="position: relative; left: 10px;left: 135px; height: 64px; bottom: 10px"class="avatar" title={{userAccount}} style="display: block; margin: 0 auto; padding-top: 20px; width: 96px; margin-left: 32%;">
<p style="font-family: monospace; font-weight: bold;" id="AccountDialog">{{userAccount}}</p>
<p style="text-transform: uppercase; font-weight: bold;" id="AccountDialog">{{userAccount}}</p>
<p style="text-align: center; font-weight: bold;">{{userBalance}}</p>
<p style="text-align: center;">{{echo('profileViewHtml_Show_Account_In_Explorer')}}:
<iron-icon icon="icons:explore" class=clickable title={{echo('profileViewHtml_Show_Account_In_Explorer')}} on-tap="showExplorerWindowFromDialog" style="display: block; margin: 0 auto; color: #cccccc; padding-top: 6px;"></iron-icon></p>
Expand All @@ -180,8 +181,8 @@
<iron-icon icon="icons:picture-in-picture" class=clickable title={{echo('profileViewHtml_Create_Paper_Wallet')}} on-tap="paperWallet" style="display: block; margin: 0 auto; color: #cccccc; padding-top: 6px;"></iron-icon></p>
<input id=fileDialogBackupAccount-{{userAccount}} type="file" nwdirectory style="display: none;">
<div class="buttons-style-old top-buttons" style="display: block; margin: 0 auto;">
<paper-button raised on-tap="approveRemoveAccount" id="approve-remove" style="right: 25%; bottom: 20px" class="spl-button">{{echo('profileViewHtml_Btn_REMOVE')}}</paper-button>
<paper-button raised on-tap="showSendDialogFromAccount" id="send-funds" class="spl-button" style="position: relative; bottom: 20px;">{{echo('profileViewHtml_Btn_SEND_FUNDS_SMALL')}}</paper-button>
<paper-button raised on-tap="approveRemoveAccount" id="approve-remove" style="right: 25%; bottom: 20px;" class="spl-button">{{echo('profileViewHtml_Btn_REMOVE')}}</paper-button>
<paper-button raised on-tap="showSendDialogFromAccount" id="send-funds" class="spl-button" style="position: relative; left: 10px; bottom: 20px;">{{echo('profileViewHtml_Btn_SEND_FUNDS_SMALL')}}</paper-button>
</div>
<div class="buttons">
<paper-button dialog-dismiss>{{echo('profileViewHtml_Btn_OK')}}</paper-button>
Expand Down
Binary file modified interface/images/bg.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified interface/images/favicon.ico
Binary file not shown.
4 changes: 0 additions & 4 deletions interface/images/logo.svg

This file was deleted.

Binary file removed interface/images/wallpaper/concert1.jpg
Binary file not shown.
Binary file removed interface/images/wallpaper/concert2.jpg
Binary file not shown.
13 changes: 2 additions & 11 deletions interface/index.html
Expand Up @@ -5,24 +5,15 @@
<meta charset="utf-8">
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="generator" content="Polymer Starter Kit">
<meta name="theme-color" content="#2E3AA1">
<meta name="generator" content="Musicoin Desktop Wallet">
<link rel="manifest" href="manifest.json">
<meta name="msapplication-TileColor" content="#3372DF">
<meta name="mobile-web-app-capable" content="yes">
<meta name="application-name" content="PSK">
<!-- <link rel="icon" sizes="192x192" href="images/touch/chrome-touch-icon-192x192.png"> -->
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<meta name="apple-mobile-web-app-title" content="Polymer Starter Kit">
<link rel="apple-touch-icon" href="images/touch/apple-touch-icon.png">
<meta name="msapplication-TileImage" content="images/touch/ms-touch-icon-144x144-precomposed.png">
<link rel="stylesheet" href="styles/main.css">
<script src="scripts/datapreload.js"></script>
<script src="bower_components/webcomponentsjs/webcomponents-lite.js"></script>
<link rel="import" href="elements/elements.html">
<style is="custom-style" include="shared-styles"></style>
<title>Musicoin Wallet 1.0</title>
<title>Musicoin Wallet 1.5</title>
</head>

<body unresolved data-selected-page="0" class="layout vertical">
Expand Down

0 comments on commit 37d6307

Please sign in to comment.