Skip to content

Commit e935d32

Browse files
author
James Cori
committed
Merge branch 'dev'
2 parents 313189b + c7e44e7 commit e935d32

29 files changed

+2065
-75
lines changed

‎README.md‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,14 @@ The following configuration parameters are available:
3737
| OAUTH2_TOKEN_NAME | OAuth2 token name |
3838
| OAUTH2_TOKEN_EXPIRETIME_TAGNAME | OAuth2 token expire time tag name |
3939
| SPIGIT_API_URL | SPIGIT api base url |
40-
|SPIGIT_API_VERSION_PATH | SPIGIT api version path |
41-
|GROUP_V5_API_URL | URL of the v5 Groups API |
42-
|LOOKUP_V5_API_URL | URL of the v5 Devices API |
40+
| SPIGIT_API_VERSION_PATH | SPIGIT api version path |
41+
| GROUP_V5_API_URL | URL of the v5 Groups API |
42+
| LOOKUP_V5_API_URL | URL of the v5 Devices API |
43+
| TERMS_V5_API_URL | URL of the v5 Terms API |
44+
| AGREEABILITY_TYPES | List of Agreeable types and its UUID from Database |
45+
| AGREE_FOR_DOCUSIGN_TEMPLATE | UUID from Database of the `"DocuSign Template"` Agreeable type |
46+
| AGREE_ELECTRONICALLY | UUID from Database of the `Electronically` Agreeable Type |
47+
| DEFAULT_TERMS_TYPE_ID | The default terms type id |
4348

4449

4550
## Start the Application
@@ -90,4 +95,4 @@ npm install
9095
```gulp protractor```
9196

9297

93-
Update to Push CI
98+
Update to Push CI

‎config.json‎

