Merge branch 'master' of https://github.com/pixellos/TWIN

pixellos · Oct 1, 2016 · ad7ab4c · ad7ab4c
2 parents 3d63e86 + 471d747
commit ad7ab4c
Show file tree

Hide file tree

Showing 12 changed files with 55 additions and 11 deletions.
diff --git a/WebLedMatrix.Matrix/Logic/ServiceWrapper.cs b/WebLedMatrix.Matrix/Logic/ServiceWrapper.cs
@@ -31,14 +31,13 @@ public void SetName(string name)
             try
             {
                 _client.UnRegisterMatrix(_name);
+                _name = name;
+                _client.RegisterMatrix(_name);
             }
             catch (Exception )
             {
                 //Connection has been lost
             }
-
-            _name = name;
-            _client.RegisterMatrix(_name);
         }
     }
 }
diff --git a/WebLedMatrix.Matrix/OutputWindow.xaml b/WebLedMatrix.Matrix/OutputWindow.xaml
@@ -1,4 +1,5 @@
-<Window x:Class="WebLedMatrix.Matrix.OutputWindow"
+<Window WindowStyle="None" WindowState="Maximized" WindowStartupLocation="CenterOwner" x:Class="WebLedMatrix.Matrix.OutputWindow"
+
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

diff --git a/WebLedMatrix.Matrix/ViewModel/MainViewModel.cs b/WebLedMatrix.Matrix/ViewModel/MainViewModel.cs
@@ -34,6 +34,11 @@ public MainViewModel(IDataService dataService)
             _serviceWrapper = IoCContainter.Resolve<ServiceWrapper>();
             SetName = new RelayCommand(() =>
             {
+                if (NodeName.Contains(" "))
+                {
+                    MessageBox.Show("Name cannot contain spaces", "Error!");
+                    return;
+                }
                 _serviceWrapper.SetName(NodeName);
                 Messenger.Default.Send(new NotificationMessage(MessageStrings.Show));
             });

diff --git a/WebLedMatrix/Controllers/AccountController.cs b/WebLedMatrix/Controllers/AccountController.cs
@@ -68,10 +68,8 @@ public PartialViewResult Login(LoginModel loginModel)
         {
             if (HttpContext.User.Identity.IsAuthenticated)
                 return PartialView("Greetings", User.Identity.Name);
-
             if (ModelState.IsValid && Manager.TryLogin(loginModel))
                 return PartialView("AccessGranted");
-
             ModelState.AddModelError(string.Empty,"Input incorrect data");
 
             return PartialView(loginModel);

diff --git a/WebLedMatrix/Controllers/Authentication/Abstract/ITwinUser.cs b/WebLedMatrix/Controllers/Authentication/Abstract/ITwinUser.cs
@@ -1,4 +1,5 @@
 using System.ComponentModel.DataAnnotations;
+using WebLedMatrix.Logic.Authentication.Models.Roles;
 
 namespace WebLedMatrix.Logic.Authentication.Abstract
 {
@@ -12,5 +13,8 @@ public interface ITwinUser
 
         [Required]
         string TelephoneNumber { get; set; }
+
+        [Required]
+        string About { get; set; }
     }
 }
