Skip to content

Implemented some pages of administration #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,20 @@ import { PageWelcomeComponent } from './components/root/page-welcome/page-welcom
import { PageNotFoundComponent } from './components/root/page-not-found/page-not-found.component';
import { PageForbiddenComponent } from './components/root/page-forbidden/page-forbidden.component';
import { ROUTES } from '../routes/routes';
import { PagePrivacyPolicyComponent } from './components/privacy-policy/page-privacy-policy/page-privacy-policy.component';

const routes: Routes = [
{ path: '', component: PageWelcomeComponent, pathMatch: 'full' },
{ path: '', component: PageWelcomeComponent, pathMatch: 'full' },
{ path: '403', component: PageForbiddenComponent },
{ path: '404', component: PageNotFoundComponent },
{ path: ROUTES.privacyPolicy, loadChildren: () => import('./components/privacy-policy/privacy-policy.module').then((m) => m.PrivacyPolicyModule) },
{ path: ROUTES.news, loadChildren: () => import('./components/news/news.module').then((m) => m.NewsModule)},
{ path: ROUTES.about, loadChildren: () => import('./components/about/about.module').then((m) => m.AboutModule)},
{ path: ROUTES.results, loadChildren: () => import('./components/results/results.module').then((m) => m.ResultsModule)},
{ path: ROUTES.tasks._, loadChildren: () => import('./components/tasks/tasks.module').then((m) => m.TasksModule)},
{ path: ROUTES.discussion, loadChildren: () => import('./components/discussion/discussion.module').then((m) => m.DiscussionModule)},
{ path: ROUTES.profile._, loadChildren: () => import('./components/profile/profile.module').then((m) => m.ProfileModule)},
{ path: ROUTES.achievements, loadChildren: () => import('./components/achievements/achievements.module').then((m) => m.AchievementsModule)},
{ path: ROUTES.admin._, loadChildren: () => import('./components/admin/admin.module').then((m) => m.AdminModule)},
{ path: ROUTES.news, loadChildren: () => import('./components/news/news.module').then((m) => m.NewsModule) },
{ path: ROUTES.about, loadChildren: () => import('./components/about/about.module').then((m) => m.AboutModule) },
{ path: ROUTES.results, loadChildren: () => import('./components/results/results.module').then((m) => m.ResultsModule) },
{ path: ROUTES.tasks._, loadChildren: () => import('./components/tasks/tasks.module').then((m) => m.TasksModule) },
{ path: ROUTES.discussion, loadChildren: () => import('./components/discussion/discussion.module').then((m) => m.DiscussionModule) },
{ path: ROUTES.profile._, loadChildren: () => import('./components/profile/profile.module').then((m) => m.ProfileModule) },
{ path: ROUTES.achievements, loadChildren: () => import('./components/achievements/achievements.module').then((m) => m.AchievementsModule) },
{ path: ROUTES.admin._, loadChildren: () => import('./components/admin/admin.module').then((m) => m.AdminModule) },
{ path: '**', component: PageNotFoundComponent }
];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@
<div class="content">
<h1>{{'achievements.title' | translate}}</h1>
<div class="achievements">
<a *ngFor="let achievement of achievements$ | async"
class="achievement"
[routerLink]="['/', routes.routes.achievements, achievement.id]"
>
<a *ngFor="let achievement of achievements$ | async" class="achievement"
[routerLink]="['/', routes.routes.achievements, achievement.id]">
<img [src]="achievement.picture" class="icon" alt="">
<span class="name">{{achievement.title}}</span>
<p class="description" [innerHTML]="achievement.description"></p>
</a>
</div>
</div>
</div>
33 changes: 23 additions & 10 deletions src/app/components/admin/admin-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,31 @@ import { ROUTES } from '../../../routes/routes';
import { PageAdminTasksComponent } from './page-admin-tasks/page-admin-tasks.component';
import { PageAdminMonitorComponent } from './page-admin-monitor/page-admin-monitor.component';
import { PageAdminEmailComponent } from './page-admin-email/page-admin-email.component';
import {PageAdminDiscussionComponent} from './page-admin-discussion/page-admin-discussion.component';
import {PageAdminAchievementsComponent} from './page-admin-achievements/page-admin-achievements.component';
import {PageAdminInstanceConfigComponent} from './page-admin-instance-config/page-admin-instance-config.component';
import { PageAdminDiscussionComponent } from './page-admin-discussion/page-admin-discussion.component';
import { PageAdminAchievementsComponent } from './page-admin-achievements/page-admin-achievements.component';
import { PageAdminInstanceConfigComponent } from './page-admin-instance-config/page-admin-instance-config.component';
import { PageAdminWavesComponent } from './page-admin-waves/page-admin-waves.component';
import { PageAdminWavesEditComponent } from './page-admin-waves/page-admin-waves-edit/page-admin-waves-edit.component';
import { PageAdminYearsComponent } from './page-admin-years/page-admin-years.component';
import { PageAdminYearsEditComponent } from './page-admin-years/page-admin-years-edit/page-admin-years-edit.component';
import { PageAdminArticlesComponent } from './page-admin-articles/page-admin-articles.component';
import { PageAdminArticleEditComponent } from './page-admin-articles/page-admin-article-edit/page-admin-article-edit.component';

