Super Admin - Listview pages

ProRestaurant/Controllers/Accounts/IUserController.cs

@@ -0,0 +1,6 @@
+namespace ProRestaurant.Controllers.Accounts
+{
+    internal interface IUserController
+    {
+    }
+}

ProRestaurant/Controllers/Accounts/UserController.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Transactions;
+using Microsoft.AspNetCore.Mvc;
+using ProRestaurant.Models.Accounts;
+using ProRestaurant.Repository.Accounts;
+
+namespace ProRestaurant.Controllers.Accounts
+{
+    [Route("api/[controller]")]
+    [ApiController]
+    public class UserController : ControllerBase
+    {
+        private readonly IUserRepository repo;
+        public UserController(IUserRepository Repo)
+        {
+            repo = Repo;
+        }       
+
+        [HttpGet("GetCustomers")]
+        public IActionResult GetCustomers()
+        {
+            return new OkObjectResult(repo.Get(u => u.SystemRole == Classes.SystemRole.Customer));
+        }
+
+        [HttpGet("{id}")]
+        public IActionResult Get(int id)
+        {
+            return new OkObjectResult(repo.GetUser(id));
+        }
+
+        [HttpGet("GetUserAddress/{id}")]
+        public IActionResult GetUserAddress(int id)
+        {
+            return new OkObjectResult(repo.GetUserAddress(id));
+        }
+
+        [HttpPut]
+        public IActionResult Put([FromBody] User user)
+        {
+            if (user != null)
+            {
+                using (var scope = new TransactionScope())
+                {
+                    repo.Update(user);
+                    scope.Complete();
+                    return new OkResult();
+                }
+            }
+            return new NoContentResult();
+        }        
+    }
+}

ProRestaurant/Controllers/Restaurants/IRestaurantCategory.cs

@@ -1,6 +0,0 @@
-namespace ProRestaurant.Controllers.Restaurants
-{
-    internal interface IRestaurantCategory
-    {
-    }
-}

ProRestaurant/Controllers/Restaurants/RestaurantController.cs

@@ -16,6 +16,12 @@ namespace ProRestaurant.Controllers.Restaurants
             repo = _repo;
         }
 
