Index: Farmatiko/ClientApp/src/app/app.component.ts
===================================================================
--- Farmatiko/ClientApp/src/app/app.component.ts (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ Farmatiko/ClientApp/src/app/app.component.ts (revision 822c59d84fd842899190245e947330c1ddd5ed44)
@@ -1,4 +1,3 @@
import { Component } from '@angular/core';
-import { MaterialModule } from './shared/material.module'
@Component({
Index: Farmatiko/ClientApp/src/app/app.module.ts
===================================================================
--- Farmatiko/ClientApp/src/app/app.module.ts (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ Farmatiko/ClientApp/src/app/app.module.ts (revision 822c59d84fd842899190245e947330c1ddd5ed44)
@@ -4,30 +4,10 @@
import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
import { RouterModule } from '@angular/router';
-import { MaterialModule } from './shared/material.module';
-import { ReactiveFormsModule } from '@angular/forms';
-import { LeafletModule } from '@asymmetrik/ngx-leaflet';
-import { CoreModule } from './shared/core.module';
-
-import { AuthGuard } from './shared/guards/auth.guard';
-import { DataService } from './shared/data.service';
import { AppComponent } from './app.component';
import { NavMenuComponent } from './nav-menu/nav-menu.component';
import { HomeComponent } from './home/home.component';
import { CounterComponent } from './counter/counter.component';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { KoronaComponent } from './korona/korona.component';
-import { AdminComponent } from './admin/admin.component';
-import { DashboardComponent } from './dashboard/dashboard.component';
-import { LoginComponent } from './login/login.component';
-import { MedicineDialogComponent } from './dialogs/medicine-dialog/medicine-dialog.component';
-import { PharmacyDialogComponent } from './dialogs/pharmacy-dialog/pharmacy-dialog.component';
-import { FacilityDialogComponent } from './dialogs/facility-dialog/facility-dialog.component';
-import { WorkerDialogComponent } from './dialogs/worker-dialog/worker-dialog.component';
-import { EditPharmacyDialogComponent } from './dialogs/edit-pharmacy-dialog/edit-pharmacy-dialog.component';
-import { EditPharmacyHeadDialogComponent } from './dialogs/edit-pharmacy-head-dialog/edit-pharmacy-head-dialog.component';
-import { PharmacyHeadDialogComponent } from './dialogs/pharmacy-head-dialog/pharmacy-head-dialog.component';
-import { AddMedicineDialogComponent } from './dialogs/add-medicine-dialog/add-medicine-dialog.component';
-import { ListMedicinesDialogComponent } from './dialogs/list-medicines-dialog/list-medicines-dialog.component';
+import { FetchDataComponent } from './fetch-data/fetch-data.component';
@NgModule({
@@ -37,17 +17,5 @@
HomeComponent,
CounterComponent,
- KoronaComponent,
- AdminComponent,
- DashboardComponent,
- LoginComponent,
- MedicineDialogComponent,
- PharmacyDialogComponent,
- FacilityDialogComponent,
- WorkerDialogComponent,
- EditPharmacyDialogComponent,
- EditPharmacyHeadDialogComponent,
- PharmacyHeadDialogComponent,
- AddMedicineDialogComponent,
- ListMedicinesDialogComponent
+ FetchDataComponent
],
imports: [
@@ -57,19 +25,9 @@
RouterModule.forRoot([
{ path: '', component: HomeComponent, pathMatch: 'full' },
- { path: 'mapa', component: CounterComponent },
- { path: 'koronavirus', component: KoronaComponent },
- { path: 'admin', component: AdminComponent, canActivate: [AuthGuard] },
- { path: 'dashboard', component: DashboardComponent, canActivate: [AuthGuard] },
- { path: 'login', component: LoginComponent }
- ]),
- BrowserAnimationsModule,
- MaterialModule,
- ReactiveFormsModule,
- LeafletModule,
- CoreModule
+ { path: 'counter', component: CounterComponent },
+ { path: 'fetch-data', component: FetchDataComponent },
+ ])
],
- providers: [
- DataService
- ],
+ providers: [],
bootstrap: [AppComponent]
})
Index: Farmatiko/ClientApp/src/app/app.server.module.ts
===================================================================
--- Farmatiko/ClientApp/src/app/app.server.module.ts (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ Farmatiko/ClientApp/src/app/app.server.module.ts (revision 822c59d84fd842899190245e947330c1ddd5ed44)
@@ -6,6 +6,6 @@
@NgModule({
- imports: [AppModule, ServerModule, ModuleMapLoaderModule],
- bootstrap: [AppComponent]
+ imports: [AppModule, ServerModule, ModuleMapLoaderModule],
+ bootstrap: [AppComponent]
})
export class AppServerModule { }
Index: rmatiko/ClientApp/src/app/counter/counter.component.css
===================================================================
--- Farmatiko/ClientApp/src/app/counter/counter.component.css (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,50 +1,0 @@
-.wrapper {
- display: flex;
- flex-direction: column;
- min-width: 300px;
-}
-
-.mat-table {
- overflow: auto;
- max-height: 500px;
-}
-
-.header {
- padding: 8px 24px 0;
-}
-
-.mat-form-field {
- font-size: 14px;
- width: 100%;
-}
-
-table {
- width: 100%;
-}
-
-h2 {
- padding: 1em 0;
-}
-.tableRow:hover {
- background-color: #D4F2CD;
- transform: scale(1.0005);
-}
-
-h2 button {
- float: right;
- padding: 0 5em;
-}
-
-#map {
- height: 100%;
-}
-
-.map-frame {
- border: 2px solid black;
- height: 100%;
-}
-
-.map-wrapper {
- margin: 0 3em 3em 3em;
- min-height: 400px;
-}
Index: Farmatiko/ClientApp/src/app/counter/counter.component.html
===================================================================
--- Farmatiko/ClientApp/src/app/counter/counter.component.html (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ Farmatiko/ClientApp/src/app/counter/counter.component.html (revision 822c59d84fd842899190245e947330c1ddd5ed44)
@@ -1,68 +1,7 @@
+
Counter
-
+
This is a simple example of an Angular component.
-
-
-
-
-
-
-
- Име
- Општина
- Тип
-
-
-
-
- {{ facility.name }}
- {{ facility.municipality }}
- {{ facility.type }}
-
-
-
-
-
-
-
-
-
-
- Име
- Гранка
-
-
-
-
- {{ worker.name }}
- {{ worker.branch }}
-
-
-
-
-
+
Increment
Index: Farmatiko/ClientApp/src/app/counter/counter.component.spec.ts
===================================================================
--- Farmatiko/ClientApp/src/app/counter/counter.component.spec.ts (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ Farmatiko/ClientApp/src/app/counter/counter.component.spec.ts (revision 822c59d84fd842899190245e947330c1ddd5ed44)
@@ -9,7 +9,7 @@
beforeEach(async(() => {
TestBed.configureTestingModule({
- declarations: [CounterComponent]
+ declarations: [ CounterComponent ]
})
- .compileComponents();
+ .compileComponents();
}));
Index: Farmatiko/ClientApp/src/app/counter/counter.component.ts
===================================================================
--- Farmatiko/ClientApp/src/app/counter/counter.component.ts (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ Farmatiko/ClientApp/src/app/counter/counter.component.ts (revision 822c59d84fd842899190245e947330c1ddd5ed44)
@@ -1,166 +1,13 @@
-import { Component, OnInit } from '@angular/core';
-import { IHealthFacilities, IHealthcareWorkers } from '../shared/interfaces';
-import { DataService } from '../shared/data.service';
-import { MatDialog } from '@angular/material/dialog';
-import { FacilityDialogComponent } from '../dialogs/facility-dialog/facility-dialog.component';
-import { WorkerDialogComponent } from '../dialogs/worker-dialog/worker-dialog.component';
-import { latLng, LatLng, tileLayer, marker, icon } from 'leaflet';
-import { HttpClient } from '@angular/common/http';
+import { Component } from '@angular/core';
@Component({
selector: 'app-counter-component',
- templateUrl: './counter.component.html',
- styleUrls: ['./counter.component.css']
+ templateUrl: './counter.component.html'
})
-export class CounterComponent implements OnInit {
- public facilities: IHealthFacilities[] = [];
- public workers: IHealthcareWorkers[] = [];
- public filteredFacilities: IHealthFacilities[] = [];
- public filteredWorkers: IHealthcareWorkers[] = [];
- public lat;
- public lng;
- clicked = false;
- showMap: boolean = false;
- options = {
- layers: [
- tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { attribution: '©
OpenStreetMap contributors' })
- ],
- zoom: 8,
- center: latLng(41.61807, 21.74348)
+export class CounterComponent {
+ public currentCount = 0;
+
+ public incrementCounter() {
+ this.currentCount++;
}
-
- constructor(private dataService: DataService, private dialog: MatDialog, private http: HttpClient) {
-
- }
-
- ngOnInit(): void {
- this.dataService.getFacilities()
- .subscribe((facility: IHealthFacilities[]) => {
- this.facilities = this.filteredFacilities = facility;
- },
- (err: any) => console.log(err),
- () => {
- this.appendFacilityMarkers(this.facilities)
- console.log('Facility data retrieved!');
- });
-
- this.dataService.getWorkers()
- .subscribe((worker: IHealthcareWorkers[]) => {
- this.workers = this.filteredWorkers = worker;
- },
- (err: any) => console.log(err),
- () => console.log('Facility data retrieved!'));
-
- if (navigator.geolocation) {
- navigator.geolocation.getCurrentPosition((position) => {
- if (position) {
- this.lat = position.coords.latitude;
- this.lng = position.coords.longitude;
- let layer = marker([ this.lat, this.lng ], {
- icon: icon({
- iconSize: [ 25, 41 ],
- iconAnchor: [ 13, 41 ],
- iconUrl: 'assets/home-icon.png'
- })
- }).bindPopup("Вашата локација");
- this.options.layers.push(layer);
- }
- });
- }
- }
-
- appendFacilityMarkers(facils: IHealthFacilities[]) {
- this.options.layers = [];
- this.options.layers.push(tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { attribution: '©
OpenStreetMap contributors'}));
- if(this.lat && this.lng) {
- this.options.layers.push(marker([ this.lat, this.lng ], {
- icon: icon({
- iconSize: [ 25, 41 ],
- iconAnchor: [ 13, 41 ],
- iconUrl: 'assets/home-icon.png'
- })
- }).bindPopup("Вашата локација"));
- }
- facils.forEach((facil) => {
- this.http.get
('https://jankuloski.xyz:8080/https://nominatim.openstreetmap.org/search/?country=Macedonia&city='+facil.municipality+'&street='+facil.address+'&format=json').subscribe(obj => {
- console.log(obj);
- if(obj.length) {
- let layer = marker([ obj[0]?.lat, obj[0]?.lon ], {
- icon: icon({
- iconSize: [ 25, 41 ],
- iconAnchor: [ 13, 41 ],
- iconUrl: 'assets/hospital-icon.png'
- })
- }).bindPopup(facil.name);
- this.options.layers.push(layer);
- }
- }, error => console.error(error));
- });
- }
-
- applyFilterFacilities(filterValue: string) {
- console.log("applyFilterFacilities works!")
- if(filterValue) {
- this.dataService.searchFacilities(filterValue)
- .subscribe((facility: IHealthFacilities[]) => {
- this.filteredFacilities = facility;
- },
- (err: any) => console.log(err),
- () => {
- this.appendFacilityMarkers(this.filteredFacilities);
- if(this.showMap) {
- this.showMap = false;
- setTimeout(() => this.showMap = true, 300);
- }
- console.log('Facility data retrieved!');
- });
- }
- else {
- this.filteredFacilities = this.facilities;
- this.appendFacilityMarkers(this.facilities);
- if(this.showMap) {
- this.showMap = false;
- setTimeout(() => this.showMap = true, 300);
- }
- }
- }
-
- applyFilterWorkers(filterValue: string) {
- console.log("applyFilterWorkers works!")
- if(filterValue) {
- this.dataService.searchWorkers(filterValue)
- .subscribe((worker: IHealthcareWorkers[]) => {
- this.filteredWorkers = worker;
- },
- (err: any) => console.log(err),
- () => console.log('Worker data retrieved!'));
- }
- else {
- this.filteredWorkers = this.workers;
- }
- }
-
- openFacilityDialog(facility: IHealthFacilities): void {
- this.dialog.open(FacilityDialogComponent, {
- width: '450px',
- data: facility
- });
- }
-
- openWorkerDialog(worker: IHealthcareWorkers): void {
- this.dialog.open(WorkerDialogComponent, {
- width: '450px',
- data: worker
- });
- }
-
- toggleMap() {
- this.showMap = !this.showMap;
- }
-
- refreshMap() {
- this.showMap = false;
- setTimeout(() => this.showMap = true, 300);
- }
-
}
Index: rmatiko/ClientApp/src/app/dashboard/dashboard.component.css
===================================================================
--- Farmatiko/ClientApp/src/app/dashboard/dashboard.component.css (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,41 +1,0 @@
-a.navbar-brand img {
- width: 200px;
-}
-.wrapper {
- display: flex;
- flex-direction: column;
- max-height: 500px;
- min-width: 300px;
-}
-
-.mat-table {
- overflow: auto;
- max-height: 500px;
-}
-
-.header {
- padding: 8px 24px 0;
-}
-
-.mat-form-field {
- font-size: 14px;
- width: 100%;
-}
-
-table {
- width: 100%;
-}
-
-h2 {
- padding: 1em 0;
-}
-
-.btns {
- display: flex;
- flex-direction: row;
- justify-content: flex-start;
-}
-
-.btns button {
- margin: 0.5em 0.5em 0.5em 0;
-}
Index: rmatiko/ClientApp/src/app/dashboard/dashboard.component.html
===================================================================
--- Farmatiko/ClientApp/src/app/dashboard/dashboard.component.html (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,138 +1,0 @@
-
-
-
-
-
-
-
-
- Logged as {{head.Name}}
-
-
-
-
more_vert
-
- directions Почетнаexit_to_app Одјави се
-
-
-
-
-
-
-
-
-
-
- Име
- Локација
- Адреса
- Работи 24/7
- Actions
-
-
-
-
- {{pharmacies.name}}
- {{pharmacies.location}}
- {{pharmacies.address}}
- {{pharmacies.workAllTime}}
- Edit
-
-
-
-
-
-
-
-
-
- Име
- Локација
- Адреса
- Работи 27/7?
-
-
-
-
- {{ pharmacy.name }}
- {{ pharmacy.location }}
- {{ pharmacy.address }}
- {{ pharmacy.workAllTime }}
- Claim Already claimed
-
-
-
-
-
-
Index: rmatiko/ClientApp/src/app/dashboard/dashboard.component.spec.ts
===================================================================
--- Farmatiko/ClientApp/src/app/dashboard/dashboard.component.spec.ts (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,25 +1,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { DashboardComponent } from './dashboard.component';
-
-describe('DashboardComponent', () => {
- let component: DashboardComponent;
- let fixture: ComponentFixture;
-
- beforeEach(async(() => {
- TestBed.configureTestingModule({
- declarations: [ DashboardComponent ]
- })
- .compileComponents();
- }));
-
- beforeEach(() => {
- fixture = TestBed.createComponent(DashboardComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
Index: rmatiko/ClientApp/src/app/dashboard/dashboard.component.ts
===================================================================
--- Farmatiko/ClientApp/src/app/dashboard/dashboard.component.ts (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,226 +1,0 @@
-import { Component, OnInit} from '@angular/core';
-import { MatDialog } from '@angular/material/dialog';
-import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material/snack-bar';
-import { IPharmacy, IMedicine, IPharmacyHead, IPharmacyHeadRequest } from '../shared/interfaces';
-import { DataService } from '../shared/data.service';
-import { PharmacyDialogComponent } from '../dialogs/pharmacy-dialog/pharmacy-dialog.component';
-import { EditPharmacyDialogComponent } from '../dialogs/edit-pharmacy-dialog/edit-pharmacy-dialog.component';
-import { MedicineDialogComponent } from '../dialogs/medicine-dialog/medicine-dialog.component';
-import { ActivatedRoute, Router } from '@angular/router';
-import { AuthService } from '../shared/services/auth.service';
-import { AddMedicineDialogComponent } from '../dialogs/add-medicine-dialog/add-medicine-dialog.component';
-import { ListMedicinesDialogComponent } from '../dialogs/list-medicines-dialog/list-medicines-dialog.component';
-
-@Component({
- selector: 'app-dashboard',
- templateUrl: './dashboard.component.html',
- styleUrls: ['./dashboard.component.css']
-})
-export class DashboardComponent implements OnInit {
- public pharmacies: IPharmacy[] = [];
- public head: IPharmacyHead;
- public filteredPharmacies: IPharmacy[] = [];
- public filteredMedicines: IMedicine[] = [];
- public request: IPharmacyHeadRequest;
- editedMedicine: boolean = false;
- medicinesEditMode: boolean = false;
-
- constructor(private dataService: DataService, private authService: AuthService, private dialog: MatDialog, private snackBar: MatSnackBar, private router: Router, private route: ActivatedRoute) {
-
- }
-
- ngOnInit(): void {
- this.authService.getUser()
- .subscribe((data) => {
- console.log(data);
- this.head = data;
- },
- (err: any) => console.log(err),
- () => console.log('User data retrieved'));
- this.dataService.getPharmacies()
- .subscribe((pharmacy: IPharmacy[]) => {
- this.pharmacies = this.filteredPharmacies = pharmacy;
- // Iskluceno filtriranje na farmacies (Star metod)
- // this.head.Pharmacy.forEach((pharma) => {
- // this.filteredPharmacies = this.pharmacies = this.pharmacies.filter(x => x == pharma);
- // });
- },
- (err: any) => console.log(err),
- () => console.log('Pharmacy data retrieved'));
- this.filteredMedicines = this.head.PharmacyMedicines;
- }
-
- claimPharmacy(pharmacy: IPharmacy) {
- if(this.head.Pharmacy != null) {
- if(pharmacy && !this.head.Pharmacy.find(x => x === pharmacy)) {
- this.request = {};
- this.request.Pharmacy = pharmacy;
- this.request.PharmacyHead = this.head;
- this.dataService.claimPharmacy(this.request)
- .subscribe((req) => {
- if(req) {
- this.openSnackBar("Request sent!", "OK");
- }
- },
- (err: any) => console.log(err),
- () => console.log('Claiming request sent!'));
- }
- }
- else {
- if(pharmacy) {
- this.request = {};
- this.request.Pharmacy = pharmacy;
- this.request.PharmacyHead = this.head;
- this.dataService.claimPharmacy(this.request)
- .subscribe((req) => {
- if(req) {
- this.openSnackBar("Request sent!", "OK");
- }
- },
- (err: any) => console.log(err),
- () => console.log('Claiming request sent!'));
- }
- }
- }
-
- deleteMedicine(medicine: IMedicine){
- this.head.PharmacyMedicines = this.head.PharmacyMedicines.filter(x => x !== medicine);
- this.filteredMedicines = this.head.PharmacyMedicines;
- this.editedMedicine = true;
- }
-
- saveDeletedMedicines() {
- this.dataService.updatePharmacyHead(this.head)
- .subscribe(() => {
- this.openSnackBar("Success!", "OK");
- this.editedMedicine = false;
- },
- (err: any) => {
- console.log(err);
- this.openSnackBar("Failed!", "Try again");
- },
- () => console.log('Update sent!'));
- }
-
- applyFilterMedicines(filterValue: string) {
- console.log("applyFilterMedicines works!")
- if(filterValue) {
- this.filteredMedicines = this.filteredMedicines.filter(x => x.name.toLocaleLowerCase().includes(filterValue.toLocaleLowerCase()));
- }
- else {
- this.filteredMedicines = this.head.PharmacyMedicines;
- }
- }
-
- addMedicine() {
- let dialogRef = this.dialog.open(AddMedicineDialogComponent, {
- width: 'auto'
- });
- dialogRef.afterClosed().subscribe((newMedicine: IMedicine) => {
- if(newMedicine){
- this.head.PharmacyMedicines.push(newMedicine);
- this.filteredMedicines = this.head.PharmacyMedicines;
- if(this.editedMedicine == false) {
- this.editedMedicine = true;
- }
- this.openSnackBar("Success!", "OK");
- }
- }, () => this.openSnackBar("Failed! Please try again", "OK"));
- }
-
- addMedicinesFromList() {
- let dialogRef = this.dialog.open(ListMedicinesDialogComponent, {
- width: 'auto',
- height: 'auto'
- });
- dialogRef.afterClosed().subscribe((listMedicines: IMedicine[]) => {
- if(listMedicines){
- listMedicines.forEach((medicine) => {
- if(this.head.PharmacyMedicines) {
- this.head.PharmacyMedicines = this.head.PharmacyMedicines.filter(x => x != medicine);
- }
- else {
- this.head.PharmacyMedicines = [];
- }
- this.head.PharmacyMedicines.push(medicine);
- this.filteredMedicines = this.head.PharmacyMedicines;
- });
- if(this.editedMedicine == false) {
- this.editedMedicine = true;
- }
- this.openSnackBar("Success!", "OK");
- }
- }, () => this.openSnackBar("Failed! Please try again", "OK"));
- }
-
- switchEditMedicineMode() {
- this.medicinesEditMode = !this.medicinesEditMode;
- if(this.editedMedicine == false) {
- this.editedMedicine = true;
- }
- }
-
- applyFilterPharmacies(filterValue: string) {
- console.log("applyFilterPharmacies works!")
- if(filterValue) {
- this.dataService.searchPharmacies(filterValue)
- .subscribe((pharmacy: IPharmacy[]) => {
- this.filteredPharmacies = pharmacy;
- // this.head.Pharmacy.forEach((pharma) => {
- // this.filteredPharmacies = this.filteredPharmacies.filter(x => x == pharma);
- // });
- },
- (err: any) => console.log(err),
- () => console.log('Pharmacy data retrieved'));
- }
- else {
- this.filteredPharmacies = this.pharmacies;
- }
- }
-
- logout() {
- this.authService.logout();
- }
-
- openPharmacyDialog(pharmacy: IPharmacy): void {
- this.dialog.open(PharmacyDialogComponent, {
- width: '450px',
- data: pharmacy
- });
- }
-
- openEditPharmacyDialog(pharmacy: IPharmacy): void {
- console.log(pharmacy);
- let dialogRef = this.dialog.open(EditPharmacyDialogComponent, {
- width: '450px',
- data: pharmacy
- });
- dialogRef.afterClosed().subscribe((editedPharmacy: IPharmacy) => {
- if(editedPharmacy) {
- this.head.Pharmacy = this.head.Pharmacy.filter(x => x !== pharmacy);
- this.head.Pharmacy.push(editedPharmacy);
- this.dataService.updatePharmacyHead(this.head)
- .subscribe((hd) => {
- this.openSnackBar("Success!", "OK").onAction().subscribe(() => {
- window.location.reload();
- });
- },
- (err: any) => console.log(err),
- () => console.log('PharmacyHead data updated'));
- };
- });
- }
-
- openMedicineDialog(medicine: IMedicine): void {
- this.dialog.open(MedicineDialogComponent, {
- width: '450px',
- data: medicine
- });
- }
-
- openSnackBar(message: string, action: string) : MatSnackBarRef {
- return this.snackBar.open(message, action, {
- duration: 5000,
- });
- }
-}
Index: rmatiko/ClientApp/src/app/dialogs/add-medicine-dialog/add-medicine-dialog.component.css
===================================================================
--- Farmatiko/ClientApp/src/app/dialogs/add-medicine-dialog/add-medicine-dialog.component.css (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,6 +1,0 @@
-.wrapper {
- display: block;
- text-align: center;
- align-items: center;
- justify-content: center;
-}
Index: rmatiko/ClientApp/src/app/dialogs/add-medicine-dialog/add-medicine-dialog.component.html
===================================================================
--- Farmatiko/ClientApp/src/app/dialogs/add-medicine-dialog/add-medicine-dialog.component.html (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,34 +1,0 @@
-
-
-
Index: rmatiko/ClientApp/src/app/dialogs/add-medicine-dialog/add-medicine-dialog.component.ts
===================================================================
--- Farmatiko/ClientApp/src/app/dialogs/add-medicine-dialog/add-medicine-dialog.component.ts (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,42 +1,0 @@
-import { Component, OnInit } from '@angular/core';
-import { MatDialogRef } from '@angular/material/dialog';
-import { IMedicine } from '../../shared';
-import { FormGroup, Validators, FormBuilder } from '@angular/forms';
-
-@Component({
- selector: 'app-add-medicine-dialog',
- templateUrl: './add-medicine-dialog.component.html',
- styleUrls: ['./add-medicine-dialog.component.css']
-})
-export class AddMedicineDialogComponent implements OnInit {
- medicine: IMedicine;
- forma: FormGroup;
-
- constructor(private dialogRef: MatDialogRef, private formBuilder: FormBuilder) {
-
- }
-
- ngOnInit(): void {
- this.forma = this.formBuilder.group({
- name: ['', [Validators.required]],
- strength: ['', [Validators.required]],
- form: ['', [Validators.required]],
- wayOfIssuing: ['', [Validators.required]],
- manufacturer: ['', [Validators.required]],
- price: ['', [Validators.required, Validators.min(0)]],
- packaging: ['', [Validators.required]]
- });
- }
-
- save() {
- this.medicine = this.forma.value;
- console.log(this.forma.value);
- console.log(this.medicine);
- this.forma.reset();
- this.dialogRef.close(this.medicine);
- }
-
- close() {
- this.dialogRef.close();
- }
-}
Index: rmatiko/ClientApp/src/app/dialogs/edit-pharmacy-dialog/edit-pharmacy-dialog.component.html
===================================================================
--- Farmatiko/ClientApp/src/app/dialogs/edit-pharmacy-dialog/edit-pharmacy-dialog.component.html (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,31 +1,0 @@
-
-
Index: rmatiko/ClientApp/src/app/dialogs/edit-pharmacy-dialog/edit-pharmacy-dialog.component.ts
===================================================================
--- Farmatiko/ClientApp/src/app/dialogs/edit-pharmacy-dialog/edit-pharmacy-dialog.component.ts (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,29 +1,0 @@
-import { Component, OnInit, Inject } from '@angular/core';
-import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { IPharmacy } from '../../shared/interfaces';
-
-@Component({
- selector: 'app-edit-pharmacy-dialog',
- templateUrl: './edit-pharmacy-dialog.component.html',
- styleUrls: ['./edit-pharmacy-dialog.component.css']
-})
-export class EditPharmacyDialogComponent implements OnInit {
- pharmacy: IPharmacy;
-
- constructor(private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) data) {
- this.pharmacy = data;
- }
-
- ngOnInit(): void {
- }
-
- save() {
- console.log(this.pharmacy);
- this.dialogRef.close(this.pharmacy);
- }
-
- close() {
- this.dialogRef.close();
- }
-
-}
Index: rmatiko/ClientApp/src/app/dialogs/edit-pharmacy-head-dialog/edit-pharmacy-head-dialog.component.html
===================================================================
--- Farmatiko/ClientApp/src/app/dialogs/edit-pharmacy-head-dialog/edit-pharmacy-head-dialog.component.html (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,28 +1,0 @@
-
-
Index: rmatiko/ClientApp/src/app/dialogs/edit-pharmacy-head-dialog/edit-pharmacy-head-dialog.component.ts
===================================================================
--- Farmatiko/ClientApp/src/app/dialogs/edit-pharmacy-head-dialog/edit-pharmacy-head-dialog.component.ts (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,28 +1,0 @@
-import { Component, OnInit, Inject } from '@angular/core';
-import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { IPharmacyHead } from '../../shared/interfaces';
-
-@Component({
- selector: 'app-edit-pharmacy-head-dialog',
- templateUrl: './edit-pharmacy-head-dialog.component.html',
- styleUrls: ['./edit-pharmacy-head-dialog.component.css']
-})
-export class EditPharmacyHeadDialogComponent implements OnInit {
- head: IPharmacyHead;
-
- constructor(private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) data) {
- this.head = data;
- }
-
- ngOnInit(): void {
- }
-
- save() {
- this.dialogRef.close(this.head);
- }
-
- close() {
- this.dialogRef.close();
- }
-
-}
Index: rmatiko/ClientApp/src/app/dialogs/facility-dialog/facility-dialog.component.css
===================================================================
--- Farmatiko/ClientApp/src/app/dialogs/facility-dialog/facility-dialog.component.css (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,3 +1,0 @@
-button {
- float: right;
-}
Index: rmatiko/ClientApp/src/app/dialogs/facility-dialog/facility-dialog.component.html
===================================================================
--- Farmatiko/ClientApp/src/app/dialogs/facility-dialog/facility-dialog.component.html (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,33 +1,0 @@
-Повеќе информации
-
-
-
- Име
- {{facility?.name}}
-
-
- Општина
- {{facility?.municipality}}
-
-
- Тип на установа
- {{facility?.type}}
-
-
- Адреса
- {{facility?.address}}
-
-
- Е-пошта
- {{facility?.email}}
-
-
- Телефон
- {{facility?.phone}}
-
-
-
-
-
-Затвори
Index: rmatiko/ClientApp/src/app/dialogs/facility-dialog/facility-dialog.component.ts
===================================================================
--- Farmatiko/ClientApp/src/app/dialogs/facility-dialog/facility-dialog.component.ts (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,59 +1,0 @@
-import { Component, OnInit, Inject } from '@angular/core';
-import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { IHealthFacilities } from '../../shared/interfaces';
-import { latLng, LatLng, tileLayer, marker, icon } from 'leaflet';
-import { HttpClient } from '@angular/common/http';
-
-@Component({
- selector: 'app-facility-dialog',
- templateUrl: './facility-dialog.component.html',
- styleUrls: ['./facility-dialog.component.css']
-})
-export class FacilityDialogComponent implements OnInit {
- facility: IHealthFacilities;
- mapShown: boolean = true;
- options = {
- layers: [
- tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { attribution: '© OpenStreetMap contributors' })
- ],
- zoom: 7,
- center: latLng(41.61807, 21.74348)
- }
-
- constructor(private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) data, private http: HttpClient) {
- this.facility = data;
- if(this.facility) {
- this.addMarkers();
- }
- }
-
- ngOnInit(): void {
- }
-
- addMarkers() {
- this.http.get('https://jankuloski.xyz:8080/https://nominatim.openstreetmap.org/search/?country=Macedonia&city='+this.facility?.municipality+'&street='+this.facility?.address+'&format=json').subscribe(obj => {
- console.log(obj);
- if(obj.length) {
- let layer = marker([ obj[0]?.lat, obj[0]?.lon ], {
- icon: icon({
- iconSize: [ 25, 41 ],
- iconAnchor: [ 13, 41 ],
- iconUrl: 'assets/hospital-icon.png'
- })
- }).bindPopup(this.facility?.name);
- this.options.layers.push(layer);
- this.options.center = latLng(obj[0]?.lat, obj[0]?.lon);
- this.options.zoom = 13;
- }
- }, error => console.error(error),
- () => {
- this.mapShown = false;
- setTimeout(() => this.mapShown = true, 300);
- });
- }
-
- close() {
- this.dialogRef.close();
- }
-
-}
Index: rmatiko/ClientApp/src/app/dialogs/list-medicines-dialog/list-medicines-dialog.component.css
===================================================================
--- Farmatiko/ClientApp/src/app/dialogs/list-medicines-dialog/list-medicines-dialog.component.css (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,3 +1,0 @@
-mat-form-field {
- width: 100%;
-}
Index: rmatiko/ClientApp/src/app/dialogs/list-medicines-dialog/list-medicines-dialog.component.html
===================================================================
--- Farmatiko/ClientApp/src/app/dialogs/list-medicines-dialog/list-medicines-dialog.component.html (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,36 +1,0 @@
-
-
-
-
-
- Име
- Јачина
- Форма
- Начин на издавање
- Производител
- Цена
- Пакување
- Додај
-
-
-
-
- {{ medicine.name }}
- {{ medicine.strength }}
- {{ medicine.form }}
- {{ medicine.wayOfIssuing }}
- {{ medicine.manufacturer }}
- {{ medicine.price }}
- {{ medicine.packaging }}
-
-
-
-
Cancel
-Додај ги лековите
Index: rmatiko/ClientApp/src/app/dialogs/list-medicines-dialog/list-medicines-dialog.component.ts
===================================================================
--- Farmatiko/ClientApp/src/app/dialogs/list-medicines-dialog/list-medicines-dialog.component.ts (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,58 +1,0 @@
-import { Component, OnInit } from '@angular/core';
-import { MatDialogRef } from '@angular/material/dialog';
-import { IMedicine } from '../../shared';
-import { DataService } from '../../shared/data.service';
-
-@Component({
- selector: 'app-list-medicines-dialog-component',
- templateUrl: './list-medicines-dialog.component.html',
- styleUrls: ['./list-medicines-dialog.component.css']
-})
-export class ListMedicinesDialogComponent implements OnInit {
- medicines: IMedicine[] = [];
- listMedicines: IMedicine[];
- filteredListMedicines: IMedicine[];
-
- constructor(private dialogRef: MatDialogRef, private dataService: DataService) {
- }
-
- ngOnInit(): void {
- this.dataService.getMedicines()
- .subscribe((medicine: IMedicine[]) => {
- this.listMedicines = this.filteredListMedicines = medicine;
- },
- (err: any) => console.log(err),
- () => console.log('Medicine data retrieved'));
- }
-
- selectMedicine(selectedMedicine: IMedicine) {
- if(this.medicines.filter(x => x == selectedMedicine)) {
- this.medicines = this.medicines.filter(x => x != selectedMedicine);
- }
- this.medicines.push(selectedMedicine);
- }
-
- save() {
- console.log(this.medicines);
- this.dialogRef.close(this.medicines);
- }
-
- close() {
- this.dialogRef.close();
- }
-
- applyFilterMedicines(filterValue: string) {
- if(filterValue) {
- this.dataService.searchMedicines(filterValue)
- .subscribe((medicine: IMedicine[]) => {
- this.filteredListMedicines = medicine;
- },
- (err: any) => console.log(err),
- () => console.log('Medicine data retrieved'));
- }
- else {
- this.filteredListMedicines = this.listMedicines;
- }
- }
-
-}
Index: rmatiko/ClientApp/src/app/dialogs/medicine-dialog/medicine-dialog.component.css
===================================================================
--- Farmatiko/ClientApp/src/app/dialogs/medicine-dialog/medicine-dialog.component.css (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,3 +1,0 @@
-button {
- float: right;
-}
Index: rmatiko/ClientApp/src/app/dialogs/medicine-dialog/medicine-dialog.component.html
===================================================================
--- Farmatiko/ClientApp/src/app/dialogs/medicine-dialog/medicine-dialog.component.html (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,44 +1,0 @@
-Повеќе информации
-
-
-
- Име
- {{medicine?.name}}
-
-
- Форма
- {{medicine?.form}}
-
-
- Пакување
- {{medicine?.packaging}}
-
-
- Цена
- {{medicine?.price}}
-
-
- Јачина
- {{medicine?.strength}}
-
-
- Начин на издавање
- {{medicine?.wayOfIssuing}}
-
-
- Производител
- {{medicine?.manufacturer}}
-
-
-
-
-
Достапен во аптеките на:
-
-
Затвори
Index: rmatiko/ClientApp/src/app/dialogs/medicine-dialog/medicine-dialog.component.ts
===================================================================
--- Farmatiko/ClientApp/src/app/dialogs/medicine-dialog/medicine-dialog.component.ts (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,24 +1,0 @@
-import { Component, OnInit, Inject } from '@angular/core';
-import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { IMedicine } from '../../shared/interfaces';
-
-@Component({
- selector: 'app-medicine-dialog',
- templateUrl: './medicine-dialog.component.html',
- styleUrls: ['./medicine-dialog.component.css']
-})
-export class MedicineDialogComponent implements OnInit {
- medicine: IMedicine;
-
- constructor(private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) data) {
- this.medicine = data;
- }
-
- ngOnInit(): void {
- }
-
- close() {
- this.dialogRef.close();
- }
-
-}
Index: rmatiko/ClientApp/src/app/dialogs/pharmacy-dialog/pharmacy-dialog.component.css
===================================================================
--- Farmatiko/ClientApp/src/app/dialogs/pharmacy-dialog/pharmacy-dialog.component.css (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,7 +1,0 @@
-button {
- float: right;
-}
-
-div {
- white-space: nowrap;
-}
Index: rmatiko/ClientApp/src/app/dialogs/pharmacy-dialog/pharmacy-dialog.component.html
===================================================================
--- Farmatiko/ClientApp/src/app/dialogs/pharmacy-dialog/pharmacy-dialog.component.html (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,29 +1,0 @@
-Повеќе информации
-
-
-
- Име
- {{pharmacy?.name}}
-
-
- Општина
- {{pharmacy?.location}}
-
-
- Адреса
- {{pharmacy?.address}}
-
-
- Работи 24/7
- Да
Не
-
- Компанија
- {{pharmacy?.headName}}
-
-
-
-
-
-Затвори
Index: rmatiko/ClientApp/src/app/dialogs/pharmacy-dialog/pharmacy-dialog.component.ts
===================================================================
--- Farmatiko/ClientApp/src/app/dialogs/pharmacy-dialog/pharmacy-dialog.component.ts (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,60 +1,0 @@
-import { Component, OnInit, Inject, AfterViewInit } from '@angular/core';
-import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { IPharmacy } from '../../shared/interfaces';
-import { latLng, LatLng, tileLayer, marker, icon } from 'leaflet';
-import { HttpClient } from '@angular/common/http';
-
-@Component({
- selector: 'app-pharmacy-dialog',
- templateUrl: './pharmacy-dialog.component.html',
- styleUrls: ['./pharmacy-dialog.component.css']
-})
-export class PharmacyDialogComponent implements OnInit {
- pharmacy: IPharmacy;
- mapShown: boolean = true;
- options = {
- layers: [
- tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { attribution: '© OpenStreetMap contributors' })
- ],
- zoom: 7,
- center: latLng(41.61807, 21.74348)
- }
-
- constructor(private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) data, private http: HttpClient) {
- this.pharmacy = data;
- if(this.pharmacy) {
- this.addMarkers();
- }
- }
-
- ngOnInit(): void {
- }
-
- addMarkers() {
- this.http.get('https://jankuloski.xyz:8080/https://nominatim.openstreetmap.org/search/?country=Macedonia&city='+this.pharmacy?.location+'&street='+this.pharmacy?.address+'&format=json').subscribe(obj => {
- console.log(obj);
- if(obj.length) {
- let layer = marker([ obj[0]?.lat, obj[0]?.lon ], {
- icon: icon({
- iconSize: [ 25, 41 ],
- iconAnchor: [ 13, 41 ],
- iconUrl: 'assets/pharmacy-icon.png'
- })
- }).bindPopup("Аптека: "+this.pharmacy?.name);
- this.options.layers.push(layer);
- this.options.center = latLng(obj[0]?.lat, obj[0]?.lon);
- this.options.zoom = 13;
- }
- }, error => console.error(error),
- () => {
- this.mapShown = false;
- setTimeout(() => this.mapShown = true, 200);
- });
- }
-
- close() {
- this.dialogRef.close();
- }
-
-
-}
Index: rmatiko/ClientApp/src/app/dialogs/pharmacy-head-dialog/pharmacy-head-dialog.component.html
===================================================================
--- Farmatiko/ClientApp/src/app/dialogs/pharmacy-head-dialog/pharmacy-head-dialog.component.html (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,1 +1,0 @@
-pharmacy-head-dialog works!
Index: rmatiko/ClientApp/src/app/dialogs/pharmacy-head-dialog/pharmacy-head-dialog.component.ts
===================================================================
--- Farmatiko/ClientApp/src/app/dialogs/pharmacy-head-dialog/pharmacy-head-dialog.component.ts (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,15 +1,0 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
- selector: 'app-pharmacy-head-dialog',
- templateUrl: './pharmacy-head-dialog.component.html',
- styleUrls: ['./pharmacy-head-dialog.component.css']
-})
-export class PharmacyHeadDialogComponent implements OnInit {
-
- constructor() { }
-
- ngOnInit(): void {
- }
-
-}
Index: rmatiko/ClientApp/src/app/dialogs/worker-dialog/worker-dialog.component.css
===================================================================
--- Farmatiko/ClientApp/src/app/dialogs/worker-dialog/worker-dialog.component.css (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,3 +1,0 @@
-button {
- float: right;
-}
Index: rmatiko/ClientApp/src/app/dialogs/worker-dialog/worker-dialog.component.html
===================================================================
--- Farmatiko/ClientApp/src/app/dialogs/worker-dialog/worker-dialog.component.html (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,78 +1,0 @@
-Повеќе информации
-
-
-
- Име
- {{worker?.name}}
-
-
- Гранка
- {{worker?.branch}}
-
-
- Титула
- {{worker?.title}}
-
-
-
-
- Институција
- {{worker?.facility?.name}}
-
-
- Општина
- {{worker?.facility?.municipality}}
-
-
- Тип
- {{worker?.facility?.type}}
-
-
- Адреса
- {{worker.facility?.address}}
-
-
- Е-пошта
- {{worker.facility?.email}}
-
-
- Телефон
- {{worker.facility?.phone}}
-
-
-
-
- Институција
- Нема податок
-
-
- Општина
- Нема податок
-
-
- Тип
- Нема податок
-
-
- Адреса
- Нема податок
-
-
- Е-пошта
- Нема податок
-
-
- Телефон
- Нема податок
-
-
-
-
- expand_more
-
-
- expand_less
-
-Затвори
Index: rmatiko/ClientApp/src/app/dialogs/worker-dialog/worker-dialog.component.ts
===================================================================
--- Farmatiko/ClientApp/src/app/dialogs/worker-dialog/worker-dialog.component.ts (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,29 +1,0 @@
-import { Component, OnInit, Inject } from '@angular/core';
-import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { IHealthcareWorkers } from '../../shared/interfaces';
-
-@Component({
- selector: 'app-worker-dialog',
- templateUrl: './worker-dialog.component.html',
- styleUrls: ['./worker-dialog.component.css']
-})
-export class WorkerDialogComponent implements OnInit {
- worker: IHealthcareWorkers;
- isExpanded: boolean = false;
-
- constructor(private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) data) {
- this.worker = data;
- }
-
- ngOnInit(): void {
- }
-
- close() {
- this.dialogRef.close();
- }
-
- toggleExpansion() {
- this.isExpanded = !this.isExpanded;
- }
-
-}
Index: Farmatiko/ClientApp/src/app/fetch-data/fetch-data.component.html
===================================================================
--- Farmatiko/ClientApp/src/app/fetch-data/fetch-data.component.html (revision 822c59d84fd842899190245e947330c1ddd5ed44)
+++ Farmatiko/ClientApp/src/app/fetch-data/fetch-data.component.html (revision 822c59d84fd842899190245e947330c1ddd5ed44)
@@ -0,0 +1,24 @@
+Weather forecast
+
+This component demonstrates fetching data from the server.
+
+Loading...
+
+
+
+
+ Date
+ Temp. (C)
+ Temp. (F)
+ Summary
+
+
+
+
+ {{ forecast.date }}
+ {{ forecast.temperatureC }}
+ {{ forecast.temperatureF }}
+ {{ forecast.summary }}
+
+
+
Index: Farmatiko/ClientApp/src/app/fetch-data/fetch-data.component.ts
===================================================================
--- Farmatiko/ClientApp/src/app/fetch-data/fetch-data.component.ts (revision 822c59d84fd842899190245e947330c1ddd5ed44)
+++ Farmatiko/ClientApp/src/app/fetch-data/fetch-data.component.ts (revision 822c59d84fd842899190245e947330c1ddd5ed44)
@@ -0,0 +1,23 @@
+import { Component, Inject } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+
+@Component({
+ selector: 'app-fetch-data',
+ templateUrl: './fetch-data.component.html'
+})
+export class FetchDataComponent {
+ public forecasts: WeatherForecast[];
+
+ constructor(http: HttpClient, @Inject('BASE_URL') baseUrl: string) {
+ http.get(baseUrl + 'weatherforecast').subscribe(result => {
+ this.forecasts = result;
+ }, error => console.error(error));
+ }
+}
+
+interface WeatherForecast {
+ date: string;
+ temperatureC: number;
+ temperatureF: number;
+ summary: string;
+}
Index: rmatiko/ClientApp/src/app/home/home.component.css
===================================================================
--- Farmatiko/ClientApp/src/app/home/home.component.css (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,50 +1,0 @@
-.wrapper {
- display: flex;
- flex-direction: column;
- min-width: 300px;
-}
-
-.mat-table {
- overflow: auto;
- max-height: 500px;
-}
-
-.header {
- padding: 8px 24px 0;
-}
-
-.mat-form-field {
- font-size: 14px;
- width: 100%;
-}
-
-table {
-width: 100%;
-}
-
-h2 {
- padding: 1em 0;
-}
-.tableRow:hover {
- background-color: #D4F2CD;
- transform: scale(1.0005);
-}
-
-h2 button {
- float: right;
- padding: 0 5em;
-}
-
-#map {
- height: 100%;
-}
-
-.map-frame {
- border: 2px solid black;
- height: 100%;
-}
-
-.map-wrapper {
- margin: 0 3em 3em 3em;
- min-height: 400px;
-}
Index: Farmatiko/ClientApp/src/app/home/home.component.html
===================================================================
--- Farmatiko/ClientApp/src/app/home/home.component.html (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ Farmatiko/ClientApp/src/app/home/home.component.html (revision 822c59d84fd842899190245e947330c1ddd5ed44)
@@ -1,71 +1,14 @@
-
-
-
-
-
-
-
- Име
- Форма
- Цена
-
-
-
-
- {{ medicine.name }}
- {{ medicine.form }}
- {{ medicine.price }}
-
-
-
-
-
-
-
-
-
-
- Име
- Локација
- Работи 27/7?
-
-
-
-
- {{ pharmacy.name }}
- {{ pharmacy.location }}
- Да
- Не
-
-
-
-
-
-
+Hello, world!
+Welcome to your new single-page application, built with:
+
+To help you get started, we've also set up:
+
+ Client-side navigation . For example, click Counter then Back to return here.Angular CLI integration . In development mode, there's no need to run ng serve. It runs in the background automatically, so your client-side resources are dynamically built on demand and the page refreshes when you modify any file.Efficient production builds . In production mode, development-time features are disabled, and your dotnet publish configuration automatically invokes ng build to produce minified, ahead-of-time compiled JavaScript files.
+The ClientApp subdirectory is a standard Angular CLI application. If you open a command prompt in that directory, you can run any ng command (e.g., ng test), or use npm to install extra packages into it.
Index: Farmatiko/ClientApp/src/app/home/home.component.ts
===================================================================
--- Farmatiko/ClientApp/src/app/home/home.component.ts (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ Farmatiko/ClientApp/src/app/home/home.component.ts (revision 822c59d84fd842899190245e947330c1ddd5ed44)
@@ -1,166 +1,8 @@
-import { Component, OnInit } from '@angular/core';
-import { IMedicine, IPharmacy } from '../shared/interfaces';
-import { DataService } from '../shared/data.service';
-import { MatDialog } from '@angular/material/dialog';
-import { MedicineDialogComponent } from '../dialogs/medicine-dialog/medicine-dialog.component';
-import { PharmacyDialogComponent } from '../dialogs/pharmacy-dialog/pharmacy-dialog.component';
-import { latLng, LatLng, tileLayer, marker, icon } from 'leaflet';
-import { HttpClient } from '@angular/common/http';
+import { Component } from '@angular/core';
@Component({
selector: 'app-home',
templateUrl: './home.component.html',
- styleUrls: ['./home.component.css']
})
-export class HomeComponent implements OnInit {
- public medicines: IMedicine[] = [];
- public pharmacies: IPharmacy[] = [];
- public filteredMedicines: IMedicine[] = [];
- public filteredPharmacies: IPharmacy[] = [];
- public lat;
- public lng;
- clicked = false;
- showMap: boolean = false;
- options = {
- layers: [
- tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { attribution: '© OpenStreetMap contributors' })
- ],
- zoom: 8,
- center: latLng(41.61807, 21.74348)
- }
-
- constructor(private dataService: DataService, private dialog: MatDialog, private http: HttpClient) {
-
- }
-
- ngOnInit(): void {
- this.dataService.getMedicines()
- .subscribe((medicine: IMedicine[]) => {
- this.medicines = this.filteredMedicines = medicine;
- },
- (err: any) => console.log(err),
- () => console.log('Medicine data retrieved'));
-
- this.dataService.getPharmacies()
- .subscribe((pharmacy: IPharmacy[]) => {
- this.pharmacies = this.filteredPharmacies = pharmacy;
- },
- (err: any) => console.log(err),
- () => {
- this.appendPharmacyMarkers(this.pharmacies);
- console.log('Pharmacy data retrieved');
- });
- if (navigator.geolocation) {
- navigator.geolocation.getCurrentPosition((position) => {
- if (position) {
- this.lat = position.coords.latitude;
- this.lng = position.coords.longitude;
- let layer = marker([ this.lat, this.lng ], {
- icon: icon({
- iconSize: [ 25, 41 ],
- iconAnchor: [ 13, 41 ],
- iconUrl: 'assets/home-icon.png'
- })
- }).bindPopup("Вашата локација");
- this.options.layers.push(layer);
- }
- });
- }
- }
-
- appendPharmacyMarkers(pharmas: IPharmacy[]) {
- this.options.layers = [];
- this.options.layers.push(tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { attribution: '© OpenStreetMap contributors'}));
- if(this.lat && this.lng) {
- this.options.layers.push(marker([ this.lat, this.lng ], {
- icon: icon({
- iconSize: [ 25, 41 ],
- iconAnchor: [ 13, 41 ],
- iconUrl: 'assets/home-icon.png'
- })
- }).bindPopup("Вашата локација"));
- }
- pharmas.forEach((pharmacy) => {
- this.http.get('https://jankuloski.xyz:8080/https://nominatim.openstreetmap.org/search/?country=Macedonia&city='+pharmacy.location+'&street='+pharmacy.address+'&format=json').subscribe(obj => {
- console.log(obj);
- if(obj.length) {
- let layer = marker([ obj[0]?.lat, obj[0]?.lon ], {
- icon: icon({
- iconSize: [ 25, 41 ],
- iconAnchor: [ 13, 41 ],
- iconUrl: 'assets/pharmacy-icon.png'
- })
- }).bindPopup("Аптека: "+pharmacy.name);
- this.options.layers.push(layer);
- }
- }, error => console.error(error));
- });
- }
-
-
- applyFilterMedicines(filterValue: string) {
- console.log("applyFilterMedicines works!")
- if(filterValue) {
- this.dataService.searchMedicines(filterValue)
- .subscribe((medicine: IMedicine[]) => {
- this.filteredMedicines = medicine;
- },
- (err: any) => console.log(err),
- () => console.log('Medicine data retrieved'));
- }
- else {
- this.filteredMedicines = this.medicines;
- }
- }
-
- applyFilterPharmacies(filterValue: string) {
- console.log("applyFilterPharmacies works!")
- if(filterValue) {
- this.dataService.searchPharmacies(filterValue)
- .subscribe((pharmacy: IPharmacy[]) => {
- this.filteredPharmacies = pharmacy;
- },
- (err: any) => console.log(err),
- () => {
- this.appendPharmacyMarkers(this.filteredPharmacies);
- if(this.showMap) {
- this.showMap = false;
- setTimeout(() => this.showMap = true, 300);
- }
- console.log('Pharmacy data retrieved')
- });
- }
- else {
- this.filteredPharmacies = this.pharmacies;
- this.appendPharmacyMarkers(this.pharmacies);
- if(this.showMap) {
- this.showMap = false;
- setTimeout(() => this.showMap = true, 300);
- }
- }
- }
-
- openMedicineDialog(medicine: IMedicine): void {
- this.dialog.open(MedicineDialogComponent, {
- width: '450px',
- data: medicine
- });
- }
-
- openPharmacyDialog(pharmacy: IPharmacy): void {
- this.dialog.open(PharmacyDialogComponent, {
- width: '450px',
- data: pharmacy
- });
- }
-
- toggleMap() {
- this.showMap = !this.showMap;
- }
-
- refreshMap() {
- this.showMap = false;
- setTimeout(() => this.showMap = true, 300);
- }
-
+export class HomeComponent {
}
Index: rmatiko/ClientApp/src/app/korona/korona.component.css
===================================================================
--- Farmatiko/ClientApp/src/app/korona/korona.component.css (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,32 +1,0 @@
-.counter {
- background-color: #f5f5f5;
- padding: 20px 0;
- border-radius: 5px;
-}
-
-.count-title {
- font-size: 40px;
- font-weight: normal;
- margin-top: 10px;
- margin-bottom: 0;
- text-align: center;
-}
-
-.count-text {
- font-size: 13px;
- font-weight: normal;
- margin-top: 10px;
- margin-bottom: 0;
- text-align: center;
-}
-
-.fa-2x {
- margin: 0 auto;
- float: none;
- display: table;
- color: #4ad1e5;
-}
-
-.pads {
- padding: 1em 0;
-}
Index: rmatiko/ClientApp/src/app/korona/korona.component.html
===================================================================
--- Farmatiko/ClientApp/src/app/korona/korona.component.html (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,64 +1,0 @@
-
-
-
-
-
{{korona.name}}
-
статистика
-
-
-
-
-
-
{{korona.totalMK}}
-
-
Вкупно случаи во земјата
-
-
-
-
-
{{korona.activeMK}}
-
-
Активни случаи во земјата
-
-
-
-
-
{{korona.deathsMK}}
-
-
Смртни случаи во земјата
-
-
-
-
-
{{korona.newMK}}
-
-
Нови случаи во земјата
-
-
-
-
-
-
-
{{korona.totalGlobal}}
-
-
Вкупно случаи глобално
-
-
-
-
-
{{korona.activeGlobal}}
-
-
Активни случаи глобално
-
-
-
-
-
{{korona.deathsGlobal}}
-
-
Смртни случаи глобално
-
-
-
-
;
-
- beforeEach(async(() => {
- TestBed.configureTestingModule({
- declarations: [KoronaComponent]
- })
- .compileComponents();
- }));
-
- beforeEach(() => {
- fixture = TestBed.createComponent(KoronaComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
Index: rmatiko/ClientApp/src/app/korona/korona.component.ts
===================================================================
--- Farmatiko/ClientApp/src/app/korona/korona.component.ts (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,27 +1,0 @@
-import { Component, OnInit } from '@angular/core';
-import { DataService } from '../shared/data.service';
-import { IPandemic } from '../shared/interfaces';
-
-@Component({
- selector: 'app-korona',
- templateUrl: './korona.component.html',
- styleUrls: ['./korona.component.css']
-})
-export class KoronaComponent implements OnInit {
- public korona: IPandemic;
-
- constructor(private dataService: DataService) {
-
- }
-
- ngOnInit(): void {
- this.dataService.getPandemic()
- .subscribe((res: IPandemic) => {
- this.korona = res;
- console.log(this.korona);
- },
- (err: any) => console.log(err),
- () => console.log('Pandemic data retrieved'));
- }
-
-}
Index: rmatiko/ClientApp/src/app/login/login.component.css
===================================================================
--- Farmatiko/ClientApp/src/app/login/login.component.css (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,51 +1,0 @@
-.example-container {
- display: flex;
- flex-direction: column;
-}
-
-.example-container > * {
- width: 100%;
-}
-
-.wrapper {
- position: fixed;
- left: 50%;
- top: 50%;
- transform: translate(-50%, -50%);
-}
-
-
-:host {
- display: flex;
- justify-content: center;
-}
-
-.mat-form-field {
- width: 100%;
- min-width: 300px;
-}
-
-mat-card-title,
-mat-card-content {
- display: flex;
- justify-content: center;
- text-align: center;
- align-items: center;
-}
-
-.error {
- padding: 16px;
- width: 300px;
- color: white;
- background-color: red;
-}
-
-.button {
- display: flex;
- justify-content: flex-end;
-}
-
-.aligner {
- float: right;
- padding-left: 2.5em;
-}
Index: rmatiko/ClientApp/src/app/login/login.component.html
===================================================================
--- Farmatiko/ClientApp/src/app/login/login.component.html (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,43 +1,0 @@
-
-
-Најава
-
-
- Почетна home
-
-
-
-
-
-
-
- Регистрација
-
-
- local_hospital
-
-
-
- Модераторски профил може да има само еден
претставник од компанија што поседува деловен објект
- Аптека. За регистрација на профилот, потребно е
компанијата да приложи соодветен доказ со испраќање
на мејл до нашата е-пошта:
admin@farmatiko.tk
-
-
-
;
-
- beforeEach(async(() => {
- TestBed.configureTestingModule({
- declarations: [ LoginComponent ]
- })
- .compileComponents();
- }));
-
- beforeEach(() => {
- fixture = TestBed.createComponent(LoginComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
Index: rmatiko/ClientApp/src/app/login/login.component.ts
===================================================================
--- Farmatiko/ClientApp/src/app/login/login.component.ts (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,74 +1,0 @@
-import { Component, OnInit, OnDestroy } from '@angular/core';
-import { FormGroup, FormControl, Validators } from '@angular/forms';
-import { Router, ActivatedRoute } from '@angular/router';
-import { Subscription } from 'rxjs';
-import { first } from 'rxjs/operators';
-import { AuthService } from '../shared/services/auth.service';
-import { finalize } from 'rxjs/operators';
-
-@Component({
- selector: 'app-login',
- templateUrl: './login.component.html',
- styleUrls: ['./login.component.css']
-})
-export class LoginComponent implements OnInit, OnDestroy {
- busy = false;
- loginForm: FormGroup;
- username = '';
- password = '';
- loginError = false;
- expanded = false;
- private subscription: Subscription;
-
- constructor(private authService: AuthService,private router: Router, private route: ActivatedRoute) {
- this.loginForm = new FormGroup({
- username: new FormControl('', [Validators.required, Validators.email]),
- password: new FormControl('', [Validators.required])
- });
- }
- ngOnDestroy(): void {
- this.subscription?.unsubscribe();
- }
-
- ngOnInit(): void {
- this.subscription = this.authService.user$.subscribe((x) => {
- if (this.route.snapshot.url[0].path === 'login') {
- const accessToken = localStorage.getItem('access_token');
- const refreshToken = localStorage.getItem('refresh_token');
- if (x && accessToken && refreshToken) {
- const returnUrl = this.route.snapshot.queryParams['returnUrl'] || '';
- this.router.navigate([returnUrl]);
- }
- }
- });
- }
-
- loginPharmacyHead() {
- if (!this.username || !this.password) {
- return;
- }
- this.busy = true;
- const returnUrl = this.route.snapshot.queryParams['returnUrl'] || '';
- this.authService
- .login(this.username, this.password)
- .pipe(finalize(() => (this.busy = false)))
- .subscribe(
- (data) => {
- if(data.role === 'Admin') {
- this.router.navigate(['/admin']);
- }
- else {
- this.router.navigate(['/dashboard']);
- }
- },
- () => {
- this.loginError = true;
- }
- );
- this.loginForm.reset();
- }
-
- expandRegistration() {
- this.expanded = !this.expanded;
- }
-}
Index: rmatiko/ClientApp/src/app/nav-menu/dialogs/pharmacy-head-dialog/pharmacy-head-dialog.component.html
===================================================================
--- Farmatiko/ClientApp/src/app/nav-menu/dialogs/pharmacy-head-dialog/pharmacy-head-dialog.component.html (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,1 +1,0 @@
-pharmacy-head-dialog works!
Index: rmatiko/ClientApp/src/app/nav-menu/dialogs/pharmacy-head-dialog/pharmacy-head-dialog.component.ts
===================================================================
--- Farmatiko/ClientApp/src/app/nav-menu/dialogs/pharmacy-head-dialog/pharmacy-head-dialog.component.ts (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,15 +1,0 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
- selector: 'app-pharmacy-head-dialog',
- templateUrl: './pharmacy-head-dialog.component.html',
- styleUrls: ['./pharmacy-head-dialog.component.css']
-})
-export class PharmacyHeadDialogComponent implements OnInit {
-
- constructor() { }
-
- ngOnInit(): void {
- }
-
-}
Index: Farmatiko/ClientApp/src/app/nav-menu/nav-menu.component.css
===================================================================
--- Farmatiko/ClientApp/src/app/nav-menu/nav-menu.component.css (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ Farmatiko/ClientApp/src/app/nav-menu/nav-menu.component.css (revision 822c59d84fd842899190245e947330c1ddd5ed44)
@@ -5,12 +5,7 @@
}
-a.navbar-brand img {
- width: 200px;
-}
-
html {
font-size: 14px;
}
-
@media (min-width: 768px) {
html {
Index: Farmatiko/ClientApp/src/app/nav-menu/nav-menu.component.html
===================================================================
--- Farmatiko/ClientApp/src/app/nav-menu/nav-menu.component.html (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ Farmatiko/ClientApp/src/app/nav-menu/nav-menu.component.html (revision 822c59d84fd842899190245e947330c1ddd5ed44)
@@ -1,38 +1,40 @@
-
+
-
-
+ Farmatiko
+
-
+
Index: Farmatiko/ClientApp/src/app/nav-menu/nav-menu.component.ts
===================================================================
--- Farmatiko/ClientApp/src/app/nav-menu/nav-menu.component.ts (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ Farmatiko/ClientApp/src/app/nav-menu/nav-menu.component.ts (revision 822c59d84fd842899190245e947330c1ddd5ed44)
@@ -1,4 +1,3 @@
-import { Component, OnInit } from '@angular/core';
-import { AuthService } from '../shared/services/auth.service';
+import { Component } from '@angular/core';
@Component({
@@ -7,21 +6,6 @@
styleUrls: ['./nav-menu.component.css']
})
-export class NavMenuComponent implements OnInit {
+export class NavMenuComponent {
isExpanded = false;
- loggedIn: boolean = false;
-
- constructor(private authService: AuthService) {
-
- }
-
- ngOnInit(): void {
- if(localStorage.getItem('access_token')) {
- this.loggedIn = true;
- }
- }
-
- logout() {
- this.authService.logout();
- }
collapse() {
Index: rmatiko/ClientApp/src/app/shared/core.module.ts
===================================================================
--- Farmatiko/ClientApp/src/app/shared/core.module.ts (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,33 +1,0 @@
-import { NgModule, APP_INITIALIZER, Optional, SkipSelf } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { HTTP_INTERCEPTORS } from '@angular/common/http';
-import { AuthService } from './services/auth.service';
-import { appInitializer } from './services/app-initializer';
-import { JwtInterceptor } from './interceptors/jwt.interceptor';
-import { UnauthorizedInterceptor } from './interceptors/unauthorized.interceptor';
-
-@NgModule({
- declarations: [],
- imports: [CommonModule],
- providers: [
- {
- provide: APP_INITIALIZER,
- useFactory: appInitializer,
- multi: true,
- deps: [AuthService],
- },
- { provide: HTTP_INTERCEPTORS, useClass: JwtInterceptor, multi: true },
- {
- provide: HTTP_INTERCEPTORS,
- useClass: UnauthorizedInterceptor,
- multi: true,
- },
- ],
-})
-export class CoreModule {
- constructor(@Optional() @SkipSelf() core: CoreModule) {
- if (core) {
- throw new Error('Core Module can only be imported to AppModule.');
- }
- }
-}
Index: rmatiko/ClientApp/src/app/shared/data.service.ts
===================================================================
--- Farmatiko/ClientApp/src/app/shared/data.service.ts (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,217 +1,0 @@
-import { Injectable, } from '@angular/core';
-import { HttpClient, HttpErrorResponse } from '@angular/common/http';
-
-import { Observable } from 'rxjs';
-import { map, catchError } from 'rxjs/operators';
-
-import { IHealthFacilities, IHealthcareWorkers, IMedicine, IPandemic, IPharmacy, IPharmacyHead, IPharmacyHeadRequest } from './interfaces';
-import { environment } from '../../environments/environment';
-
-@Injectable()
-export class DataService {
- baseFacilitiesUrl: string = `${environment.baseApiUrl}api/facilities`;
- baseWorkersUrl: string = `${environment.baseApiUrl}api/workers`;
- baseMedicineUrl: string = `${environment.baseApiUrl}api/medicines`;
- basePandemicUrl: string = `${environment.baseApiUrl}api/pandemic`;
- basePharmacyUrl: string = `${environment.baseApiUrl}api/pharmacy`;
- basePharmacyHead: string = `${environment.baseApiUrl}api/pharmacyhead`;
-
- constructor(private http: HttpClient) {
-
- }
-
- //Facility GET
- getFacilities() : Observable
{
- return this.http.get(this.baseFacilitiesUrl)
- .pipe(
- map((facilities: IHealthFacilities[]) => {
- return facilities;
- }),
- catchError(this.handleError)
- );
- }
- searchFacilities(searchquery: string) : Observable {
- return this.http.get(this.baseFacilitiesUrl + '/search/' + searchquery)
- .pipe(
- map((facilities: IHealthFacilities[]) => {
- return facilities;
- }),
- catchError(this.handleError)
- );
- }
- getFacility(id: string) : Observable {
- return this.http.get(this.baseFacilitiesUrl + '/' + id)
- .pipe(catchError(this.handleError));
- }
-
-
- //Worker GET
- getWorkers() : Observable {
- return this.http.get(this.baseWorkersUrl)
- .pipe(
- map((workers: IHealthcareWorkers[]) => {
- return workers;
- }),
- catchError(this.handleError)
- );
- }
- searchWorkers(searchquery: string) : Observable {
- return this.http.get(this.baseWorkersUrl + '/search/' + searchquery)
- .pipe(
- map((workers: IHealthcareWorkers[]) => {
- return workers;
- }),
- catchError(this.handleError)
- );
- }
- getWorker(id: string) : Observable {
- return this.http.get(this.baseWorkersUrl + '/' + id)
- .pipe(catchError(this.handleError));
- }
-
-
- //Medicine GET
- getMedicines() : Observable {
- return this.http.get(this.baseMedicineUrl)
- .pipe(
- map((medicines: IMedicine[]) => {
- return medicines;
- }),
- catchError(this.handleError)
- );
- }
- searchMedicines(searchquery: string) : Observable {
- return this.http.get(this.baseMedicineUrl + '/search/' + searchquery)
- .pipe(
- map((medicines: IMedicine[]) => {
- return medicines;
- }),
- catchError(this.handleError)
- );
- }
- getMedicine(id: string) : Observable {
- return this.http.get(this.baseMedicineUrl + '/' + id)
- .pipe(catchError(this.handleError));
- }
-
-
- getPandemic() : Observable {
- return this.http.get(this.basePandemicUrl)
- .pipe(catchError(this.handleError));
- }
-
-
- //Pharmacy GET
- getPharmacies() : Observable {
- return this.http.get(this.basePharmacyUrl)
- .pipe(
- map((pharmacies: IPharmacy[]) => {
- return pharmacies;
- }),
- catchError(this.handleError)
- );
- }
- searchPharmacies(searchquery: string) : Observable {
- return this.http.get(this.basePharmacyUrl + '/search/' + searchquery)
- .pipe(
- map((pharmacies: IPharmacy[]) => {
- return pharmacies;
- }),
- catchError(this.handleError)
- );
- }
- getPharmacy(id: string) : Observable {
- return this.http.get(this.basePharmacyUrl + '/' + id)
- .pipe(catchError(this.handleError));
- }
-
- //PharmacyHead GET
- getPharmacyHeads() : Observable {
- return this.http.get(this.basePharmacyHead)
- .pipe(
- map((pharmacyheads: IPharmacyHead[]) => {
- return pharmacyheads;
- }),
- catchError(this.handleError)
- );
- }
- getClaimingRequests() : Observable {
- return this.http.get(this.basePharmacyHead + '/requests')
- .pipe(
- map((requests: IPharmacyHeadRequest[]) => {
- return requests;
- }),
- catchError(this.handleError)
- );
- }
- loginPharmacyHead(email: string, passwd: string) : Observable {
- let postData = {username : email ,password :passwd};
- return this.http.post(this.basePharmacyHead + '/login', postData)
- .pipe(
- map((data) => {
- return data;
- }),
- catchError(this.handleError)
- );
- }
- getPharmacyHead(id: string) : Observable {
- return this.http.get(this.basePharmacyHead + '/' + id)
- .pipe(catchError(this.handleError));
- }
- //PharmacyHead POST
- insertPharmacyHead(head: IPharmacyHead) : Observable {
- return this.http.post(this.basePharmacyHead + '/add', head)
- .pipe(
- map((data) => {
- return data;
- }),
- catchError(this.handleError)
- );
- }
- claimPharmacy(req: IPharmacyHeadRequest) : Observable {
- return this.http.post(this.basePharmacyHead + '/requests', req)
- .pipe(
- map((data) => {
- return data;
- }),
- catchError(this.handleError)
- );
- }
- updatePharmacyHead(head: IPharmacyHead) : Observable {
- return this.http.post(this.basePharmacyHead + '/update', head)
- .pipe(
- map((data) => {
- return data;
- }),
- catchError(this.handleError)
- );
- }
- deletePharmacyHead(id: string) : Observable {
- return this.http.post(this.basePharmacyHead + '/delete/' + id, id)
- .pipe(
- map((data) => {
- return data;
- }),
- catchError(this.handleError)
- );
- }
- deleteClaimingRequest(req: IPharmacyHeadRequest) : Observable {
- return this.http.post(this.basePharmacyHead + '/requests/' + req.id, req)
- .pipe(
- map((data) => {
- return data;
- }),
- catchError(this.handleError)
- );
- }
-
- private handleError(error: HttpErrorResponse) {
- console.error('server error:', error);
- if (error.error instanceof Error) {
- let errMessage = error.error.message;
- return Observable.throw(errMessage);
- }
- return Observable.throw(error || 'ASP.NET Core server error');
- }
-
-}
Index: rmatiko/ClientApp/src/app/shared/guards/auth.guard.ts
===================================================================
--- Farmatiko/ClientApp/src/app/shared/guards/auth.guard.ts (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,40 +1,0 @@
-import { Injectable } from '@angular/core';
-import {
- CanActivate,
- ActivatedRouteSnapshot,
- RouterStateSnapshot,
- UrlTree,
- Router,
-} from '@angular/router';
-import { Observable } from 'rxjs';
-import { AuthService } from '../services/auth.service';
-import { map } from 'rxjs/operators';
-
-@Injectable({
- providedIn: 'root',
-})
-export class AuthGuard implements CanActivate {
- constructor(private router: Router, private authService: AuthService) {}
-
- canActivate(
- next: ActivatedRouteSnapshot,
- state: RouterStateSnapshot
- ):
- | Observable
- | Promise
- | boolean
- | UrlTree {
- return this.authService.user$.pipe(
- map((user) => {
- if (user) {
- return true;
- } else {
- this.router.navigate(['login'], {
- queryParams: { returnUrl: state.url },
- });
- return false;
- }
- })
- );
- }
-}
Index: rmatiko/ClientApp/src/app/shared/index.ts
===================================================================
--- Farmatiko/ClientApp/src/app/shared/index.ts (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,3 +1,0 @@
-export * from './guards/auth.guard';
-export * from './services/auth.service';
-export * from './interfaces';
Index: rmatiko/ClientApp/src/app/shared/interceptors/jwt.interceptor.ts
===================================================================
--- Farmatiko/ClientApp/src/app/shared/interceptors/jwt.interceptor.ts (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,30 +1,0 @@
-import { Injectable } from '@angular/core';
-import {
- HttpRequest,
- HttpHandler,
- HttpEvent,
- HttpInterceptor,
-} from '@angular/common/http';
-import { Observable } from 'rxjs';
-import { environment } from '../../../environments/environment';
-import { AuthService } from '../services/auth.service';
-
-@Injectable()
-export class JwtInterceptor implements HttpInterceptor {
- constructor(private authService: AuthService) {}
-
- intercept(
- request: HttpRequest,
- next: HttpHandler
- ): Observable> {
- const accessToken = localStorage.getItem('access_token');
- const isApiUrl = request.url.startsWith(environment.baseApiUrl);
- if (accessToken && isApiUrl) {
- request = request.clone({
- setHeaders: { Authorization: `Bearer ${accessToken}` },
- });
- }
-
- return next.handle(request);
- }
-}
Index: rmatiko/ClientApp/src/app/shared/interceptors/unauthorized.interceptor.ts
===================================================================
--- Farmatiko/ClientApp/src/app/shared/interceptors/unauthorized.interceptor.ts (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,39 +1,0 @@
-import { Injectable } from '@angular/core';
-import {
- HttpRequest,
- HttpHandler,
- HttpEvent,
- HttpInterceptor,
-} from '@angular/common/http';
-import { Observable, throwError } from 'rxjs';
-import { catchError } from 'rxjs/operators';
-import { AuthService } from '../services/auth.service';
-import { environment } from '../../../environments/environment';
-import { Router } from '@angular/router';
-
-@Injectable()
-export class UnauthorizedInterceptor implements HttpInterceptor {
- constructor(private authService: AuthService, private router: Router) {}
-
- intercept(
- request: HttpRequest,
- next: HttpHandler
- ): Observable> {
- return next.handle(request).pipe(
- catchError((err) => {
- if (err.status === 401) {
- this.authService.clearLocalStorage();
- this.router.navigate(['login'], {
- queryParams: { returnUrl: this.router.routerState.snapshot.url },
- });
- }
-
- if (!environment.production) {
- console.error(err);
- }
- const error = (err && err.error && err.error.message) || err.statusText;
- return throwError(error);
- })
- );
- }
-}
Index: rmatiko/ClientApp/src/app/shared/interfaces.ts
===================================================================
--- Farmatiko/ClientApp/src/app/shared/interfaces.ts (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,66 +1,0 @@
-export interface IHealthcareWorkers {
- id?: string;
- name: string;
- branch: Date;
- facility: IHealthFacilities;
- title: string;
-}
-
-export interface IHealthFacilities {
- id?: string;
- address: string;
- email?: string;
- municipality: string;
- name: string;
- phone?: string;
- type?: string;
-}
-
-export interface IMedicine {
- id?: string;
- name: string;
- strength: string;
- form: string;
- wayOfIssuing: string;
- manufacturer: string;
- price: number;
- packaging: string;
- headNames?: string[];
-}
-
-export interface IPandemic {
- id?: string;
- name?: string;
- totalMK?: number;
- activeMK?: number;
- deathsMK?: number;
- newMK?: number;
- totalGlobal?: number;
- deathsGlobal?: number;
- activeGlobal?: number;
-}
-
-export interface IPharmacy {
- id?: string;
- name: string;
- location: string;
- address: string;
- workAllTime?: boolean;
- headName?: string;
-}
-
-export interface IPharmacyHead {
- id?: string;
- PharmacyMedicines?: IMedicine[];
- Pharmacy?: IPharmacy[];
- Email: string;
- Name: string;
- Passwd: string;
- originalUserName?: string;
- Role?: string;
-}
-export interface IPharmacyHeadRequest {
- id?: string;
- PharmacyHead?: IPharmacyHead;
- Pharmacy?: IPharmacy;
-}
Index: rmatiko/ClientApp/src/app/shared/material.module.ts
===================================================================
--- Farmatiko/ClientApp/src/app/shared/material.module.ts (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,120 +1,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-
-import { MatButtonModule } from '@angular/material/button';
-import { MatCheckboxModule } from '@angular/material/checkbox';
-import { MatIconModule } from '@angular/material/icon';
-import { MatAutocompleteModule } from '@angular/material/autocomplete';
-import { MatButtonToggleModule } from '@angular/material/button-toggle';
-import { MatCardModule } from '@angular/material/card';
-import { MatChipsModule } from '@angular/material/chips';
-import { MatStepperModule } from '@angular/material/stepper';
-import { MatDatepickerModule } from '@angular/material/datepicker';
-import { MatDialogModule } from '@angular/material/dialog';
-import { MatDividerModule } from '@angular/material/divider';
-import { MatExpansionModule } from '@angular/material/expansion';
-import { MatInputModule } from '@angular/material/input';
-import { MatGridListModule } from '@angular/material/grid-list';
-import { MatListModule } from '@angular/material/list';
-import { MatMenuModule } from '@angular/material/menu';
-import { MatNativeDateModule } from '@angular/material/core';
-import { MatPaginatorModule } from '@angular/material/paginator';
-import { MatProgressBarModule } from '@angular/material/progress-bar';
-import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
-import { MatRadioModule } from '@angular/material/radio';
-import { MatRippleModule } from '@angular/material/core';
-import { MatSelectModule } from '@angular/material/select';
-import { MatSidenavModule } from '@angular/material/sidenav';
-import { MatSliderModule } from '@angular/material/slider';
-import { MatSlideToggleModule } from '@angular/material/slide-toggle';
-import { MatSnackBarModule } from '@angular/material/snack-bar';
-import { MatTableModule } from '@angular/material/table';
-import { MatSortModule } from '@angular/material/sort';
-import { MatTabsModule } from '@angular/material/tabs';
-import { MatToolbarModule } from '@angular/material/toolbar';
-import { MatTooltipModule } from '@angular/material/tooltip';
-import { MatFormFieldModule } from '@angular/material/form-field';
-
-import { CdkTableModule } from '@angular/cdk/table';
-
-@NgModule({
- imports: [
- CommonModule,
- MatButtonModule,
- MatCheckboxModule,
- MatIconModule,
- CdkTableModule,
- MatAutocompleteModule,
- MatButtonModule,
- MatButtonToggleModule,
- MatCardModule,
- MatCheckboxModule,
- MatChipsModule,
- MatStepperModule,
- MatDatepickerModule,
- MatDialogModule,
- MatDividerModule,
- MatExpansionModule,
- MatGridListModule,
- MatInputModule,
- MatListModule,
- MatMenuModule,
- MatNativeDateModule,
- MatPaginatorModule,
- MatProgressBarModule,
- MatProgressSpinnerModule,
- MatRadioModule,
- MatRippleModule,
- MatSelectModule,
- MatSidenavModule,
- MatSliderModule,
- MatSlideToggleModule,
- MatSnackBarModule,
- MatSortModule,
- MatTableModule,
- MatTabsModule,
- MatToolbarModule,
- MatTooltipModule,
- MatFormFieldModule
- ],
- exports: [
- CommonModule,
- MatButtonModule,
- MatCheckboxModule,
- MatIconModule,
- CdkTableModule,
- MatAutocompleteModule,
- MatButtonModule,
- MatButtonToggleModule,
- MatCardModule,
- MatCheckboxModule,
- MatChipsModule,
- MatStepperModule,
- MatDatepickerModule,
- MatDialogModule,
- MatDividerModule,
- MatExpansionModule,
- MatGridListModule,
- MatInputModule,
- MatListModule,
- MatMenuModule,
- MatNativeDateModule,
- MatPaginatorModule,
- MatProgressBarModule,
- MatProgressSpinnerModule,
- MatRadioModule,
- MatRippleModule,
- MatSelectModule,
- MatSidenavModule,
- MatSliderModule,
- MatSlideToggleModule,
- MatSnackBarModule,
- MatSortModule,
- MatTableModule,
- MatTabsModule,
- MatToolbarModule,
- MatTooltipModule,
- MatFormFieldModule
- ]
-})
-export class MaterialModule { }
Index: rmatiko/ClientApp/src/app/shared/services/app-initializer.ts
===================================================================
--- Farmatiko/ClientApp/src/app/shared/services/app-initializer.ts (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,9 +1,0 @@
-import { AuthService } from './auth.service';
-
-export function appInitializer(authService: AuthService) {
- return () =>
- new Promise((resolve) => {
- console.log('refresh token on app start up')
- authService.refreshToken().subscribe().add(resolve);
- });
-}
Index: rmatiko/ClientApp/src/app/shared/services/auth.service.ts
===================================================================
--- Farmatiko/ClientApp/src/app/shared/services/auth.service.ts (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,161 +1,0 @@
-import { Injectable, OnDestroy } from '@angular/core';
-import { Router } from '@angular/router';
-import { HttpClient } from '@angular/common/http';
-import { BehaviorSubject, Observable, of, Subscription } from 'rxjs';
-import { map, tap, delay, finalize } from 'rxjs/operators';
-import { IPharmacyHead } from '../interfaces';
-import { environment } from '../../../environments/environment';
-
-
-interface LoginResult {
- userName: string;
- role: string;
- originalUserName?: string;
- accessToken: string;
- refreshToken: string;
- head?: IPharmacyHead;
-}
-
-@Injectable({
- providedIn: 'root',
-})
-export class AuthService implements OnDestroy {
- private readonly apiUrl = `${environment.baseApiUrl}api/pharmacyhead`;
- private timer: Subscription;
- private _user = new BehaviorSubject(null);
- user$: Observable = this._user.asObservable();
-
- private storageEventListener(event: StorageEvent) {
- if (event.storageArea === localStorage) {
- if (event.key === 'logout-event') {
- this.stopTokenTimer();
- this._user.next(null);
- }
- if (event.key === 'login-event') {
- this.stopTokenTimer();
- this.http.get(`${this.apiUrl}/user`).subscribe((x) => {
- this._user.next({
- Email: x.userName,
- Passwd: x.head.Passwd,
- Role: x.role,
- originalUserName: x.originalUserName,
- Name: x.head.Name,
- PharmacyMedicines: x.head.PharmacyMedicines,
- Pharmacy: x.head.Pharmacy
- });
- });
- }
- }
- }
-
- constructor(private router: Router, private http: HttpClient) {
- window.addEventListener('storage', this.storageEventListener.bind(this));
- console.log(this.apiUrl);
- }
-
- ngOnDestroy(): void {
- window.removeEventListener('storage', this.storageEventListener.bind(this));
- }
-
- login(username: string, password: string) {
- return this.http
- .post(`${this.apiUrl}/login`, { username, password })
- .pipe(
- map((x) => {
- this._user.next({
- Email: x.userName,
- Passwd: x.head.Passwd,
- Role: x.role,
- originalUserName: x.originalUserName,
- Name: x.head.Name,
- PharmacyMedicines: x.head.PharmacyMedicines,
- Pharmacy: x.head.Pharmacy
- });
- this.setLocalStorage(x);
- this.startTokenTimer();
- return x;
- })
- );
- }
-
- logout() {
- this.http
- .post(`${this.apiUrl}/logout`, {})
- .pipe(
- finalize(() => {
- this.clearLocalStorage();
- this._user.next(null);
- this.stopTokenTimer();
- this.router.navigate(['login']);
- })
- )
- .subscribe();
- }
-
- refreshToken() {
- const refreshToken = localStorage.getItem('refresh_token');
- if (!refreshToken) {
- this.clearLocalStorage();
- return of(null);
- }
-
- return this.http
- .post(`${this.apiUrl}/refresh-token`, { refreshToken })
- .pipe(
- map((x) => {
- this._user.next({
- Email: x.userName,
- Passwd: x.head.Passwd,
- Role: x.role,
- originalUserName: x.originalUserName,
- Name: x.head.Name,
- PharmacyMedicines: x.head.PharmacyMedicines,
- Pharmacy: x.head.Pharmacy
- });
- this.setLocalStorage(x);
- this.startTokenTimer();
- return x;
- })
- );
- }
-
- setLocalStorage(x: LoginResult) {
- localStorage.setItem('access_token', x.accessToken);
- localStorage.setItem('refresh_token', x.refreshToken);
- localStorage.setItem('login-event', 'login' + Math.random());
- }
-
- clearLocalStorage() {
- localStorage.removeItem('access_token');
- localStorage.removeItem('refresh_token');
- localStorage.setItem('logout-event', 'logout' + Math.random());
- }
-
- getUser() {
- return this.user$;
- }
-
- private getTokenRemainingTime() {
- const accessToken = localStorage.getItem('access_token');
- if (!accessToken) {
- return 0;
- }
- const jwtToken = JSON.parse(atob(accessToken.split('.')[1]));
- const expires = new Date(jwtToken.exp * 1000);
- return expires.getTime() - Date.now();
- }
-
- private startTokenTimer() {
- const timeout = this.getTokenRemainingTime();
- this.timer = of(true)
- .pipe(
- delay(timeout),
- tap(() => this.refreshToken().subscribe())
- )
- .subscribe();
- }
-
- private stopTokenTimer() {
- this.timer?.unsubscribe();
- }
-}
Index: rmatiko/ClientApp/src/custom-theme.scss
===================================================================
--- Farmatiko/ClientApp/src/custom-theme.scss (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ (revision )
@@ -1,28 +1,0 @@
-
-// Custom Theming for Angular Material
-// For more information: https://material.angular.io/guide/theming
-@import '~@angular/material/theming';
-// Plus imports for other components in your app.
-
-// Include the common styles for Angular Material. We include this here so that you only
-// have to load a single css file for Angular Material in your app.
-// Be sure that you only ever include this mixin once!
-@include mat-core();
-
-// Define the palettes for your theme using the Material Design palettes available in palette.scss
-// (imported above). For each palette, you can optionally specify a default, lighter, and darker
-// hue. Available color palettes: https://material.io/design/color/
-$Farmatiko-primary: mat-palette($mat-green);
-$Farmatiko-accent: mat-palette($mat-cyan);
-
-// The warn palette is optional (defaults to red).
-$Farmatiko-warn: mat-palette($mat-red);
-
-// Create the theme object (a Sass map containing all of the palettes).
-$Farmatiko-theme: mat-light-theme($Farmatiko-primary, $Farmatiko-accent, $Farmatiko-warn);
-
-// Include theme styles for core and each component used in your app.
-// Alternatively, you can import and @include the theme mixins for each component
-// that you are using.
-@include angular-material-theme($Farmatiko-theme);
-
Index: Farmatiko/ClientApp/src/environments/environment.prod.ts
===================================================================
--- Farmatiko/ClientApp/src/environments/environment.prod.ts (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ Farmatiko/ClientApp/src/environments/environment.prod.ts (revision 822c59d84fd842899190245e947330c1ddd5ed44)
@@ -1,4 +1,3 @@
export const environment = {
- production: true,
- baseApiUrl: 'htpps://api.farmatiko.com/',
+ production: true
};
Index: Farmatiko/ClientApp/src/environments/environment.ts
===================================================================
--- Farmatiko/ClientApp/src/environments/environment.ts (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ Farmatiko/ClientApp/src/environments/environment.ts (revision 822c59d84fd842899190245e947330c1ddd5ed44)
@@ -4,6 +4,5 @@
export const environment = {
- production: false,
- baseApiUrl: 'https://localhost:5001/',
+ production: false
};
Index: Farmatiko/ClientApp/src/index.html
===================================================================
--- Farmatiko/ClientApp/src/index.html (revision 472dd7eebc4868fc35f23bfc46732aa38cc21a1d)
+++ Farmatiko/ClientApp/src/index.html (revision 822c59d84fd842899190245e947330c1ddd5ed44)
@@ -7,16 +7,8 @@
Loading...