arbetsformedlingen/mina-sidor-fa-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated some models and changed to custom api

Browse Source
This commit is contained in:
Erik Tiekstra
2021-05-05 14:19:57 +02:00
parent cd60e9383a
commit f24ab48943
21 changed files with 125 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/dafa-web/src/app/app.component.spec.ts
View File

@@ -1,3 +1,4 @@
import { HttpClientTestingModule } from '@angular/common/http/testing';
import { TestBed } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
import { AppComponent } from './app.component';
@@ -9,7 +10,7 @@ describe('AppComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [AppComponent],
imports: [RouterTestingModule, SkipToContentModule, NavigationModule, SidebarModule],
imports: [RouterTestingModule, HttpClientTestingModule, SkipToContentModule, NavigationModule, SidebarModule],
}).compileComponents();
});

2
apps/dafa-web/src/app/components/navigation/navigation.component.html
View File

@@ -1,7 +1,7 @@
<div class="navigation">
<div class="navigation__logo-wrapper">
<a [routerLink]="['/']" aria-label="Till startsidan för FA Mina sidor">
<img src="assets/logo/fa-mina-sidor-light.svg" class="navigation__logo" alt="" />
<img src="assets/logo/mina-sidor-fa-light.svg" class="navigation__logo" alt="" />
</a>
</div>
<ul class="navigation__list dafa__hide-on-print">

24
apps/dafa-web/src/app/data/models/api/employee-response.model.ts
View File

@@ -1,10 +1,26 @@
export interface EmployeesApiResponse {
pxMore: string;
pxObjClass: string;
pxPageCount: string;
pxQueryTimeStamp: string;
pxResultCount: string;
pxTotalResultCount: string;
pyMaxRecords: string;
pyObjClass: string;
pxResults: EmployeeResponse[];
pzPerformanceSettings: string[];
}
export interface EmployeeResponse {
pxInsHandle: string;
pxObjClass: string;
pyAccessGroup: string;
pyLabel: string;
pyPosition: string;
pyReportTo: string;
pyFirstName: string;
pyLastName: string;
pyOrganization: string;
pyOrgDivision: string;
pyOrgUnit: string;
pyTelephone: string;
pyUserIdentifier: string;
pyUserName: string;
pyWorkGroup: string;
}

32
apps/dafa-web/src/app/data/models/employee.model.ts
View File

