Compare commits

..

No commits in common. "1f176e0256abdd3b7c8dfeb1699413fae0a425b0" and "2fffad3c609b1e8ce83190ba2b0b0168434ec358" have entirely different histories.

7 changed files with 1488 additions and 57 deletions

View File

@ -5,13 +5,10 @@ Update an army members signature image
**Permission: 4** **Permission: 4**
+ Parameters + Parameters
+ userId: `5ab68d42f547ed304064e5f7` (string, required) - army members unique user id + userId: `5ab68d42f547ed304064e5f7` (string, required) - army members unique user id
+ Request (application/json) + Request (application/json)
{}
+ Attributes (object)
+ Response 200 (application/json; charset=utf-8) + Response 200 (application/json; charset=utf-8)

View File

@ -1,9 +1,8 @@
### List Users [GET /users{?q,fractFilter,squadId,decorationId,limit,offset}] ### List Users [GET /users{?q,fractFilter,limit,offset}]
Get single army member information Get single army member information
+ Parameters + Parameters
+ q: `hardi` (string, optional) - filter string which filters for partial username + q: `hardi` (string, optional) - filter string which filters for partial username
+ fractFilter: `BLUFOR` (enum[string], optional) - Field to filter by fraction + fractFilter: `BLUFOR` (enum[string], optional) - Field to filter by fraction
@ -13,15 +12,17 @@ Get single army member information
+ `OPFOR` + `OPFOR`
+ `GLOBAL` + `GLOBAL`
+ squadId: `5aba54eaeadcce6332c6a774` (string, optional) - Field to filter by membership of certain squad + squadId: `591470249e9fae286e008e31` (string, optional) - Field to filter by membership of certain squad
+ decorationId: `5abd3dff6e6a0334d95b8ba0` (string, optional) - Field to filter by ownership of certain decoration + decorationId: `5abd3dff6e6a0334d95b8ba0` (string, optional) - Field to filter by ownership of certain decoration
+ limit: 20 (number, optional) - Maximum number of users to return + limit: 20 (number, optional)
Maximum number of users to return
+ Default: Infinity + Default: Infinity
+ offset: 0 (number, optional) - Offset into result-set (useful for pagination) + offset: 0 (number, optional)
Offset into result-set (useful for pagination)
+ Default: 0 + Default: 0
@ -39,7 +40,6 @@ Get single army member information
Get single army member information Get single army member information
+ Parameters + Parameters
+ id: `5ab68d42f547ed304064e5f7` (string, required) - unique id of army-member + id: `5ab68d42f547ed304064e5f7` (string, required) - unique id of army-member
+ Response 200 (application/json; charset=utf-8) + Response 200 (application/json; charset=utf-8)

View File

@ -1,5 +1,4 @@
# Campaign (object) # Campaign (object)
Campaign entity Campaign entity
## Properties ## Properties
@ -10,10 +9,8 @@ Campaign entity
+ __v: 0 (number, required) - version number + __v: 0 (number, required) - version number
#WarCampaign (object) #WarCampaign (object)
Cmpaign entity with attached War collection Cmpaign entity with attached War collection
## Properties ## Properties
+ _id: `5abd55ea9e30a76bfef747d6` (string, required) - unique id of the campaign + _id: `5abd55ea9e30a76bfef747d6` (string, required) - unique id of the campaign
+ title: `Ein Kessel Buntes` (string, required) - display title of the campaign + title: `Ein Kessel Buntes` (string, required) - display title of the campaign
+ wars: WarWithPlayers (array[WarWithPlayers], required) + wars (array[WarWithPlayers], requied)

View File

@ -16,66 +16,56 @@ FORMAT: 1A
# Group Access # Group Access
## Endpoints [/auth]
:[Gists](auth/signup.apib) :[Gists](auth/signup.apib)
:[Gists](auth/login.apib) :[Gists](auth/login.apib)
# Group Admin # Group Admin
## Account [/account]
:[Gists](admin/account.apib) :[Gists](admin/account.apib)
## Commands [/cmd]
:[Gists](admin/signature.apib) :[Gists](admin/signature.apib)
# Group Army Management # Group Army Overview
## Army [/overview]
:[Gists](army-management/army.apib) :[Gists](army-management/army.apib)
## Awardings [/awarding] # Group Awardings
:[Gists](army-management/awardings.apib) :[Gists](army-management/awardings.apib)
## Decorations [/decorations] # Group Campaigns
:[Gists](army-management/decorations.apib)
## Promotion [/promotions]
:[Gists](army-management/promotions.apib)
## Ranks [/ranks]
:[Gists](army-management/ranks.apib)
## Squads [/squads]
:[Gists](army-management/squads.apib)
## Users [/user]
:[Gists](army-management/users.apib)
# Group Statistics
## Campaigns [/campaigns]
:[Gists](statistics/campaigns.apib) :[Gists](statistics/campaigns.apib)
## Logs [/logs] # Group Decorations
:[Gists](army-management/decorations.apib)
# Group Logs
:[Gists](statistics/logs.apib) :[Gists](statistics/logs.apib)
## Players [/players] # Group Players
:[Gists](statistics/players.apib) :[Gists](statistics/players.apib)
## Wars [/wars] # Group Promotion
:[Gists](army-management/promotions.apib)
# Group Ranks
:[Gists](army-management/ranks.apib)
# Group Squads
:[Gists](army-management/squads.apib)
# Group Users
:[Gists](army-management/users.apib)
# Group Wars
:[Gists](statistics/wars.apib) :[Gists](statistics/wars.apib)

File diff suppressed because it is too large Load Diff

View File

@ -11,7 +11,6 @@ import {SpinnerService} from './services/user-interface/spinner/spinner.service'
import {TranslateService} from '@ngx-translate/core'; import {TranslateService} from '@ngx-translate/core';
import {SettingsService} from './services/settings.service'; import {SettingsService} from './services/settings.service';
import {environment} from '../environments/environment'; import {environment} from '../environments/environment';
import {SnackBarService} from './services/user-interface/snack-bar/snack-bar.service';
declare function require(url: string); declare function require(url: string);
@ -85,7 +84,6 @@ export class AppComponent implements OnInit {
private spinnerService: SpinnerService, private spinnerService: SpinnerService,
private translate: TranslateService, private translate: TranslateService,
private settingsService: SettingsService, private settingsService: SettingsService,
private snackBarService: SnackBarService,
@Inject(DOCUMENT) private document) { @Inject(DOCUMENT) private document) {
this.initMaterialSvgIcons(); this.initMaterialSvgIcons();
@ -94,7 +92,6 @@ export class AppComponent implements OnInit {
router.events.subscribe(event => { router.events.subscribe(event => {
if (event instanceof NavigationStart) { if (event instanceof NavigationStart) {
this.spinnerService.activate(); this.spinnerService.activate();
this.snackBarService.dismiss();
} }
if (event instanceof NavigationEnd) { if (event instanceof NavigationEnd) {
this.spinnerService.deactivate(); this.spinnerService.deactivate();

View File

@ -29,10 +29,6 @@ export class SnackBarService {
return this.snackbar.open(message, action, config); return this.snackbar.open(message, action, config);
} }
dismiss() {
this.snackbar.dismiss();
}
showSuccess(i18n: string) { showSuccess(i18n: string) {
this.translate.get(i18n).subscribe((translated) => { this.translate.get(i18n).subscribe((translated) => {
return this.show(translated, undefined, 2500, ['custom-snack-bar', 'label-success']); return this.show(translated, undefined, 2500, ['custom-snack-bar', 'label-success']);