Skip to content

Commit

Permalink
Fixed up Admin Login Form
Browse files Browse the repository at this point in the history
Previous way to setup was just a InputBox(), which is outdated and
Doesn't support Password Masking.
  • Loading branch information
AConsolePeasant authored and AConsolePeasant committed Aug 8, 2016
1 parent fdc354b commit b6c1e0e
Show file tree
Hide file tree
Showing 7 changed files with 221 additions and 8 deletions.
9 changes: 9 additions & 0 deletions EO-Flashcards/EO-Flashcards/EO-Flashcards.vbproj
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,12 @@
<Compile Include="frmAdmin.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="frmAdminLogin.Designer.vb">
<DependentUpon>frmAdminLogin.vb</DependentUpon>
</Compile>
<Compile Include="frmAdminLogin.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="frmMenu.Designer.vb">
<DependentUpon>frmMenu.vb</DependentUpon>
</Compile>
Expand Down Expand Up @@ -117,6 +123,9 @@
<EmbeddedResource Include="frmAdmin.resx">
<DependentUpon>frmAdmin.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmAdminLogin.resx">
<DependentUpon>frmAdminLogin.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmMenu.resx">
<DependentUpon>frmMenu.vb</DependentUpon>
</EmbeddedResource>
Expand Down
1 change: 0 additions & 1 deletion EO-Flashcards/EO-Flashcards/Form1.vb
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,4 @@ Public Class frmMain
frmMenu.Show() 'Open main menu
Me.Close() 'Close myself
End Sub

End Class
4 changes: 4 additions & 0 deletions EO-Flashcards/EO-Flashcards/frmAdmin.vb
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,8 @@
My.Settings.AdminPassword = InputBox("Enter New Password WARNING, this will change with no confirmation, and if spelt wrong, will set that.")
'This instantly changes the admin password.
End Sub

Private Sub frmAdmin_Closing(sender As Object, e As EventArgs) Handles MyBase.FormClosed
frmMenu.Show()
End Sub
End Class
75 changes: 75 additions & 0 deletions EO-Flashcards/EO-Flashcards/frmAdminLogin.Designer.vb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

120 changes: 120 additions & 0 deletions EO-Flashcards/EO-Flashcards/frmAdminLogin.resx
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
10 changes: 10 additions & 0 deletions EO-Flashcards/EO-Flashcards/frmAdminLogin.vb
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Public Class frmAdminLogin
Private Sub btnLogin_Click(sender As Object, e As EventArgs) Handles btnLogin.Click
If txtPassword.Text = My.Settings.AdminPassword Then
frmAdmin.Show()
Me.Close()
Else
MsgBox("Invalid Admin Password")
End If
End Sub
End Class
10 changes: 3 additions & 7 deletions EO-Flashcards/EO-Flashcards/frmMenu.vb
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,8 @@

Public Class frmMenu
Private Sub Button9_Click(sender As Object, e As EventArgs) Handles Button9.Click
If InputBox("Enter Admin Password") = My.Settings.AdminPassword Then 'todo: Put all of this poo in a array
frmAdmin.Show()
Me.Close()
Else
MsgBox("Invalid Admin Password")
End If
' Opens Admin Menu and closes frmMenu when clicked.
frmAdminLogin.Show()
frmAdmin.Close()
' Opens Admin new Form for admin login, as the previous method (inputbox) couldn't have a password mask.
End Sub
End Class

0 comments on commit b6c1e0e

Please sign in to comment.