Index: Farmatiko/ClientApp/package-lock.json
===================================================================
--- Farmatiko/ClientApp/package-lock.json	(revision 1f041f6c059e6fe4273e18b284d2d1615b98907b)
+++ Farmatiko/ClientApp/package-lock.json	(revision 46c298d4252844b3fef2ebcafd36872eb266197a)
@@ -6332,4 +6332,9 @@
       "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="
     },
+    "hammerjs": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz",
+      "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE="
+    },
     "handle-thing": {
       "version": "2.0.1",
Index: Farmatiko/ClientApp/package.json
===================================================================
--- Farmatiko/ClientApp/package.json	(revision 1f041f6c059e6fe4273e18b284d2d1615b98907b)
+++ Farmatiko/ClientApp/package.json	(revision 46c298d4252844b3fef2ebcafd36872eb266197a)
@@ -28,4 +28,5 @@
     "bootstrap": "^4.3.1",
     "core-js": "^3.3.3",
+    "hammerjs": "^2.0.8",
     "jquery": "3.4.1",
     "oidc-client": "^1.9.1",
Index: Farmatiko/ClientApp/src/app/app.server.module.ts
===================================================================
--- Farmatiko/ClientApp/src/app/app.server.module.ts	(revision 1f041f6c059e6fe4273e18b284d2d1615b98907b)
+++ Farmatiko/ClientApp/src/app/app.server.module.ts	(revision 46c298d4252844b3fef2ebcafd36872eb266197a)
@@ -6,6 +6,6 @@
 
 @NgModule({
-    imports: [AppModule, ServerModule, ModuleMapLoaderModule],
-    bootstrap: [AppComponent]
+  imports: [AppModule, ServerModule, ModuleMapLoaderModule],
+  bootstrap: [AppComponent]
 })
 export class AppServerModule { }
Index: Farmatiko/ClientApp/src/app/home/home.component.css
===================================================================
--- Farmatiko/ClientApp/src/app/home/home.component.css	(revision 1f041f6c059e6fe4273e18b284d2d1615b98907b)
+++ Farmatiko/ClientApp/src/app/home/home.component.css	(revision 46c298d4252844b3fef2ebcafd36872eb266197a)
@@ -1,13 +1,13 @@
 .wrapper {
-    display: flex;
-    justify-content: space-around;
-    padding-top: 50px;
+  display: flex;
+  justify-content: space-around;
+  padding-top: 50px;
 }
 
 nav {
-    float: right;
+  float: right;
 }
 
 table {
-    margin-top: 25px;
+  margin-top: 25px;
 }
Index: Farmatiko/ClientApp/src/app/home/home.component.html
===================================================================
--- Farmatiko/ClientApp/src/app/home/home.component.html	(revision 1f041f6c059e6fe4273e18b284d2d1615b98907b)
+++ Farmatiko/ClientApp/src/app/home/home.component.html	(revision 46c298d4252844b3fef2ebcafd36872eb266197a)
@@ -1,84 +1,84 @@
 <div class="wrapper">
-    <div>
+  <div>
     <h2>Лекови</h2>
     <input type="text" class="form-control" name="lek" placeholder="Пронајди лек">
     <table class='table table-striped table-bordered table-sm' cellspacing="0" width="100%" aria-labelledby="tableLabel" *ngIf="true">
-        <thead>
-            <tr>
-            <th>Placeholder1</th>
-            <th>Placeholder2</th>
-            <th>Placeholder3</th>
-            <th>Placeholder4</th>
-            </tr>
-        </thead>
-        <tbody>
-            <tr *ngFor="">
-            <td>data1</td>
-            <td>data2</td>
-            <td>data3</td>
-            <td>data4</td>
-            </tr>
-        </tbody>
+      <thead>
+        <tr>
+          <th>Placeholder1</th>
+          <th>Placeholder2</th>
+          <th>Placeholder3</th>
+          <th>Placeholder4</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr *ngFor="">
+          <td>data1</td>
+          <td>data2</td>
+          <td>data3</td>
+          <td>data4</td>
+        </tr>
+      </tbody>
     </table>
     <nav aria-label="Page navigation example">
-        <ul class="pagination">
-          <li class="page-item">
-            <a class="page-link" href="#" aria-label="Previous">
-              <span aria-hidden="true">&laquo;</span>
-              <span class="sr-only">Previous</span>
-            </a>
-          </li>
-          <li class="page-item"><a class="page-link" href="#">1</a></li>
-          <li class="page-item"><a class="page-link" href="#">2</a></li>
-          <li class="page-item"><a class="page-link" href="#">3</a></li>
-          <li class="page-item">
-            <a class="page-link" href="#" aria-label="Next">
-              <span aria-hidden="true">&raquo;</span>
-              <span class="sr-only">Next</span>
-            </a>
-          </li>
-        </ul>
-      </nav>
-    </div>
-    <div>
+      <ul class="pagination">
+        <li class="page-item">
+          <a class="page-link" href="#" aria-label="Previous">
+            <span aria-hidden="true">&laquo;</span>
+            <span class="sr-only">Previous</span>
+          </a>
+        </li>
+        <li class="page-item"><a class="page-link" href="#">1</a></li>
+        <li class="page-item"><a class="page-link" href="#">2</a></li>
+        <li class="page-item"><a class="page-link" href="#">3</a></li>
+        <li class="page-item">
+          <a class="page-link" href="#" aria-label="Next">
+            <span aria-hidden="true">&raquo;</span>
+            <span class="sr-only">Next</span>
+          </a>
+        </li>
+      </ul>
+    </nav>
+  </div>
+  <div>
     <h2>Аптеки</h2>
     <input type="text" class="form-control" name="apteka" placeholder="Пронајди аптека">
     <table class='table table-striped table-bordered table-sm' cellspacing="0" width="100%" aria-labelledby="tableLabel" *ngIf="true">
-        <thead>
+      <thead>
         <tr>
-            <th>Placeholder1</th>
-            <th>Placeholder2</th>
-            <th>Placeholder3</th>
-            <th>Placeholder4</th>
+          <th>Placeholder1</th>
+          <th>Placeholder2</th>
+          <th>Placeholder3</th>
+          <th>Placeholder4</th>
         </tr>
-        </thead>
-        <tbody>
+      </thead>
+      <tbody>
         <tr *ngFor="">
-            <td>data1</td>
-            <td>data2</td>
-            <td>data3</td>
-            <td>data4</td>
+          <td>data1</td>
+          <td>data2</td>
+          <td>data3</td>
+          <td>data4</td>
         </tr>
-        </tbody>
+      </tbody>
     </table>
     <nav aria-label="Page navigation example">
-        <ul class="pagination">
-          <li class="page-item">
-            <a class="page-link" href="#" aria-label="Previous">
-              <span aria-hidden="true">&laquo;</span>
-              <span class="sr-only">Previous</span>
-            </a>
-          </li>
-          <li class="page-item"><a class="page-link" href="#">1</a></li>
-          <li class="page-item"><a class="page-link" href="#">2</a></li>
-          <li class="page-item"><a class="page-link" href="#">3</a></li>
-          <li class="page-item">
-            <a class="page-link" href="#" aria-label="Next">
-              <span aria-hidden="true">&raquo;</span>
-              <span class="sr-only">Next</span>
-            </a>
-          </li>
-        </ul>
-      </nav>
-    </div>
+      <ul class="pagination">
+        <li class="page-item">
+          <a class="page-link" href="#" aria-label="Previous">
+            <span aria-hidden="true">&laquo;</span>
+            <span class="sr-only">Previous</span>
+          </a>
+        </li>
+        <li class="page-item"><a class="page-link" href="#">1</a></li>
+        <li class="page-item"><a class="page-link" href="#">2</a></li>
+        <li class="page-item"><a class="page-link" href="#">3</a></li>
+        <li class="page-item">
+          <a class="page-link" href="#" aria-label="Next">
+            <span aria-hidden="true">&raquo;</span>
+            <span class="sr-only">Next</span>
+          </a>
+        </li>
+      </ul>
+    </nav>
+  </div>
 </div>
Index: Farmatiko/ClientApp/src/app/korona/korona.component.html
===================================================================
--- Farmatiko/ClientApp/src/app/korona/korona.component.html	(revision 1f041f6c059e6fe4273e18b284d2d1615b98907b)
+++ Farmatiko/ClientApp/src/app/korona/korona.component.html	(revision 46c298d4252844b3fef2ebcafd36872eb266197a)
@@ -1,41 +1,42 @@
 <div class="container">
-	<div class="row">
-	    <br/>
-	   <div class="col text-center">
-		<h2>Коронавирус</h2>
-		<p>статистика</p>
-		</div>
-		
-             
-		
-	</div>
-		<div class="row text-center">
-	        <div class="col">
-	        <div class="counter">
-      <i class="fa fa-code fa-2x">0</i>
-      <h2 class="timer count-title count-number" data-to="100" data-speed="1500"></h2>
-       <p class="count-text ">Placeholder1</p>
+  <div class="row">
+    <br />
+    <div class="col text-center">
+      <h2>Коронавирус</h2>
+      <p>статистика</p>
     </div>
-	        </div>
-              <div class="col">
-               <div class="counter">
-      <i class="fa fa-coffee fa-2x">0</i>
-      <h2 class="timer count-title count-number" data-to="1700" data-speed="1500"></h2>
-      <p class="count-text ">Placeholder2</p>
+
+
+
+  </div>
+  <div class="row text-center">
+    <div class="col">
+      <div class="counter">
+        <i class="fa fa-code fa-2x">0</i>
+        <h2 class="timer count-title count-number" data-to="100" data-speed="1500"></h2>
+        <p class="count-text ">Placeholder1</p>
+      </div>
     </div>
-              </div>
-              <div class="col">
-                  <div class="counter">
-      <i class="fa fa-lightbulb-o fa-2x">0</i>
-      <h2 class="timer count-title count-number" data-to="11900" data-speed="1500"></h2>
-      <p class="count-text ">Placeholder3</p>
-    </div></div>
-              <div class="col">
-              <div class="counter">
-      <i class="fa fa-bug fa-2x">0</i>
-      <h2 class="timer count-title count-number" data-to="157" data-speed="1500"></h2>
-      <p class="count-text ">Placeholder4</p>
+    <div class="col">
+      <div class="counter">
+        <i class="fa fa-coffee fa-2x">0</i>
+        <h2 class="timer count-title count-number" data-to="1700" data-speed="1500"></h2>
+        <p class="count-text ">Placeholder2</p>
+      </div>
     </div>
-              </div>
-         </div>
+    <div class="col">
+      <div class="counter">
+        <i class="fa fa-lightbulb-o fa-2x">0</i>
+        <h2 class="timer count-title count-number" data-to="11900" data-speed="1500"></h2>
+        <p class="count-text ">Placeholder3</p>
+      </div>
+    </div>
+    <div class="col">
+      <div class="counter">
+        <i class="fa fa-bug fa-2x">0</i>
+        <h2 class="timer count-title count-number" data-to="157" data-speed="1500"></h2>
+        <p class="count-text ">Placeholder4</p>
+      </div>
+    </div>
+  </div>
 </div>
Index: Farmatiko/ClientApp/src/app/models/HealthFacilities.ts
===================================================================
--- Farmatiko/ClientApp/src/app/models/HealthFacilities.ts	(revision 1f041f6c059e6fe4273e18b284d2d1615b98907b)
+++ Farmatiko/ClientApp/src/app/models/HealthFacilities.ts	(revision 46c298d4252844b3fef2ebcafd36872eb266197a)
@@ -1,8 +1,8 @@
 export class HealthFacilities {
-    Name: string;
-    Municipality: string;
-    Address: string;
-    Type: string;
-    Email: string;
-    Phone: string;
+  Name: string;
+  Municipality: string;
+  Address: string;
+  Type: string;
+  Email: string;
+  Phone: string;
 }
Index: Farmatiko/ClientApp/src/app/models/HealthcareWorkers.ts
===================================================================
--- Farmatiko/ClientApp/src/app/models/HealthcareWorkers.ts	(revision 1f041f6c059e6fe4273e18b284d2d1615b98907b)
+++ Farmatiko/ClientApp/src/app/models/HealthcareWorkers.ts	(revision 46c298d4252844b3fef2ebcafd36872eb266197a)
@@ -2,7 +2,7 @@
 
 export class HealthcareWorkers {
-    Name: string;
-    Branch: Date;
-    Facility: HealthFacilities;
-    Title: string;
+  Name: string;
+  Branch: Date;
+  Facility: HealthFacilities;
+  Title: string;
 }
Index: Farmatiko/ClientApp/src/app/models/MedicineList.ts
===================================================================
--- Farmatiko/ClientApp/src/app/models/MedicineList.ts	(revision 1f041f6c059e6fe4273e18b284d2d1615b98907b)
+++ Farmatiko/ClientApp/src/app/models/MedicineList.ts	(revision 46c298d4252844b3fef2ebcafd36872eb266197a)
@@ -2,5 +2,5 @@
 
 export class MedicineList {
-    Medicines: Medicine[];
-    HasMedicine: boolean[];
+  Medicines: Medicine[];
+  HasMedicine: boolean[];
 }
Index: Farmatiko/ClientApp/src/app/models/Pandemic.ts
===================================================================
--- Farmatiko/ClientApp/src/app/models/Pandemic.ts	(revision 1f041f6c059e6fe4273e18b284d2d1615b98907b)
+++ Farmatiko/ClientApp/src/app/models/Pandemic.ts	(revision 46c298d4252844b3fef2ebcafd36872eb266197a)
@@ -1,10 +1,10 @@
 export class Pandemic {
-    Name: string;
-    TotalMK: BigInt;
-    ActiveMK: BigInt;
-    DeathsMK: BigInt;
-    NewMK: BigInt;
-    TotalGlobal: BigInt;
-    DeathsGlobal: BigInt;
-    ActiveGlobal: BigInt;
+  Name: string;
+  TotalMK: BigInt;
+  ActiveMK: BigInt;
+  DeathsMK: BigInt;
+  NewMK: BigInt;
+  TotalGlobal: BigInt;
+  DeathsGlobal: BigInt;
+  ActiveGlobal: BigInt;
 }
Index: Farmatiko/ClientApp/src/app/models/Pharmacy.ts
===================================================================
--- Farmatiko/ClientApp/src/app/models/Pharmacy.ts	(revision 1f041f6c059e6fe4273e18b284d2d1615b98907b)
+++ Farmatiko/ClientApp/src/app/models/Pharmacy.ts	(revision 46c298d4252844b3fef2ebcafd36872eb266197a)
@@ -1,6 +1,6 @@
 export class Pharmacy {
-    Name: string;
-    Location: string;
-    Address: string;
-    WorkAllTime: boolean;
+  Name: string;
+  Location: string;
+  Address: string;
+  WorkAllTime: boolean;
 }
Index: Farmatiko/ClientApp/src/app/models/PharmacyHead.ts
===================================================================
--- Farmatiko/ClientApp/src/app/models/PharmacyHead.ts	(revision 1f041f6c059e6fe4273e18b284d2d1615b98907b)
+++ Farmatiko/ClientApp/src/app/models/PharmacyHead.ts	(revision 46c298d4252844b3fef2ebcafd36872eb266197a)
@@ -3,8 +3,8 @@
 
 export class PharmacyHead {
-    PharmacyMedicines: MedicineList;
-    Pharmacy: Pharmacy[];
-    Email: string;
-    Passwd: string;
-    Name: string;
+  PharmacyMedicines: MedicineList;
+  Pharmacy: Pharmacy[];
+  Email: string;
+  Passwd: string;
+  Name: string;
 }
Index: Farmatiko/ClientApp/src/app/nav-menu/nav-menu.component.css
===================================================================
--- Farmatiko/ClientApp/src/app/nav-menu/nav-menu.component.css	(revision 1f041f6c059e6fe4273e18b284d2d1615b98907b)
+++ Farmatiko/ClientApp/src/app/nav-menu/nav-menu.component.css	(revision 46c298d4252844b3fef2ebcafd36872eb266197a)
@@ -5,11 +5,12 @@
 }
 
-a.navbar-brand img {
-  width: 200px;
-}
+  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 1f041f6c059e6fe4273e18b284d2d1615b98907b)
+++ Farmatiko/ClientApp/src/app/nav-menu/nav-menu.component.html	(revision 46c298d4252844b3fef2ebcafd36872eb266197a)
@@ -1,40 +1,28 @@
 <header>
-  <nav
-    class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3"
-  >
+  <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
     <div class="container">
       <a class="navbar-brand" [routerLink]="['/']"><img src="../../assets/logo.png"></a>
-      <button
-        class="navbar-toggler"
-        type="button"
-        data-toggle="collapse"
-        data-target=".navbar-collapse"
-        aria-label="Toggle navigation"
-        [attr.aria-expanded]="isExpanded"
-        (click)="toggle()"
-      >
+      <button class="navbar-toggler"
+              type="button"
+              data-toggle="collapse"
+              data-target=".navbar-collapse"
+              aria-label="Toggle navigation"
+              [attr.aria-expanded]="isExpanded"
+              (click)="toggle()">
         <span class="navbar-toggler-icon"></span>
       </button>
-      <div
-        class="navbar-collapse collapse d-sm-inline-flex flex-sm-row-reverse"
-        [ngClass]="{ show: isExpanded }"
-      >
+      <div class="navbar-collapse collapse d-sm-inline-flex flex-sm-row-reverse"
+           [ngClass]="{ show: isExpanded }">
         <ul class="navbar-nav flex-grow">
-          <li
-            class="nav-item"
-            [routerLinkActive]="['link-active']"
-            [routerLinkActiveOptions]="{ exact: true }"
-          >
+          <li class="nav-item"
+              [routerLinkActive]="['link-active']"
+              [routerLinkActiveOptions]="{ exact: true }">
             <a class="nav-link text-dark" [routerLink]="['/']">Побарај лек</a>
           </li>
           <li class="nav-item" [routerLinkActive]="['link-active']">
-            <a class="nav-link text-dark" [routerLink]="['/mapa']"
-              >Мапа на здравствени работници и здравствени установи</a
-            >
-          </li>          
+            <a class="nav-link text-dark" [routerLink]="['/mapa']">Мапа на здравствени работници и здравствени установи</a>
+          </li>
           <li class="nav-item" [routerLinkActive]="['link-active']">
-            <a class="nav-link text-dark" [routerLink]="['/koronavirus']"
-              >Коронавирус</a
-            >
+            <a class="nav-link text-dark" [routerLink]="['/koronavirus']">Коронавирус</a>
           </li>
         </ul>
Index: Farmatiko/ClientApp/src/app/shared/material.module.ts
===================================================================
--- Farmatiko/ClientApp/src/app/shared/material.module.ts	(revision 1f041f6c059e6fe4273e18b284d2d1615b98907b)
+++ Farmatiko/ClientApp/src/app/shared/material.module.ts	(revision 46c298d4252844b3fef2ebcafd36872eb266197a)
@@ -24,15 +24,15 @@
 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 { 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';
Index: Farmatiko/Farmatiko.csproj
===================================================================
--- Farmatiko/Farmatiko.csproj	(revision 1f041f6c059e6fe4273e18b284d2d1615b98907b)
+++ Farmatiko/Farmatiko.csproj	(revision 46c298d4252844b3fef2ebcafd36872eb266197a)
@@ -38,4 +38,8 @@
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Services\" />
+  </ItemGroup>
+
   <Target Name="DebugEnsureNodeEnv" BeforeTargets="Build" Condition=" '$(Configuration)' == 'Debug' And !Exists('$(SpaRoot)node_modules') ">
     <!-- Ensure Node.js is installed -->
