Skip to content

Commit

Permalink
UI and Email Adjustments
Browse files Browse the repository at this point in the history 
UI adjustment for font size and features
Email authentication and BCC addition
  • Loading branch information
@TylerRose
TylerRose committed Dec 18, 2021
1 parent df87286 commit 11aa608
Show file tree
Hide file tree
Showing 55 changed files with 590 additions and 219 deletions.
26 changes: 16 additions & 10 deletions src/main/java/GUI/ConfirmationGUI.form
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@
<Component id="jLabel2" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="jLabel4" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="32767" attributes="0"/>
<EmptySpace pref="18" max="32767" attributes="0"/>
</Group>
<Group type="102" attributes="0">
<Component id="jButton1" max="32767" attributes="0"/>
<Component id="btnCancel" max="32767" attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="jButton2" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="28" max="-2" attributes="0"/>
<Component id="btnContinue" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="22" max="-2" attributes="0"/>
</Group>
</Group>
</Group>
Expand All @@ -60,8 +60,8 @@
<Component id="jLabel4" min="-2" max="-2" attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="jButton1" alignment="3" min="-2" pref="69" max="-2" attributes="0"/>
<Component id="jButton2" alignment="3" min="-2" pref="69" max="-2" attributes="0"/>
<Component id="btnCancel" alignment="3" min="-2" pref="69" max="-2" attributes="0"/>
<Component id="btnContinue" alignment="3" min="-2" pref="69" max="-2" attributes="0"/>
</Group>
<EmptySpace max="32767" attributes="0"/>
</Group>
Expand Down Expand Up @@ -93,20 +93,26 @@
<Property name="text" type="java.lang.String" value="Emails will be sent to contacts."/>
</Properties>
</Component>
<Component class="javax.swing.JButton" name="jButton1">
<Component class="javax.swing.JButton" name="btnCancel">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="16" style="1"/>
</Property>
<Property name="text" type="java.lang.String" value="CANCEL"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton1ActionPerformed"/>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnCancelActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JButton" name="jButton2">
<Component class="javax.swing.JButton" name="btnContinue">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="16" style="1"/>
</Property>
<Property name="text" type="java.lang.String" value="Continue"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton2ActionPerformed"/>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnContinueActionPerformed"/>
</Events>
</Component>
</SubComponents>
Expand Down
43 changes: 23 additions & 20 deletions src/main/java/GUI/ConfirmationGUI.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ private void initComponents() {
jLabel1 = new javax.swing.JLabel();
jLabel2 = new javax.swing.JLabel();
jLabel4 = new javax.swing.JLabel();
jButton1 = new javax.swing.JButton();
jButton2 = new javax.swing.JButton();
btnCancel = new javax.swing.JButton();
btnContinue = new javax.swing.JButton();

setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
setAlwaysOnTop(true);
Expand All @@ -53,17 +53,19 @@ public void windowOpened(java.awt.event.WindowEvent evt) {
jLabel4.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N
jLabel4.setText("Emails will be sent to contacts.");

jButton1.setText("CANCEL");
jButton1.addActionListener(new java.awt.event.ActionListener() {
btnCancel.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N
btnCancel.setText("CANCEL");
btnCancel.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
jButton1ActionPerformed(evt);
btnCancelActionPerformed(evt);
}
});

jButton2.setText("Continue");
jButton2.addActionListener(new java.awt.event.ActionListener() {
btnContinue.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N
btnContinue.setText("Continue");
btnContinue.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
jButton2ActionPerformed(evt);
btnContinueActionPerformed(evt);
}
});

Expand All @@ -79,12 +81,12 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
.addComponent(jLabel1)
.addComponent(jLabel2)
.addComponent(jLabel4))
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addContainerGap(18, Short.MAX_VALUE))
.addGroup(layout.createSequentialGroup()
.addComponent(jButton1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(btnCancel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGap(18, 18, 18)
.addComponent(jButton2)
.addGap(28, 28, 28))))
.addComponent(btnContinue)
.addGap(22, 22, 22))))
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
Expand All @@ -97,22 +99,23 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
.addComponent(jLabel4)
.addGap(18, 18, 18)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, 69, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(jButton2, javax.swing.GroupLayout.PREFERRED_SIZE, 69, javax.swing.GroupLayout.PREFERRED_SIZE))
.addComponent(btnCancel, javax.swing.GroupLayout.PREFERRED_SIZE, 69, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(btnContinue, javax.swing.GroupLayout.PREFERRED_SIZE, 69, javax.swing.GroupLayout.PREFERRED_SIZE))
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);

pack();
}// </editor-fold>//GEN-END:initComponents

private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
private void btnCancelActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnCancelActionPerformed
this.setVisible(false);
this.dispose();
}//GEN-LAST:event_jButton1ActionPerformed
}//GEN-LAST:event_btnCancelActionPerformed

private void jButton2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton2ActionPerformed
private void btnContinueActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnContinueActionPerformed
new LoginGUI().setVisible(true);
this.dispose();
}//GEN-LAST:event_jButton2ActionPerformed
}//GEN-LAST:event_btnContinueActionPerformed

