Skip to content

Commit d7f388f

Browse files
hailiang-wanghailiang-wang
committed
remove test
2 parents 15f79bb + 5f3d5b4 commit d7f388f

File tree

354 files changed

+31671
-4752
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

354 files changed

+31671
-4752
lines changed

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,8 @@ npm-debug.log
88
*.swp
99
*.swo
1010
client/app/config.js
11+
lyman/
12+
server/public/sampleapps/ionic-client/www/lib
13+
server/public/sampleapps/nodejs-backend/austack-variables.json
14+
server/public/sampleapps/nodejs-backend/node_modules
15+
.env

‎.jsbeautifyrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"indent_size": 2,
77
"max_preserve_newlines": 2,
88
"preserve_newlines": true,
9-
"unformatted": ["a", "sub", "sup", "b", "i", "u"],
9+
"unformatted": ["a", "span", "img", "code", "pre", "sub", "sup", "em", "strong", "b", "i", "u", "strike", "big", "small", "pre", "h1", "h2", "h3", "h4", "h5", "h6"], // List of tags that should not be reformatted
1010
"wrap_line_length": 0
1111
},
1212
"css": {

‎.jshintignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
client/app/components/hljs/*

‎.jshintrc‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@
4040
// JASMINE
4141
"describe": false,
4242
"it": false,
43+
"saveAs": false,
44+
"FileReader": false,
45+
"Blob": false,
4346
"before": false,
4447
"beforeEach": false,
4548
"after": false,
@@ -51,9 +54,12 @@
5154
"_": false,
5255
// sinon
5356
"sinon": false,
57+
// Jquery
58+
"$": false,
5459
// Browser
5560
"document": false,
56-
"console": false
61+
"console": false,
62+
"window": false
5763
},
5864
//relaxing options
5965
"globalstrict": true,
@@ -62,4 +68,4 @@
6268
"devel": true //'console' is not defined.
6369

6470
//"jasmine": true
65-
}
71+
}

‎README.md‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,29 @@ gulp serve # start client at http://localhost:3000/
3030
exports.users = [{
3131
provider: 'local',
3232
role: 'admin',
33-
name: '15801213126',
34-
password: 'auth4fun',
35-
userId: 'dave',
33+
name: 'dave1',
34+
password: 'dave1',
35+
userId: 'dave1',
36+
active: true
37+
}, {
38+
provider: 'local',
39+
role: 'admin',
40+
name: 'dave2',
41+
password: 'dave2',
42+
userId: 'dave2',
3643
active: true
3744
}, {
3845
provider: 'local',
3946
role: 'root',
40-
name: 'Root',
47+
name: 'root',
4148
userId: 'root',
42-
password: 'auth4fun',
49+
password: 'root',
4350
active: true
4451
}];
45-
```
52+
```
53+
54+
# License
55+
Copyright (c) 2015 Hain, Lyman, Neo, Wendy, contributors.
56+
57+
Released under the [MIT license](https://tldrlegal.com/license/mit-license).
58+

‎bin/server.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@
22

33
'use strict';
44

5-
var app = require('../server/austack-server');
5+
var app = require('../server/app');
66

77
// start sockets for this instance and start server
88
app.startServer().listen(app.get('port'), app.get('ip'), function serverStarted() {
9-
console.log('austack started server on ip %s on port %d, in %s mode',
9+
console.log('> austack started server on ip %s on port %d, in %s mode',
1010
app.get('ip'), app.get('port'), app.get('env'));
11+
console.log('+ + + + + + + + + + +');
12+
console.log('+ IN CODE, WE TRUST +');
13+
console.log('+ + + + + + + + + + +');
1114
});
1215

1316
// expose app

‎bower.json‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,21 @@
1111
"angular-ui-router": "latest",
1212
"material-design-icons": ">=1.0.1",
1313
"lodash": "~2.4.1",
14-
"angular-material": "0.10.0",
14+
"angular-material": "0.10.1",
1515
"angular-socket-io": "~0.6.0",
1616
"angular-i18n": "~1.3.14",
1717
"angular-moment": "~0.9.0",
1818
"angular-loading-bar": "~0.7.1",
19-
"jQuery": "~2.1.4",
20-
"angular-breadcrumb": "~0.4.0"
19+
"angular-breadcrumb": "~0.4.0",
20+
"angular-timer": "~1.3.3",
21+
"cal-heatmap": "~3.5.2",
22+
"file-saver.js": "~1.20150507.2",
23+
"angular-ui-ace": "bower",
24+
"angular-material-data-table": "~0.8.0",
25+
"angular-drag-and-drop-lists": "~1.2.0",
26+
"animate.css": "~3.3.1",
27+
"geopattern": "~1.2.3",
28+
"ngImgCrop": "~0.3.2"
2129
},
2230
"devDependencies": {
2331
"angular-mocks": ">=1.2.*",

‎client/app/account/account.html‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
<section id="user-content" layout="column" layout-fill flex>
2-
<div ui-view layout="row" layout-fill flex></div>
3-
</section>
1+
<div id="account-content" flex layout="column">
2+
<section flex layout="row" layout-align="center center">
3+
<div ui-view flex layout="column"></div>
4+
</section>
5+
</div>

‎client/app/account/account.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
angular
1515
.module('austackApp.account', [
1616
'ui.router',
17-
'ngMaterial'
17+
'timer',
18+
'ngMaterial',
19+
'austackApp.account.settings'
1820
])
1921
.config(configAccountRoute);
2022

@@ -25,7 +27,7 @@
2527
function configAccountRoute($stateProvider) {
2628
var accountState = {
2729
name: 'account',
28-
url: '/acount',
30+
abstract: true,
2931
templateUrl: 'app/account/account.html',
3032
controller: 'AccountController',
3133
controllerAs: 'account'

‎client/app/account/account.scss‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,20 @@
1-
#account-items-content {}
1+
#account-content {
2+
background-color: $as-primary;
3+
margin-bottom: 8%;
4+
.text-center {
5+
color: #fff;
6+
}
7+
.captcha {
8+
margin-top: 20px;
9+
height: 30px;
10+
cursor: pointer;
11+
}
12+
md-card {
13+
width: 100%;
14+
max-width: 360px;
15+
border-radius: 8px;
16+
.md-button {
17+
min-width: inherit;
18+
}
19+
}
20+
}

0 commit comments

Comments
 (0)