Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…mystudies into urwebapp-sites-tab

# Conflicts:
#	UR-web-app/src/app/site-coordinator/location/shared/location.service.spec.ts
#	UR-web-app/src/app/site-coordinator/studies/shared/studies.service.spec.ts
  • Loading branch information
rohithd-btc committed Aug 8, 2020
2 parents 6fe9dda + 239d678 commit f3cc80b
Show file tree
Hide file tree
Showing 65 changed files with 2,460 additions and 84 deletions.
19 changes: 19 additions & 0 deletions .github/workflows/build-participant-manager-module.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
on:
pull_request:
paths:
- 'participant-manager-module/**'
- '.github/workflows/build-participant-manager-module.yml'
name: Build-participant-manager-module
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- name: Build with Maven
run: |
cd participant-manager-module
mvn -B package --file pom.xml
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@
**/.factorypath
**/*.log
user-registration-server-ws/consent-mgmt/ConsentMgmtServicesWs.iml
UR-web-app/coverage/
UR-web-app/node_modules/
31 changes: 30 additions & 1 deletion UR-web-app/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ module.exports = {
'google',
],
globals: {
// eslint-disable-next-line @typescript-eslint/naming-convention
Atomics: 'readonly',
// eslint-disable-next-line @typescript-eslint/naming-convention
SharedArrayBuffer: 'readonly',
localStorage: true,
},
Expand All @@ -22,7 +24,7 @@ module.exports = {
tsconfigRootDir: __dirname,
project: 'tsconfig.eslint.json',
},
plugins: ['@typescript-eslint'],
plugins: ['@typescript-eslint', 'unicorn'],
rules: {
'require-jsdoc': 'off',
'no-unused-vars': 'off',
Expand All @@ -35,6 +37,33 @@ module.exports = {
'@typescript-eslint/prefer-readonly': 'error',
'@typescript-eslint/promise-function-async': 'error',
'@typescript-eslint/switch-exhaustiveness-check': 'error',
'@typescript-eslint/naming-convention': [
'error',
{
selector: 'default',
format: ['camelCase'],
},

{
selector: 'variable',
format: ['camelCase', 'UPPER_CASE'],
},
{
selector: 'parameter',
format: ['camelCase'],
leadingUnderscore: 'allow',
},
{
selector: 'typeLike',
format: ['PascalCase'],
},
],
'unicorn/filename-case': [
'error',
{
case: 'kebabCase',
},
],

// Handled by prettier.
'semi': 'off',
Expand Down
8 changes: 4 additions & 4 deletions UR-web-app/.prettierrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"quoteProps": "consistent",
"trailingComma": "all",
"bracketSpacing": false,
"xmlWhitespaceSensitivity": "ignore"
"quoteProps": "consistent",
"trailingComma": "all",
"bracketSpacing": false,
"xmlWhitespaceSensitivity": "ignore"
}
1 change: 1 addition & 0 deletions UR-web-app/e2e/protractor.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Protractor configuration file, see link for more information
// https://github.com/angular/protractor/blob/master/lib/config.ts

// eslint-disable-next-line @typescript-eslint/naming-convention
const {SpecReporter} = require('jasmine-spec-reporter');

exports.config = {
Expand Down
Loading

0 comments on commit f3cc80b

Please sign in to comment.