diff --git a/WebLedMatrix/Controllers/Authentication/Infrastructure/UserIdentityDbContext.cs b/WebLedMatrix/Controllers/Authentication/Infrastructure/UserIdentityDbContext.cs
@@ -5,8 +5,10 @@ namespace WebLedMatrix.Logic.Authentication.Infrastructure
 {
     public class UserIdentityDbContext : IdentityDbContext<User>
     {
-        public UserIdentityDbContext() : base("Server=tcp:data11admin.database.windows.net,1433;Database=TestDatabase;User ID=admin1@data11admin;Password=Data123456!;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;") {}
-
+        public UserIdentityDbContext(): base("Server=tcp:data11admin.database.windows.net,1433;Initial Catalog=TestDatabase;Persist Security Info=False;User ID=admin1@data11admin;Password=Data123456!;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;")
+        {
+
+        }
         static UserIdentityDbContext()
         {
             System.Data.Entity.Database.SetInitializer<UserIdentityDbContext>(new UserIdentityDbInitialize());

diff --git a/WebLedMatrix/Controllers/Authentication/Infrastructure/UserIdentityDbInitialize.cs b/WebLedMatrix/Controllers/Authentication/Infrastructure/UserIdentityDbInitialize.cs
@@ -16,8 +16,8 @@ protected override void Seed(UserIdentityDbContext context)
             base.Seed(context);
         }
 
-        private string userName = "Admin";
-        private string password = "ChangeThisPassword1";
+        private string userName = "Administrator";
+        private string password = "Admin1";
         private string email = "[email protected]";
         private string firstName = "TWIN";
         private string lastName= "TWIN";

diff --git a/WebLedMatrix/Controllers/Authentication/Models/CreationModel.cs b/WebLedMatrix/Controllers/Authentication/Models/CreationModel.cs
@@ -17,5 +17,7 @@ public class CreationModel : ITwinUser
         public string LastName { get; set; }
         [Required]
         public string TelephoneNumber { get; set; }
+        [Required]
+        public string About { get; set; }
     }
 }
diff --git a/WebLedMatrix/Controllers/Authentication/Models/Roles/TypicalRoles.cs b/WebLedMatrix/Controllers/Authentication/Models/Roles/TypicalRoles.cs
@@ -1,6 +1,6 @@
 namespace WebLedMatrix.Logic.Authentication.Models.Roles
 {
-    enum TypicalRoles
+    public enum TypicalRoles
     {
         User,
         Speaker,

diff --git a/WebLedMatrix/Migrations/Configuration.cs b/WebLedMatrix/Migrations/Configuration.cs
@@ -0,0 +1,31 @@
+namespace WebLedMatrix.Migrations
+{
+    using System;
+    using System.Data.Entity;
+    using System.Data.Entity.Migrations;
+    using System.Linq;
+
+    internal sealed class Configuration : DbMigrationsConfiguration<WebLedMatrix.Logic.Authentication.Infrastructure.UserIdentityDbContext>
+    {
+        public Configuration()
+        {
+            AutomaticMigrationsEnabled = true;
+        }
+
+        protected override void Seed(WebLedMatrix.Logic.Authentication.Infrastructure.UserIdentityDbContext context)
+        {
+            //  This method will be called after migrating to the latest version.
+
+            //  You can use the DbSet<T>.AddOrUpdate() helper extension method 
+            //  to avoid creating duplicate seed data. E.g.
+            //
+            //    context.People.AddOrUpdate(
+            //      p => p.FullName,
+            //      new Person { FullName = "Andrew Peters" },
+            //      new Person { FullName = "Brice Lambson" },
+            //      new Person { FullName = "Rowan Miller" }
+            //    );
+            //
+        }
+    }
+}
diff --git a/WebLedMatrix/Models/AdministrationModel.cs b/WebLedMatrix/Models/AdministrationModel.cs
@@ -7,5 +7,6 @@ public class AdministrationModel
     {
         public string Id { get; set; }
         public string Name { get; set; }
+        public int Value { get; set; }
     }
 }
diff --git a/WebLedMatrix/WebLedMatrix.Server.csproj b/WebLedMatrix/WebLedMatrix.Server.csproj
@@ -269,6 +269,7 @@
     <Compile Include="Controllers\Authentication\Concrete\DefaultUserValidatorHelper.cs" />
     <Compile Include="Controllers\Authentication\Concrete\ResultException.cs" />
     <Compile Include="Logic\HubConnections.cs" />
+    <Compile Include="Migrations\Configuration.cs" />
     <Compile Include="Models\AdministrationModel.cs" />
     <Compile Include="Models\Authentication\Roles\RoleAdministrating.cs" />
     <Compile Include="Models\HubUser.cs" />