diff --git a/ErgometerApplication/.vs/ErgometerApplication/v14/.suo b/ErgometerApplication/.vs/ErgometerApplication/v14/.suo index 374aa9f..0457cd7 100644 Binary files a/ErgometerApplication/.vs/ErgometerApplication/v14/.suo and b/ErgometerApplication/.vs/ErgometerApplication/v14/.suo differ diff --git a/ErgometerApplication/ErgometerApplication/ClientApplicatie.Designer.cs b/ErgometerApplication/ErgometerApplication/ClientApplicatie.Designer.cs index 3c48df2..8cd890d 100644 --- a/ErgometerApplication/ErgometerApplication/ClientApplicatie.Designer.cs +++ b/ErgometerApplication/ErgometerApplication/ClientApplicatie.Designer.cs @@ -33,10 +33,17 @@ namespace ErgometerApplication this.components = new System.ComponentModel.Container(); this.updateTimer = new System.Windows.Forms.Timer(this.components); this.writeTimer = new System.Windows.Forms.Timer(this.components); - this.panelLogin = new System.Windows.Forms.Panel(); - this.lblUsername = new System.Windows.Forms.Label(); - this.lblPassword = new System.Windows.Forms.Label(); - this.panelLogin.SuspendLayout(); + this.panelClientContainer = new System.Windows.Forms.Panel(); + this.panelFullscreenView = new System.Windows.Forms.Panel(); + this.panelClientDataView = new ErgometerApplication.PanelClientDataView(); + this.panelClientChat = new ErgometerApplication.PanelClientChat(); + this.panelLogin = new ErgometerApplication.PanelLogin(this); + this.panelTopBar = new System.Windows.Forms.Panel(); + this.buttonLogOff = new System.Windows.Forms.Button(); + this.labelUsername = new System.Windows.Forms.Label(); + this.labelHallo = new System.Windows.Forms.Label(); + this.panelClientContainer.SuspendLayout(); + this.panelTopBar.SuspendLayout(); this.SuspendLayout(); // // updateTimer @@ -47,47 +54,108 @@ namespace ErgometerApplication // this.writeTimer.Interval = 10000; // - // panelLogin + // panelClientContainer // - this.panelLogin.Controls.Add(this.lblUsername); - this.panelLogin.Controls.Add(this.lblPassword); - this.panelLogin.Dock = System.Windows.Forms.DockStyle.Fill; - this.panelLogin.Location = new System.Drawing.Point(0, 0); - this.panelLogin.Name = "panelLogin"; - this.panelLogin.Size = new System.Drawing.Size(800, 600); - this.panelLogin.TabIndex = 0; + this.panelClientContainer.Controls.Add(this.panelFullscreenView); + this.panelClientContainer.Controls.Add(this.panelClientDataView); + this.panelClientContainer.Controls.Add(this.panelClientChat); + this.panelClientContainer.Dock = System.Windows.Forms.DockStyle.Fill; + this.panelClientContainer.Location = new System.Drawing.Point(0, 0); + this.panelClientContainer.Name = "panelClientContainer"; + this.panelClientContainer.Size = new System.Drawing.Size(800, 600); + this.panelClientContainer.TabIndex = 0; // - // lblUsername + // panelFullscreenView // - this.lblUsername.Anchor = System.Windows.Forms.AnchorStyles.None; - this.lblUsername.AutoSize = true; - this.lblUsername.Location = new System.Drawing.Point(243, 255); - this.lblUsername.Name = "lblUsername"; - this.lblUsername.Size = new System.Drawing.Size(84, 13); - this.lblUsername.TabIndex = 1; - this.lblUsername.Text = "Gebruikersnaam"; + this.panelFullscreenView.Dock = System.Windows.Forms.DockStyle.Left; + this.panelFullscreenView.Location = new System.Drawing.Point(0, 0); + this.panelFullscreenView.Name = "panelFullscreenView"; + this.panelFullscreenView.Size = new System.Drawing.Size(18, 600); + this.panelFullscreenView.TabIndex = 3; + this.panelFullscreenView.BackColor = System.Drawing.Color.Gray; // - // lblPassword + // panelClientDataView // - this.lblPassword.Anchor = System.Windows.Forms.AnchorStyles.None; - this.lblPassword.AutoSize = true; - this.lblPassword.Location = new System.Drawing.Point(243, 291); - this.lblPassword.Name = "lblPassword"; - this.lblPassword.Size = new System.Drawing.Size(68, 13); - this.lblPassword.TabIndex = 0; - this.lblPassword.Text = "Wachtwoord"; + this.panelClientDataView.BackColor = System.Drawing.SystemColors.ButtonFace; + this.panelClientDataView.Dock = System.Windows.Forms.DockStyle.Fill; + this.panelClientDataView.Location = new System.Drawing.Point(0, 0); + this.panelClientDataView.Name = "panelClientDataView"; + this.panelClientDataView.Size = new System.Drawing.Size(400, 600); + this.panelClientDataView.TabIndex = 1; + // + // panelClientChat + // + this.panelClientChat.BackColor = System.Drawing.SystemColors.ButtonHighlight; + this.panelClientChat.Dock = System.Windows.Forms.DockStyle.Right; + this.panelClientChat.Location = new System.Drawing.Point(400, 0); + this.panelClientChat.Name = "panelClientChat"; + this.panelClientChat.Size = new System.Drawing.Size(400, 600); + this.panelClientChat.TabIndex = 2; + // + // panelTopBar + // + this.panelTopBar.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.panelTopBar.Controls.Add(this.buttonLogOff); + this.panelTopBar.Controls.Add(this.labelUsername); + this.panelTopBar.Controls.Add(this.labelHallo); + this.panelTopBar.Dock = System.Windows.Forms.DockStyle.Top; + this.panelTopBar.Location = new System.Drawing.Point(0, 0); + this.panelTopBar.Name = "panelTopBar"; + this.panelTopBar.Size = new System.Drawing.Size(800, 30); + this.panelTopBar.TabIndex = 1; + this.panelTopBar.Visible = false; + // + // buttonLogOff + // + this.buttonLogOff.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.buttonLogOff.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.buttonLogOff.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.buttonLogOff.Font = new System.Drawing.Font("Segoe UI Light", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.buttonLogOff.Location = new System.Drawing.Point(722, 3); + this.buttonLogOff.Name = "buttonLogOff"; + this.buttonLogOff.Size = new System.Drawing.Size(75, 23); + this.buttonLogOff.TabIndex = 1; + this.buttonLogOff.Text = "Afmelden"; + this.buttonLogOff.UseVisualStyleBackColor = false; + this.buttonLogOff.Click += new System.EventHandler(this.buttonLogOff_Click); + // + // labelUsername + // + this.labelUsername.AutoSize = true; + this.labelUsername.Font = new System.Drawing.Font("Segoe UI Semilight", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelUsername.ForeColor = System.Drawing.Color.White; + this.labelUsername.Location = new System.Drawing.Point(49, 3); + this.labelUsername.Name = "labelUsername"; + this.labelUsername.Size = new System.Drawing.Size(144, 21); + this.labelUsername.TabIndex = 0; + this.labelUsername.Text = ""; + // + // labelHallo + // + this.labelHallo.AutoSize = true; + this.labelHallo.Font = new System.Drawing.Font("Segoe UI Semilight", 12F); + this.labelHallo.ForeColor = System.Drawing.Color.White; + this.labelHallo.Location = new System.Drawing.Point(3, 3); + this.labelHallo.Name = "labelHallo"; + this.labelHallo.Size = new System.Drawing.Size(54, 21); + this.labelHallo.TabIndex = 0; + this.labelHallo.Text = "Hallo, "; // // ClientApplicatie // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(800, 600); + this.Controls.Add(this.panelTopBar); this.Controls.Add(this.panelLogin); + this.Controls.Add(this.panelClientContainer); this.Name = "ClientApplicatie"; this.Text = "Client Applicatie"; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; - this.panelLogin.ResumeLayout(false); - this.panelLogin.PerformLayout(); + this.Resize += new System.EventHandler(this.ClientApplicatie_Resize); + this.panelClientContainer.ResumeLayout(false); + this.panelTopBar.ResumeLayout(false); + this.panelTopBar.PerformLayout(); this.ResumeLayout(false); } @@ -95,8 +163,14 @@ namespace ErgometerApplication #endregion private System.Windows.Forms.Timer updateTimer; private System.Windows.Forms.Timer writeTimer; - private System.Windows.Forms.Panel panelLogin; - private System.Windows.Forms.Label lblUsername; - private System.Windows.Forms.Label lblPassword; + private System.Windows.Forms.Panel panelClientContainer; + private PanelClientChat panelClientChat; + private PanelClientDataView panelClientDataView; + private PanelLogin panelLogin; + private System.Windows.Forms.Panel panelFullscreenView; + private System.Windows.Forms.Panel panelTopBar; + private System.Windows.Forms.Button buttonLogOff; + private System.Windows.Forms.Label labelUsername; + private System.Windows.Forms.Label labelHallo; } } diff --git a/ErgometerApplication/ErgometerApplication/ClientApplicatie.cs b/ErgometerApplication/ErgometerApplication/ClientApplicatie.cs index 74e65a6..78bae25 100644 --- a/ErgometerApplication/ErgometerApplication/ClientApplicatie.cs +++ b/ErgometerApplication/ErgometerApplication/ClientApplicatie.cs @@ -278,5 +278,71 @@ namespace ErgometerApplication // readFile = null; // } //} + + public void validateLogin(string username, string password) + { + if(username.Length >= 4) + { + if(password.Length == 0) + { + panelLogin.lblVerification.Text = "Vul een wachtwoord in."; + panelLogin.lblVerification.ForeColor = Color.Red; + panelLogin.lblVerification.Visible = true; + } + if (password.Length > 0 && password.Length < 9) + { + panelLogin.lblVerification.Text = "Vul een wachtwoord in van minimaal 8 karakters."; + panelLogin.lblVerification.ForeColor = Color.Red; + panelLogin.lblVerification.Visible = true; + } + if (password.Length >= 8) + { + //password checken + panelClientContainer.BringToFront(); + this.labelUsername.Text = panelLogin.textBoxUsername.Text; + panelTopBar.Visible = true; + } + } + else + { + panelLogin.lblVerification.Text = "Vul een gebruikersnaam in van minimaal 4 karakters."; + panelLogin.lblVerification.ForeColor = Color.Red; + panelLogin.lblVerification.Visible = true; + } + } + + private void ClientApplicatie_Resize(object sender, System.EventArgs e) + { + Control control = (Control)sender; + if(control.Size.Width < 980) + { + panelFullscreenView.Visible = false; + } + if (control.Size.Width >= 980 && control.Size.Width < 1368) + { + panelFullscreenView.Visible = true; + panelFullscreenView.Width = 250; + } + if (control.Size.Width >= 1368) + { + panelFullscreenView.Visible = true; + panelFullscreenView.Width = 500; + } + + } + + public void sessionLogout() + { + + } + + private void buttonLogOff_Click(object sender, EventArgs e) + { + panelLogin.BringToFront(); + panelTopBar.Visible = false; + sessionLogout(); + } + + } } \ No newline at end of file diff --git a/ErgometerApplication/ErgometerApplication/ErgometerApplication.csproj b/ErgometerApplication/ErgometerApplication/ErgometerApplication.csproj index 3ccd635..45c4132 100644 --- a/ErgometerApplication/ErgometerApplication/ErgometerApplication.csproj +++ b/ErgometerApplication/ErgometerApplication/ErgometerApplication.csproj @@ -54,6 +54,18 @@ + + Component + + + Component + + + Component + + + Component + @@ -75,6 +87,7 @@ True Resources.resx + True @@ -93,6 +106,9 @@ + + + + @@ -68,9 +69,10 @@ - + + @@ -85,9 +87,10 @@ - + + @@ -109,9 +112,13 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\flatbike.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/ErgometerApplication/ErgometerApplication/Resources/flatbike.png b/ErgometerApplication/ErgometerApplication/Resources/flatbike.png new file mode 100644 index 0000000..1a88ba6 Binary files /dev/null and b/ErgometerApplication/ErgometerApplication/Resources/flatbike.png differ diff --git a/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerApplication.exe b/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerApplication.exe index 2bc4b6d..bf3db4b 100644 Binary files a/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerApplication.exe and b/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerApplication.exe differ diff --git a/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerApplication.pdb b/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerApplication.pdb index ce2b5fa..1c2839e 100644 Binary files a/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerApplication.pdb and b/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerApplication.pdb differ diff --git a/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerApplication.vshost.exe b/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerApplication.vshost.exe index 03e9101..681ab77 100644 Binary files a/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerApplication.vshost.exe and b/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerApplication.vshost.exe differ diff --git a/ErgometerApplication/ErgometerApplication/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/ErgometerApplication/ErgometerApplication/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 261683c..e5db290 100644 Binary files a/ErgometerApplication/ErgometerApplication/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/ErgometerApplication/ErgometerApplication/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/ErgometerApplication/ErgometerApplication/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/ErgometerApplication/ErgometerApplication/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index bacc9d8..71a55ed 100644 Binary files a/ErgometerApplication/ErgometerApplication/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/ErgometerApplication/ErgometerApplication/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.Properties.Resources.resources b/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.Properties.Resources.resources index 6c05a97..29438f1 100644 Binary files a/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.Properties.Resources.resources and b/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.Properties.Resources.resources differ diff --git a/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.csproj.FileListAbsolute.txt b/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.csproj.FileListAbsolute.txt index 94a47b9..8b46477 100644 --- a/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.csproj.FileListAbsolute.txt +++ b/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.csproj.FileListAbsolute.txt @@ -30,3 +30,14 @@ C:\Users\startklaar\Source\Repos\ErgometerApplication\ErgometerApplication\Ergom C:\Users\startklaar\Source\Repos\ErgometerApplication\ErgometerApplication\ErgometerApplication\obj\Debug\ErgometerApplication.exe C:\Users\startklaar\Source\Repos\ErgometerApplication\ErgometerApplication\ErgometerApplication\obj\Debug\ErgometerApplication.pdb C:\Users\startklaar\Source\Repos\ErgometerApplication\ErgometerApplication\ErgometerApplication\obj\Debug\ErgometerApplication.ClientApplicatie.resources +D:\Source\Repos\ErgometerApplication\ErgometerApplication\ErgometerApplication\bin\Debug\ErgometerApplication.exe.config +D:\Source\Repos\ErgometerApplication\ErgometerApplication\ErgometerApplication\obj\Debug\ErgometerApplication.exe +D:\Source\Repos\ErgometerApplication\ErgometerApplication\ErgometerApplication\obj\Debug\ErgometerApplication.pdb +D:\Source\Repos\ErgometerApplication\ErgometerApplication\ErgometerApplication\bin\Debug\ErgometerApplication.exe +D:\Source\Repos\ErgometerApplication\ErgometerApplication\ErgometerApplication\bin\Debug\ErgometerApplication.pdb +D:\Source\Repos\ErgometerApplication\ErgometerApplication\ErgometerApplication\bin\Debug\Newtonsoft.Json.dll +D:\Source\Repos\ErgometerApplication\ErgometerApplication\ErgometerApplication\bin\Debug\Newtonsoft.Json.xml +D:\Source\Repos\ErgometerApplication\ErgometerApplication\ErgometerApplication\obj\Debug\ErgometerApplication.csprojResolveAssemblyReference.cache +D:\Source\Repos\ErgometerApplication\ErgometerApplication\ErgometerApplication\obj\Debug\ErgometerApplication.ClientApplicatie.resources +D:\Source\Repos\ErgometerApplication\ErgometerApplication\ErgometerApplication\obj\Debug\ErgometerApplication.Properties.Resources.resources +D:\Source\Repos\ErgometerApplication\ErgometerApplication\ErgometerApplication\obj\Debug\ErgometerApplication.csproj.GenerateResource.Cache diff --git a/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.csproj.GenerateResource.Cache b/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.csproj.GenerateResource.Cache index 1d013ca..54bdb68 100644 Binary files a/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.csproj.GenerateResource.Cache and b/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.csproj.GenerateResource.Cache differ diff --git a/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.csprojResolveAssemblyReference.cache b/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.csprojResolveAssemblyReference.cache index debeed8..b8ac41e 100644 Binary files a/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.csprojResolveAssemblyReference.cache and b/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.csprojResolveAssemblyReference.cache differ diff --git a/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.exe b/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.exe index 2bc4b6d..bf3db4b 100644 Binary files a/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.exe and b/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.exe differ diff --git a/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.pdb b/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.pdb index ce2b5fa..1c2839e 100644 Binary files a/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.pdb and b/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.pdb differ