BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ionic integration

This commit is contained in:
Javier 2016-05-13 10:49:36 -03:00
parent 952a834fff
commit c1324dd19c
11 changed files with 2341 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Gruntfile.js
View File

@ -138,7 +138,35 @@ module.exports = function(grunt) {
'bower_components/angular-ui-switch/angular-ui-switch.css'
],
dest: 'public/css/foundation.css',
}
},
ionic_js: {
src: [
'bower_components/ionic/release/js/ionic.bundle.min.js'
],
dest: 'public/lib/ionic.bundle.js'
},
ionic_css: {
src: [
'bower_components/ionic/release/css/ionic.min.css'
],
dest: 'public/css/ionic.css',
},
ui_components_js: {
src: [
'bower_components/jquery/dist/jquery.js',
'bower_components/roundSlider/dist/roundslider.min.js',
'bower_components/angular-gridster/dist/angular-gridster.min.js',
'bower_components/javascript-detect-element-resize/detect-element-resize.js'
],
dest: 'public/lib/ui-components.js'
},
ui_components_css: {
src: [
'bower_components/roundSlider/dist/roundslider.min.css',
'bower_components/angular-gridster/dist/angular-gridster.min.css'
],
dest: 'public/css/ui-components.css',
},
},
uglify: {
options: {
@ -182,6 +210,12 @@ module.exports = function(grunt) {
src: 'bower_components/foundation-icon-fonts/foundation-icons.*',
dest: 'public/icons/'
},
ionic_fonts: {
expand: true,
flatten: true,
src: 'bower_components/ionic/release/fonts/ionicons.*',
dest: 'public/font/'
},
linux: {
files: [{
expand: true,
@ -242,7 +276,7 @@ module.exports = function(grunt) {
}
});
grunt.registerTask('default', ['nggettext_compile', 'exec:version', 'exec:coinbase', 'browserify', 'sass', 'concat', 'copy:icons']);
grunt.registerTask('default', ['nggettext_compile', 'exec:version', 'exec:coinbase', 'browserify', 'sass', 'concat', 'copy:icons', 'copy:ionic_fonts']);
grunt.registerTask('prod', ['default', 'uglify']);
grunt.registerTask('translate', ['nggettext_extract']);
grunt.registerTask('test', ['karma:unit']);

1
bower.json
View File

@ -18,6 +18,7 @@
"animate.css": "3.5.1",
"foundation": "5.5.3",
"foundation-icon-fonts": "*",
"ionic": "1.2.4",
"moment": "2.10.3",
"ng-lodash": "0.2.3",
"qrcode-decoder-js": "*",

1
package.json
View File

@ -91,6 +91,7 @@
"load-grunt-tasks": "^3.5.0",
"mocha": "^2.4.5",
"phantomjs-prebuilt": "^2.1.7",
"ionic": "^1.7.14",
"xcode": "^0.8.2"
}
}

BIN
public/font/ionicons.eot Normal file
View File

Binary file not shown.

2230
public/font/ionicons.svg Normal file
View File

File diff suppressed because it is too large Load Diff
Side by Side

After

Width:  |  Height:  |  Size: 326 KiB

BIN
public/font/ionicons.ttf Normal file
View File

Binary file not shown.

BIN
public/font/ionicons.woff Normal file
View File

Binary file not shown.

12
public/index.html
View File

@ -6,8 +6,10 @@
<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no">
<meta name="msapplication-tap-highlight" content="no">
<meta name="format-detection" content="telephone=no">
<link rel="stylesheet" type="text/css" href="css/ionic.css">
<link rel="stylesheet" type="text/css" href="css/foundation.css">
<link rel="stylesheet" type="text/css" href="icons/foundation-icons.css">
<link rel="stylesheet" type="text/css" href="css/ui-components.css">
<link rel="stylesheet" type="text/css" href="css/copay.css">
<title>Copay - Multisignature Wallet</title>
<link rel="shortcut icon" href="img/favicon.ico">
@ -15,14 +17,14 @@
<body ng-cloak class="ng-cloak">
<div class="page" ng-controller="indexController as index">
<div notifications="right top"></div>
<div notifications="right top"></div>
<div ng-include="'views/includes/tx-details.html'" ng-if="index.showTx"></div>
<div ng-include="'views/includes/password.html'" ng-if="index.askPassword"></div>
<div ng-include="'views/includes/alert.html'" ng-if="index.showAlert"></div>
<div ng-include="'views/includes/confirm-tx.html'" ng-if="index.confirmTx"></div>
<div class="off-canvas-wrap" id="off-canvas-wrap"
ng-swipe-disable-mouse
ng-swipe-disable-mouse
ng-swipe-left="index.closeMenu()"
ng-swipe-right="index.openMenu()">
<div class="inner-wrap">
@ -40,12 +42,14 @@
</div>
</div>
</div>
<script src="lib/ionic.bundle.js"></script>
<script src="lib/angular.js"></script>
<!-- DO NOT DELETE THIS COMMET -->
<!-- PLACEHOLDER: CORDOVA SRIPT -->
<script src="lib/ui-components.js"></script>
<script src="js/copay.js"></script>
</body>

63
src/css/ionic-migration.css Normal file
View File

@ -0,0 +1,63 @@
/*
*
* Ionic migration CSS
* These styles reapply foundation.css styles AFTER iconic.css has been applied.
* This has the effect of allowing all foundation styles be available at the same time as all Ionic styles being available.
* Where there are conflicts between foundation and css, this file resolves the conflict with a compromise which the developer must manage.
* This stylesheet is merged into copay.css.
*/
/* Foundation.css styles re-applied. These styles are exactly as described in foundation.css */
/* Conflicting styles that are customized as a compromise. These styles are a merge or compromise of foundation.css and ionic.css. */
.row {
display: inherit;
padding: 0;
}
button, .button {
min-width: inherit;
min-height: inherit;
text-overflow: inherit;
}
.modal-open {
pointer-events: inherit;
}
/* Defeat Ionic .row+.row in transaction history */
.last-transactions-content+.last-transactions-content, .row+.last-transactions-content {
padding: 0.8rem 1rem;
cursor: pointer;
margin: inherit;
}
/* Add margins to the session log */
.row.columns.large-centered.medium-centered {
padding-left: 0.9375rem;
padding-right: 0.9375rem;
}
/* Defeat Ionic .row+.row in backup failed view */
.backup .row {
margin-top: 10px;
padding: 0;
}
.scroll-view {
height: 100% !important;
}
/* Override the default modal size for large devices */
@media (min-width: 680px) {
.modal {
top: 10%;
right: 20%;
bottom: 10%;
left: 20%;
min-height: 240px;
width: 60%;
}
}

3
src/js/app.js
View File

@ -6,9 +6,10 @@ var modules = [
'mm.foundation',
'monospaced.qrcode',
'gettext',
'ionic',
'ngLodash',
'uiSwitch',
'ngSanitize',
'ngSanitize',
'ngCsv',
'ngTouch',
'bwcModule',

5
src/js/routes.js
View File

@ -148,11 +148,6 @@ angular
},
}
})
.state('importProfile', {
url: '/importProfile',
templateUrl: 'views/importProfile.html',
needProfile: false
})
.state('importLegacy', {
url: '/importLegacy',
needProfile: true,