const routes: Routes = [
{path: '', component: PageAdminRootComponent},
{path: ROUTES.admin.tasks, component: PageAdminTasksComponent},
{path: ROUTES.admin.monitor, component: PageAdminMonitorComponent},
{path: ROUTES.admin.email, component: PageAdminEmailComponent},
{path: ROUTES.admin.discussion, component: PageAdminDiscussionComponent},
{path: ROUTES.admin.achievements, component: PageAdminAchievementsComponent},
{path: ROUTES.admin.instanceConfig, component: PageAdminInstanceConfigComponent},
{ path: '', component: PageAdminRootComponent },
{ path: ROUTES.admin.tasks, component: PageAdminTasksComponent },
{ path: ROUTES.admin.monitor, component: PageAdminMonitorComponent },
{ path: ROUTES.admin.email, component: PageAdminEmailComponent },
{ path: ROUTES.admin.discussion, component: PageAdminDiscussionComponent },
{ path: ROUTES.admin.achievements, component: PageAdminAchievementsComponent },
{ path: ROUTES.admin.instanceConfig, component: PageAdminInstanceConfigComponent },
{ path: ROUTES.admin.waves._, component: PageAdminWavesComponent },
{ path: ROUTES.admin.waves._ + "/" + ROUTES.admin.waves.edit + "/:waveId", component: PageAdminWavesEditComponent },
{ path: ROUTES.admin.years._, component: PageAdminYearsComponent },
{ path: ROUTES.admin.years._ + "/" + ROUTES.admin.years.edit + "/:yearId", component: PageAdminYearsEditComponent },
{ path: ROUTES.admin.articles._, component: PageAdminArticlesComponent },
{ path: ROUTES.admin.articles._ + "/" + ROUTES.admin.articles.edit + "/:articleId", component: PageAdminArticleEditComponent },

];

