Skip to content

Commit 236d8f7

Browse files
renemadsenrenemadsen
committed
Merge branch 'Angular6AndMaterialDesign'
2 parents 7c65e79 + c90b662 commit 236d8f7

File tree

894 files changed

+32240
-25399
lines changed

Some content is hidden

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

894 files changed

+32240
-25399
lines changed

‎eFormAPI/Installation/CustomActions/CustomAction.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,11 @@ public static ActionResult UpdateCA(Session session)
338338
{
339339
DeleteDirectory(Path.Combine(uiIisDir, "node_modules"));
340340
} catch { }
341+
try
342+
{
343+
File.Delete("package-lock.json");
344+
} catch { }
345+
341346
try
342347
{
343348
DeleteDirectory(Path.Combine(uiIisDir, "dist"));

‎eFormAPI/eFormAPI/Infrastructure/Identity/Providers/ApplicationOAuthProvider.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public override async Task GrantResourceOwnerCredentials(OAuthGrantResourceOwner
5656
}
5757
// check code
5858
var otp = new Totp(Base32Encoder.Decode(user.GoogleAuthenticatorSecretKey));
59-
var isCodeValid = otp.VerifyTotp(code, out long timeStepMatched, new VerificationWindow(1, 1));
59+
var isCodeValid = otp.VerifyTotp(code, out long timeStepMatched, new VerificationWindow(5, 5));
6060
if (!isCodeValid)
6161
{
6262
context.SetError("Invalid code", "Invalid code");

‎eform-client/.gitignore‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# compiled output
44
/dist
55
/tmp
6+
/out-tsc
67

78
# dependencies
89
/node_modules
@@ -14,6 +15,7 @@
1415
.c9/
1516
*.launch
1617
.settings/
18+
*.sublime-workspace
1719

1820
# IDE - VSCode
1921
.vscode/*
@@ -25,19 +27,13 @@
2527
# misc
2628
/.sass-cache
2729
/connect.lock
28-
/coverage/*
30+
/coverage
2931
/libpeerconnection.log
3032
npm-debug.log
33+
yarn-error.log
3134
testem.log
3235
/typings
3336

34-
# e2e
35-
/e2e/*.js
36-
/e2e/*.map
37-
38-
# Tests
39-
/test-output
40-
41-
#System Files
37+
# System Files
4238
.DS_Store
4339
Thumbs.db

‎eform-client/angular-cli.json‎

Lines changed: 0 additions & 97 deletions
This file was deleted.

‎eform-client/angular.json‎

Lines changed: 136 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
1+
{
2+
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
3+
"version": 1,
4+
"newProjectRoot": "projects",
5+
"projects": {
6+
"eform-angular": {
7+
"root": "",
8+
"sourceRoot": "src",
9+
"projectType": "application",
10+
"prefix": "app",
11+
"schematics": {
12+
"@schematics/angular:component": {
13+
"styleext": "scss"
14+
}
15+
},
16+
"architect": {
17+
"build": {
18+
"builder": "@angular-devkit/build-angular:browser",
19+
"options": {
20+
"outputPath": "dist",
21+
"index": "src/index.html",
22+
"main": "src/main.ts",
23+
"polyfills": "src/polyfills.ts",
24+
"tsConfig": "src/tsconfig.app.json",
25+
"assets": [
26+
"src/favicon.ico",
27+
"src/assets"
28+
],
29+
"styles": [
30+
"port/angular-bootstrap-md/scss/bootstrap/bootstrap.scss",
31+
"port/angular-bootstrap-md/scss/mdb-free.scss",
32+
"node_modules/ngx-toastr/toastr.css",
33+
"src/scss/styles.scss"
34+
],
35+
"scripts": [
36+
"node_modules/hammerjs/hammer.min.js"
37+
]
38+
},
39+
"configurations": {
40+
"production": {
41+
"fileReplacements": [
42+
{
43+
"replace": "src/environments/environment.ts",
44+
"with": "src/environments/environment.prod.ts"
45+
}
46+
],
47+
"optimization": true,
48+
"outputHashing": "all",
49+
"sourceMap": false,
50+
"extractCss": true,
51+
"namedChunks": false,
52+
"aot": true,
53+
"extractLicenses": true,
54+
"vendorChunk": false,
55+
"buildOptimizer": true
56+
}
57+
}
58+
},
59+
"serve": {
60+
"builder": "@angular-devkit/build-angular:dev-server",
61+
"options": {
62+
"browserTarget": "eform-angular:build"
63+
},
64+
"configurations": {
65+
"production": {
66+
"browserTarget": "eform-angular:build:production"
67+
}
68+
}
69+
},
70+
"extract-i18n": {
71+
"builder": "@angular-devkit/build-angular:extract-i18n",
72+
"options": {
73+
"browserTarget": "eform-angular:build"
74+
}
75+
},
76+
"test": {
77+
"builder": "@angular-devkit/build-angular:karma",
78+
"options": {
79+
"main": "src/test.ts",
80+
"polyfills": "src/polyfills.ts",
81+
"tsConfig": "src/tsconfig.spec.json",
82+
"karmaConfig": "src/karma.conf.js",
83+
"styles": [
84+
"src/styles.scss"
85+
],
86+
"scripts": [],
87+
"assets": [
88+
"src/favicon.ico",
89+
"src/assets"
90+
]
91+
}
92+
},
93+
"lint": {
94+
"builder": "@angular-devkit/build-angular:tslint",
95+
"options": {
96+
"tsConfig": [
97+
"src/tsconfig.app.json",
98+
"src/tsconfig.spec.json"
99+
],
100+
"exclude": [
101+
"**/node_modules/**"
102+
]
103+
}
104+
}
105+
}
106+
},
107+
"eform-angular-e2e": {
108+
"root": "e2e/",
109+
"projectType": "application",
110+
"architect": {
111+
"e2e": {
112+
"builder": "@angular-devkit/build-angular:protractor",
113+
"options": {
114+
"protractorConfig": "e2e/protractor.conf.js",
115+
"devServerTarget": "eform-angular:serve"
116+
},
117+
"configurations": {
118+
"production": {
119+
"devServerTarget": "eform-angular:serve:production"
120+
}
121+
}
122+
},
123+
"lint": {
124+
"builder": "@angular-devkit/build-angular:tslint",
125+
"options": {
126+
"tsConfig": "e2e/tsconfig.e2e.json",
127+
"exclude": [
128+
"**/node_modules/**"
129+
]
130+
}
131+
}
132+
}
133+
}
134+
},
135+
"defaultProject": "eform-angular"
136+
}

‎eform-client/e2e/Helper methods/go-to-pages.ts‎

Lines changed: 0 additions & 62 deletions
This file was deleted.

‎eform-client/e2e/Helper methods/other-helper-methods.ts‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)