Skip to content

Commit 9f313e9

Browse files
Gid733Gid733
authored
Merge pull request #19 from Gid733/eform-new
Updates
2 parents 25a8df9 + 17e47f5 commit 9f313e9

File tree

918 files changed

+33363
-25382
lines changed

Some content is hidden

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

918 files changed

+33363
-25382
lines changed

‎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: 137 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,137 @@
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+
{ "glob": "**/*", "input": "src/assets/", "output": "/assets/" },
27+
{ "glob": "**/assets/**", "input": "src/app/plugins/modules", "output": "/assets/plugins/" },
28+
{ "glob": "favicon.ico", "input": "/src", "output": "/" }
29+
],
30+
"styles": [
31+
"port/angular-bootstrap-md/scss/bootstrap/bootstrap.scss",
32+
"port/angular-bootstrap-md/scss/mdb-free.scss",
33+
"node_modules/ngx-toastr/toastr.css",
34+
"src/scss/styles.scss"
35+
],
36+
"scripts": [
37+
"node_modules/hammerjs/hammer.min.js"
38+
]
39+
},
40+
"configurations": {
41+
"production": {
42+
"fileReplacements": [
43+
{
44+
"replace": "src/environments/environment.ts",
45+
"with": "src/environments/environment.prod.ts"
46+
}
47+
],
48+
"optimization": true,
49+
"outputHashing": "all",
50+
"sourceMap": false,
51+
"extractCss": true,
52+
"namedChunks": false,
53+
"aot": true,
54+
"extractLicenses": true,
55+
"vendorChunk": false,
56+
"buildOptimizer": true
57+
}
58+
}
59+
},
60+
"serve": {
61+
"builder": "@angular-devkit/build-angular:dev-server",
62+
"options": {
63+
"browserTarget": "eform-angular:build"
64+
},
65+
"configurations": {
66+
"production": {
67+
"browserTarget": "eform-angular:build:production"
68+
}
69+
}
70+
},
71+
"extract-i18n": {
72+
"builder": "@angular-devkit/build-angular:extract-i18n",
73+
"options": {
74+
"browserTarget": "eform-angular:build"
75+
}
76+
},
77+
"test": {
78+
"builder": "@angular-devkit/build-angular:karma",
79+
"options": {
80+
"main": "src/test.ts",
81+
"polyfills": "src/polyfills.ts",
82+
"tsConfig": "src/tsconfig.spec.json",
83+
"karmaConfig": "src/karma.conf.js",
84+
"styles": [
85+
"src/styles.scss"
86+
],
87+
"scripts": [],
88+
"assets": [
89+
"src/favicon.ico",
90+
"src/assets"
91+
]
92+
}
93+
},
94+
"lint": {
95+
"builder": "@angular-devkit/build-angular:tslint",
96+
"options": {
97+
"tsConfig": [
98+
"src/tsconfig.app.json",
99+
"src/tsconfig.spec.json"
100+
],
101+
"exclude": [
102+
"**/node_modules/**"
103+
]
104+
}
105+
}
106+
}
107+
},
108+
"eform-angular-e2e": {
109+
"root": "e2e/",
110+
"projectType": "application",
111+
"architect": {
112+
"e2e": {
113+
"builder": "@angular-devkit/build-angular:protractor",
114+
"options": {
115+
"protractorConfig": "e2e/protractor.conf.js",
116+
"devServerTarget": "eform-angular:serve"
117+
},
118+
"configurations": {
119+
"production": {
120+
"devServerTarget": "eform-angular:serve:production"
121+
}
122+
}
123+
},
124+
"lint": {
125+
"builder": "@angular-devkit/build-angular:tslint",
126+
"options": {
127+
"tsConfig": "e2e/tsconfig.e2e.json",
128+
"exclude": [
129+
"**/node_modules/**"
130+
]
131+
}
132+
}
133+
}
134+
}
135+
},
136+
"defaultProject": "eform-angular"
137+
}

‎eform-client/e2e/Constants/ApplicationSettingsConstants.ts‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
export default {
2+
LoginPage: {
3+
originalMainText: 'Microting eForm',
4+
customMainText: 'Custom login page main text',
5+
originalSecondaryText: 'No more paper-forms and back-office data entry',
6+
customSecondaryText: 'Custom login page secondary text'
7+
},
8+
SiteHeader: {
9+
originalMainText: 'Microting eForm',
10+
customMainText: 'No more paper-forms and back-office data entry',
11+
originalSecondaryText: 'No more paper-forms and back-office data entry',
12+
customSecondaryText: 'Custom site header secondary text'
13+
}
14+
};

eform-client/e2e/dbData.ts renamed to eform-client/e2e/Constants/DatabaseConfigurationConstants.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ export default {
44
email: '[email protected]',
55
firstName: 'John',
66
lastNAme: 'Smith',
7-
dataSourceSDK: '(LocalDb)\\SharedInstance',
7+
dataSourceSDK: 'Data Source=.\\SQLEXPRESS',
88
initialCatalogueSDK: 'eFormSDK',
99
authenticationTypeSDK: 'Integrated Security=True',
10-
dataSourceMain: '(LocalDb)\\SharedInstance',
10+
dataSourceMain: 'Data Source=.\\SQLEXPRESS',
1111
token: 'abc1234567890abc1234567890abcdef',
1212
initialCatalogueMain: 'eFormMain',
1313
authenticationTypeMain: 'Integrated Security=True',
@@ -16,4 +16,3 @@ export default {
1616
danish: 'Danish'
1717
}
1818
};
19-

‎eform-client/e2e/Constants/DeviceUsersConstants.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export default {};

‎eform-client/e2e/Constants/LoginConstants.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
export default {
2+
username: 'admin',
3+
password: 'Qq1234567$'
4+
};

‎eform-client/e2e/Constants/MyEformsConstants.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export default {};

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

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

0 commit comments

Comments
 (0)