@NgModule({
Expand Down
48 changes: 33 additions & 15 deletions src/app/components/admin/admin-sidebar/admin-sidebar.component.html
Original file line number Diff line number Diff line change
@@ -1,32 +1,50 @@
<ng-container *ngIf="visible$ | async; else hidden">
<div class="content" [class.clickable]="window.isMobile$ | async" (click)="hideFullMenu($event)">
<nav class="navigation-bar">
<a class="title" [routerLink]="['/', routes.routes.admin._]" [routerLinkActiveOptions]="{exact: true}" routerLinkActive="active">{{'admin.navbar.title'|translate}}</a>
<a class="title" [routerLink]="['/', routes.routes.admin._]" [routerLinkActiveOptions]="{exact: true}"
routerLinkActive="active">{{'admin.navbar.title'|translate}}</a>

<a class="nav-btn" [routerLink]="['/', routes.routes.admin._, routes.routes.admin.tasks]" routerLinkActive="active" (click)="hideFullMenu($event)">
<a class="nav-btn" [routerLink]="['/', routes.routes.admin._, routes.routes.admin.tasks]"
routerLinkActive="active" (click)="hideFullMenu($event)">
{{'admin.navbar.tasks' | translate}}
</a>
<a class="nav-btn" [routerLink]="['/', routes.routes.admin._, routes.routes.admin.monitor]" routerLinkActive="active" (click)="hideFullMenu($event)">
<a class="nav-btn" [routerLink]="['/', routes.routes.admin._, routes.routes.admin.monitor]"
routerLinkActive="active" (click)="hideFullMenu($event)">
{{'admin.navbar.monitor' | translate}}
</a>
<a class="nav-btn" [routerLink]="['/', routes.routes.admin._, routes.routes.admin.email]" routerLinkActive="active" (click)="hideFullMenu($event)">
<a class="nav-btn" [routerLink]="['/', routes.routes.admin._, routes.routes.admin.email]"
routerLinkActive="active" (click)="hideFullMenu($event)">
{{'admin.navbar.email' | translate}}
</a>
<a class="nav-btn" [routerLink]="['/', routes.routes.admin._, routes.routes.admin.discussion]" routerLinkActive="active" (click)="hideFullMenu($event)">
<a class="nav-btn" [routerLink]="['/', routes.routes.admin._, routes.routes.admin.discussion]"
routerLinkActive="active" (click)="hideFullMenu($event)">
{{'admin.navbar.discussion' | translate}}
</a>
<!-- <a class="nav-btn" [routerLink]="['/', routes.routes.admin._, routes.routes.admin.achievements]" routerLinkActive="active" (click)="hideFullMenu($event)">-->
<!-- {{'admin.navbar.achievement' | translate}}-->
<!-- </a>-->
<a *ngIf="userService.isAdmin$ | async" class="nav-btn" [routerLink]="['/', routes.routes.admin._, routes.routes.admin.instanceConfig]" routerLinkActive="active" (click)="hideFullMenu($event)">
<a class="nav-btn" [routerLink]="['/', routes.routes.admin._, routes.routes.admin.waves._]"
routerLinkActive="active" (click)="hideFullMenu($event)">
{{'admin.navbar.waves' | translate}}
</a>
<a class="nav-btn" [routerLink]="['/', routes.routes.admin._, routes.routes.admin.years._]"
routerLinkActive="active" (click)="hideFullMenu($event)">
{{'admin.navbar.years' | translate}}
</a>
<a class="nav-btn" [routerLink]="['/', routes.routes.admin._, routes.routes.admin.achievements]"
routerLinkActive="active" (click)="hideFullMenu($event)">
{{'admin.navbar.achievement' | translate}}
</a>
<a class="nav-btn" [routerLink]="['/', routes.routes.admin._, routes.routes.admin.articles._]"
routerLinkActive="active" (click)="hideFullMenu($event)">
{{'admin.navbar.articles' | translate}}
</a>
<a *ngIf="userService.isAdmin$ | async" class="nav-btn"
[routerLink]="['/', routes.routes.admin._, routes.routes.admin.instanceConfig]" routerLinkActive="active"
(click)="hideFullMenu($event)">
{{'admin.navbar.instance-config' | translate}}
</a>
<hr style="width: 100%; border: var(--ksi-page-welcome-banner-bg) 1px solid;">
<ng-container *ngIf="oldFrontendUrl">
<a *ngFor="let oldLink of oldFrontendButtons"
class="nav-btn"
[href]="oldFrontendUrl + '/admin/' + oldLink[0]"
(click)="openExternal($event)"
>
<a *ngFor="let oldLink of oldFrontendButtons" class="nav-btn" [href]="oldFrontendUrl + '/admin/' + oldLink[0]"
(click)="openExternal($event)">
{{oldLink[1]}}
</a>
</ng-container>
Expand All @@ -42,4 +60,4 @@
<span>{{icon.FORWARD}}</span>
</nav>
</div>
</ng-template>
</ng-template>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Component, OnInit, ChangeDetectionStrategy, OnDestroy } from '@angular/core';
import { IconService, RoutesService, UserService, WindowService } from '../../../services';
import {BehaviorSubject, combineLatest, Observable, Subscription} from 'rxjs';
import {filter, map, mergeMap} from 'rxjs/operators';
import { BehaviorSubject, combineLatest, Observable, Subscription } from 'rxjs';
import { filter, map, mergeMap } from 'rxjs/operators';
import { Router } from '@angular/router';
import { environment } from 'src/environments/environment';

Expand All @@ -23,10 +23,8 @@ export class AdminSidebarComponent implements OnInit, OnDestroy {
oldFrontendButtons = [
['users/', 'Uživatelé'],
['years/', 'Ročníky'],
['waves/', 'Vlny'],
['execs/', 'Spuštění'],
['opravovani/', 'Opravování'],
['achievements/', 'Trofeje'],
]

constructor(
Expand Down
25 changes: 21 additions & 4 deletions src/app/components/admin/admin.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,19 @@ import { SharedModule } from '../shared/shared.module';
import { TooltipModule } from 'ngx-bootstrap/tooltip';
import { PageAdminEmailComponent } from './page-admin-email/page-admin-email.component';
import { QuillModule } from 'ngx-quill';
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { AccordionModule } from 'ngx-bootstrap/accordion';
import { PageAdminDiscussionComponent } from './page-admin-discussion/page-admin-discussion.component';
import { AdminWaveSelectorComponent } from './shared/admin-wave-selector/admin-wave-selector.component';
import { PageAdminAchievementsComponent } from './page-admin-achievements/page-admin-achievements.component';
import { PageAdminInstanceConfigComponent } from './page-admin-instance-config/page-admin-instance-config.component';
import { PageAdminWavesComponent } from './page-admin-waves/page-admin-waves.component';
import { PageAdminWavesEditComponent } from './page-admin-waves/page-admin-waves-edit/page-admin-waves-edit.component';
import { DefaultService } from 'src/api/backend';
import { PageAdminYearsComponent } from './page-admin-years/page-admin-years.component';
import { PageAdminYearsEditComponent } from './page-admin-years/page-admin-years-edit/page-admin-years-edit.component';
import { PageAdminArticlesComponent } from './page-admin-articles/page-admin-articles.component';
import { PageAdminArticleEditComponent } from './page-admin-articles/page-admin-article-edit/page-admin-article-edit.component';


@NgModule({
Expand All @@ -31,7 +38,13 @@ import { PageAdminInstanceConfigComponent } from './page-admin-instance-config/p
PageAdminDiscussionComponent,
AdminWaveSelectorComponent,
PageAdminAchievementsComponent,
PageAdminInstanceConfigComponent
PageAdminInstanceConfigComponent,
PageAdminWavesComponent,
PageAdminWavesEditComponent,
PageAdminYearsComponent,
PageAdminYearsEditComponent,
PageAdminArticlesComponent,
PageAdminArticleEditComponent,
],
imports: [
CommonModule,
Expand All @@ -42,7 +55,11 @@ import { PageAdminInstanceConfigComponent } from './page-admin-instance-config/p
QuillModule,
ReactiveFormsModule,
AccordionModule,
FormsModule
]
FormsModule,
],
providers: [
DefaultService // Add DefaultService to the providers array
],

})
export class AdminModule { }
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<ksi-admin-sidebar></ksi-admin-sidebar>

<div class="content-container">
<div class="content">
<h2>Work in progress...</h2>
<a [routerLink]="['/', routes.routes.admin._, routes.routes.admin.waves._]"> Zpět na přehled</a>

<div class="">
<img src="https://media1.giphy.com/media/v1.Y2lkPTc5MGI3NjExaWxremdsOW1mcmJtY3hxZ3BieTczZWN3ODB5MW8zY3BkcDVzeHl4ZyZlcD12MV9pbnRlcm5hbF9naWZfYnlfaWQmY3Q9Zw/VHOF8pfPZOt9p018zw/giphy.gif"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

je mi to líto, je to krásný gif, ale poprosím tě, abys nepoužíval externí obrázky. Externí obrázky zpomalují stránku a prozrazují tvoji IP adresu a fakt, že jsi na KSI webu ostatním službám.

alt="Work in progress" />
</div>
</div>
</div>
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@import "src/app/styles/vars";
@import "src/app/styles/mixins";

@include page-admin;
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';

import { PageAdminArticleEditComponent } from './page-admin-article-edit.component';

describe('PageAdminArticleEditComponent', () => {
let component: PageAdminArticleEditComponent;
let fixture: ComponentFixture<PageAdminArticleEditComponent>;

beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ PageAdminArticleEditComponent ]
})
.compileComponents();
});

