This is the codeAbility Sharing Platform! Learn more about the codeAbility Sharing Platform.

Skip to content
Snippets Groups Projects
Commit e8c843a5 authored by Michael Breu's avatar Michael Breu
Browse files

running prettier and npm audit fix

parent 530e7eb7
Branches
2 merge requests!188Merging Peer Reviewing et. al to Master,!164211 peer reviewing functionality
Showing
with 327 additions and 144 deletions
......@@ -23,7 +23,7 @@ pmdCheckstylePrettierLint:
when: always
before_script:
- 'export VERSION="6.40.0"'
- 'wget "https://github.com/pmd/pmd/releases/download/pmd_releases%2F$VERSION/pmd-bin-$VERSION.zip"'
- 'wget --no-verbose "https://github.com/pmd/pmd/releases/download/pmd_releases%2F$VERSION/pmd-bin-$VERSION.zip"'
- 'jar -xf "pmd-bin-$VERSION.zip"'
- 'chmod u+x "pmd-bin-$VERSION/bin/run.sh"'
script:
......
This diff is collapsed.
......@@ -68,7 +68,7 @@ public class UserJWTController {
}
@PostMapping("/refreshToken")
public ResponseEntity<JWTToken> refreshToken(@RequestParam("token") String token, @RequestParam("rememberMe") boolean rememberMe) {
public ResponseEntity<JWTToken> refreshToken(@RequestParam("token") String token, @RequestParam("rememberMe") boolean rememberMe) {
if (tokenProvider.validateToken(token)) {
Authentication authentication = tokenProvider.getAuthentication(token);
@SuppressWarnings("unchecked")
......
......@@ -46,12 +46,12 @@ export class AuthServerProvider {
observer.complete();
});
}
saveRememberMe(rememberMe:boolean): void {
this.localStorageService.store('rememberMe', rememberMe);
saveRememberMe(rememberMe: boolean): void {
this.localStorageService.store('rememberMe', rememberMe);
}
getRememberMe(): boolean {
return this.localStorageService.retrieve('rememberMe') as boolean;
return this.localStorageService.retrieve('rememberMe') as boolean;
}
private authenticateSuccess(response: JwtToken, rememberMe: boolean): void {
......@@ -63,6 +63,6 @@ export class AuthServerProvider {
this.sessionStorageService.store('authenticationToken', jwt);
this.localStorageService.clear('authenticationToken');
}
this.localStorageService.clear('rememberMe')
this.localStorageService.clear('rememberMe');
}
}
......@@ -9,7 +9,7 @@ import { ApplicationConfigService } from 'app/core/config/application-config.ser
import { createRequestOption } from 'app/core/request/request-util';
import { Search } from 'app/core/request/request.model';
import { ILikes, Likes } from 'app/shared/model/likes.model';
import { encodeURIforExerciseId } from 'app/exercise/service/exercise.service'
import { encodeURIforExerciseId } from 'app/exercise/service/exercise.service';
type EntityResponseType = HttpResponse<ILikes>;
type EntityArrayResponseType = HttpResponse<ILikes[]>;
......
......@@ -5,8 +5,7 @@ import { IStatistics } from 'app/shared/model/statistics.model';
import { createRequestOption } from 'app/core/request/request-util';
import { Search } from 'app/core/request/request.model';
import { Observable } from 'rxjs';
import { encodeURIforExerciseId } from 'app/exercise/service/exercise.service'
import { encodeURIforExerciseId } from 'app/exercise/service/exercise.service';
type EntityResponseType = HttpResponse<IStatistics>;
type EntityArrayResponseType = HttpResponse<IStatistics[]>;
......
<div *ngIf="value && value.length > 0"
class="row exercise-metadata-item">
<ng-container *ngIf="isArray(value)">
<div *ngIf="value.length === 1"
class="col-5 exercise-metadata-item-description">{{ description
+ '.singular' | translate }}</div>
<div *ngIf="value.length > 1"
class="col-5 exercise-metadata-item-description">{{ description
+ '.plural' | translate }}</div>
<ng-container *ngIf="link"> <a
href="{{link}}" class="col-7 exercise-metadata-item-value">
<div *ngIf="treatAsHTML" class="exercise-metadata-item-value"
[innerHTML]="arrayToString(value)"></div>
<div *ngIf="!treatAsHTML" class="exercise-metadata-item-value">
{{ arrayToString(value) }}</div>
</a> </ng-container> <ng-container *ngIf="!link">
<div *ngIf="treatAsHTML" class="col-7 exercise-metadata-item-value"
[innerHTML]="arrayToString(value)"></div>
<div *ngIf="!treatAsHTML" class="col-7 exercise-metadata-item-value">
{{ arrayToString(value) }}</div>
</ng-container> </ng-container>
<ng-container *ngIf="!isArray(value)">
<div jhiTranslate="{{ description }}"
class="col-5 exercise-metadata-item-description"></div>
<ng-container *ngIf="link" class="col-7"> <a
href="{{link}}" class="col-7 exercise-metadata-item-value">
<div>{{ value }}</div>
</a> </ng-container> <ng-container *ngIf="!link" >
<div class="col-7 exercise-metadata-item-value">{{ value }}</div>
</ng-container> </ng-container>
<div *ngIf="value && value.length > 0" class="row exercise-metadata-item">
<ng-container *ngIf="isArray(value)">
<div *ngIf="value.length === 1" class="col-5 exercise-metadata-item-description">{{ description + '.singular' | translate }}</div>
<div *ngIf="value.length > 1" class="col-5 exercise-metadata-item-description">{{ description + '.plural' | translate }}</div>
<ng-container *ngIf="link">
<a href="{{ link }}" class="col-7 exercise-metadata-item-value">
<div *ngIf="treatAsHTML" class="exercise-metadata-item-value" [innerHTML]="arrayToString(value)"></div>
<div *ngIf="!treatAsHTML" class="exercise-metadata-item-value">
{{ arrayToString(value) }}
</div>
</a>
</ng-container>
<ng-container *ngIf="!link">
<div *ngIf="treatAsHTML" class="col-7 exercise-metadata-item-value" [innerHTML]="arrayToString(value)"></div>
<div *ngIf="!treatAsHTML" class="col-7 exercise-metadata-item-value">
{{ arrayToString(value) }}
</div>
</ng-container>
</ng-container>
<ng-container *ngIf="!isArray(value)">
<div jhiTranslate="{{ description }}" class="col-5 exercise-metadata-item-description"></div>
<ng-container *ngIf="link" class="col-7">
<a href="{{ link }}" class="col-7 exercise-metadata-item-value">
<div>{{ value }}</div>
</a>
</ng-container>
<ng-container *ngIf="!link">
<div class="col-7 exercise-metadata-item-value">{{ value }}</div>
</ng-container>
</ng-container>
</div>
......@@ -9,7 +9,7 @@ export class ExerciseMetadataItemComponent {
@Input() description = '';
@Input() value: string | string[] | undefined;
@Input() treatAsHTML = false;
@Input() link: string | undefined
@Input() link: string | undefined;
isArray(value: string | string[]): boolean {
return Array.isArray(value);
......
......@@ -113,7 +113,11 @@
</jhi-exercise-metadata-item>
<jhi-exercise-metadata-item [description]="'exercise.metadata.identifier'" [value]="exercise.identifier"> </jhi-exercise-metadata-item>
<jhi-exercise-metadata-item [description]="'exercise.metadata.internalIdentifier'" [value]="exercise.originalResult.exerciseId" link="/item/{{exercise.originalResult.exerciseId}}">
<jhi-exercise-metadata-item
[description]="'exercise.metadata.internalIdentifier'"
[value]="exercise.originalResult.exerciseId"
link="/item/{{ exercise.originalResult.exerciseId }}"
>
</jhi-exercise-metadata-item>
<jhi-exercise-metadata-item [description]="'exercise.metadata.interactivityType'" [value]="exercise.interactivityType">
......
......@@ -103,6 +103,6 @@ export class ExerciseService {
* I have not found a good way to repair this. So we unencode the slashes here.
*/
export function encodeURIforExerciseId(exerciseId: string): string {
const encodedURL = encodeURIComponent(exerciseId);
return encodedURL.replace("%2F", "/").replace("%2f", "/")
const encodedURL = encodeURIComponent(exerciseId);
return encodedURL.replace('%2F', '/').replace('%2f', '/');
}
......@@ -295,17 +295,15 @@
</div>
</li>
<form class="form" role="form" (ngSubmit)="login()" [formGroup]="loginForm">
<li>
<div class="form-check">
<label class="form-check-label" for="rememberMe"> <input
class="form-check-input" type="checkbox" name="rememberMe"
id="rememberMe" formControlName="rememberMe" /> <span
jhiTranslate="login.form.rememberme">Remember me</span>
</label>
</div>
</li>
<li class="dropdown-divider"></li>
<li>
<div class="form-check">
<label class="form-check-label" for="rememberMe">
<input class="form-check-input" type="checkbox" name="rememberMe" id="rememberMe" formControlName="rememberMe" />
<span jhiTranslate="login.form.rememberme">Remember me</span>
</label>
</div>
</li>
<li class="dropdown-divider"></li>
<li>
<h5 style="color: #b3b3b3; margin-bottom: 25px">Sign in locally</h5>
<div class="input-group mb-3">
......
......@@ -37,7 +37,7 @@ export class NavbarComponent implements OnInit {
authenticationError = false;
loginForm : FormGroup;
loginForm: FormGroup;
public configs: OAuth2Config[] = [];
......@@ -64,7 +64,6 @@ export class NavbarComponent implements OnInit {
password: [''],
rememberMe: [this.authServerProvider.getRememberMe()],
});
}
ngOnInit(): void {
......@@ -89,9 +88,6 @@ export class NavbarComponent implements OnInit {
// eslint-disable-next-line no-console
console.error(error)
);
}
changeLanguage(languageKey: string): void {
......
......@@ -7,7 +7,7 @@ import { ApplicationConfigService } from 'app/core/config/application-config.ser
import { SearchResultsDTO } from 'app/shared/model/search/search-results-dto.model';
import { SearchInput } from 'app/shared/model/search/search-input.model';
import { Statistics } from 'app/shared/model/statistics.model';
import { encodeURIforExerciseId } from 'app/exercise/service/exercise.service'
import { encodeURIforExerciseId } from 'app/exercise/service/exercise.service';
@Injectable({ providedIn: 'root' })
export class SearchService {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment