Merge pull request #22 from umpirsky/restaurant/la-strega

La strega

app/data/la-strega.json

@@ -0,0 +1,16 @@
+{
+    "name": "La Strega",
+    "logo": "images/restaurant/la-strega.png",
+    "phone": "065 290 22 22, 018 29 22 22",
+    "delivery": true,
+    "address": "Nikole Pašića 1, Niš",
+    "url": "http://www.picerijalastrega.rs",
+    "images": [
+        "images/menu/la-strega/1.jpg",
+        "images/menu/la-strega/2.jpg",
+        "images/menu/la-strega/3.jpg",
+        "images/menu/la-strega/4.jpg",
+        "images/menu/la-strega/5.jpg",
+        "images/menu/la-strega/6.jpg"
+    ]
+}

app/data/novopazarski-cevap-deset-sa-lukom.json

@@ -0,0 +1,12 @@
+{
+    "name": "Novopazarski ćevap deset sa lukom",
+    "logo": "images/restaurant/novopazarski-cevap-deset-sa-lukom.png",
+    "phone": "063 70 77 901",
+    "delivery": true,
+    "address": "Nikole Pašića 2, Niš",
+    "url": "https://www.facebook.com/pages/Novopazarski-%C4%87evap-Deset-ucelo/1496451907287776",
+    "images": [
+        "images/menu/novopazarski-cevap-deset-sa-lukom/1.jpg",
+        "images/menu/novopazarski-cevap-deset-sa-lukom/2.jpg"
+    ]
+}

app/data/pizza-boss.json

@@ -11,6 +11,8 @@
         "images/menu/pizza-boss/3.jpg",
         "images/menu/pizza-boss/4.jpg",
         "images/menu/pizza-boss/5.jpg",
-        "images/menu/pizza-boss/6.jpg"
+        "images/menu/pizza-boss/6.jpg",
+        "images/menu/pizza-boss/7.jpg",
+        "images/menu/pizza-boss/8.jpg"
     ]
 }

app/data/rapido.json

@@ -0,0 +1,12 @@
+{
+    "name": "Rapido",
+    "logo": "images/restaurant/rapido.jpg",
+    "phone": "060 529 11 10, 018  29 11 11",
+    "delivery": true,
+    "address": "Nikole Pašića 1, Niš",
+    "url": "http://www.picerijalastrega.rs",
+    "images": [
+        "images/menu/rapido/1.jpg",
+        "images/menu/rapido/2.jpg"
+    ]
+}

app/data/restaurants.json

@@ -53,6 +53,18 @@
         "logo": "images/restaurant/geppetto.jpg",
         "tags": "pica, sendvič,palačinka"
     },
+    {
+        "name": "Rapido",
+        "slug": "rapido",
+        "logo": "images/restaurant/rapido.jpg",
+        "tags": "salata, sendvič, palačinka"
+    },
+    {
+        "name": "La Strega",
+        "slug": "la-strega",
+        "logo": "images/restaurant/la-strega.png",
+        "tags": "pasta, pica, palačinka"
+    },
     {
         "name": "Cezar",
         "slug": "cezar",
@@ -77,6 +89,12 @@
         "logo": "images/restaurant/kabak.jpg",
         "tags": "burek, pica, pecivo, sendvič, kroasan"
     },
+    {
+        "name": "Novopazarski ćevap deset sa lukom",
+        "slug": "novopazarski-cevap-deset-sa-lukom",
+        "logo": "images/restaurant/novopazarski-cevap-deset-sa-lukom.png",
+        "tags": "ćevap, pljeskavica, sudžuk"
+    },
     {
         "name": "Pizza Boss",
         "slug": "pizza-boss",

app/scripts/services/url.js

@@ -7,7 +7,7 @@ angular.module('restaurantsServices', [])
       link.href = url;
 
       if (-1 !== link.href.indexOf('facebook.com/pages')) {
-        return link.pathname.split('/')[2];
+        return window.decodeURIComponent(link.pathname.split('/')[2]);
       }
 
       if (-1 !== link.hostname.indexOf('facebook')) {

test/e2e/scenarios.js

@@ -14,14 +14,14 @@ describe('Restaurants App', function() {
       var restaurantList = element.all(by.repeater('restaurant in restaurants'));
       var query = element(by.model('query'));
 
-      expect(restaurantList.count()).toBe(14);
+      expect(restaurantList.count()).toBe(17);
 
       query.sendKeys('Cezar');
       expect(restaurantList.count()).toBe(1);
 
       query.clear();
       query.sendKeys('pica');
-      expect(restaurantList.count()).toBe(8);
+      expect(restaurantList.count()).toBe(9);
     });
   });
 });