private void formWindowOpened(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_formWindowOpened
this.rootPane.setAlignmentX(MainGUI.posX);
Expand Down Expand Up @@ -155,8 +158,8 @@ public void run() {
}

// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton jButton1;
private javax.swing.JButton jButton2;
private javax.swing.JButton btnCancel;
private javax.swing.JButton btnContinue;
private javax.swing.JLabel jLabel1;
private javax.swing.JLabel jLabel2;
private javax.swing.JLabel jLabel4;
Expand Down
23 changes: 22 additions & 1 deletion src/main/java/GUI/LoginGUI.form
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,16 @@
<Component class="javax.swing.JLabel" name="jLabel1">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="14" style="1"/>
<Font name="Dialog" size="18" style="1"/>
</Property>
<Property name="text" type="java.lang.String" value="Email Login"/>
</Properties>
</Component>
<Component class="javax.swing.JTextField" name="txtUsername">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="16" style="0"/>
</Property>
<Property name="text" type="java.lang.String" value="Email Address"/>
</Properties>
<Events>
Expand All @@ -96,16 +99,25 @@
</Component>
<Component class="javax.swing.JLabel" name="jLabel2">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="16" style="1"/>
</Property>
<Property name="text" type="java.lang.String" value="Email:"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="jLabel3">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="16" style="1"/>
</Property>
<Property name="text" type="java.lang.String" value="Password:"/>
</Properties>
</Component>
<Component class="javax.swing.JPasswordField" name="txtPassword">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="16" style="0"/>
</Property>
<Property name="text" type="java.lang.String" value="SafePassword123"/>
</Properties>
<Events>
Expand All @@ -115,6 +127,9 @@
</Component>
<Component class="javax.swing.JButton" name="jButton1">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="16" style="1"/>
</Property>
<Property name="text" type="java.lang.String" value="Show"/>
</Properties>
<Events>
Expand All @@ -125,6 +140,9 @@
</Component>
<Component class="javax.swing.JButton" name="btnSubmit">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="16" style="1"/>
</Property>
<Property name="text" type="java.lang.String" value="Submit"/>
</Properties>
<Events>
Expand All @@ -133,6 +151,9 @@
</Component>
<Component class="javax.swing.JButton" name="btnCancel">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="16" style="1"/>
</Property>
<Property name="text" type="java.lang.String" value="Cancel"/>
</Properties>
<Events>
Expand Down
21 changes: 18 additions & 3 deletions src/main/java/GUI/LoginGUI.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
public class LoginGUI extends javax.swing.JFrame {

private boolean showingPass = false;
public static boolean retrying = false;

/**
* Creates new form LoginGUI
Expand Down Expand Up @@ -46,9 +47,10 @@ private void initComponents() {
setLocationByPlatform(true);
setResizable(false);

jLabel1.setFont(new java.awt.Font("Dialog", 1, 14)); // NOI18N
jLabel1.setFont(new java.awt.Font("Dialog", 1, 18)); // NOI18N
jLabel1.setText("Email Login");

txtUsername.setFont(new java.awt.Font("Dialog", 0, 16)); // NOI18N
txtUsername.setText("Email Address");
txtUsername.addFocusListener(new java.awt.event.FocusAdapter() {
public void focusGained(java.awt.event.FocusEvent evt) {
Expand All @@ -59,10 +61,13 @@ public void focusLost(java.awt.event.FocusEvent evt) {
}
});

jLabel2.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N
jLabel2.setText("Email:");

jLabel3.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N
jLabel3.setText("Password:");

txtPassword.setFont(new java.awt.Font("Dialog", 0, 16)); // NOI18N
txtPassword.setText("SafePassword123");
txtPassword.addFocusListener(new java.awt.event.FocusAdapter() {
public void focusGained(java.awt.event.FocusEvent evt) {
Expand All @@ -73,6 +78,7 @@ public void focusLost(java.awt.event.FocusEvent evt) {
}
});

jButton1.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N
jButton1.setText("Show");
jButton1.addMouseListener(new java.awt.event.MouseAdapter() {
public void mouseClicked(java.awt.event.MouseEvent evt) {
Expand All @@ -86,13 +92,15 @@ public void mouseReleased(java.awt.event.MouseEvent evt) {
}
});

btnSubmit.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N
btnSubmit.setText("Submit");
btnSubmit.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
btnSubmitActionPerformed(evt);
}
});

btnCancel.setFont(new java.awt.Font("Dialog", 1, 16)); // NOI18N
btnCancel.setText("Cancel");
btnCancel.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
Expand Down Expand Up @@ -156,20 +164,27 @@ private void jButton1MouseReleased(java.awt.event.MouseEvent evt) {//GEN-FIRST:e
}//GEN-LAST:event_jButton1MouseReleased

private void btnSubmitActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnSubmitActionPerformed
SendEmail.retryLogin = true;
SendEmail.username = txtUsername.getText();
StringBuilder builder = new StringBuilder();
builder.append(txtPassword.getPassword());
SendEmail.setPassword(builder.toString());

this.setVisible(false);
Thread run = new Thread() {
public void run() {
Source.startReview();
}
};
run.start();
if (!retrying) {
retrying = true;
run.start();
}
this.dispose();
}//GEN-LAST:event_btnSubmitActionPerformed

private void btnCancelActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnCancelActionPerformed
SendEmail.retryLogin = false;
this.dispose();
}//GEN-LAST:event_btnCancelActionPerformed

Expand All @@ -196,7 +211,7 @@ private void jButton1MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:ev
}
if (!showingPass) {
txtPassword.setEchoChar('*');
}
}
}//GEN-LAST:event_jButton1MouseClicked

/**
Expand Down
Loading

0 comments on commit 11aa608

Please sign in to comment.