@@ -2,18 +2,22 @@ import { Agency } from '@dafa-models/agency.model';
import { EmployeeResponse } from './api/employee-response.model';
import { Participant } from './participant.model';
export interface User {
export interface Employee {
id: string;
employeeId: string;
firstName: string;
lastName: string;
fullName: string;
organization: string;
organizationDivision: string;
organizationUnit: string;
phone: string;
email: string;
accessGroup: string;
utforandeverksamhet: string;
active: boolean;
service: string;
fullName?: string;
}
export interface EmployeeDetail extends User {
export interface EmployeeDetail extends Employee {
languages: string[];
outOfOffice: {
start: Date;
@@ -27,17 +31,19 @@ export interface EmployeeDetail extends User {
participants: Participant[];
}
export function mapEmployeeReponseToEmployee(data: EmployeeResponse): User {
const names = data.pyUserName.split(' ');
export function mapEmployeeReponseToEmployee(data: EmployeeResponse): Employee {
return {
id: data.pyUserIdentifier,
employeeId: data.pyUserIdentifier,
lastName: names.pop() || 'Doe',
firstName: names.join(' ') || 'John',
lastName: data.pyLastName,
firstName: data.pyFirstName,
fullName: `${data.pyFirstName} ${data.pyLastName}`,
organization: data.pyOrganization,
organizationDivision: data.pyOrgDivision,
organizationUnit: data.pyOrgUnit,
phone: data.pyTelephone,
email: '',
accessGroup: data.pyAccessGroup,
utforandeverksamhet: '',
active: true,
service: '',
fullName: data.pyUserName,
};
}

4
apps/dafa-web/src/app/data/models/sort-by.model.ts
View File

@@ -1,7 +1,7 @@
import { User } from './employee.model';
import { Employee } from './employee.model';
import { Participant } from './participant.model';
export interface SortBy {
key: keyof Participant | keyof User;
key: keyof Participant | keyof Employee;
reverse: boolean;
}

4
apps/dafa-web/src/app/pages/administration/pages/employee-card/employee-card.component.ts
View File

@@ -1,7 +1,7 @@
import { ChangeDetectionStrategy, Component } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { UnsubscribeDirective } from '@dafa-directives/unsubscribe.directive';
import { User } from '@dafa-models/employee.model';
import { Employee } from '@dafa-models/employee.model';
import { Participant } from '@dafa-models/participant.model';
import { EmployeeService } from '@dafa-services/api/employee.service';
import { BehaviorSubject, Observable } from 'rxjs';
@@ -13,7 +13,7 @@ import { BehaviorSubject, Observable } from 'rxjs';
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class EmployeeCardComponent extends UnsubscribeDirective {
detailedEmployeeData$: Observable<User>;
detailedEmployeeData$: Observable<Employee>;
private _pendingSelectedParticipants$ = new BehaviorSubject<string[]>([]);
constructor(private activatedRoute: ActivatedRoute, private employeeService: EmployeeService) {

10
apps/dafa-web/src/app/pages/administration/pages/employees/components/employees-list/employees-list.component.ts
View File

@@ -1,5 +1,5 @@
import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
import { User } from '@dafa-models/employee.model';
import { Employee } from '@dafa-models/employee.model';
import { SortBy } from '@dafa-models/sort-by.model';
import { BehaviorSubject } from 'rxjs';
@@ -10,9 +10,9 @@ import { BehaviorSubject } from 'rxjs';
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class EmployeesListComponent {
@Input() employees: User[];
@Input() employees: Employee[];
@Input() sortBy: SortBy | null;
@Output() sorted = new EventEmitter<keyof User>();
@Output() sorted = new EventEmitter<keyof Employee>();
private _currentPage$ = new BehaviorSubject<number>(1);
private _employeesPerPage = 10;
@@ -27,7 +27,7 @@ export class EmployeesListComponent {
return Math.ceil(this.employees.length / this._employeesPerPage);
}
get pagedEmployees(): User[] {
get pagedEmployees(): Employee[] {
return [...this.employees].slice(this.currentResultStart - 1, this.currentResultEnd - 1);
}
@@ -39,7 +39,7 @@ export class EmployeesListComponent {
return this.currentResultStart + this._employeesPerPage;
}
handleSort(key: keyof User): void {
handleSort(key: keyof Employee): void {
this.sorted.emit(key);
}

6
apps/dafa-web/src/app/pages/administration/pages/employees/employees.component.ts
View File

@@ -1,6 +1,6 @@
import { ChangeDetectionStrategy, Component } from '@angular/core';
import { IconType } from '@dafa-enums/icon-type.enum';
import { User } from '@dafa-models/employee.model';
import { Employee } from '@dafa-models/employee.model';
import { SortBy } from '@dafa-models/sort-by.model';
import { EmployeeService } from '@dafa-services/api/employee.service';
import { BehaviorSubject, Observable } from 'rxjs';
@@ -13,7 +13,7 @@ import { BehaviorSubject, Observable } from 'rxjs';
})
export class EmployeesComponent {
private _searchValue$ = new BehaviorSubject<string>('');
filteredEmployees$: Observable<User[]> = this.employeeService.filteredEmployees$;
filteredEmployees$: Observable<Employee[]> = this.employeeService.filteredEmployees$;
employeesSortBy$: Observable<SortBy | null> = this.employeeService.employeesSortBy$;
iconType = IconType;
@@ -31,7 +31,7 @@ export class EmployeesComponent {
this._searchValue$.next($event.detail.target.value);
}
handleEmployeesSort(key: keyof User): void {
handleEmployeesSort(key: keyof Employee): void {
this.employeeService.setEmployeesSortKey(key);
}
}

31
apps/dafa-web/src/app/services/api/employee.service.ts
View File

@@ -1,14 +1,14 @@
import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { environment } from '@dafa-environment';
import { EmployeeResponse } from '@dafa-models/api/employee-response.model';
import { EmployeeDetail, mapEmployeeReponseToEmployee, User } from '@dafa-models/employee.model';
import { EmployeesApiResponse } from '@dafa-models/api/employee-response.model';
import { Employee, EmployeeDetail, mapEmployeeReponseToEmployee } from '@dafa-models/employee.model';
import { SortBy } from '@dafa-models/sort-by.model';
import { sort } from '@dafa-utils/sort.util';
import { BehaviorSubject, combineLatest, Observable, throwError } from 'rxjs';
import { catchError, map } from 'rxjs/operators';
function filterEmployees(employees: User[], searchFilter: string): User[] {
function filterEmployees(employees: Employee[], searchFilter: string): Employee[] {
return employees.filter(person => person.fullName.toLowerCase().includes(searchFilter.toLowerCase()));
}
@@ -16,23 +16,26 @@ function filterEmployees(employees: User[], searchFilter: string): User[] {
providedIn: 'root',
})
export class EmployeeService {
private _employeesApiUrl = `${environment.apiBase}/D_pxOperatorsList`;
private _allEmployees$: Observable<User[]> = this.httpClient
.get<{ pxResults: EmployeeResponse[] }>(this._employeesApiUrl, {
headers: environment.apiHeaders,
})
.pipe(map(({ pxResults }) => pxResults.map(result => mapEmployeeReponseToEmployee(result))));
private _employeesApiUrl = `${environment.api.meet}/employees`;
private _employeesRawData: Observable<EmployeesApiResponse> = this.httpClient.get<EmployeesApiResponse>(
this._employeesApiUrl,
{ headers: environment.api.headers }
);
private _allEmployees$: Observable<Employee[]> = this._employeesRawData.pipe(
map(({ pxResults }) => pxResults.map(result => mapEmployeeReponseToEmployee(result)))
);
private _employeesSortBy$ = new BehaviorSubject<SortBy | null>({ key: 'fullName', reverse: false });
public employeesSortBy$: Observable<SortBy> = this._employeesSortBy$.asObservable();
private _searchFilter$ = new BehaviorSubject<string>('');
public searchFilter$: Observable<string> = this._searchFilter$.asObservable();
private _filteredEmployees$: Observable<User[]> = combineLatest([this._allEmployees$, this._searchFilter$]).pipe(
private _filteredEmployees$: Observable<Employee[]> = combineLatest([this._allEmployees$, this._searchFilter$]).pipe(
map(([employees, searchFilter]) => filterEmployees(employees, searchFilter))
);
public filteredEmployees$: Observable<User[]> = combineLatest([
public resultCount$: Observable<number> = this._employeesRawData.pipe(map(({ pxResultCount }) => +pxResultCount));
public filteredEmployees$: Observable<Employee[]> = combineLatest([
this._filteredEmployees$,
this._employeesSortBy$,
]).pipe(
@@ -43,15 +46,15 @@ export class EmployeeService {
constructor(private httpClient: HttpClient) {}
public getDetailedEmployeeData(id: string): Observable<User> {
return this.httpClient.get<User>(`${this._employeesApiUrl}/${id}`, { params: { _embed: 'participants' } });
public getDetailedEmployeeData(id: string): Observable<Employee> {
return this.httpClient.get<Employee>(`${this._employeesApiUrl}/${id}`, { params: { _embed: 'participants' } });
}
public setSearchFilter(value: string) {
this._searchFilter$.next(value);
}
public setEmployeesSortKey(key: keyof User) {
public setEmployeesSortKey(key: keyof Employee) {
const currentSortBy = this._employeesSortBy$.getValue();
const reverse = currentSortBy?.key === key ? !currentSortBy.reverse : false;
this._employeesSortBy$.next({ key, reverse });

2
apps/dafa-web/src/app/services/api/participants.service.ts
View File

@@ -22,7 +22,7 @@ function filterParticipants(participants: Participant[], searchFilter: string):
})
export class ParticipantsService {
private _allParticipants$: Observable<Participant[]> = this.httpClient.get<Participant[]>(
`${environment.apiBase}/participants`
`${environment.api.meet}/participants`
);
private _activeParticipantsSortBy$ = new BehaviorSubject<SortBy | null>({ key: 'handleBefore', reverse: false });
public activeParticipantsSortBy$: Observable<SortBy> = this._activeParticipantsSortBy$.asObservable();

4
apps/dafa-web/src/app/services/api/user.service.ts
View File

@@ -10,10 +10,10 @@ import { map } from 'rxjs/operators';
providedIn: 'root',
})
export class UserService {
private _userApiUrl = `${environment.apiBase}/D_OperatorID`;
private _userApiUrl = `${environment.api.default}/D_OperatorID`;
public currentUser$: Observable<User> = this.httpClient
.get<UserResponse>(this._userApiUrl, {
headers: environment.apiHeaders,
headers: environment.api.headers,
})
.pipe(map(response => mapUserReponseToUser(response)));

BIN
apps/dafa-web/src/assets/logo/fa-mina-sidor-dark.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.3 KiB

17
apps/dafa-web/src/assets/logo/fa-mina-sidor-dark.svg
View File

@@ -1,17 +0,0 @@
<svg width="428" height="48" viewBox="0 0 428 48" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M68.68 3.85001H67.68V45.35H68.68V3.85001Z" fill="white"/>
<path d="M69.18 3.35001H67.18V45.85H69.18V3.35001Z" fill="#333333"/>
<path d="M16.43 39.37C14.2391 39.2639 12.1731 38.3189 10.6601 36.7308C9.14712 35.1428 8.30316 33.0334 8.30316 30.84C8.30316 28.6466 9.14712 26.5373 10.6601 24.9492C12.1731 23.3612 14.2391 22.4161 16.43 22.31C18.6209 22.4161 20.6869 23.3612 22.1999 24.9492C23.7129 26.5373 24.5568 28.6466 24.5568 30.84C24.5568 33.0334 23.7129 35.1428 22.1999 36.7308C20.6869 38.3189 18.6209 39.2639 16.43 39.37ZM16.43 14.88C12.2677 14.951 8.30393 16.6722 5.4104 19.6652C2.51687 22.6581 0.930454 26.6777 1 30.84C0.919652 35.0024 2.49583 39.0264 5.3819 42.0268C8.26797 45.0273 12.2276 46.7586 16.39 46.84V46.84C18.4544 46.8049 20.4916 46.3629 22.385 45.5394C24.2784 44.7159 25.9907 43.527 27.424 42.0407C28.8572 40.5545 29.9833 38.8002 30.7376 36.8782C31.4919 34.9563 31.8598 32.9044 31.82 30.84V30.84C31.9003 26.6776 30.3242 22.6537 27.4381 19.6532C24.552 16.6528 20.5924 14.9215 16.43 14.84V14.84" fill="#95C34E"/>
<path d="M16.43 0V7.46C28.91 7.46 39 17.93 39 30.84C39.0261 35.1114 37.9036 39.3112 35.75 43L41.75 47.11C44.6883 42.2077 46.2306 36.5954 46.21 30.88C46.23 13.81 32.89 0 16.43 0Z" fill="#95C34E"/>
<path d="M101.938 43H94.4922V7.30664H114.951V13.5078H101.938V22.7119H114.048V28.8887H101.938V43Z" fill="#333333"/>
<path d="M143.784 43L141.196 34.5039H128.184L125.596 43H117.441L130.039 7.16016H139.292L151.938 43H143.784ZM139.39 28.1562C136.997 20.4577 135.646 16.1038 135.337 15.0947C135.044 14.0856 134.832 13.2881 134.702 12.7021C134.165 14.7855 132.627 19.9368 130.088 28.1562H139.39Z" fill="#333333"/>
<path d="M184.556 43L175.962 14.9971H175.742C176.051 20.6937 176.206 24.4941 176.206 26.3984V43H169.443V7.30664H179.746L188.193 34.6016H188.34L197.3 7.30664H207.603V43H200.547V26.1055C200.547 25.3079 200.555 24.3883 200.571 23.3467C200.604 22.305 200.718 19.5381 200.913 15.0459H200.693L191.489 43H184.556Z" fill="#333333"/>
<path d="M215.708 8.64941C215.708 6.22428 217.059 5.01172 219.761 5.01172C222.463 5.01172 223.813 6.22428 223.813 8.64941C223.813 9.80501 223.472 10.7083 222.788 11.3594C222.121 11.9941 221.112 12.3115 219.761 12.3115C217.059 12.3115 215.708 11.0908 215.708 8.64941ZM223.472 43H216.025V15.7051H223.472V43Z" fill="#333333"/>
<path d="M256.504 43H249.058V27.0576C249.058 25.0882 248.708 23.6152 248.008 22.6387C247.308 21.6458 246.193 21.1494 244.663 21.1494C242.58 21.1494 241.074 21.8493 240.146 23.249C239.219 24.6325 238.755 26.9355 238.755 30.1582V43H231.309V15.7051H236.997L237.998 19.1963H238.413C239.243 17.8779 240.382 16.8851 241.831 16.2178C243.296 15.5342 244.956 15.1924 246.812 15.1924C249.985 15.1924 252.394 16.055 254.038 17.7803C255.682 19.4893 256.504 21.9632 256.504 25.2021V43Z" fill="#333333"/>
<path d="M281.504 43L280.063 39.2891H279.868C278.615 40.8678 277.321 41.9665 275.986 42.585C274.668 43.1872 272.943 43.4883 270.811 43.4883C268.19 43.4883 266.123 42.7396 264.609 41.2422C263.112 39.7448 262.363 37.6126 262.363 34.8457C262.363 31.9486 263.372 29.8164 265.391 28.4492C267.425 27.0658 270.485 26.3008 274.57 26.1543L279.307 26.0078V24.8115C279.307 22.0446 277.891 20.6611 275.059 20.6611C272.878 20.6611 270.314 21.3203 267.368 22.6387L264.902 17.6094C268.044 15.9655 271.527 15.1436 275.352 15.1436C279.014 15.1436 281.821 15.9411 283.774 17.5361C285.728 19.1312 286.704 21.5563 286.704 24.8115V43H281.504ZM279.307 30.3535L276.426 30.4512C274.261 30.5163 272.65 30.9069 271.592 31.623C270.534 32.3392 270.005 33.4297 270.005 34.8945C270.005 36.9941 271.209 38.0439 273.618 38.0439C275.343 38.0439 276.719 37.5475 277.744 36.5547C278.786 35.5618 279.307 34.2435 279.307 32.5996V30.3535Z" fill="#333333"/>
<path d="M326.426 34.8945C326.426 37.694 325.449 39.8262 323.496 41.291C321.559 42.7559 318.654 43.4883 314.78 43.4883C312.795 43.4883 311.102 43.3499 309.702 43.0732C308.302 42.8128 306.992 42.4222 305.771 41.9014V35.749C307.155 36.4001 308.709 36.9453 310.435 37.3848C312.176 37.8242 313.706 38.0439 315.024 38.0439C317.726 38.0439 319.077 37.2627 319.077 35.7002C319.077 35.1143 318.898 34.6423 318.54 34.2842C318.182 33.9098 317.563 33.4948 316.685 33.0391C315.806 32.5671 314.634 32.0218 313.169 31.4033C311.069 30.5244 309.523 29.7106 308.53 28.9619C307.554 28.2132 306.838 27.3587 306.382 26.3984C305.942 25.4219 305.723 24.2256 305.723 22.8096C305.723 20.3844 306.659 18.5127 308.53 17.1943C310.418 15.8597 313.088 15.1924 316.538 15.1924C319.826 15.1924 323.024 15.9085 326.133 17.3408L323.887 22.7119C322.52 22.126 321.242 21.6458 320.054 21.2715C318.866 20.8971 317.653 20.71 316.416 20.71C314.219 20.71 313.12 21.304 313.12 22.4922C313.12 23.1595 313.47 23.7373 314.17 24.2256C314.886 24.7139 316.44 25.4382 318.833 26.3984C320.965 27.2611 322.528 28.0667 323.521 28.8154C324.513 29.5641 325.246 30.4268 325.718 31.4033C326.19 32.3799 326.426 33.5436 326.426 34.8945Z" fill="#333333"/>
<path d="M331.919 8.64941C331.919 6.22428 333.27 5.01172 335.972 5.01172C338.674 5.01172 340.024 6.22428 340.024 8.64941C340.024 9.80501 339.683 10.7083 338.999 11.3594C338.332 11.9941 337.323 12.3115 335.972 12.3115C333.27 12.3115 331.919 11.0908 331.919 8.64941ZM339.683 43H332.236V15.7051H339.683V43Z" fill="#333333"/>
<path d="M356.162 43.4883C352.956 43.4883 350.433 42.2432 348.594 39.7529C346.771 37.2627 345.859 33.8122 345.859 29.4014C345.859 24.9255 346.787 21.4424 348.643 18.9521C350.514 16.4456 353.086 15.1924 356.357 15.1924C359.792 15.1924 362.412 16.527 364.219 19.1963H364.463C364.089 17.1618 363.901 15.347 363.901 13.752V5.01172H371.372V43H365.659L364.219 39.46H363.901C362.209 42.1455 359.629 43.4883 356.162 43.4883ZM358.774 37.5557C360.679 37.5557 362.07 37.0023 362.949 35.8955C363.844 34.7887 364.333 32.9089 364.414 30.2559V29.4502C364.414 26.5205 363.958 24.4209 363.047 23.1514C362.152 21.8818 360.687 21.2471 358.652 21.2471C356.992 21.2471 355.698 21.9551 354.771 23.3711C353.859 24.7708 353.403 26.8135 353.403 29.499C353.403 32.1846 353.867 34.2028 354.795 35.5537C355.723 36.8883 357.049 37.5557 358.774 37.5557Z" fill="#333333"/>
<path d="M385.093 29.3037C385.093 32.0055 385.532 34.0482 386.411 35.4316C387.306 36.8151 388.755 37.5068 390.757 37.5068C392.743 37.5068 394.167 36.8232 395.029 35.4561C395.908 34.0726 396.348 32.0218 396.348 29.3037C396.348 26.6019 395.908 24.5755 395.029 23.2246C394.15 21.8737 392.71 21.1982 390.708 21.1982C388.722 21.1982 387.29 21.8737 386.411 23.2246C385.532 24.5592 385.093 26.5856 385.093 29.3037ZM403.965 29.3037C403.965 33.7471 402.793 37.222 400.449 39.7285C398.105 42.235 394.842 43.4883 390.659 43.4883C388.039 43.4883 385.728 42.9186 383.726 41.7793C381.724 40.6237 380.186 38.9717 379.111 36.8232C378.037 34.6748 377.5 32.1683 377.5 29.3037C377.5 24.8441 378.664 21.3773 380.991 18.9033C383.319 16.4294 386.59 15.1924 390.806 15.1924C393.426 15.1924 395.737 15.762 397.739 16.9014C399.741 18.0407 401.279 19.6764 402.354 21.8086C403.428 23.9408 403.965 26.4391 403.965 29.3037Z" fill="#333333"/>
<path d="M425.352 15.1924C426.361 15.1924 427.199 15.2656 427.866 15.4121L427.305 22.3945C426.702 22.2318 425.97 22.1504 425.107 22.1504C422.731 22.1504 420.876 22.7607 419.541 23.9814C418.223 25.2021 417.563 26.9111 417.563 29.1084V43H410.117V15.7051H415.757L416.855 20.2949H417.222C418.068 18.765 419.207 17.5361 420.64 16.6084C422.088 15.6644 423.659 15.1924 425.352 15.1924Z" fill="#333333"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 7.3 KiB

BIN
apps/dafa-web/src/assets/logo/fa-mina-sidor-light.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.8 KiB

17
apps/dafa-web/src/assets/logo/fa-mina-sidor-light.svg
View File

@@ -1,17 +0,0 @@
<svg width="428" height="48" viewBox="0 0 428 48" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M68.68 3.85001H67.68V45.35H68.68V3.85001Z" fill="white"/>
<path d="M69.18 3.35001H67.18V45.85H69.18V3.35001Z" fill="white"/>
<path d="M16.43 39.37C14.2391 39.2639 12.1731 38.3189 10.6601 36.7308C9.14712 35.1428 8.30316 33.0334 8.30316 30.84C8.30316 28.6466 9.14712 26.5373 10.6601 24.9492C12.1731 23.3612 14.2391 22.4161 16.43 22.31C18.6209 22.4161 20.6869 23.3612 22.1999 24.9492C23.7129 26.5373 24.5568 28.6466 24.5568 30.84C24.5568 33.0334 23.7129 35.1428 22.1999 36.7308C20.6869 38.3189 18.6209 39.2639 16.43 39.37ZM16.43 14.88C12.2677 14.951 8.30393 16.6722 5.4104 19.6652C2.51687 22.6581 0.930452 26.6777 0.999998 30.84C0.91965 35.0024 2.49583 39.0264 5.3819 42.0268C8.26797 45.0273 12.2276 46.7586 16.39 46.84V46.84C18.4544 46.8049 20.4916 46.3629 22.385 45.5394C24.2784 44.7159 25.9907 43.527 27.424 42.0407C28.8572 40.5545 29.9833 38.8002 30.7376 36.8782C31.4919 34.9563 31.8597 32.9044 31.82 30.84V30.84C31.9003 26.6776 30.3242 22.6537 27.4381 19.6532C24.552 16.6528 20.5924 14.9215 16.43 14.84V14.84" fill="#95C34E"/>
<path d="M16.43 0V7.46C28.91 7.46 39 17.93 39 30.84C39.0261 35.1114 37.9036 39.3112 35.75 43L41.75 47.11C44.6883 42.2077 46.2306 36.5954 46.21 30.88C46.23 13.81 32.89 0 16.43 0Z" fill="#95C34E"/>
<path d="M101.938 43H94.4922V7.30664H114.951V13.5078H101.938V22.7119H114.048V28.8887H101.938V43Z" fill="white"/>
<path d="M143.784 43L141.196 34.5039H128.184L125.596 43H117.441L130.039 7.16016H139.292L151.938 43H143.784ZM139.39 28.1562C136.997 20.4577 135.646 16.1038 135.337 15.0947C135.044 14.0856 134.832 13.2881 134.702 12.7021C134.165 14.7855 132.627 19.9368 130.088 28.1562H139.39Z" fill="white"/>
<path d="M184.556 43L175.962 14.9971H175.742C176.051 20.6937 176.206 24.4941 176.206 26.3984V43H169.443V7.30664H179.746L188.193 34.6016H188.34L197.3 7.30664H207.603V43H200.547V26.1055C200.547 25.3079 200.555 24.3883 200.571 23.3467C200.604 22.305 200.718 19.5381 200.913 15.0459H200.693L191.489 43H184.556Z" fill="white"/>
<path d="M215.708 8.64941C215.708 6.22428 217.059 5.01172 219.761 5.01172C222.463 5.01172 223.813 6.22428 223.813 8.64941C223.813 9.80501 223.472 10.7083 222.788 11.3594C222.121 11.9941 221.112 12.3115 219.761 12.3115C217.059 12.3115 215.708 11.0908 215.708 8.64941ZM223.472 43H216.025V15.7051H223.472V43Z" fill="white"/>
<path d="M256.504 43H249.058V27.0576C249.058 25.0882 248.708 23.6152 248.008 22.6387C247.308 21.6458 246.193 21.1494 244.663 21.1494C242.58 21.1494 241.074 21.8493 240.146 23.249C239.219 24.6325 238.755 26.9355 238.755 30.1582V43H231.309V15.7051H236.997L237.998 19.1963H238.413C239.243 17.8779 240.382 16.8851 241.831 16.2178C243.296 15.5342 244.956 15.1924 246.812 15.1924C249.985 15.1924 252.394 16.055 254.038 17.7803C255.682 19.4893 256.504 21.9632 256.504 25.2021V43Z" fill="white"/>
<path d="M281.504 43L280.063 39.2891H279.868C278.615 40.8678 277.321 41.9665 275.986 42.585C274.668 43.1872 272.943 43.4883 270.811 43.4883C268.19 43.4883 266.123 42.7396 264.609 41.2422C263.112 39.7448 262.363 37.6126 262.363 34.8457C262.363 31.9486 263.372 29.8164 265.391 28.4492C267.425 27.0658 270.485 26.3008 274.57 26.1543L279.307 26.0078V24.8115C279.307 22.0446 277.891 20.6611 275.059 20.6611C272.878 20.6611 270.314 21.3203 267.368 22.6387L264.902 17.6094C268.044 15.9655 271.527 15.1436 275.352 15.1436C279.014 15.1436 281.821 15.9411 283.774 17.5361C285.728 19.1312 286.704 21.5563 286.704 24.8115V43H281.504ZM279.307 30.3535L276.426 30.4512C274.261 30.5163 272.65 30.9069 271.592 31.623C270.534 32.3392 270.005 33.4297 270.005 34.8945C270.005 36.9941 271.209 38.0439 273.618 38.0439C275.343 38.0439 276.719 37.5475 277.744 36.5547C278.786 35.5618 279.307 34.2435 279.307 32.5996V30.3535Z" fill="white"/>
<path d="M326.426 34.8945C326.426 37.694 325.449 39.8262 323.496 41.291C321.559 42.7559 318.654 43.4883 314.78 43.4883C312.795 43.4883 311.102 43.3499 309.702 43.0732C308.302 42.8128 306.992 42.4222 305.771 41.9014V35.749C307.155 36.4001 308.709 36.9453 310.435 37.3848C312.176 37.8242 313.706 38.0439 315.024 38.0439C317.726 38.0439 319.077 37.2627 319.077 35.7002C319.077 35.1143 318.898 34.6423 318.54 34.2842C318.182 33.9098 317.563 33.4948 316.685 33.0391C315.806 32.5671 314.634 32.0218 313.169 31.4033C311.069 30.5244 309.523 29.7106 308.53 28.9619C307.554 28.2132 306.838 27.3587 306.382 26.3984C305.942 25.4219 305.723 24.2256 305.723 22.8096C305.723 20.3844 306.659 18.5127 308.53 17.1943C310.418 15.8597 313.088 15.1924 316.538 15.1924C319.826 15.1924 323.024 15.9085 326.133 17.3408L323.887 22.7119C322.52 22.126 321.242 21.6458 320.054 21.2715C318.866 20.8971 317.653 20.71 316.416 20.71C314.219 20.71 313.12 21.304 313.12 22.4922C313.12 23.1595 313.47 23.7373 314.17 24.2256C314.886 24.7139 316.44 25.4382 318.833 26.3984C320.965 27.2611 322.528 28.0667 323.521 28.8154C324.513 29.5641 325.246 30.4268 325.718 31.4033C326.19 32.3799 326.426 33.5436 326.426 34.8945Z" fill="white"/>
<path d="M331.919 8.64941C331.919 6.22428 333.27 5.01172 335.972 5.01172C338.674 5.01172 340.024 6.22428 340.024 8.64941C340.024 9.80501 339.683 10.7083 338.999 11.3594C338.332 11.9941 337.323 12.3115 335.972 12.3115C333.27 12.3115 331.919 11.0908 331.919 8.64941ZM339.683 43H332.236V15.7051H339.683V43Z" fill="white"/>
<path d="M356.162 43.4883C352.956 43.4883 350.433 42.2432 348.594 39.7529C346.771 37.2627 345.859 33.8122 345.859 29.4014C345.859 24.9255 346.787 21.4424 348.643 18.9521C350.514 16.4456 353.086 15.1924 356.357 15.1924C359.792 15.1924 362.412 16.527 364.219 19.1963H364.463C364.089 17.1618 363.901 15.347 363.901 13.752V5.01172H371.372V43H365.659L364.219 39.46H363.901C362.209 42.1455 359.629 43.4883 356.162 43.4883ZM358.774 37.5557C360.679 37.5557 362.07 37.0023 362.949 35.8955C363.844 34.7887 364.333 32.9089 364.414 30.2559V29.4502C364.414 26.5205 363.958 24.4209 363.047 23.1514C362.152 21.8818 360.687 21.2471 358.652 21.2471C356.992 21.2471 355.698 21.9551 354.771 23.3711C353.859 24.7708 353.403 26.8135 353.403 29.499C353.403 32.1846 353.867 34.2028 354.795 35.5537C355.723 36.8883 357.049 37.5557 358.774 37.5557Z" fill="white"/>
<path d="M385.093 29.3037C385.093 32.0055 385.532 34.0482 386.411 35.4316C387.306 36.8151 388.755 37.5068 390.757 37.5068C392.743 37.5068 394.167 36.8232 395.029 35.4561C395.908 34.0726 396.348 32.0218 396.348 29.3037C396.348 26.6019 395.908 24.5755 395.029 23.2246C394.15 21.8737 392.71 21.1982 390.708 21.1982C388.722 21.1982 387.29 21.8737 386.411 23.2246C385.532 24.5592 385.093 26.5856 385.093 29.3037ZM403.965 29.3037C403.965 33.7471 402.793 37.222 400.449 39.7285C398.105 42.235 394.842 43.4883 390.659 43.4883C388.039 43.4883 385.728 42.9186 383.726 41.7793C381.724 40.6237 380.186 38.9717 379.111 36.8232C378.037 34.6748 377.5 32.1683 377.5 29.3037C377.5 24.8441 378.664 21.3773 380.991 18.9033C383.319 16.4294 386.59 15.1924 390.806 15.1924C393.426 15.1924 395.737 15.762 397.739 16.9014C399.741 18.0407 401.279 19.6764 402.354 21.8086C403.428 23.9408 403.965 26.4391 403.965 29.3037Z" fill="white"/>
<path d="M425.352 15.1924C426.361 15.1924 427.199 15.2656 427.866 15.4121L427.305 22.3945C426.702 22.2318 425.97 22.1504 425.107 22.1504C422.731 22.1504 420.876 22.7607 419.541 23.9814C418.223 25.2021 417.563 26.9111 417.563 29.1084V43H410.117V15.7051H415.757L416.855 20.2949H417.222C418.068 18.765 419.207 17.5361 420.64 16.6084C422.088 15.6644 423.659 15.1924 425.352 15.1924Z" fill="white"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 7.3 KiB

17
apps/dafa-web/src/assets/logo/mina-sidor-fa-dark.svg Executable file
View File

@@ -0,0 +1,17 @@
<svg width="429" height="48" viewBox="0 0 429 48" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M68.6801 3.85001H67.6801V45.35H68.6801V3.85001Z" fill="white"/>
<path d="M69.1801 3.35001H67.1801V45.85H69.1801V3.35001Z" fill="#333333"/>
<path d="M16.43 39.37C14.2391 39.2639 12.1731 38.3189 10.6601 36.7308C9.14712 35.1427 8.30316 33.0334 8.30316 30.84C8.30316 28.6466 9.14712 26.5372 10.6601 24.9492C12.1731 23.3611 14.2391 22.4161 16.43 22.31C18.6209 22.4161 20.6869 23.3611 22.1999 24.9492C23.7129 26.5372 24.5568 28.6466 24.5568 30.84C24.5568 33.0334 23.7129 35.1427 22.1999 36.7308C20.6869 38.3189 18.6209 39.2639 16.43 39.37ZM16.43 14.88C12.2677 14.951 8.30393 16.6722 5.4104 19.6651C2.51687 22.6581 0.930452 26.6776 0.999998 30.84C0.91965 35.0024 2.49583 39.0263 5.3819 42.0268C8.26797 45.0272 12.2276 46.7586 16.39 46.84V46.84C18.4544 46.8049 20.4916 46.3629 22.385 45.5394C24.2784 44.7158 25.9907 43.5269 27.424 42.0407C28.8572 40.5545 29.9833 38.8002 30.7376 36.8782C31.4919 34.9562 31.8597 32.9043 31.82 30.84V30.84C31.9003 26.6776 30.3242 22.6537 27.4381 19.6532C24.552 16.6527 20.5924 14.9214 16.43 14.84V14.84" fill="#95C34E"/>
<path d="M16.4301 0V7.46C28.9101 7.46 39.0001 17.93 39.0001 30.84C39.0261 35.1114 37.9036 39.3112 35.7501 43L41.7501 47.11C44.6884 42.2077 46.2306 36.5954 46.2101 30.88C46.2301 13.81 32.8901 0 16.4301 0Z" fill="#95C34E"/>
<path d="M109.604 43L101.011 14.9971H100.791C101.1 20.6937 101.255 24.4941 101.255 26.3984V43H94.4922V7.30664H104.795L113.242 34.6016H113.389L122.349 7.30664H132.651V43H125.596V26.1055C125.596 25.3079 125.604 24.3883 125.62 23.3467C125.653 22.305 125.767 19.5381 125.962 15.0459H125.742L116.538 43H109.604Z" fill="#333333"/>
<path d="M140.757 8.64941C140.757 6.22428 142.108 5.01172 144.81 5.01172C147.511 5.01172 148.862 6.22428 148.862 8.64941C148.862 9.80501 148.521 10.7083 147.837 11.3594C147.17 11.9941 146.16 12.3115 144.81 12.3115C142.108 12.3115 140.757 11.0908 140.757 8.64941ZM148.521 43H141.074V15.7051H148.521V43Z" fill="#333333"/>
<path d="M181.553 43H174.106V27.0576C174.106 25.0882 173.757 23.6152 173.057 22.6387C172.357 21.6458 171.242 21.1494 169.712 21.1494C167.629 21.1494 166.123 21.8493 165.195 23.249C164.268 24.6325 163.804 26.9355 163.804 30.1582V43H156.357V15.7051H162.046L163.047 19.1963H163.462C164.292 17.8779 165.431 16.8851 166.88 16.2178C168.345 15.5342 170.005 15.1924 171.86 15.1924C175.034 15.1924 177.443 16.055 179.087 17.7803C180.731 19.4893 181.553 21.9632 181.553 25.2021V43Z" fill="#333333"/>
<path d="M206.553 43L205.112 39.2891H204.917C203.664 40.8678 202.37 41.9665 201.035 42.585C199.717 43.1872 197.992 43.4883 195.859 43.4883C193.239 43.4883 191.172 42.7396 189.658 41.2422C188.161 39.7448 187.412 37.6126 187.412 34.8457C187.412 31.9486 188.421 29.8164 190.439 28.4492C192.474 27.0658 195.534 26.3008 199.619 26.1543L204.355 26.0078V24.8115C204.355 22.0446 202.939 20.6611 200.107 20.6611C197.926 20.6611 195.363 21.3203 192.417 22.6387L189.951 17.6094C193.092 15.9655 196.576 15.1436 200.4 15.1436C204.062 15.1436 206.87 15.9411 208.823 17.5361C210.776 19.1312 211.753 21.5563 211.753 24.8115V43H206.553ZM204.355 30.3535L201.475 30.4512C199.31 30.5163 197.699 30.9069 196.641 31.623C195.583 32.3392 195.054 33.4297 195.054 34.8945C195.054 36.9941 196.258 38.0439 198.667 38.0439C200.392 38.0439 201.768 37.5475 202.793 36.5547C203.835 35.5618 204.355 34.2435 204.355 32.5996V30.3535Z" fill="#333333"/>
<path d="M251.475 34.8945C251.475 37.694 250.498 39.8262 248.545 41.291C246.608 42.7559 243.703 43.4883 239.829 43.4883C237.843 43.4883 236.151 43.3499 234.751 43.0732C233.351 42.8128 232.041 42.4222 230.82 41.9014V35.749C232.204 36.4001 233.758 36.9453 235.483 37.3848C237.225 37.8242 238.755 38.0439 240.073 38.0439C242.775 38.0439 244.126 37.2627 244.126 35.7002C244.126 35.1143 243.947 34.6423 243.589 34.2842C243.231 33.9098 242.612 33.4948 241.733 33.0391C240.854 32.5671 239.683 32.0218 238.218 31.4033C236.118 30.5244 234.572 29.7106 233.579 28.9619C232.603 28.2132 231.886 27.3587 231.431 26.3984C230.991 25.4219 230.771 24.2256 230.771 22.8096C230.771 20.3844 231.707 18.5127 233.579 17.1943C235.467 15.8597 238.136 15.1924 241.587 15.1924C244.875 15.1924 248.073 15.9085 251.182 17.3408L248.936 22.7119C247.568 22.126 246.291 21.6458 245.103 21.2715C243.914 20.8971 242.702 20.71 241.465 20.71C239.268 20.71 238.169 21.304 238.169 22.4922C238.169 23.1595 238.519 23.7373 239.219 24.2256C239.935 24.7139 241.489 25.4382 243.882 26.3984C246.014 27.2611 247.576 28.0667 248.569 28.8154C249.562 29.5641 250.295 30.4268 250.767 31.4033C251.239 32.3799 251.475 33.5436 251.475 34.8945Z" fill="#333333"/>
<path d="M256.968 8.64941C256.968 6.22428 258.319 5.01172 261.021 5.01172C263.722 5.01172 265.073 6.22428 265.073 8.64941C265.073 9.80501 264.731 10.7083 264.048 11.3594C263.381 11.9941 262.371 12.3115 261.021 12.3115C258.319 12.3115 256.968 11.0908 256.968 8.64941ZM264.731 43H257.285V15.7051H264.731V43Z" fill="#333333"/>
<path d="M281.211 43.4883C278.005 43.4883 275.482 42.2432 273.643 39.7529C271.82 37.2627 270.908 33.8122 270.908 29.4014C270.908 24.9255 271.836 21.4424 273.691 18.9521C275.563 16.4456 278.135 15.1924 281.406 15.1924C284.84 15.1924 287.461 16.527 289.268 19.1963H289.512C289.137 17.1618 288.95 15.347 288.95 13.752V5.01172H296.421V43H290.708L289.268 39.46H288.95C287.257 42.1455 284.678 43.4883 281.211 43.4883ZM283.823 37.5557C285.728 37.5557 287.119 37.0023 287.998 35.8955C288.893 34.7887 289.382 32.9089 289.463 30.2559V29.4502C289.463 26.5205 289.007 24.4209 288.096 23.1514C287.201 21.8818 285.736 21.2471 283.701 21.2471C282.041 21.2471 280.747 21.9551 279.819 23.3711C278.908 24.7708 278.452 26.8135 278.452 29.499C278.452 32.1846 278.916 34.2028 279.844 35.5537C280.771 36.8883 282.098 37.5557 283.823 37.5557Z" fill="#333333"/>
<path d="M310.142 29.3037C310.142 32.0055 310.581 34.0482 311.46 35.4316C312.355 36.8151 313.804 37.5068 315.806 37.5068C317.791 37.5068 319.215 36.8232 320.078 35.4561C320.957 34.0726 321.396 32.0218 321.396 29.3037C321.396 26.6019 320.957 24.5755 320.078 23.2246C319.199 21.8737 317.759 21.1982 315.757 21.1982C313.771 21.1982 312.339 21.8737 311.46 23.2246C310.581 24.5592 310.142 26.5856 310.142 29.3037ZM329.014 29.3037C329.014 33.7471 327.842 37.222 325.498 39.7285C323.154 42.235 319.891 43.4883 315.708 43.4883C313.088 43.4883 310.776 42.9186 308.774 41.7793C306.772 40.6237 305.234 38.9717 304.16 36.8232C303.086 34.6748 302.549 32.1683 302.549 29.3037C302.549 24.8441 303.713 21.3773 306.04 18.9033C308.368 16.4294 311.639 15.1924 315.854 15.1924C318.475 15.1924 320.786 15.762 322.788 16.9014C324.79 18.0407 326.328 19.6764 327.402 21.8086C328.477 23.9408 329.014 26.4391 329.014 29.3037Z" fill="#333333"/>
<path d="M350.4 15.1924C351.41 15.1924 352.248 15.2656 352.915 15.4121L352.354 22.3945C351.751 22.2318 351.019 22.1504 350.156 22.1504C347.78 22.1504 345.924 22.7607 344.59 23.9814C343.271 25.2021 342.612 26.9111 342.612 29.1084V43H335.166V15.7051H340.806L341.904 20.2949H342.271C343.117 18.765 344.256 17.5361 345.688 16.6084C347.137 15.6644 348.708 15.1924 350.4 15.1924Z" fill="#333333"/>
<path d="M378.892 43H371.445V7.30664H391.904V13.5078H378.892V22.7119H391.001V28.8887H378.892V43Z" fill="#333333"/>
<path d="M420.737 43L418.149 34.5039H405.137L402.549 43H394.395L406.992 7.16016H416.245L428.892 43H420.737ZM416.343 28.1562C413.95 20.4577 412.599 16.1038 412.29 15.0947C411.997 14.0856 411.785 13.2881 411.655 12.7021C411.118 14.7855 409.58 19.9368 407.041 28.1562H416.343Z" fill="#333333"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 7.3 KiB

17
apps/dafa-web/src/assets/logo/mina-sidor-fa-light.svg Executable file
View File

@@ -0,0 +1,17 @@
<svg width="429" height="48" viewBox="0 0 429 48" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M68.68 3.85001H67.68V45.35H68.68V3.85001Z" fill="white"/>
<path d="M69.18 3.35001H67.18V45.85H69.18V3.35001Z" fill="white"/>
<path d="M16.43 39.37C14.2391 39.2639 12.1731 38.3189 10.6601 36.7308C9.14712 35.1427 8.30316 33.0334 8.30316 30.84C8.30316 28.6466 9.14712 26.5372 10.6601 24.9492C12.1731 23.3611 14.2391 22.4161 16.43 22.31C18.6209 22.4161 20.6869 23.3611 22.1999 24.9492C23.7129 26.5372 24.5568 28.6466 24.5568 30.84C24.5568 33.0334 23.7129 35.1427 22.1999 36.7308C20.6869 38.3189 18.6209 39.2639 16.43 39.37ZM16.43 14.88C12.2677 14.951 8.30393 16.6722 5.4104 19.6651C2.51687 22.6581 0.930452 26.6776 0.999998 30.84C0.91965 35.0024 2.49583 39.0263 5.3819 42.0268C8.26797 45.0272 12.2276 46.7586 16.39 46.84V46.84C18.4544 46.8049 20.4916 46.3629 22.385 45.5394C24.2784 44.7158 25.9907 43.5269 27.424 42.0407C28.8572 40.5545 29.9833 38.8002 30.7376 36.8782C31.4919 34.9562 31.8597 32.9043 31.82 30.84V30.84C31.9003 26.6776 30.3242 22.6537 27.4381 19.6532C24.552 16.6527 20.5924 14.9214 16.43 14.84V14.84" fill="#95C34E"/>
<path d="M16.43 0V7.46C28.91 7.46 39 17.93 39 30.84C39.0261 35.1114 37.9036 39.3112 35.75 43L41.75 47.11C44.6883 42.2077 46.2306 36.5954 46.21 30.88C46.23 13.81 32.89 0 16.43 0Z" fill="#95C34E"/>
<path d="M109.604 43L101.011 14.9971H100.791C101.1 20.6937 101.255 24.4941 101.255 26.3984V43H94.4922V7.30664H104.795L113.242 34.6016H113.389L122.349 7.30664H132.651V43H125.596V26.1055C125.596 25.3079 125.604 24.3883 125.62 23.3467C125.653 22.305 125.767 19.5381 125.962 15.0459H125.742L116.538 43H109.604Z" fill="white"/>
<path d="M140.757 8.64941C140.757 6.22428 142.108 5.01172 144.81 5.01172C147.511 5.01172 148.862 6.22428 148.862 8.64941C148.862 9.80501 148.521 10.7083 147.837 11.3594C147.17 11.9941 146.16 12.3115 144.81 12.3115C142.108 12.3115 140.757 11.0908 140.757 8.64941ZM148.521 43H141.074V15.7051H148.521V43Z" fill="white"/>
<path d="M181.553 43H174.106V27.0576C174.106 25.0882 173.757 23.6152 173.057 22.6387C172.357 21.6458 171.242 21.1494 169.712 21.1494C167.629 21.1494 166.123 21.8493 165.195 23.249C164.268 24.6325 163.804 26.9355 163.804 30.1582V43H156.357V15.7051H162.046L163.047 19.1963H163.462C164.292 17.8779 165.431 16.8851 166.88 16.2178C168.345 15.5342 170.005 15.1924 171.86 15.1924C175.034 15.1924 177.443 16.055 179.087 17.7803C180.731 19.4893 181.553 21.9632 181.553 25.2021V43Z" fill="white"/>
<path d="M206.553 43L205.112 39.2891H204.917C203.664 40.8678 202.37 41.9665 201.035 42.585C199.717 43.1872 197.992 43.4883 195.859 43.4883C193.239 43.4883 191.172 42.7396 189.658 41.2422C188.161 39.7448 187.412 37.6126 187.412 34.8457C187.412 31.9486 188.421 29.8164 190.439 28.4492C192.474 27.0658 195.534 26.3008 199.619 26.1543L204.355 26.0078V24.8115C204.355 22.0446 202.939 20.6611 200.107 20.6611C197.926 20.6611 195.363 21.3203 192.417 22.6387L189.951 17.6094C193.092 15.9655 196.576 15.1436 200.4 15.1436C204.062 15.1436 206.87 15.9411 208.823 17.5361C210.776 19.1312 211.753 21.5563 211.753 24.8115V43H206.553ZM204.355 30.3535L201.475 30.4512C199.31 30.5163 197.699 30.9069 196.641 31.623C195.583 32.3392 195.054 33.4297 195.054 34.8945C195.054 36.9941 196.258 38.0439 198.667 38.0439C200.392 38.0439 201.768 37.5475 202.793 36.5547C203.835 35.5618 204.355 34.2435 204.355 32.5996V30.3535Z" fill="white"/>
<path d="M251.475 34.8945C251.475 37.694 250.498 39.8262 248.545 41.291C246.608 42.7559 243.703 43.4883 239.829 43.4883C237.843 43.4883 236.151 43.3499 234.751 43.0732C233.351 42.8128 232.041 42.4222 230.82 41.9014V35.749C232.204 36.4001 233.758 36.9453 235.483 37.3848C237.225 37.8242 238.755 38.0439 240.073 38.0439C242.775 38.0439 244.126 37.2627 244.126 35.7002C244.126 35.1143 243.947 34.6423 243.589 34.2842C243.231 33.9098 242.612 33.4948 241.733 33.0391C240.854 32.5671 239.683 32.0218 238.218 31.4033C236.118 30.5244 234.572 29.7106 233.579 28.9619C232.603 28.2132 231.886 27.3587 231.431 26.3984C230.991 25.4219 230.771 24.2256 230.771 22.8096C230.771 20.3844 231.707 18.5127 233.579 17.1943C235.467 15.8597 238.136 15.1924 241.587 15.1924C244.875 15.1924 248.073 15.9085 251.182 17.3408L248.936 22.7119C247.568 22.126 246.291 21.6458 245.103 21.2715C243.914 20.8971 242.702 20.71 241.465 20.71C239.268 20.71 238.169 21.304 238.169 22.4922C238.169 23.1595 238.519 23.7373 239.219 24.2256C239.935 24.7139 241.489 25.4382 243.882 26.3984C246.014 27.2611 247.576 28.0667 248.569 28.8154C249.562 29.5641 250.295 30.4268 250.767 31.4033C251.239 32.3799 251.475 33.5436 251.475 34.8945Z" fill="white"/>
<path d="M256.968 8.64941C256.968 6.22428 258.319 5.01172 261.021 5.01172C263.722 5.01172 265.073 6.22428 265.073 8.64941C265.073 9.80501 264.731 10.7083 264.048 11.3594C263.381 11.9941 262.371 12.3115 261.021 12.3115C258.319 12.3115 256.968 11.0908 256.968 8.64941ZM264.731 43H257.285V15.7051H264.731V43Z" fill="white"/>
<path d="M281.211 43.4883C278.005 43.4883 275.482 42.2432 273.643 39.7529C271.82 37.2627 270.908 33.8122 270.908 29.4014C270.908 24.9255 271.836 21.4424 273.691 18.9521C275.563 16.4456 278.135 15.1924 281.406 15.1924C284.84 15.1924 287.461 16.527 289.268 19.1963H289.512C289.137 17.1618 288.95 15.347 288.95 13.752V5.01172H296.421V43H290.708L289.268 39.46H288.95C287.257 42.1455 284.678 43.4883 281.211 43.4883ZM283.823 37.5557C285.728 37.5557 287.119 37.0023 287.998 35.8955C288.893 34.7887 289.382 32.9089 289.463 30.2559V29.4502C289.463 26.5205 289.007 24.4209 288.096 23.1514C287.201 21.8818 285.736 21.2471 283.701 21.2471C282.041 21.2471 280.747 21.9551 279.819 23.3711C278.908 24.7708 278.452 26.8135 278.452 29.499C278.452 32.1846 278.916 34.2028 279.844 35.5537C280.771 36.8883 282.098 37.5557 283.823 37.5557Z" fill="white"/>
<path d="M310.142 29.3037C310.142 32.0055 310.581 34.0482 311.46 35.4316C312.355 36.8151 313.804 37.5068 315.806 37.5068C317.791 37.5068 319.215 36.8232 320.078 35.4561C320.957 34.0726 321.396 32.0218 321.396 29.3037C321.396 26.6019 320.957 24.5755 320.078 23.2246C319.199 21.8737 317.759 21.1982 315.757 21.1982C313.771 21.1982 312.339 21.8737 311.46 23.2246C310.581 24.5592 310.142 26.5856 310.142 29.3037ZM329.014 29.3037C329.014 33.7471 327.842 37.222 325.498 39.7285C323.154 42.235 319.891 43.4883 315.708 43.4883C313.088 43.4883 310.776 42.9186 308.774 41.7793C306.772 40.6237 305.234 38.9717 304.16 36.8232C303.086 34.6748 302.549 32.1683 302.549 29.3037C302.549 24.8441 303.713 21.3773 306.04 18.9033C308.368 16.4294 311.639 15.1924 315.854 15.1924C318.475 15.1924 320.786 15.762 322.788 16.9014C324.79 18.0407 326.328 19.6764 327.402 21.8086C328.477 23.9408 329.014 26.4391 329.014 29.3037Z" fill="white"/>
<path d="M350.4 15.1924C351.41 15.1924 352.248 15.2656 352.915 15.4121L352.354 22.3945C351.751 22.2318 351.019 22.1504 350.156 22.1504C347.78 22.1504 345.924 22.7607 344.59 23.9814C343.271 25.2021 342.612 26.9111 342.612 29.1084V43H335.166V15.7051H340.806L341.904 20.2949H342.271C343.117 18.765 344.256 17.5361 345.688 16.6084C347.137 15.6644 348.708 15.1924 350.4 15.1924Z" fill="white"/>
<path d="M378.892 43H371.445V7.30664H391.904V13.5078H378.892V22.7119H391.001V28.8887H378.892V43Z" fill="white"/>
<path d="M420.737 43L418.149 34.5039H405.137L402.549 43H394.395L406.992 7.16016H416.245L428.892 43H420.737ZM416.343 28.1562C413.95 20.4577 412.599 16.1038 412.29 15.0947C411.997 14.0856 411.785 13.2881 411.655 12.7021C411.118 14.7855 409.58 19.9368 407.041 28.1562H416.343Z" fill="white"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 7.3 KiB

9
apps/dafa-web/src/environments/environment.pega.ts
View File

@@ -1,7 +1,10 @@
export const environment = {
production: false,
apiBase: 'https://dafa-utv.tocp.arbetsformedlingen.se/prweb/api/v1/data',
apiHeaders: {
Authorization: 'Basic dGVzdHVzZXIxOmRhZmFAMTIz', // user: testuser1, password: dafa@123
api: {
meet: 'https://dafa-utv.tocp.arbetsformedlingen.se/prweb/api/meettest/v1',
default: 'https://dafa-utv.tocp.arbetsformedlingen.se/prweb/api/v1/data',
headers: {
Authorization: 'Basic dGVzdHVzZXIxOmRhZmFAMTIz', // user: testuser1, password: dafa@123
},
},
};

6
apps/dafa-web/src/environments/environment.prod.ts
View File

@@ -1,4 +1,8 @@
export const environment = {
production: true,
apiBase: '/api',
api: {
meet: '/api',
default: '/api',
headers: {},
},
};

7
apps/dafa-web/src/environments/environment.ts
View File

@@ -1,5 +1,8 @@
export const environment = {
production: false,
apiBase: '/api',
apiHeaders: {},
api: {
meet: '/api',
default: '/api',
headers: {},
},
};

2
apps/dafa-web/src/index.html
View File

@@ -2,7 +2,7 @@
<html lang="sv">
<head>
<meta charset="utf-8" />
<title>FA Mina Sidor</title>
<title>Mina sidor FA</title>
<base href="/" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="icon" type="image/x-icon" href="assets/favicon.png" />