+        [HttpGet("GetRestaurants")]
+        public IActionResult GetRestaurants()
+        {
+            return new OkObjectResult(repo.GetRestaurants());
+        }
+
         [HttpGet]
         public IActionResult Get()
         {

ProRestaurant/Migrations/20200611111141_005.Designer.cs

@@ -0,0 +1,392 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using ProRestaurant.DBContexts;
+
+namespace ProRestaurant.Migrations
+{
+    [DbContext(typeof(DBContext))]
+    [Migration("20200611111141_005")]
+    partial class _005
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "2.2.0-rtm-35687")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128)
+                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+            modelBuilder.Entity("ProRestaurant.Models.Accounts.DriverDetail", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<string>("Photo");
+
+                    b.Property<string>("RegistrationNumber");
+
+                    b.Property<int>("UserId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("DriverDetails");
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Accounts.User", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<string>("Cellphone");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("EmailAddress");
+
+                    b.Property<string>("FirstName");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<string>("Password");
+
+                    b.Property<string>("Surname");
+
+                    b.Property<int>("SystemRole");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Users");
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Accounts.UserAddress", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<string>("City");
+
+                    b.Property<string>("ComplexName");
+
+                    b.Property<string>("Country");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("GoogleMapUrl");
+
+                    b.Property<bool>("IsComplex");
+
+                    b.Property<bool>("IsDefault");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<decimal>("Latitude");
+
+                    b.Property<decimal>("Longitude");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<string>("PostalCode");
+
+                    b.Property<string>("Provice");
+
+                    b.Property<string>("SteetNumber");
+
+                    b.Property<string>("StreetName");
+
+                    b.Property<string>("Suburb");
+
+                    b.Property<string>("UnitNumber");
+
+                    b.Property<int>("UserId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("UserAddresses");
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Misc.Locations", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<string>("CategoryStore");
+
+                    b.Property<string>("ImageStore");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Locations");
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuCategory", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Description");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<int>("RestaurantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RestaurantId");
+
+                    b.ToTable("MenuCategories");
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuItem", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<int>("CategoryId");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Description");
+
+                    b.Property<string>("Image");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<decimal>("Price");
+
+                    b.Property<int>("RestaurantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RestaurantId");
+
+                    b.ToTable("MenuItems");
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.Restaurant", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<string>("Categories");
+
+                    b.Property<string>("City");
+
+                    b.Property<string>("Country");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<decimal>("DeliveryFee");
+
+                    b.Property<decimal>("DeliveryRadius");
+
+                    b.Property<string>("DeliveryTime");
+
+                    b.Property<string>("GoogleMapUrl");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<decimal>("Latitude");
+
+                    b.Property<string>("Logo");
+
+                    b.Property<decimal>("Longitude");
+
+                    b.Property<string>("MethodsOfPayment");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<string>("Name");
+
+                    b.Property<string>("PostalCode");
+
+                    b.Property<string>("Provice");
+
+                    b.Property<string>("ShopNumber");
+
+                    b.Property<string>("ShoppingCentre");
+
+                    b.Property<string>("StreetName");
+
+                    b.Property<string>("StreetNumber");
+
+                    b.Property<string>("Suburb");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Restaurants");
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantCategory", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<string>("Description");
+
+                    b.Property<string>("Image");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("RestaurantCategories");
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantUser", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<int>("RestaurantId");
+
+                    b.Property<int>("UserId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RestaurantId");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("RestaurantUsers");
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.TradingHours", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<bool>("Closed");
+
+                    b.Property<DateTime>("ClosingTime");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Description");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<bool>("Opened24H");
+
+                    b.Property<DateTime>("OpeningTime");
+
+                    b.Property<int>("RestaurantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RestaurantId");
+
+                    b.ToTable("TradingHours");
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Accounts.DriverDetail", b =>
+                {
+                    b.HasOne("ProRestaurant.Models.Accounts.User", "User")
+                        .WithOne("DriverDetails")
+                        .HasForeignKey("ProRestaurant.Models.Accounts.DriverDetail", "UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Accounts.UserAddress", b =>
+                {
+                    b.HasOne("ProRestaurant.Models.Accounts.User", "User")
+                        .WithMany("Addresses")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuCategory", b =>
+                {
+                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
+                        .WithMany()
+                        .HasForeignKey("RestaurantId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuItem", b =>
+                {
+                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
+                        .WithMany()
+                        .HasForeignKey("RestaurantId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantUser", b =>
+                {
+                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
+                        .WithMany("Users")
+                        .HasForeignKey("RestaurantId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("ProRestaurant.Models.Accounts.User", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.TradingHours", b =>
+                {
+                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
+                        .WithMany("TradingHours")
+                        .HasForeignKey("RestaurantId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

ProRestaurant/Migrations/20200611111141_005.cs

@@ -0,0 +1,23 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace ProRestaurant.Migrations
+{
+    public partial class _005 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "IsComplex",
+                table: "UserAddresses",
+                nullable: false,
+                defaultValue: false);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "IsComplex",
+                table: "UserAddresses");
+        }
+    }
+}

ProRestaurant/Migrations/20200611112655_006.Designer.cs

@@ -0,0 +1,392 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using ProRestaurant.DBContexts;
+
+namespace ProRestaurant.Migrations
+{
+    [DbContext(typeof(DBContext))]
+    [Migration("20200611112655_006")]
+    partial class _006
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "2.2.0-rtm-35687")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128)
+                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+            modelBuilder.Entity("ProRestaurant.Models.Accounts.DriverDetail", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<string>("Photo");
+
+                    b.Property<string>("RegistrationNumber");
+
+                    b.Property<int>("UserId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("DriverDetails");
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Accounts.User", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<string>("Cellphone");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("EmailAddress");
+
+                    b.Property<string>("FirstName");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<string>("Password");
+
+                    b.Property<string>("Surname");
+
+                    b.Property<int>("SystemRole");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Users");
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Accounts.UserAddress", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<string>("City");
+
+                    b.Property<string>("ComplexName");
+
+                    b.Property<string>("Country");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("GoogleMapUrl");
+
+                    b.Property<bool>("IsComplex");
+
+                    b.Property<bool>("IsDefault");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<decimal>("Latitude");
+
+                    b.Property<decimal>("Longitude");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<string>("PostalCode");
+
+                    b.Property<string>("Province");
+
+                    b.Property<string>("SteetNumber");
+
+                    b.Property<string>("StreetName");
+
+                    b.Property<string>("Suburb");
+
+                    b.Property<string>("UnitNumber");
+
+                    b.Property<int>("UserId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("UserAddresses");
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Misc.Locations", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<string>("CategoryStore");
+
+                    b.Property<string>("ImageStore");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Locations");
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuCategory", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Description");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<int>("RestaurantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RestaurantId");
+
+                    b.ToTable("MenuCategories");
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuItem", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<int>("CategoryId");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Description");
+
+                    b.Property<string>("Image");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<decimal>("Price");
+
+                    b.Property<int>("RestaurantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RestaurantId");
+
+                    b.ToTable("MenuItems");
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.Restaurant", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<string>("Categories");
+
+                    b.Property<string>("City");
+
+                    b.Property<string>("Country");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<decimal>("DeliveryFee");
+
+                    b.Property<decimal>("DeliveryRadius");
+
+                    b.Property<string>("DeliveryTime");
+
+                    b.Property<string>("GoogleMapUrl");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<decimal>("Latitude");
+
+                    b.Property<string>("Logo");
+
+                    b.Property<decimal>("Longitude");
+
+                    b.Property<string>("MethodsOfPayment");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<string>("Name");
+
+                    b.Property<string>("PostalCode");
+
+                    b.Property<string>("Provice");
+
+                    b.Property<string>("ShopNumber");
+
+                    b.Property<string>("ShoppingCentre");
+
+                    b.Property<string>("StreetName");
+
+                    b.Property<string>("StreetNumber");
+
+                    b.Property<string>("Suburb");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Restaurants");
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantCategory", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<string>("Description");
+
+                    b.Property<string>("Image");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("RestaurantCategories");
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantUser", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<int>("RestaurantId");
+
+                    b.Property<int>("UserId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RestaurantId");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("RestaurantUsers");
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.TradingHours", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<bool>("Closed");
+
+                    b.Property<DateTime>("ClosingTime");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Description");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<bool>("Opened24H");
+
+                    b.Property<DateTime>("OpeningTime");
+
+                    b.Property<int>("RestaurantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RestaurantId");
+
+                    b.ToTable("TradingHours");
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Accounts.DriverDetail", b =>
+                {
+                    b.HasOne("ProRestaurant.Models.Accounts.User", "User")
+                        .WithOne("DriverDetails")
+                        .HasForeignKey("ProRestaurant.Models.Accounts.DriverDetail", "UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Accounts.UserAddress", b =>
+                {
+                    b.HasOne("ProRestaurant.Models.Accounts.User", "User")
+                        .WithMany("Addresses")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuCategory", b =>
+                {
+                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
+                        .WithMany()
+                        .HasForeignKey("RestaurantId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuItem", b =>
+                {
+                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
+                        .WithMany()
+                        .HasForeignKey("RestaurantId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantUser", b =>
+                {
+                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
+                        .WithMany("Users")
+                        .HasForeignKey("RestaurantId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("ProRestaurant.Models.Accounts.User", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.TradingHours", b =>
+                {
+                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
+                        .WithMany("TradingHours")
+                        .HasForeignKey("RestaurantId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

ProRestaurant/Migrations/20200611112655_006.cs

@@ -0,0 +1,23 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace ProRestaurant.Migrations
+{
+    public partial class _006 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.RenameColumn(
+                name: "Provice",
+                table: "UserAddresses",
+                newName: "Province");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.RenameColumn(
+                name: "Province",
+                table: "UserAddresses",
+                newName: "Provice");
+        }
+    }
+}

ProRestaurant/Migrations/20200611113345_007.Designer.cs

@@ -0,0 +1,392 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using ProRestaurant.DBContexts;
+
+namespace ProRestaurant.Migrations
+{
+    [DbContext(typeof(DBContext))]
+    [Migration("20200611113345_007")]
+    partial class _007
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "2.2.0-rtm-35687")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128)
+                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+            modelBuilder.Entity("ProRestaurant.Models.Accounts.DriverDetail", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<string>("Photo");
+
+                    b.Property<string>("RegistrationNumber");
+
+                    b.Property<int>("UserId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("DriverDetails");
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Accounts.User", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<string>("Cellphone");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("EmailAddress");
+
+                    b.Property<string>("FirstName");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<string>("Password");
+
+                    b.Property<string>("Surname");
+
+                    b.Property<int>("SystemRole");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Users");
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Accounts.UserAddress", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<string>("City");
+
+                    b.Property<string>("ComplexName");
+
+                    b.Property<string>("Country");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("GoogleMapUrl");
+
+                    b.Property<bool>("IsComplex");
+
+                    b.Property<bool>("IsDefault");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<decimal>("Latitude");
+
+                    b.Property<decimal>("Longitude");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<string>("PostalCode");
+
+                    b.Property<string>("Province");
+
+                    b.Property<string>("StreetName");
+
+                    b.Property<string>("StreetNumber");
+
+                    b.Property<string>("Suburb");
+
+                    b.Property<string>("UnitNumber");
+
+                    b.Property<int>("UserId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("UserAddresses");
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Misc.Locations", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<string>("CategoryStore");
+
+                    b.Property<string>("ImageStore");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Locations");
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuCategory", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Description");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<int>("RestaurantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RestaurantId");
+
+                    b.ToTable("MenuCategories");
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuItem", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<int>("CategoryId");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Description");
+
+                    b.Property<string>("Image");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<decimal>("Price");
+
+                    b.Property<int>("RestaurantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RestaurantId");
+
+                    b.ToTable("MenuItems");
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.Restaurant", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<string>("Categories");
+
+                    b.Property<string>("City");
+
+                    b.Property<string>("Country");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<decimal>("DeliveryFee");
+
+                    b.Property<decimal>("DeliveryRadius");
+
+                    b.Property<string>("DeliveryTime");
+
+                    b.Property<string>("GoogleMapUrl");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<decimal>("Latitude");
+
+                    b.Property<string>("Logo");
+
+                    b.Property<decimal>("Longitude");
+
+                    b.Property<string>("MethodsOfPayment");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<string>("Name");
+
+                    b.Property<string>("PostalCode");
+
+                    b.Property<string>("Provice");
+
+                    b.Property<string>("ShopNumber");
+
+                    b.Property<string>("ShoppingCentre");
+
+                    b.Property<string>("StreetName");
+
+                    b.Property<string>("StreetNumber");
+
+                    b.Property<string>("Suburb");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Restaurants");
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantCategory", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<string>("Description");
+
+                    b.Property<string>("Image");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("RestaurantCategories");
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantUser", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<int>("RestaurantId");
+
+                    b.Property<int>("UserId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RestaurantId");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("RestaurantUsers");
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.TradingHours", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<bool>("Closed");
+
+                    b.Property<DateTime>("ClosingTime");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Description");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<bool>("Opened24H");
+
+                    b.Property<DateTime>("OpeningTime");
+
+                    b.Property<int>("RestaurantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RestaurantId");
+
+                    b.ToTable("TradingHours");
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Accounts.DriverDetail", b =>
+                {
+                    b.HasOne("ProRestaurant.Models.Accounts.User", "User")
+                        .WithOne("DriverDetails")
+                        .HasForeignKey("ProRestaurant.Models.Accounts.DriverDetail", "UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Accounts.UserAddress", b =>
+                {
+                    b.HasOne("ProRestaurant.Models.Accounts.User", "User")
+                        .WithMany("Addresses")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuCategory", b =>
+                {
+                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
+                        .WithMany()
+                        .HasForeignKey("RestaurantId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuItem", b =>
+                {
+                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
+                        .WithMany()
+                        .HasForeignKey("RestaurantId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantUser", b =>
+                {
+                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
+                        .WithMany("Users")
+                        .HasForeignKey("RestaurantId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("ProRestaurant.Models.Accounts.User", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.TradingHours", b =>
+                {
+                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
+                        .WithMany("TradingHours")
+                        .HasForeignKey("RestaurantId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

ProRestaurant/Migrations/20200611113345_007.cs

@@ -0,0 +1,23 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace ProRestaurant.Migrations
+{
+    public partial class _007 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.RenameColumn(
+                name: "SteetNumber",
+                table: "UserAddresses",
+                newName: "StreetNumber");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.RenameColumn(
+                name: "StreetNumber",
+                table: "UserAddresses",
+                newName: "SteetNumber");
+        }
+    }
+}

ProRestaurant/Migrations/DBContextModelSnapshot.cs

@@ -94,6 +94,8 @@ namespace ProRestaurant.Migrations
 
                     b.Property<string>("GoogleMapUrl");
 
+                    b.Property<bool>("IsComplex");
+
                     b.Property<bool>("IsDefault");
 
                     b.Property<bool>("IsDeleted");
@@ -108,12 +110,12 @@ namespace ProRestaurant.Migrations
 
                     b.Property<string>("PostalCode");
 
-                    b.Property<string>("Provice");
-
-                    b.Property<string>("SteetNumber");
+                    b.Property<string>("Province");
 
                     b.Property<string>("StreetName");
 
+                    b.Property<string>("StreetNumber");
+
                     b.Property<string>("Suburb");
 
                     b.Property<string>("UnitNumber");

ProRestaurant/Models/Accounts/UserAddress.cs

@@ -4,17 +4,18 @@
     {
         public int UserId { get; set; }
         public bool IsDefault { get; set; }
+        public bool IsComplex { get; set; }
         public string GoogleMapUrl { get; set; }
         public decimal Latitude { get; set; }
         public decimal Longitude { get; set; } 
 
         public string UnitNumber { get; set; }
         public string ComplexName { get; set; }
-        public string SteetNumber { get; set; }
+        public string StreetNumber { get; set; }
         public string StreetName { get; set; }
         public string Suburb { get; set; }
         public string City { get; set; }
-        public string Provice { get; set; }
+        public string Province { get; set; }
         public string Country { get; set; }
         public string PostalCode { get; set; }
 

ProRestaurant/Repository/Accounts/IUserRepository.cs

@@ -0,0 +1,66 @@
+using ProRestaurant.DBContexts;
+using ProRestaurant.Models.Accounts;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace ProRestaurant.Repository.Accounts
+{
+    public interface IUserRepository
+    {
+        ICollection<User> Get(Func<User, bool> where);
+        User GetUser(int UserId);
+        UserAddress GetUserAddress(int UserId);
+        void Update(User user);
+        void Save();
+    }
+
+    public class UserRepository : IUserRepository
+    {
+        private readonly DBContext dbContext;
+
+        public UserRepository(DBContext _db)
+        {
+            dbContext = _db;
+        }
+
+        public ICollection<User> Get(Func<User, bool> where)
+        {
+            return dbContext.Users.Where(where).ToList();
+        }
+
+        public User GetUser(int UserId)
+        {            
+            return dbContext.Users.Where(u => u.Id == UserId).FirstOrDefault();
+        }
+
+        public UserAddress GetUserAddress(int UserId)
+        {
+            var address = dbContext.UserAddresses.Where(a => a.UserId == UserId).FirstOrDefault();
+            return address;
+        }
+
+        public void Save()
+        {
+            dbContext.SaveChanges();
+        }
+
+        public void Update(User user)
+        {
+            if (user.Addresses != null && user.Addresses.Count > 0)
+            {
+                foreach(var address in user.Addresses)
+                {
+                    if (address.Id == 0)
+                    {
+                        dbContext.Add(address);
+                        Save();
+                    }
+                }
+            }
+
+            dbContext.Entry(user).State = Microsoft.EntityFrameworkCore.EntityState.Modified;
+            Save();
+        }
+    }
+}

ProRestaurant/Repository/Restaurants/IRestaurantRepository.cs

@@ -8,7 +8,8 @@ using System.Threading.Tasks;
 namespace ProRestaurant.Repository.Restaurants
 {
     public interface IRestaurantRepository
-    {        
+    {
+        List<Restaurant> GetRestaurants();
         List<RestaurantCard> GetSearch();
         Restaurant GetRestaurant(Func<Restaurant, bool> where);
         void Insert(Restaurant restaurant);

ProRestaurant/Repository/Restaurants/RestaurantRepository.cs

@@ -23,11 +23,6 @@ namespace ProRestaurant.Repository.Restaurants
             return dBContext.Restaurants.Where(where).FirstOrDefault();
         }
 
-        public IEnumerable<Restaurant> GetRestaurants()
-        {
-            return dBContext.Restaurants.ToList();
-        }
-
         public List<RestaurantCard> GetSearch()
         {
             var restaurants = dBContext.Restaurants.ToList();
@@ -77,6 +72,11 @@ namespace ProRestaurant.Repository.Restaurants
         {
             dBContext.Entry(restaurant).State = EntityState.Modified;
             Save();
-        }        
+        }
+
+        List<Restaurant> IRestaurantRepository.GetRestaurants()
+        {
+            return dBContext.Restaurants.ToList();
+        }
     }
 }

ProRestaurant/Startup.cs

@@ -71,12 +71,12 @@ namespace ProRestaurant
             services.AddScoped<IAuthenticateRepository, AuthenticateRepository>();
             #endregion
 
-
             services.AddDbContext<DBContext>(o => o.UseSqlServer(Configuration.GetConnectionString("DefaultDatabase")));           
 
             services.AddTransient<IRegistrationRepository, RegistrationRepository>();
             services.AddTransient<IRestaurantCategoryRepository, RestaurantCategoryRepository>();
             services.AddTransient<IRestaurantRepository, RestaurantRepository>();
+            services.AddTransient<IUserRepository, UserRepository>();
 
             services.Configure<MvcOptions>(options =>
             {
@@ -95,6 +95,11 @@ namespace ProRestaurant
                 app.UseHsts();
             }
 
+            app.UseCors(x => x
+                 .AllowAnyOrigin()
+                 .AllowAnyMethod()
+                 .AllowAnyHeader());
+            app.UseAuthentication();
             app.UseHttpsRedirection();
             app.UseMvc();
         }

ProRestaurant/obj/Debug/netcoreapp2.2/ProRestaurant.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-d43a7af6b2b5d7d9d5ce44deb53c19ad484cc2cc
+95f31759ff509a3473cf7dbab60f1f45eea8a8ac