beforeEach(() => {
fixture = TestBed.createComponent(PageAdminArticleEditComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});

it('should create', () => {
expect(component).toBeTruthy();
});
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
import { Component, OnInit, ChangeDetectionStrategy, ChangeDetectorRef } from '@angular/core';
import { FormBuilder } from '@angular/forms';
import { Router } from '@angular/router';
import { EditMode } from 'src/app/models/EditMode';
import { IconService, RoutesService, YearsService } from 'src/app/services';
import { AdminArticlesService } from 'src/app/services/admin/admin-articles.service';
import { AdminWavesService } from 'src/app/services/admin/admin-waves.service';

@Component({
selector: 'ksi-page-admin-article-edit',
templateUrl: './page-admin-article-edit.component.html',
styleUrls: ['./page-admin-article-edit.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush
})
export class PageAdminArticleEditComponent implements OnInit {
editMode: EditMode;
EditMode = {
New: 'New',
Edit: 'Edit'
};

articleId: number;

form = this.fb.group({
title: [''],
body: [''],
published: [false],
year: [this.years.selected?.id], // User won't set this - it's for better DevEx when submitting
time_published: [null], // Store as ISO string
picture: [null]
});

constructor(
public icon: IconService,
public routes: RoutesService,
public years: YearsService,
public router: Router,
public fb: FormBuilder,
private cdRef: ChangeDetectorRef,
private adminArticlesService: AdminArticlesService
) { }

ngOnInit(): void {
this.articleId = Number.parseInt(this.router.url.split('/').pop() || '0', 10);

this.editMode = this.articleId == 0 ? EditMode.New : EditMode.Update;

if (this.editMode === EditMode.Update) {
this.adminArticlesService.getArticleById(this.articleId).subscribe({
next: (article) => {
if (article) {
this.form.patchValue(article);
this.cdRef.markForCheck();
} else {
alert('Article not found');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Místo alert prosím používej this.modal.yesNo('discussion-thread.post.delete.confirmation') (viz https://github.com/fi-ksi/web-frontend-angular/blob/main/src/app/components/shared/discussion-thread/discussion-thread-posts/discussion-thread-posts.component.ts#L150 ), je to lépe nastylované. Případně zkus vytvořit vlastní modal utilitku jen na zobrazování popupů.

this.router.navigate([this.routes.routes.admin._, this.routes.routes.admin.articles._]);
}
}
});
}

}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<ksi-admin-sidebar></ksi-admin-sidebar>
<div class="content-container">
<div class="content">

<h2>Správa článků</h2>
<a class="btn btn-ksi"
[routerLink]="['/', routes.routes.admin._, routes.routes.admin.articles._, routes.routes.admin.articles.edit, '0']">
{{ icon.ADD }} {{ 'admin.articles.new' | translate }}</a>

<table class="table table-striped table-hover table-responsive-md threads table-dark">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Místo table-dark používej prosím ksiTheme, které automaticky nastaví světlý/tmavý mód

Suggested change
<table class="table table-striped table-hover table-responsive-md threads table-dark">
<table class="table table-striped table-hover table-responsive-md threads" ksiTheme>

<thead>
<tr style="height:45px">
<th>{{ 'admin.articles.head.title' | translate}}</th>
<th>{{ 'admin.articles.head.published_date' | translate}}</th>
<th>{{ 'admin.articles.head.released' | translate}}</th>
<th>{{ 'admin.articles.head.actions' | translate}}</th>
</tr>
</thead>
<tbody>
<tr *ngFor="let article of articles$ | async">
<td><a
[routerLink]="['/', routes.routes.admin._, routes.routes.admin.articles._, routes.routes.admin.articles.edit, article.id]">{{article.title}}</a>
</td>
<td>{{(article.time_published | date : 'medium') || "---"}}</td>
<td>{{article.published ? icon.CHECKMARK : icon.CROSS}}</td>
<td>
<a class="btn btn-outline-primary"
[routerLink]="['/', routes.routes.admin._, routes.routes.admin.articles._, routes.routes.admin.articles.edit, article.id]">{{
icon.EDIT }} </a>

<button class="btn btn-outline-primary" (click)="notImplemented()">
{{ icon.DELETE }} {{ 'admin.articles.delete.btn' | translate }} </button>
</td>
</tr>
</tbody>
</table>
</div>
</div>
Loading