+
+
+
+
+
+
+
+
+
+
+
+ Edit the {{auditEdit!.fieldName.toLowerCase()}} of {{auditEdit!.featureName}}
Create {{auditOp!.featureName}}
Delete {{auditOp!.featureName}}
, last modified {{dateModified}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
Approve this operation
+
+
+
+
+
+
+
+ Audit record will be marked as APPROVED> and the operation will be carried out immediately. Proceed?
++
+
+
+
+ Reject this operation
+
+
+
+
+
+
+
+ Audit record will be marked as REJECTED . Proceed?
++
+
diff --git a/rubberduckvba.client/src/app/components/audits/feature-add.review/feature-add.review.component.ts b/rubberduckvba.client/src/app/components/audits/feature-add.review/feature-add.review.component.ts
new file mode 100644
index 0000000..1ed21d5
--- /dev/null
+++ b/rubberduckvba.client/src/app/components/audits/feature-add.review/feature-add.review.component.ts
@@ -0,0 +1,48 @@
+import { Component, Input, OnInit } from "@angular/core";
+import { BehaviorSubject } from "rxjs";
+import { FeatureOperationViewModel } from "../../../model/feature.model";
+import { FaIconLibrary } from "@fortawesome/angular-fontawesome";
+import { fas } from "@fortawesome/free-solid-svg-icons";
+import { ApiClientService } from "../../../services/api-client.service";
+
+@Component({
+ selector: 'review-feature-add',
+ templateUrl: './feature-add.review.component.html'
+})
+export class AuditFeatureAdditionComponent implements OnInit {
+
+ private readonly _audit: BehaviorSubject
+
+
+
+
+
+
+
+
+
+ The name of the feature. Must be unique.
+
+
+
+
+
+
+
+
+
+ The display name of the feature
+
+
+
+
+
+
+
+
+
+ Whether the feature should have a 'new feature' marker on the site
+
+
+
+
+
+
+ A short description of the feature.
+
+
+
+
+
+
+
+
+ A markdown document describing the feature in details.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+ + +
+
diff --git a/rubberduckvba.client/src/app/components/audits/feature-delete.review/feature-delete.review.component.ts b/rubberduckvba.client/src/app/components/audits/feature-delete.review/feature-delete.review.component.ts
new file mode 100644
index 0000000..ef04066
--- /dev/null
+++ b/rubberduckvba.client/src/app/components/audits/feature-delete.review/feature-delete.review.component.ts
@@ -0,0 +1,28 @@
+import { Component, Input, OnInit } from "@angular/core";
+import { FeatureOperationViewModel } from "../../../model/feature.model";
+import { BehaviorSubject } from "rxjs";
+
+@Component({
+ selector: 'review-feature-delete',
+ templateUrl: './feature-delete.review.component.html'
+})
+export class AuditFeatureDeleteComponent implements OnInit {
+
+ private readonly _audit: BehaviorSubject
+
+
+
+
+
+ +
++ +
+
diff --git a/rubberduckvba.client/src/app/components/audits/feature-markdown.review/feature-edit-markdown.review.component.ts b/rubberduckvba.client/src/app/components/audits/feature-markdown.review/feature-edit-markdown.review.component.ts
new file mode 100644
index 0000000..461bc1c
--- /dev/null
+++ b/rubberduckvba.client/src/app/components/audits/feature-markdown.review/feature-edit-markdown.review.component.ts
@@ -0,0 +1,87 @@
+import { Component, Input, OnInit } from "@angular/core";
+import { FaIconLibrary } from "@fortawesome/angular-fontawesome";
+import { fas } from "@fortawesome/free-solid-svg-icons";
+import { ApiClientService } from "../../../services/api-client.service";
+import { BehaviorSubject } from "rxjs";
+import { FeatureEditViewModel } from "../../../model/feature.model";
+import { Change, diffWords } from "diff";
+
+@Component({
+ selector: 'review-edit-markdown',
+ templateUrl: './feature-edit-markdown.review.component.html'
+})
+export class AuditFeatureEditMarkdownComponent implements OnInit {
+
+ private readonly _audit: BehaviorSubject
+
+
+
+
+
+
+
+ + + +
+Show/hide the modified field's initial value.
+
+
+
+
+
+
+
+ Submitted value (unformatted):
+
+
+
+
+
+
+
+ Formatted:
+
+
+
+
+
+
+
+
diff --git a/rubberduckvba.client/src/app/components/auth-menu/auth-menu.component.ts b/rubberduckvba.client/src/app/components/auth-menu/auth-menu.component.ts
index 0411a94..794f3c5 100644
--- a/rubberduckvba.client/src/app/components/auth-menu/auth-menu.component.ts
+++ b/rubberduckvba.client/src/app/components/auth-menu/auth-menu.component.ts
@@ -3,10 +3,12 @@ import { FaIconLibrary } from "@fortawesome/angular-fontawesome";
import { BehaviorSubject } from "rxjs";
import { UserViewModel } from "../../model/feature.model";
import { AuthService } from "src/app/services/auth.service";
-import { fas } from "@fortawesome/free-solid-svg-icons";
+import { fa1, fa2, fa3, fa4, fa5, fa6, fa7, fa8, fa9, faCircle, faCircleCheck, faCircleExclamation, fas } from "@fortawesome/free-solid-svg-icons";
import { fab } from "@fortawesome/free-brands-svg-icons";
import { NgbModal } from "@ng-bootstrap/ng-bootstrap";
import { ApiClientService } from "../../services/api-client.service";
+import { IconProp } from "@fortawesome/fontawesome-svg-core";
+import { far } from "@fortawesome/free-regular-svg-icons";
@Component({
selector: 'auth-menu',
@@ -30,6 +32,7 @@ export class AuthMenuComponent implements OnInit {
public modal = inject(NgbModal);
constructor(private auth: AuthService, private api: ApiClientService, private fa: FaIconLibrary) {
+ fa.addIconPacks(far);
fa.addIconPacks(fas);
fa.addIconPacks(fab);
}
@@ -42,10 +45,41 @@ export class AuthMenuComponent implements OnInit {
this.auth.getUser().subscribe(result => {
if (result) {
this._user.next(result);
+ if (result.isReviewer) {
+ this.api.getAllPendingAudits().subscribe(e => { if (e) { this.pendingAudits = e.edits.length + e.other.length } });
+ }
}
});
}
+
+ public pendingAudits: number = 0;
+ public auditsCountIcon(): IconProp {
+ switch (this.pendingAudits) {
+ case 0: return faCircleCheck;
+ case 1: return fa1;
+ case 2: return fa2;
+ case 3: return fa3;
+ case 4: return fa4;
+ case 5: return fa5;
+ case 6: return fa6;
+ case 7: return fa7;
+ case 8: return fa8;
+ case 9: return fa9;
+ default: return faCircleExclamation;
+ }
+ }
+
+ public auditsCountIconClass(): string {
+ if (this.pendingAudits == 0) {
+ return 'text-success';
+ }
+ else {
+ return 'text-danger';
+ }
+ }
+
+
public confirm(): void {
this.modal.open(this.confirmbox);
}
@@ -62,6 +96,10 @@ export class AuthMenuComponent implements OnInit {
this.modal.open(this.confirmclearcachebox);
}
+ public reviewPendingAudits(): void {
+ window.location.href = '/audits';
+ }
+
public signin(): void {
this.auth.signin();
}
diff --git a/rubberduckvba.client/src/app/components/edit-feature/edit-feature.component.html b/rubberduckvba.client/src/app/components/edit-feature/edit-feature.component.html
new file mode 100644
index 0000000..15a99a0
--- /dev/null
+++ b/rubberduckvba.client/src/app/components/edit-feature/edit-feature.component.html
@@ -0,0 +1,168 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{feature.title}}
+
+
+
+
+
+
+ Edit {{action == 'edit' ? 'description' : 'summary'}}
+
+
+
+
+
+ {{feature.description.length}}
+ {{feature.shortDescription.length}}
+
+
+
+ +
+ + +
+
+
+
+ {{feature.title}}
+
+
+
+
+
+
+
+
+
+ New {{subfeature.featureName}} Feature
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ The name of the feature. Must be unique.
+
+
+
+
+
+
+
+
+
+ The display name of the feature
+
+
+
+
+
+
+
+
+
+ Whether the feature should have a 'new feature' marker on the site
+
+
+
+
+
+
+ A short description of the feature.
+
+
+
+
+
+
+
+
+ A markdown document describing the feature in details.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Confirmation
+
+
+
+
+
+
+
+ Delete Feature
+The record for feature {{feature.name}} will only be deleted after an explicit approval. Proceed?
++
{{feature.title}}
- + Details ▸ @@ -29,5 +29,72 @@{{feature.title}}
+
+
+
+
+
+ Delete Feature
+
+
+
+
+
+
+
+ Final Confirmation
+The record for feature {{feature.name}} will be permanently deleted. Proceed?
++
Home▸Features▸{{feature?.featureName}}▸
{{feature?.title}}
- +
+
+
-
+
= new BehaviorSubject(null!);
+ private readonly _user: BehaviorSubject = new BehaviorSubject(null!);
+ private readonly _audits: BehaviorSubject = new BehaviorSubject(null!);
+
+ public editAction: AdminAction = AdminAction.Edit;
+ public createAction: AdminAction = AdminAction.Create;
+ public deleteAction: AdminAction = AdminAction.Delete;
public filterState = {
// searchbox
@@ -33,19 +40,82 @@ export class FeatureInfoComponent implements OnInit, OnChanges {
public set feature(value: XmlDocOrFeatureViewModel | undefined) {
if (value != null) {
this._info.next(value);
+ this._formattedDescriptionHtml = value.description;
+ this._formattedShortDescriptionHtml = value.shortDescription;
this.filterByNameOrDescription(this.filterState.filterText)
+
+ this.api.formatMarkdown(value.description).subscribe(e => this._formattedDescriptionHtml = e.content);
+ this.api.formatMarkdown(value.shortDescription).subscribe(e => this._formattedShortDescriptionHtml = e.content);
}
}
+ public get feature(): XmlDocOrFeatureViewModel | undefined {
+ return this._info.getValue();
+ }
+
+ private _formattedDescriptionHtml: string = '';
+ private _formattedShortDescriptionHtml: string = '';
+
+ public get formattedDescriptionHtml(): string {
+ return this._formattedDescriptionHtml;
+ }
+
+ public get formattedShortDescriptionHtml(): string {
+ return this._formattedShortDescriptionHtml;
+ }
+ @Input()
+ public set user(value: UserViewModel) {
+ this._user.next(value);
+ }
+
+ public get user(): UserViewModel {
+ return this._user.getValue();
+ }
+
+ @Input()
+ public set audits(value: PendingAuditsViewModel) {
+ this._audits.next(value);
+ }
+
+ public get audits(): PendingAuditsViewModel {
+ return this._audits.getValue();
+ }
+
+ public get pendingFeatures(): FeatureViewModel[] {
+ if (!this.audits?.other) {
+ return [];
+ }
+
+ return this.audits.other.filter(e => e.featureAction == 1 && e.parentId == this.feature?.id)
+ .map((e) => {
+ return {
+ id: e.id,
+ dateInserted: e.dateInserted,
+ dateUpdated: '',
+ features: [],
+ name: e.name ?? '',
+ title: e.title ?? '',
+ description: e.description ?? '',
+ shortDescription: e.shortDescription ?? '',
+ featureId: e.parentId ?? undefined,
+ featureName: undefined,
+ featureTitle: undefined,
+ hasImage: e.hasImage ?? false,
+ isHidden: e.isHidden ?? false,
+ isNew: e.isNew ?? false,
+ links: e.links ?? [],
+ isCollapsed: false,
+ isDetailsCollapsed: true,
+
+ isCreatePending: true
+ }
+ });
+ }
private _filteredItems: XmlDocItemViewModel[] = [];
public get filteredItems(): XmlDocItemViewModel[] {
return this._filteredItems;
}
- public get feature(): XmlDocOrFeatureViewModel | undefined {
- return this._info.value;
- }
-
public get inspectionItems(): InspectionViewModel[] {
return (this.feature as InspectionsFeatureViewModel)?.inspections?.filter(e => !e.isHidden) ?? [];
}
@@ -57,7 +127,6 @@ export class FeatureInfoComponent implements OnInit, OnChanges {
public get quickfixItems(): QuickFixViewModel[] {
return (this.feature as QuickFixesFeatureViewModel)?.quickFixes?.filter(e => !e.isHidden) ?? [];
}
- private readonly _quickfixes: BehaviorSubject = new BehaviorSubject(null!);
public get subfeatures(): FeatureViewModel[] {
return (this.feature as FeatureViewModel)?.features ?? [];
@@ -68,20 +137,11 @@ export class FeatureInfoComponent implements OnInit, OnChanges {
return feature?.links ?? [];
}
- constructor(private api: ApiClientService, private fa: FaIconLibrary) {
+ constructor(private fa: FaIconLibrary, private api: ApiClientService) {
fa.addIconPacks(fas);
}
ngOnInit(): void {
- this.api.getFeature('quickfixes').subscribe(result => {
- if (result) {
- this._quickfixes.next((result as QuickFixesFeatureViewModel).quickFixes.slice());
- }
- });
- }
-
-
- ngOnChanges(changes: SimpleChanges): void {
}
public onFilter(): void {
diff --git a/rubberduckvba.client/src/app/model/feature.model.ts b/rubberduckvba.client/src/app/model/feature.model.ts
index 97a0534..6417664 100644
--- a/rubberduckvba.client/src/app/model/feature.model.ts
+++ b/rubberduckvba.client/src/app/model/feature.model.ts
@@ -1,5 +1,5 @@
export interface ViewModel {
- id: number;
+ id: number | undefined;
dateInserted: string;
dateUpdated: string;
name: string;
@@ -10,6 +10,55 @@ export interface ViewModel {
isDetailsCollapsed: boolean;
}
+export interface MarkdownContent {
+ content: string;
+}
+
+export interface AuditRecordViewModel {
+ id: number,
+ dateInserted: string,
+ dateModified: string | null,
+ author: string,
+ approvedAt: string | null,
+ approvedBy: string | null,
+ rejectedAt: string | null,
+ rejectedBy: string | null,
+ isStale: boolean,
+ isPending: boolean,
+}
+
+export interface FeatureEditViewModel extends AuditRecordViewModel {
+ featureId: string,
+ featureName: string,
+ fieldName: string,
+ valueBefore: string | null,
+ valueAfter: string,
+}
+
+export enum FeatureOperation {
+ Create = 1,
+ Delete = 2,
+}
+
+export interface FeatureOperationViewModel extends AuditRecordViewModel {
+ featureName: string;
+ featureAction: FeatureOperation;
+ parentId: number | null;
+ name: string | null;
+ title: string | null;
+ shortDescription: string | null;
+ description: string | null;
+ isNew: boolean | null;
+ isHidden: boolean | null;
+ hasImage: boolean | null;
+ links: BlogLink[] | null;
+}
+
+export interface PendingAuditsViewModel {
+ edits: FeatureEditViewModel[];
+ other: FeatureOperationViewModel[];
+}
+
export interface SubFeatureViewModel extends ViewModel {
featureId?: number;
featureName?: string;
@@ -17,6 +66,7 @@ export interface SubFeatureViewModel extends ViewModel {
title: string;
description: string;
+ shortDescription: string;
}
export interface XmlDocViewModel extends SubFeatureViewModel {
@@ -33,6 +83,8 @@ export interface FeatureViewModel extends SubFeatureViewModel {
features: FeatureViewModel[];
links: BlogLink[];
+
+ isCreatePending: boolean;
}
export interface BlogLink {
@@ -185,7 +237,7 @@ export interface AnnotationViewModel extends XmlDocViewModel {
export type XmlDocItemViewModel = InspectionViewModel | QuickFixViewModel | AnnotationViewModel;
export class ViewModelBase implements ViewModel {
- id: number;
+ id: number | undefined;
dateInserted: string;
dateUpdated: string;
name: string;
@@ -242,6 +294,8 @@ export class FeatureViewModelClass extends ViewModelBase {
features: FeatureViewModel[];
links: BlogLink[];
+ isCreatePending: boolean;
+
constructor(model: FeatureViewModel) {
super(model);
this.title = model.title;
@@ -252,6 +306,7 @@ export class FeatureViewModelClass extends ViewModelBase {
this.links = model.links?.map(e => new BlogLinkViewModelClass(e)) ?? [];
this.isCollapsed = !model.hasImage;
+ this.isCreatePending = model.isCreatePending;
}
}
@@ -261,17 +316,29 @@ export class SubFeatureViewModelClass extends ViewModelBase implements SubFeatur
featureTitle?: string | undefined;
title: string;
description: string;
+ shortDescription: string;
constructor(model: SubFeatureViewModel) {
super(model);
this.title = model.title;
this.description = model.description;
+ this.shortDescription = model.shortDescription;
this.isDetailsCollapsed = true;
this.featureId = model.featureId;
this.featureName = model.featureName;
}
}
+export class EditSubFeatureViewModelClass extends SubFeatureViewModelClass {
+ constructor(model: SubFeatureViewModel) {
+ super(model);
+ this.isDetailsCollapsed = false;
+ this.descriptionPreview = model.description;
+ }
+
+ public descriptionPreview: string;
+}
+
export class InspectionViewModelClass extends SubFeatureViewModelClass implements InspectionViewModel {
inspectionType: string;
defaultSeverity: string;
@@ -429,4 +496,65 @@ export interface UserViewModel {
name: string;
isAuthenticated: boolean;
isAdmin: boolean;
+ isReviewer: boolean;
+ isWriter: boolean;
+}
+
+export enum UserActivityType {
+ SubmitEdit = 'SubmitEdit',
+ ApproveEdit = 'ApproveEdit',
+ RejectEdit = 'RejectEdit',
+ SubmitCreate = 'SubmitCreate',
+ ApproveCreate = 'ApproveCreate',
+ RejectCreate = 'RejectCreate',
+ SubmitDelete = 'SubmitDelete',
+ ApproveDelete = 'ApproveDelete',
+ RejectDelete = 'RejectDelete',
+}
+
+export interface UserActivityItem {
+ id: number;
+ activityTimestamp: string;
+ author: string;
+ activity: UserActivityType;
+ description: string;
+ status: UserActivityStatus;
+ reviewedBy?: string;
+}
+
+export enum UserActivityStatus {
+ pending = 'Pending',
+ approved = 'Approved',
+ rejected = 'Rejected'
+}
+
+export class UserActivityItemClass implements UserActivityItem {
+ id: number;
+ activityTimestamp: string;
+ author: string;
+ activity: UserActivityType;
+ description: string;
+ status: UserActivityStatus;
+ reviewedBy?: string;
+
+ constructor(item: UserActivityItem) {
+ this.id = item.id;
+ this.activityTimestamp = item.activityTimestamp;
+ this.author = item.author;
+ this.activity = item.activity;
+ this.description = item.description;
+ this.status = item.status;
+ this.reviewedBy = item.reviewedBy;
+ }
+
+ public get linkUrl(): string {
+ switch (this.activity) {
+ case UserActivityType.SubmitEdit:
+ case UserActivityType.ApproveEdit:
+ case UserActivityType.RejectEdit:
+ return `audits/edits/${this.id}`;
+ default:
+ return `audits/ops/${this.id}`;
+ }
+ }
}
diff --git a/rubberduckvba.client/src/app/routes/audits/audit-item/audit-item.component.html b/rubberduckvba.client/src/app/routes/audits/audit-item/audit-item.component.html
new file mode 100644
index 0000000..ccc234d
--- /dev/null
+++ b/rubberduckvba.client/src/app/routes/audits/audit-item/audit-item.component.html
@@ -0,0 +1,13 @@
+ = new BehaviorSubject(null!);
+ private _op: BehaviorSubject = new BehaviorSubject(null!);
+ private _edit: BehaviorSubject = new BehaviorSubject(null!);
+
+ private _isEdit: boolean = false;
+
+ constructor(private fa: FaIconLibrary, private api: ApiClientService, private route: ActivatedRoute) {
+ fa.addIconPacks(fas);
+ }
+
+ ngOnInit(): void {
+ const route = this.route;
+ route.paramMap.pipe(
+ switchMap(params => {
+ const id = Number.parseInt(params.get('id')!);
+ if (route.routeConfig?.path?.includes('/edit')) {
+ return this.api.getAudit(id, UserActivityType.SubmitEdit);
+ }
+ //else if (route.routeConfig?.path?.includes('/op')) {
+ // return this.api.getAudit(id, UserActivityType.SubmitCreate);
+ //}
+ return this.api.getAudit(id, UserActivityType.SubmitCreate);
+ })
+ ).subscribe(e => {
+ if (e.edits.length > 0) {
+ const edit = e.edits[0];
+ this._item.next(edit);
+ this._edit.next(edit);
+ this._isEdit = true;
+ }
+ else if (e.other.length > 0) {
+ const op = e.other[0];
+ this._item.next(op);
+ this._op.next(op);
+ this._isEdit = false;
+ }
+ });
+ }
+
+ public get isEdit(): boolean {
+ return this._isEdit;
+ }
+
+ public get featureOp(): FeatureOperationViewModel {
+ return this._op.getValue();
+ }
+
+ public get featureEdit(): FeatureEditViewModel {
+ return this._edit.getValue();
+ }
+
+ public get item(): AuditRecordViewModel {
+ return this._item.getValue();
+ }
+}
diff --git a/rubberduckvba.client/src/app/routes/audits/audits.component.css b/rubberduckvba.client/src/app/routes/audits/audits.component.css
new file mode 100644
index 0000000..e69de29
diff --git a/rubberduckvba.client/src/app/routes/audits/audits.component.html b/rubberduckvba.client/src/app/routes/audits/audits.component.html
new file mode 100644
index 0000000..cc979e1
--- /dev/null
+++ b/rubberduckvba.client/src/app/routes/audits/audits.component.html
@@ -0,0 +1,35 @@
+
+
-
diff --git a/rubberduckvba.client/src/app/routes/feature/feature.component.ts b/rubberduckvba.client/src/app/routes/feature/feature.component.ts
index f21a64e..e4906cd 100644
--- a/rubberduckvba.client/src/app/routes/feature/feature.component.ts
+++ b/rubberduckvba.client/src/app/routes/feature/feature.component.ts
@@ -3,9 +3,10 @@ import { ApiClientService } from "../../services/api-client.service";
import { FaIconLibrary } from '@fortawesome/angular-fontawesome';
import { fas } from '@fortawesome/free-solid-svg-icons';
import { BehaviorSubject, switchMap } from 'rxjs';
-import { XmlDocOrFeatureViewModel } from '../../model/feature.model';
+import { PendingAuditsViewModel, UserViewModel, XmlDocOrFeatureViewModel } from '../../model/feature.model';
import { ActivatedRoute } from '@angular/router';
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { AuthService } from '../../services/auth.service';
@Component({
selector: 'app-feature',
@@ -16,13 +17,21 @@ export class FeatureComponent implements OnInit {
public modal = inject(NgbModal);
private readonly _feature: BehaviorSubject = new BehaviorSubject(null!);
- public set feature(value: XmlDocOrFeatureViewModel){
- this._feature.next(value);
- }
public get feature(): XmlDocOrFeatureViewModel {
return this._feature.getValue();
}
- constructor(private api: ApiClientService, private fa: FaIconLibrary, private route: ActivatedRoute) {
+
+ private readonly _user: BehaviorSubject = new BehaviorSubject(null!);
+ public get user(): UserViewModel {
+ return this._user.getValue();
+ }
+
+ private readonly _audits: BehaviorSubject = new BehaviorSubject(null!);
+ public get audits(): PendingAuditsViewModel {
+ return this._audits.getValue();
+ }
+
+ constructor(private auth: AuthService, private api: ApiClientService, private fa: FaIconLibrary, private route: ActivatedRoute) {
fa.addIconPacks(fas);
}
@@ -32,8 +41,16 @@ export class FeatureComponent implements OnInit {
const name = params.get('name')!;
return this.api.getFeature(name);
})).subscribe(e => {
- this.feature = e;
- console.log(this.feature);
+ this._feature.next(e);
});
+
+ this.auth.getUser().subscribe(e => {
+ this._user.next(e);
+ if (e.isAdmin) {
+ this.api.getAllPendingAudits().subscribe(a => {
+ this._audits.next(a);
+ });
+ }
+ });
}
}
diff --git a/rubberduckvba.client/src/app/routes/features/features.component.html b/rubberduckvba.client/src/app/routes/features/features.component.html
index 2366bed..63ec77d 100644
--- a/rubberduckvba.client/src/app/routes/features/features.component.html
+++ b/rubberduckvba.client/src/app/routes/features/features.component.html
@@ -25,7 +25,7 @@
diff --git a/rubberduckvba.client/src/app/routes/features/features.component.ts b/rubberduckvba.client/src/app/routes/features/features.component.ts
index cf7c8e6..6814336 100644
--- a/rubberduckvba.client/src/app/routes/features/features.component.ts
+++ b/rubberduckvba.client/src/app/routes/features/features.component.ts
@@ -1,17 +1,22 @@
-import { Component, OnChanges, OnInit, SimpleChanges } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
import { ApiClientService } from "../../services/api-client.service";
import { FaIconLibrary } from '@fortawesome/angular-fontawesome';
import { fas } from '@fortawesome/free-solid-svg-icons';
import { BehaviorSubject } from 'rxjs';
-import { FeatureViewModel, QuickFixViewModel } from '../../model/feature.model';
+import { FeatureViewModel, PendingAuditsViewModel, QuickFixViewModel, UserViewModel } from '../../model/feature.model';
+import { AuthService } from '../../services/auth.service';
@Component({
selector: 'app-features',
templateUrl: './features.component.html',
})
-export class FeaturesComponent implements OnInit, OnChanges {
+export class FeaturesComponent implements OnInit {
+
+ private readonly _user: BehaviorSubject = new BehaviorSubject(null!);
+ private readonly _audits: BehaviorSubject = new BehaviorSubject(null!);
private readonly _features: BehaviorSubject = new BehaviorSubject(null!);
+
public set features(value: FeatureViewModel[]) {
this._features.next(value);
}
@@ -19,17 +24,19 @@ export class FeaturesComponent implements OnInit, OnChanges {
return this._features.getValue();
}
- private readonly _quickFixes: BehaviorSubject = new BehaviorSubject(null!);
- public get quickFixes(): QuickFixViewModel[] {
- return this._quickFixes.value;
+ public get user() {
+ return this._user.getValue();
}
- constructor(private api: ApiClientService, private fa: FaIconLibrary) {
- fa.addIconPacks(fas);
+ public get audits() {
+ return this._audits.getValue() ?? {
+ edits: [],
+ other: []
+ };
}
- ngOnChanges(changes: SimpleChanges): void {
- console.log(changes);
+ constructor(private api: ApiClientService, private auth: AuthService, private fa: FaIconLibrary) {
+ fa.addIconPacks(fas);
}
ngOnInit(): void {
@@ -38,5 +45,17 @@ export class FeaturesComponent implements OnInit, OnChanges {
this._features.next(result.filter(e => !e.isHidden));
}
});
+ this.auth.getUser().subscribe(result => {
+ if (result) {
+ this._user.next(result);
+ if (this.user.isAdmin) {
+ this.api.getAllPendingAudits().subscribe(audits => {
+ if (audits) {
+ this._audits.next(audits);
+ }
+ })
+ }
+ }
+ });
}
}
diff --git a/rubberduckvba.client/src/app/routes/profile/user-profile.component.html b/rubberduckvba.client/src/app/routes/profile/user-profile.component.html
new file mode 100644
index 0000000..fa1cf94
--- /dev/null
+++ b/rubberduckvba.client/src/app/routes/profile/user-profile.component.html
@@ -0,0 +1,108 @@
+ = new BehaviorSubject(null!);
+ private _activity: BehaviorSubject = new BehaviorSubject([]);
+
+ constructor(private fa: FaIconLibrary, private auth: AuthService, private api: ApiClientService) {
+ fa.addIconPacks(fas);
+ this.auth.getUser().subscribe(user => {
+ if (user) {
+ this._user.next(user);
+ this.api.getUserActivity().subscribe(activities => {
+ if (activities) {
+ this._activity.next(activities.map(e => new UserActivityItemClass(e)));
+ }
+ });
+ }
+ });
+ }
+
+ ngOnInit(): void {
+ }
+
+ public get name(): string {
+ return this._user.getValue()?.name;
+ }
+
+ public get canReview(): boolean {
+ const user = this._user.getValue();
+ return user?.isAdmin || user?.isReviewer;
+ }
+
+ public get role(): string {
+ const user = this._user.getValue();
+ if (user.isAdmin) {
+ return 'Administrator';
+ } else if (user.isReviewer) {
+ return 'Reviewer';
+ } else if (user.isWriter) {
+ return 'Writer';
+ } else {
+ return 'Reader';
+ }
+ }
+
+ public get roleDescription(): string {
+ const user = this._user.getValue();
+ if (user.isAdmin) {
+ return 'Can authorize operations from any user including themselves.';
+ } else if (user.isReviewer) {
+ return 'Can authorize operations from any user excluding themselves.';
+ } else if (user.isWriter) {
+ return 'Can submit operations for review/approval.';
+ } else {
+ return 'Unauthenticated users only have a reader role.';
+ }
+ }
+
+ public get totalEdits(): number {
+ return this.activities.filter(e => e.activity == 'SubmitEdit' || e.activity == 'SubmitCreate').length;
+ }
+ public get totalApprovedEdits(): number {
+ return this.activities.filter(e => (e.activity == 'SubmitEdit' || e.activity == 'SubmitCreate') && e.status == 'Approved').length;
+ }
+ public get totalPendingEdits(): number {
+ return this.activities.filter(e => (e.activity == 'SubmitEdit' || e.activity == 'SubmitCreate') && e.status == 'Pending').length;
+ }
+ public get totalReviews(): number {
+ return this.activities.filter(e => e.reviewedBy == this.name).length;
+ }
+ public get totalApprovedReviews(): number {
+ return this.activities.filter(e => e.reviewedBy == this.name && e.status == 'Approved').length;
+ }
+ public get totalRejectedReviews(): number {
+ return this.activities.filter(e => e.reviewedBy == this.name && e.status == 'Rejected').length;
+ }
+
+ public get activities(): UserActivityItemClass[] {
+ return this._activity.getValue();
+ }
+
+ public getActivityIcon(activity: UserActivityType) : IconDefinition {
+ switch (activity) {
+ case UserActivityType.SubmitEdit:
+ return this.fa.getIconDefinition('fas', 'square-pen')!;
+ case UserActivityType.SubmitCreate:
+ return this.fa.getIconDefinition('fas', 'square-plus')!;
+ case UserActivityType.SubmitDelete:
+ return this.fa.getIconDefinition('fas', 'square-minus')!;
+ case UserActivityType.ApproveEdit:
+ return this.fa.getIconDefinition('fas', 'user-pen')!;
+ case UserActivityType.ApproveCreate:
+ return this.fa.getIconDefinition('fas', 'user-plus')!;
+ case UserActivityType.ApproveDelete:
+ return this.fa.getIconDefinition('fas', 'user-minus')!;
+ case UserActivityType.RejectEdit:
+ case UserActivityType.RejectCreate:
+ case UserActivityType.RejectDelete:
+ return this.fa.getIconDefinition('fas', 'user-xmark')!;
+ default:
+ return null!;
+ }
+ }
+
+ public getActivityClass(activity: UserActivityType): string {
+ switch (activity) {
+ case UserActivityType.SubmitCreate:
+ case UserActivityType.SubmitDelete:
+ case UserActivityType.SubmitEdit:
+ return 'text-primary';
+ case UserActivityType.ApproveCreate:
+ case UserActivityType.ApproveDelete:
+ case UserActivityType.ApproveEdit:
+ return 'text-success';
+ case UserActivityType.RejectCreate:
+ case UserActivityType.RejectDelete:
+ case UserActivityType.RejectEdit:
+ return 'text-danger';
+ }
+ }
+}
diff --git a/rubberduckvba.client/src/app/services/api-client.service.ts b/rubberduckvba.client/src/app/services/api-client.service.ts
index 5be402b..0fdd06f 100644
--- a/rubberduckvba.client/src/app/services/api-client.service.ts
+++ b/rubberduckvba.client/src/app/services/api-client.service.ts
@@ -1,11 +1,11 @@
import { Injectable } from "@angular/core";
import { LatestTags, Tag } from "../model/tags.model";
-import { AnnotationViewModel, AnnotationViewModelClass, AnnotationsFeatureViewModel, AnnotationsFeatureViewModelClass, FeatureViewModel, FeatureViewModelClass, InspectionViewModel, InspectionViewModelClass, InspectionsFeatureViewModel, InspectionsFeatureViewModelClass, QuickFixViewModel, QuickFixViewModelClass, QuickFixesFeatureViewModel, QuickFixesFeatureViewModelClass, SubFeatureViewModel, SubFeatureViewModelClass, UserViewModel, XmlDocOrFeatureViewModel } from "../model/feature.model";
+import { AnnotationViewModel, AnnotationViewModelClass, AnnotationsFeatureViewModel, AnnotationsFeatureViewModelClass, FeatureViewModel, FeatureViewModelClass, InspectionViewModel, InspectionViewModelClass, InspectionsFeatureViewModel, InspectionsFeatureViewModelClass, MarkdownContent, PendingAuditsViewModel, QuickFixViewModel, QuickFixViewModelClass, QuickFixesFeatureViewModel, QuickFixesFeatureViewModelClass, SubFeatureViewModel, SubFeatureViewModelClass, UserActivityItem, UserActivityType, XmlDocOrFeatureViewModel } from "../model/feature.model";
import { DownloadInfo } from "../model/downloads.model";
import { DataService } from "./data.service";
import { environment } from "../../environments/environment.prod";
import { Observable, map } from "rxjs";
-import { IndenterVersionViewModelClass, IndenterViewModel, IndenterViewModelClass } from "../model/indenter.model";
+import { IndenterViewModel, IndenterViewModelClass } from "../model/indenter.model";
@Injectable()
export class ApiClientService {
@@ -82,4 +82,54 @@ export class ApiClientService {
return model;
}));
}
+
+ public getUserActivity(): Observable {
+ const url = `${environment.apiBaseUrl}profile/activity`;
+ return this.data.getAsync(url);
+ }
+
+ public createFeature(model: SubFeatureViewModel): Observable {
+ const url = `${environment.apiBaseUrl}features/create`;
+ return this.data.postAsync(url, model).pipe(map(result => new SubFeatureViewModelClass(result as SubFeatureViewModel)));
+ }
+
+ public saveFeature(model: SubFeatureViewModel): Observable {
+ const url = `${environment.apiBaseUrl}features/update`;
+ return this.data.postAsync(url, model).pipe(map(result => new SubFeatureViewModelClass(result as SubFeatureViewModel)));
+ }
+
+ public deleteFeature(model: SubFeatureViewModel): Observable {
+ const url = `${environment.apiBaseUrl}features/delete`;
+ return this.data.postAsync(url, model).pipe(map(() => model));
+ }
+
+ public getAudit(id: number, type: UserActivityType): Observable {
+ const url = `${environment.apiBaseUrl}admin/audits/${id}?type=${type}`;
+ return this.data.getAsync(url);
+ }
+ public getPendingAudits(featureId: number): Observable {
+ const url = `${environment.apiBaseUrl}admin/audits/feature/${featureId}`;
+ return this.data.getAsync(url);
+ }
+ public getAllPendingAudits(): Observable {
+ const url = `${environment.apiBaseUrl}admin/audits/pending`;
+ return this.data.getAsync(url);
+ }
+
+ public approvePendingAudit(auditId: number): Observable {
+ const url = `${environment.apiBaseUrl}admin/audits/approve/${auditId}`;
+ return this.data.postAsync(url);
+ }
+ public rejectPendingAudit(auditId: number): Observable {
+ const url = `${environment.apiBaseUrl}admin/audits/reject/${auditId}`;
+ return this.data.postAsync(url);
+ }
+
+ public formatMarkdown(raw: string): Observable {
+ const url = `${environment.apiBaseUrl}markdown/format`;
+ const content: MarkdownContent = {
+ content: raw
+ };
+ return this.data.postAsync(url, content);
+ }
}
diff --git a/rubberduckvba.client/src/app/services/auth.service.ts b/rubberduckvba.client/src/app/services/auth.service.ts
index fc0c3da..37c6d01 100644
--- a/rubberduckvba.client/src/app/services/auth.service.ts
+++ b/rubberduckvba.client/src/app/services/auth.service.ts
@@ -1,5 +1,5 @@
import { Injectable } from "@angular/core";
-import { Observable, map } from "rxjs";
+import { BehaviorSubject, Observable, map, shareReplay } from "rxjs";
import { environment } from "../../environments/environment";
import { UserViewModel } from "../model/feature.model";
import { AuthViewModel, DataService } from "./data.service";
@@ -7,8 +7,17 @@ import { AuthViewModel, DataService } from "./data.service";
@Injectable({ providedIn: 'root' })
export class AuthService {
- private timeout: number = 10000;
- constructor(private data: DataService) { }
+ private readonly _anonymousUser = {
+ isAdmin: false,
+ isWriter: false,
+ isReviewer: false,
+ isAuthenticated: false,
+ name: '(anonymous)',
+ };
+ private _user: BehaviorSubject = new BehaviorSubject(this._anonymousUser);
+
+ constructor(private data: DataService) {
+ }
private sleep(ms: number): Promise {
return new Promise(resolve => setTimeout(resolve, ms));
@@ -27,8 +36,14 @@ export class AuthService {
}
public getUser(): Observable {
+ if (this._user.getValue().isAuthenticated) {
+ return this._user;
+ }
+
const url = `${environment.apiBaseUrl}auth`;
- return this.data.getAsync(url);
+ const request = this.data.getAsync(url).pipe(shareReplay(2));
+ request.subscribe(user => { this._user.next(user); });
+ return request;
}
public signin(): void {
@@ -37,10 +52,11 @@ export class AuthService {
const url = `${environment.apiBaseUrl}auth/signin`;
this.data.postAsync(url, vm)
- .subscribe((result: string) => this.redirect(result));
+ .subscribe((redirectUrl: string) => this.redirect(redirectUrl));
}
public signout(): void {
+ this._user.next(this._anonymousUser);
sessionStorage.clear();
}
@@ -66,7 +82,6 @@ export class AuthService {
}
}
else {
- console.log('xsrf:state mismatched!');
this.redirect();
}
}
diff --git a/rubberduckvba.client/src/app/services/data.service.ts b/rubberduckvba.client/src/app/services/data.service.ts
index c66a376..96ffb3e 100644
--- a/rubberduckvba.client/src/app/services/data.service.ts
+++ b/rubberduckvba.client/src/app/services/data.service.ts
@@ -1,4 +1,4 @@
-import { HttpClient, HttpHeaders } from "@angular/common/http";
+import { HttpClient, HttpContext, HttpHeaders } from "@angular/common/http";
import { Injectable } from "@angular/core";
import { map, timeout, catchError, throwError, Observable } from "rxjs";
@@ -14,13 +14,11 @@ export class DataService {
let headers = new HttpHeaders()
.append('accept', 'application/json');
const token = sessionStorage.getItem('github:access_token');
- let withCreds = false;
if (token) {
- headers = headers.append('X-ACCESS-TOKEN', token);
- withCreds = true;
+ headers = headers.append('x-access-token', token);
}
- return this.http.get(url, { headers, withCredentials: withCreds })
+ return this.http.get(url, { headers })
.pipe(
map(result => result),
timeout(this.timeout),
@@ -38,15 +36,13 @@ export class DataService {
.append('Content-Type', 'application/json; charset=utf-8');
const token = sessionStorage.getItem('github:access_token');
- let withCreds = false;
if (token) {
- headers = headers.append('X-ACCESS-TOKEN', token);
- withCreds = true;
+ headers = headers.append('x-access-token', token);
}
return (content
- ? this.http.post(url, content, { headers, withCredentials: withCreds })
- : this.http.post(url, null, { headers, withCredentials: withCreds }))
+ ? this.http.post(url, content, { headers })
+ : this.http.post(url, null, { headers }))
.pipe(
map(result => result),
timeout(this.timeout),
diff --git a/rubberduckvba.client/src/environments/environment.prod.ts b/rubberduckvba.client/src/environments/environment.prod.ts
index d3de473..e95e3c7 100644
--- a/rubberduckvba.client/src/environments/environment.prod.ts
+++ b/rubberduckvba.client/src/environments/environment.prod.ts
@@ -1,4 +1,4 @@
export const environment = {
production: true,
- apiBaseUrl: 'https://api.rubberduckvba.com/'
+ apiBaseUrl: 'https://localhost:44314/'
};
diff --git a/rubberduckvba.client/src/environments/environment.ts b/rubberduckvba.client/src/environments/environment.ts
index fbede92..0fd806b 100644
--- a/rubberduckvba.client/src/environments/environment.ts
+++ b/rubberduckvba.client/src/environments/environment.ts
@@ -4,7 +4,7 @@
export const environment = {
production: false,
- apiBaseUrl: 'https://api.rubberduckvba.com/'
+ apiBaseUrl: 'https://localhost:44314/'
};
/*
diff --git a/rubberduckvba.client/src/styles.css b/rubberduckvba.client/src/styles.css
index e0824eb..3123c31 100644
--- a/rubberduckvba.client/src/styles.css
+++ b/rubberduckvba.client/src/styles.css
@@ -193,3 +193,13 @@ span.icon-userform-module {
span.icon-document-module {
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAApJJREFUeNqMU09IFGEU/83s7Kqr69riLonE9E8jNxM6CR3c9CTRJbooeBMqunRN0e1QZESR0aEiEAShWPDUwRBDocQOxeyhAt0y1PDP7upqubOzOzPbe+OMrJfowfveN9/3fr/v9973jXBlcBBsgiBcolCHf9s70zQTpmGgWCwitbQEgSfRkRF8WVy8OhqNPsvTZoHdNGHQHu+zKYqC0cnJaxaJYSw460wQoRghgu4GWW7QdR1qoYDfuRzyNNeJiJPj8Ti6Oztxub//OuVP0dqCQ3A7caMjqn2dhcfrQU1rB2r6YsgxmJQYRPBH0/BmYmK/jidjYwMU7vBc4oHBR/pfwlN3FDvD3XC7XLj1fAPLyymsrWUw/vQc2tvbLSU+nw9vFWXLIRN54JPL6o6hPHwevgtd1kZLYzVe32uG3++FKAiQRJEbbe2RMoHVsVsK/CR7e7jLAhvzH7Hx4yfef0hD004iEKiCRIo8EqVSWUxi6LrgKGCC6dDAODeyjReM1U/IFjXc7D2M0/V+9F70I5vPo9zttgCuPQLxAAH76lR9W2VtJcRMPdA8jMezjyCXyUilUrh74r7VF4uAol5CsD/JJrOobpmHWfMLocBZyK0y+mr7kEwmwXq5D0zipl4QgcDXzS45BOqmiu+vDsEb9KKavvnknm89SKfTVt2i3UCrhELhQAls01rkc8+ZpqbjfFUm+YNTD4FGeol7Xd8n4LG0BKkhEkFlMMh9eKHEYkO8yCQMNO2nXLRLgB11+xZ2qTwxMTODzZUVqLu7kv1TWUlO3c63SLU765zLGMaylIrlubnQ9tZWmSNLKAG4KLLzW5DoLfAtcC5jGMunVpCHdtbXM1Xh8BD+w0xVzTCG2/FXgAEAjik0I5QgmIIAAAAASUVORK5CYII=');
}
+
+
+.text-diff-added {
+ background-color: #d4fcbc;
+}
+
+.text-diff-removed {
+ background-color: #fbb6c2;
+ text-decoration: line-through;
+}
+
@@ -30,12 +33,19 @@ 
-
-
{{feature?.title}}
+
+
+
-
+
+
diff --git a/rubberduckvba.client/src/app/components/feature-info/feature-info.component.ts b/rubberduckvba.client/src/app/components/feature-info/feature-info.component.ts
index 1c51009..4cf6c08 100644
--- a/rubberduckvba.client/src/app/components/feature-info/feature-info.component.ts
+++ b/rubberduckvba.client/src/app/components/feature-info/feature-info.component.ts
@@ -1,17 +1,24 @@
-import { Component, Input, OnChanges, OnInit, SimpleChanges } from '@angular/core';
-import { AnnotationViewModel, AnnotationsFeatureViewModel, BlogLink, FeatureViewModel, InspectionViewModel, InspectionsFeatureViewModel, QuickFixViewModel, QuickFixesFeatureViewModel, SubFeatureViewModel, XmlDocItemViewModel, XmlDocOrFeatureViewModel, XmlDocViewModel } from '../../model/feature.model';
+import { Component, Input, OnInit } from '@angular/core';
+import { AnnotationViewModel, AnnotationsFeatureViewModel, BlogLink, FeatureOperationViewModel, FeatureViewModel, InspectionViewModel, InspectionsFeatureViewModel, PendingAuditsViewModel, QuickFixViewModel, QuickFixesFeatureViewModel, UserViewModel, XmlDocItemViewModel, XmlDocOrFeatureViewModel } from '../../model/feature.model';
import { BehaviorSubject } from 'rxjs';
import { FaIconLibrary } from '@fortawesome/angular-fontawesome';
import { fas } from '@fortawesome/free-solid-svg-icons';
+import { AdminAction } from '../edit-feature/edit-feature.component';
import { ApiClientService } from '../../services/api-client.service';
@Component({
selector: 'feature-info',
templateUrl: './feature-info.component.html',
})
-export class FeatureInfoComponent implements OnInit, OnChanges {
+export class FeatureInfoComponent implements OnInit {
private readonly _info: BehaviorSubject
+
+
+Review Submitted Operation
+Any GitHub-authenticated visitor can submit edits to the site content, but only members of the rubberduck-vba organization can review these operations.
+
+
+
+
+
+
+
+
diff --git a/rubberduckvba.client/src/app/routes/audits/audit-item/audit-item.component.ts b/rubberduckvba.client/src/app/routes/audits/audit-item/audit-item.component.ts
new file mode 100644
index 0000000..b2219ea
--- /dev/null
+++ b/rubberduckvba.client/src/app/routes/audits/audit-item/audit-item.component.ts
@@ -0,0 +1,69 @@
+import { Component, OnInit } from "@angular/core";
+import { ApiClientService } from "../../../services/api-client.service";
+import { ActivatedRoute } from "@angular/router";
+import { FaIconLibrary } from "@fortawesome/angular-fontawesome";
+import { fas } from "@fortawesome/free-solid-svg-icons";
+import { BehaviorSubject, switchMap } from "rxjs";
+import { AuditRecordViewModel, FeatureEditViewModel, FeatureOperationViewModel, UserActivityType } from "../../../model/feature.model";
+
+@Component({
+ selector: 'app-audit-item',
+ templateUrl: './audit-item.component.html',
+})
+export class AuditItemComponent implements OnInit {
+
+ private _item: BehaviorSubject
+
+Audits
++ Use this page to review pending additions, deletions, and edits to features described on this site; approved/rejected records are not shown. +
+
+
+Edits
+
+
++ Edits are changes to existing features, such as changing the description, or changing the title. +
+
+
+ There are no pending edits.
+
+
+ +
+
diff --git a/rubberduckvba.client/src/app/routes/audits/audits.component.ts b/rubberduckvba.client/src/app/routes/audits/audits.component.ts
new file mode 100644
index 0000000..9abc4ae
--- /dev/null
+++ b/rubberduckvba.client/src/app/routes/audits/audits.component.ts
@@ -0,0 +1,26 @@
+import { Component, OnInit } from "@angular/core";
+import { ApiClientService } from "../../services/api-client.service";
+import { FeatureEditViewModel, FeatureOperation, FeatureOperationViewModel, PendingAuditsViewModel } from "../../model/feature.model";
+import { Change, diffWords } from "diff";
+import { encode } from "html-entities";
+
+@Component({
+ selector: 'app-audits',
+ templateUrl: './audits.component.html',
+ styleUrls: ['./audits.component.css']
+})
+export class AuditsAdminComponent implements OnInit {
+
+ constructor(private api: ApiClientService) {
+
+ }
+
+ public pendingAudits: PendingAuditsViewModel = { edits: [], other: [] };
+
+ ngOnInit(): void {
+ this.api.getAllPendingAudits().subscribe(e => this.pendingAudits = e);
+ }
+
+ public get deleteOp() { return FeatureOperation.Delete; }
+ public get createOp() { return FeatureOperation.Create; }
+}
diff --git a/rubberduckvba.client/src/app/routes/feature/feature.component.html b/rubberduckvba.client/src/app/routes/feature/feature.component.html
index 6226879..9d08dc0 100644
--- a/rubberduckvba.client/src/app/routes/feature/feature.component.html
+++ b/rubberduckvba.client/src/app/routes/feature/feature.component.html
@@ -1,3 +1,3 @@
Operations
+
+
++ Operations are additions or deletions of features, such as adding a new feature, or deleting an existing feature. +
+
+
+ There are no pending operations.
+
+
+ Your IDE is incomplete without...
+
+
+
+
+ +
+ Look, there is no reason for us to track any additional information about you. Get creative on your GitHub profile instead! +
++ We do need to track who did what and when, only so we can collaboratively improve the project's website and ensure only authorized users can make changes. + All changes are therefore logged, and this page will therefore display and link to each operation submitted or reviewed under your name. +
+
+
+
+
+
+
+
+
diff --git a/rubberduckvba.client/src/app/routes/profile/user-profile.component.ts b/rubberduckvba.client/src/app/routes/profile/user-profile.component.ts
new file mode 100644
index 0000000..e58fa60
--- /dev/null
+++ b/rubberduckvba.client/src/app/routes/profile/user-profile.component.ts
@@ -0,0 +1,132 @@
+import { Component, OnInit } from "@angular/core";
+import { UserActivityItem, UserActivityItemClass, UserActivityType, UserViewModel } from "../../model/feature.model";
+import { AuthService } from "../../services/auth.service";
+import { BehaviorSubject } from "rxjs";
+import { FaIconLibrary } from "@fortawesome/angular-fontawesome";
+import { IconDefinition, fas } from "@fortawesome/free-solid-svg-icons";
+import { ApiClientService } from "../../services/api-client.service";
+
+@Component({
+ selector: 'app-profile',
+ templateUrl: './user-profile.component.html',
+})
+export class UserProfileComponent implements OnInit {
+
+ private _user: BehaviorSubjectRecorded activities
++ Everything you did that ever left a trace somewhere on this site is listed here. +
+ +
+
+
+
+
+
+
+
+
+ Total Edits
+
+ {{totalEdits}}
+
+ submitted
+
+
+
+
+
+
+ Approved Edits
+
+ {{totalApprovedEdits}}
+
+ {{totalApprovedEdits/totalEdits | percent}} approved
+
+
+
+
+
+
+ Pending Edits
+
+ {{totalPendingEdits}}
+
+ pending review
+
+
+
+
+
+
+ Reviews
+
+ {{totalApprovedReviews}} approved
+ |
+ {{totalRejectedReviews}} rejected
+
+ {{totalApprovedReviews/totalReviews | percent}} reviews approved
+
+
+
+
+
+
+
+
+
+ | Activity | +Description | +Author | +Timestamp | +Status | +
|---|---|---|---|---|
| Nothing to see here, yet. | +||||
| {{activity.description}} | +{{activity.author}} | +{{activity.activityTimestamp}} | +
+
+
+ |
+ |