Lines changed: 92 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,29 @@
1313
"SPIGIT_API_URL": "spigit.com",
1414
"SPIGIT_API_VERSION_PATH": "/api/v1",
1515
"GROUP_V5_API_URL": "http://localhost:3000/v5",
16-
"LOOKUP_V5_API_URL": "http://localhost:3000/v5"
16+
"LOOKUP_V5_API_URL": "http://localhost:3000/v5",
17+
"TERMS_V5_API_URL": "http://localhost:3000/v5",
18+
"AGREEABILITY_TYPES": [
19+
{
20+
"id": "f3cb81fa-d1ed-4231-b6c6-770f4f1ce8a4",
21+
"name": "Non-agreeable"
22+
},
23+
{
24+
"id": "208779bf-72ce-4e97-a398-13fa62c0414a",
25+
"name": "Non-electronically-agreeable"
26+
},
27+
{
28+
"id": "5b2798b2-ae82-4210-9b4d-5d6428125ccb",
29+
"name": "Electronically-agreeable"
30+
},
31+
{
32+
"id": "999a26ad-b334-453c-8425-165d4cf496d7",
33+
"name": "Docusign-template"
34+
}
35+
],
36+
"AGREE_FOR_DOCUSIGN_TEMPLATE": "999a26ad-b334-453c-8425-165d4cf496d7",
37+
"AGREE_ELECTRONICALLY": "5b2798b2-ae82-4210-9b4d-5d6428125ccb",
38+
"DEFAULT_TERMS_TYPE_ID": 5
1739
},
1840
"dev": {
1941
"API_URL": "https://api.topcoder-dev.com",
@@ -29,7 +51,29 @@
2951
"SPIGIT_API_URL": "spigit.com",
3052
"SPIGIT_API_VERSION_PATH": "/api/v1",
3153
"GROUP_V5_API_URL": "https://api.topcoder-dev.com/v5",
32-
"LOOKUP_V5_API_URL": "https://api.topcoder-dev.com/v5"
54+
"LOOKUP_V5_API_URL": "https://api.topcoder-dev.com/v5",
55+
"TERMS_V5_API_URL": "https://api.topcoder-dev.com/v5",
56+
"AGREEABILITY_TYPES": [
57+
{
58+
"id": "f3cb81fa-d1ed-4231-b6c6-770f4f1ce8a4",
59+
"name": "Non-agreeable"
60+
},
61+
{
62+
"id": "208779bf-72ce-4e97-a398-13fa62c0414a",
63+
"name": "Non-electronically-agreeable"
64+
},
65+
{
66+
"id": "5b2798b2-ae82-4210-9b4d-5d6428125ccb",
67+
"name": "Electronically-agreeable"
68+
},
69+
{
70+
"id": "999a26ad-b334-453c-8425-165d4cf496d7",
71+
"name": "Docusign-template"
72+
}
73+
],
74+
"AGREE_FOR_DOCUSIGN_TEMPLATE": "999a26ad-b334-453c-8425-165d4cf496d7",
75+
"AGREE_ELECTRONICALLY": "5b2798b2-ae82-4210-9b4d-5d6428125ccb",
76+
"DEFAULT_TERMS_TYPE_ID": 5
3377
},
3478
"qa": {
3579
"API_URL": "https://api.topcoder-qa.com",
@@ -45,7 +89,29 @@
4589
"SPIGIT_API_URL": "spigit.com",
4690
"SPIGIT_API_VERSION_PATH": "/api/v1",
4791
"GROUP_V5_API_URL": "http://localhost:9000",
48-
"LOOKUP_V5_API_URL": "http://localhost:3000/v5"
92+
"LOOKUP_V5_API_URL": "http://localhost:3000/v5",
93+
"TERMS_V5_API_URL": "http://localhost:3000/v5",
94+
"AGREEABILITY_TYPES": [
95+
{
96+
"id": "f3cb81fa-d1ed-4231-b6c6-770f4f1ce8a4",
97+
"name": "Non-agreeable"
98+
},
99+
{
100+
"id": "208779bf-72ce-4e97-a398-13fa62c0414a",
101+
"name": "Non-electronically-agreeable"
102+
},
103+
{
104+
"id": "5b2798b2-ae82-4210-9b4d-5d6428125ccb",
105+
"name": "Electronically-agreeable"
106+
},
107+
{
108+
"id": "999a26ad-b334-453c-8425-165d4cf496d7",
109+
"name": "Docusign-template"
110+
}
111+
],
112+
"AGREE_FOR_DOCUSIGN_TEMPLATE": "999a26ad-b334-453c-8425-165d4cf496d7",
113+
"AGREE_ELECTRONICALLY": "5b2798b2-ae82-4210-9b4d-5d6428125ccb",
114+
"DEFAULT_TERMS_TYPE_ID": 5
49115
},
50116
"prod": {
51117
"API_URL": "https://api.topcoder.com",
@@ -61,6 +127,28 @@
61127
"SPIGIT_API_URL": "spigit.com",
62128
"SPIGIT_API_VERSION_PATH": "/api/v1",
63129
"GROUP_V5_API_URL": "https://api.topcoder.com/v5",
64-
"LOOKUP_V5_API_URL": "https://api.topcoder.com/v5"
130+
"LOOKUP_V5_API_URL": "https://api.topcoder.com/v5",
131+
"TERMS_V5_API_URL": "https://api.topcoder.com/v5",
132+
"AGREEABILITY_TYPES": [
133+
{
134+
"id": "f3cb81fa-d1ed-4231-b6c6-770f4f1ce8a4",
135+
"name": "Non-agreeable"
136+
},
137+
{
138+
"id": "208779bf-72ce-4e97-a398-13fa62c0414a",
139+
"name": "Non-electronically-agreeable"
140+
},
141+
{
142+
"id": "5b2798b2-ae82-4210-9b4d-5d6428125ccb",
143+
"name": "Electronically-agreeable"
144+
},
145+
{
146+
"id": "999a26ad-b334-453c-8425-165d4cf496d7",
147+
"name": "Docusign-template"
148+
}
149+
],
150+
"AGREE_FOR_DOCUSIGN_TEMPLATE": "999a26ad-b334-453c-8425-165d4cf496d7",
151+
"AGREE_ELECTRONICALLY": "5b2798b2-ae82-4210-9b4d-5d6428125ccb",
152+
"DEFAULT_TERMS_TYPE_ID": 5
65153
}
66154
}

‎gulp/build.js‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ gulp.task('html', ['inject', 'partials'], function () {
4343
.pipe($.rev())
4444
.pipe(jsFilter)
4545
.pipe($.ngAnnotate())
46+
.pipe($.replace(/\.?\.?\/node_modules\/tinymce\/?/g, '/styles/tinymce/'))
4647
.pipe($.uglify({preserveComments: $.uglifySaveLicense}))
4748
.pipe(jsFilter.restore())
4849
.pipe(cssFilter)
@@ -84,6 +85,11 @@ gulp.task('fontawesome', function () {
8485
.pipe(gulp.dest(paths.dist + '/fonts/'));
8586
});
8687

88+
gulp.task('tinymce', function () {
89+
return gulp.src('node_modules/tinymce/skins/**/*')
90+
.pipe(gulp.dest(paths.dist + '/styles/tinymce/skins/'));
91+
});
92+
8793
gulp.task('misc', function () {
8894
return gulp.src(paths.src + '/**/*.ico')
8995
.pipe(gulp.dest(paths.dist + '/'));
@@ -93,4 +99,4 @@ gulp.task('clean', function (done) {
9399
$.del([paths.dist + '/', paths.tmp + '/'], done);
94100
});
95101

96-
gulp.task('build', ['ng-config', 'html', 'images', 'fonts', 'fontawesome', 'misc']);
102+
gulp.task('build', ['ng-config', 'html', 'images', 'fonts', 'fontawesome', 'tinymce', 'misc']);

0 commit comments

Comments
 (0)