diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..a7bfb90 --- /dev/null +++ b/.classpath @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/.project b/.project new file mode 100644 index 0000000..44fd324 --- /dev/null +++ b/.project @@ -0,0 +1,17 @@ + + + 6kiloCafeProject + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/GUI/FoodListPage.java b/GUI/FoodListPage.java index 6753932..1ce1b84 100644 --- a/GUI/FoodListPage.java +++ b/GUI/FoodListPage.java @@ -22,7 +22,7 @@ public class FoodListPage extends WelcomePage { } private void initialize() { - frame.setResizable(false); + frame.setResizable(true); mondayButton = new ButtonStyle("Monday"); mondayButton.setBounds(0, 0, 800, 30); tuesdayButton = new ButtonStyle("Tuesday"); diff --git a/GUI/LoginPage.java b/GUI/LoginPage.java index 4155289..4bcf1e4 100644 --- a/GUI/LoginPage.java +++ b/GUI/LoginPage.java @@ -103,7 +103,7 @@ public LoginPage() { //finally we add the foreground panel to the Frame frame.add(foreground); - frame.setUndecorated(true); //removes the minimize,maximize and close tabs + frame.setUndecorated(false); //removes the minimize,maximize and close tabs frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); frame.setSize(500, 400); frame.setLocationRelativeTo(null); //places it to center diff --git a/GUI/NewFoodListPage.java b/GUI/NewFoodListPage.java new file mode 100644 index 0000000..bc7e9f1 --- /dev/null +++ b/GUI/NewFoodListPage.java @@ -0,0 +1,139 @@ +package GUI; + +import java.awt.Color; +import java.awt.Dimension; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.util.ArrayList; + +import javax.swing.BoxLayout; +import javax.swing.JButton; +import javax.swing.JPanel; + +public class NewFoodListPage extends WelcomePage{ + private JButton mondayButton; + private JButton tuesdayButton; + private JButton wednesdayButton; + + public static void main(String[] args) { + new NewFoodListPage(); + } + + NewFoodListPage() { + initialize(); + } + + private void initialize() { + frame.setResizable(true); + + mondayButton = new ButtonStyle("Monday"); + tuesdayButton = new ButtonStyle("Tuesday"); + wednesdayButton = new ButtonStyle("Wednesday"); + + // ----------------------------------- + + ArrayList dayButtons = new ArrayList(); + dayButtons.add(mondayButton); + dayButtons.add(tuesdayButton); + dayButtons.add(wednesdayButton); + + // ----------------------------------- + + for (int i = 0; i < dayButtons.size(); i++) { + dayButtons.get(i).setMaximumSize(new Dimension(Short.MAX_VALUE, Short.MAX_VALUE)); + } + + // ----------------------------------- + + NewFoodListPanel mondayPanel = new NewFoodListPanel("Firfir", "aynet", "cake"); + NewFoodListPanel tuesdayPanel = new NewFoodListPanel("Bread with marmlade","alicha", "siga wot"); + NewFoodListPanel wednesdayPanel = new NewFoodListPanel("firfir", "dinch wot", "siga wot"); + + // Create a list of panels to use when setting one visible over the others + ArrayList dayPanels = new ArrayList(); + dayPanels.add(mondayPanel); + dayPanels.add(tuesdayPanel); + dayPanels.add(wednesdayPanel); + + // Set actions for the buttons + + mondayButton.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + if (mondayPanel.count % 2 == 0) { + displayDayPanel(dayPanels, mondayPanel); + + } else { + hideDayPanel(mondayPanel); + } + } + }); + tuesdayButton.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + if (tuesdayPanel.count % 2 == 0) { + displayDayPanel(dayPanels, tuesdayPanel); + + } else { + hideDayPanel(tuesdayPanel); + } + } + }); + wednesdayButton.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + if (wednesdayPanel.count % 2 == 0) { + displayDayPanel(dayPanels, wednesdayPanel); + + } else { + hideDayPanel(wednesdayPanel); + } + } + }); + + // ------------------------------------------- + + centerPanel.setLayout(new BoxLayout(centerPanel, BoxLayout.Y_AXIS)); + + for (int i = 0; i < dayPanels.size(); i++) { + centerPanel.add(dayButtons.get(i)); + centerPanel.add(dayPanels.get(i)); + } + + centerPanel.setBackground(new Color(46, 5, 74)); + + } + + + public void displayDayPanel(ArrayList dayPanels, NewFoodListPanel dayPanel) { + + for (int i = 0; i < dayPanels.size(); i++) { + NewFoodListPanel current = dayPanels.get(i); + + if (dayPanels.get(i) == dayPanel) { + current.count = 1; + current.setVisible(true); + } else { + current.count = 0; + current.setVisible(false); + } + } + } + + public void hideDayPanel(NewFoodListPanel dayPanel) { + + dayPanel.count = 0; + dayPanel.setVisible(false); + + } + + public void resizeButton(ArrayList dayButtons) { + + // DOESN'T WORK YET BUT IT IS GOING TO BE USED TO RESIZE THE BUTTONS FOR WHEN THEY ARE CLICKED + // It is a bug I will fix later. + + for (int i = 0; i < dayButtons.size(); i++) { + dayButtons.get(i).setMaximumSize(new Dimension(Short.MAX_VALUE, Short.MAX_VALUE)); + } + } +} diff --git a/GUI/NewFoodListPanel.java b/GUI/NewFoodListPanel.java new file mode 100644 index 0000000..0e52e88 --- /dev/null +++ b/GUI/NewFoodListPanel.java @@ -0,0 +1,47 @@ +package GUI; + +import java.awt.Color; +import java.awt.GridLayout; + +import javax.swing.*; + +public class NewFoodListPanel extends JPanel{ + + public String[] topSection = { + "Breakfast", "Lunch", "Dinner" + }; + + private String breakfast; + private String lunch; + private String dinner; + public int count = 0; + + NewFoodListPanel(String breakfast, String lunch, String dinner){ + this.breakfast = breakfast; + this.lunch = lunch; + this.dinner = dinner; + initialize(); + } + + public void initialize() { + + String[] bottomSection = {this.breakfast, this.lunch, this.dinner}; + +// this.setBackground(new Color(46, 5, 74)); + this.setLayout(new GridLayout(2, 3, 10, 10)); + this.setVisible(false); + + this.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); + + for (int i = 0; i < 3; i++) { + JLabel label = new JLabel(topSection[i], SwingConstants.CENTER); + label.setBorder(BorderFactory.createLineBorder(Color.BLACK)); // Add border for clarity + this.add(label); + } + for (int i = 0; i < 3; i++) { + JLabel label = new JLabel(bottomSection[i], SwingConstants.CENTER); + label.setBorder(BorderFactory.createLineBorder(Color.BLACK)); // Add border for clarity + this.add(label); + } + } +} diff --git a/GUI/WelcomePage.java b/GUI/WelcomePage.java index cd61959..b9f6f37 100644 --- a/GUI/WelcomePage.java +++ b/GUI/WelcomePage.java @@ -17,6 +17,7 @@ import javax.swing.border.EmptyBorder; public class WelcomePage { + protected JButton AttendanceButton; protected JLabel CafeManagementLabel; protected JPanel topPanel; @@ -53,6 +54,7 @@ public void actionPerformed(ActionEvent e) { @Override public void actionPerformed(ActionEvent e) { new FoodListPage(); + frame.add(centerPanel, BorderLayout.CENTER); frame.dispose(); } }); diff --git a/out/production/6kiloCafeProject/.classpath b/out/production/6kiloCafeProject/.classpath new file mode 100644 index 0000000..a7bfb90 --- /dev/null +++ b/out/production/6kiloCafeProject/.classpath @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/out/production/6kiloCafeProject/.gitignore b/out/production/6kiloCafeProject/.gitignore new file mode 100644 index 0000000..16d3c00 --- /dev/null +++ b/out/production/6kiloCafeProject/.gitignore @@ -0,0 +1,2 @@ +/GUI/ +/out/ diff --git a/out/production/6kiloCafeProject/.idea/uiDesigner.xml b/out/production/6kiloCafeProject/.idea/uiDesigner.xml new file mode 100644 index 0000000..2b63946 --- /dev/null +++ b/out/production/6kiloCafeProject/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/out/production/6kiloCafeProject/.project b/out/production/6kiloCafeProject/.project new file mode 100644 index 0000000..44fd324 --- /dev/null +++ b/out/production/6kiloCafeProject/.project @@ -0,0 +1,17 @@ + + + 6kiloCafeProject + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/out/production/6kiloCafeProject/GUI/AttendancePage.class b/out/production/6kiloCafeProject/GUI/AttendancePage.class index 1b7d04e..3f0277b 100644 Binary files a/out/production/6kiloCafeProject/GUI/AttendancePage.class and b/out/production/6kiloCafeProject/GUI/AttendancePage.class differ diff --git a/out/production/6kiloCafeProject/GUI/ButtonStyle.class b/out/production/6kiloCafeProject/GUI/ButtonStyle.class index c7e4539..eb854a0 100644 Binary files a/out/production/6kiloCafeProject/GUI/ButtonStyle.class and b/out/production/6kiloCafeProject/GUI/ButtonStyle.class differ diff --git a/out/production/6kiloCafeProject/GUI/FoodIcon.class b/out/production/6kiloCafeProject/GUI/FoodIcon.class index d25e328..ef086ee 100644 Binary files a/out/production/6kiloCafeProject/GUI/FoodIcon.class and b/out/production/6kiloCafeProject/GUI/FoodIcon.class differ diff --git a/out/production/6kiloCafeProject/GUI/FoodListPage$1.class b/out/production/6kiloCafeProject/GUI/FoodListPage$1.class index 27700ed..1de2fcd 100644 Binary files a/out/production/6kiloCafeProject/GUI/FoodListPage$1.class and b/out/production/6kiloCafeProject/GUI/FoodListPage$1.class differ diff --git a/out/production/6kiloCafeProject/GUI/FoodListPage$2.class b/out/production/6kiloCafeProject/GUI/FoodListPage$2.class index ab122eb..41e696e 100644 Binary files a/out/production/6kiloCafeProject/GUI/FoodListPage$2.class and b/out/production/6kiloCafeProject/GUI/FoodListPage$2.class differ diff --git a/out/production/6kiloCafeProject/GUI/FoodListPage$3.class b/out/production/6kiloCafeProject/GUI/FoodListPage$3.class index 8a56d87..3fb3d92 100644 Binary files a/out/production/6kiloCafeProject/GUI/FoodListPage$3.class and b/out/production/6kiloCafeProject/GUI/FoodListPage$3.class differ diff --git a/out/production/6kiloCafeProject/GUI/FoodListPage.class b/out/production/6kiloCafeProject/GUI/FoodListPage.class index caf080d..124c4e2 100644 Binary files a/out/production/6kiloCafeProject/GUI/FoodListPage.class and b/out/production/6kiloCafeProject/GUI/FoodListPage.class differ diff --git a/out/production/6kiloCafeProject/GUI/FoodListPanel.class b/out/production/6kiloCafeProject/GUI/FoodListPanel.class index 211e711..cf50bbf 100644 Binary files a/out/production/6kiloCafeProject/GUI/FoodListPanel.class and b/out/production/6kiloCafeProject/GUI/FoodListPanel.class differ diff --git a/out/production/6kiloCafeProject/GUI/GeneralInformationPage.class b/out/production/6kiloCafeProject/GUI/GeneralInformationPage.class index 6d57ad6..21eb3ab 100644 Binary files a/out/production/6kiloCafeProject/GUI/GeneralInformationPage.class and b/out/production/6kiloCafeProject/GUI/GeneralInformationPage.class differ diff --git a/out/production/6kiloCafeProject/GUI/IdandPassword.class b/out/production/6kiloCafeProject/GUI/IdandPassword.class index 10607cd..347ff8e 100644 Binary files a/out/production/6kiloCafeProject/GUI/IdandPassword.class and b/out/production/6kiloCafeProject/GUI/IdandPassword.class differ diff --git a/out/production/6kiloCafeProject/GUI/LoginPage.class b/out/production/6kiloCafeProject/GUI/LoginPage.class index c51bef7..0084725 100644 Binary files a/out/production/6kiloCafeProject/GUI/LoginPage.class and b/out/production/6kiloCafeProject/GUI/LoginPage.class differ diff --git a/out/production/6kiloCafeProject/GUI/LoginPageForStudent.class b/out/production/6kiloCafeProject/GUI/LoginPageForStudent.class index e27c5be..6ff6fe8 100644 Binary files a/out/production/6kiloCafeProject/GUI/LoginPageForStudent.class and b/out/production/6kiloCafeProject/GUI/LoginPageForStudent.class differ diff --git a/out/production/6kiloCafeProject/GUI/PollPage.class b/out/production/6kiloCafeProject/GUI/PollPage.class index ad71618..357cf8e 100644 Binary files a/out/production/6kiloCafeProject/GUI/PollPage.class and b/out/production/6kiloCafeProject/GUI/PollPage.class differ diff --git a/out/production/6kiloCafeProject/GUI/StudentSignInPage.class b/out/production/6kiloCafeProject/GUI/StudentSignInPage.class index d1186d3..3d02825 100644 Binary files a/out/production/6kiloCafeProject/GUI/StudentSignInPage.class and b/out/production/6kiloCafeProject/GUI/StudentSignInPage.class differ diff --git a/out/production/6kiloCafeProject/GUI/WelcomePage$1.class b/out/production/6kiloCafeProject/GUI/WelcomePage$1.class index fbc8c5b..833465c 100644 Binary files a/out/production/6kiloCafeProject/GUI/WelcomePage$1.class and b/out/production/6kiloCafeProject/GUI/WelcomePage$1.class differ diff --git a/out/production/6kiloCafeProject/GUI/WelcomePage$2.class b/out/production/6kiloCafeProject/GUI/WelcomePage$2.class index 97a532d..0bcbe00 100644 Binary files a/out/production/6kiloCafeProject/GUI/WelcomePage$2.class and b/out/production/6kiloCafeProject/GUI/WelcomePage$2.class differ diff --git a/out/production/6kiloCafeProject/GUI/WelcomePage$3.class b/out/production/6kiloCafeProject/GUI/WelcomePage$3.class index 466caf8..4b7b9a8 100644 Binary files a/out/production/6kiloCafeProject/GUI/WelcomePage$3.class and b/out/production/6kiloCafeProject/GUI/WelcomePage$3.class differ diff --git a/out/production/6kiloCafeProject/GUI/WelcomePage$4.class b/out/production/6kiloCafeProject/GUI/WelcomePage$4.class index ab9ec98..2dedf5b 100644 Binary files a/out/production/6kiloCafeProject/GUI/WelcomePage$4.class and b/out/production/6kiloCafeProject/GUI/WelcomePage$4.class differ diff --git a/out/production/6kiloCafeProject/GUI/WelcomePage.class b/out/production/6kiloCafeProject/GUI/WelcomePage.class index f9f61c2..701518e 100644 Binary files a/out/production/6kiloCafeProject/GUI/WelcomePage.class and b/out/production/6kiloCafeProject/GUI/WelcomePage.class differ diff --git a/out/production/6kiloCafeProject/GUI/peakTimeAnalysisPage.class b/out/production/6kiloCafeProject/GUI/peakTimeAnalysisPage.class index 798b1fc..a47e9e8 100644 Binary files a/out/production/6kiloCafeProject/GUI/peakTimeAnalysisPage.class and b/out/production/6kiloCafeProject/GUI/peakTimeAnalysisPage.class differ diff --git a/out/production/6kiloCafeProject/Main.class b/out/production/6kiloCafeProject/Main.class index 44d78f6..243523a 100644 Binary files a/out/production/6kiloCafeProject/Main.class and b/out/production/6kiloCafeProject/Main.class differ diff --git a/out/production/6kiloCafeProject/My_java_work/Attendance.class b/out/production/6kiloCafeProject/My_java_work/Attendance.class index 80b47fd..4000f5c 100644 Binary files a/out/production/6kiloCafeProject/My_java_work/Attendance.class and b/out/production/6kiloCafeProject/My_java_work/Attendance.class differ diff --git a/out/production/6kiloCafeProject/My_java_work/Backend.class b/out/production/6kiloCafeProject/My_java_work/Backend.class index 60d5a48..b6be77f 100644 Binary files a/out/production/6kiloCafeProject/My_java_work/Backend.class and b/out/production/6kiloCafeProject/My_java_work/Backend.class differ diff --git a/out/production/6kiloCafeProject/My_java_work/ConnectionWithDatabase.class b/out/production/6kiloCafeProject/My_java_work/ConnectionWithDatabase.class index ea62835..440f67c 100644 Binary files a/out/production/6kiloCafeProject/My_java_work/ConnectionWithDatabase.class and b/out/production/6kiloCafeProject/My_java_work/ConnectionWithDatabase.class differ diff --git a/out/production/6kiloCafeProject/My_java_work/ESPcommunication.class b/out/production/6kiloCafeProject/My_java_work/ESPcommunication.class index c763414..a148e78 100644 Binary files a/out/production/6kiloCafeProject/My_java_work/ESPcommunication.class and b/out/production/6kiloCafeProject/My_java_work/ESPcommunication.class differ diff --git a/out/production/6kiloCafeProject/My_java_work/SignUp.class b/out/production/6kiloCafeProject/My_java_work/SignUp.class index fa1efaf..5cd6b93 100644 Binary files a/out/production/6kiloCafeProject/My_java_work/SignUp.class and b/out/production/6kiloCafeProject/My_java_work/SignUp.class differ diff --git a/out/production/6kiloCafeProject/README.md b/out/production/6kiloCafeProject/README.md index 71ce82c..a9a3925 100644 --- a/out/production/6kiloCafeProject/README.md +++ b/out/production/6kiloCafeProject/README.md @@ -1,2 +1,5 @@ # 6kiloCafeProject +--- A project designed to create an online presence of Addis Ababa university 6kilo Cafe + +-Inorder to Launch the project run the `main.java` file in your local Java IDE diff --git a/out/production/6kiloCafeProject/SIGNUP_BACKEND/.idea/.gitignore b/out/production/6kiloCafeProject/SIGNUP_BACKEND/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/out/production/6kiloCafeProject/SIGNUP_BACKEND/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/out/production/6kiloCafeProject/SIGNUP_BACKEND/.idea/misc.xml b/out/production/6kiloCafeProject/SIGNUP_BACKEND/.idea/misc.xml new file mode 100644 index 0000000..20f033c --- /dev/null +++ b/out/production/6kiloCafeProject/SIGNUP_BACKEND/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/out/production/6kiloCafeProject/SIGNUP_BACKEND/.idea/modules.xml b/out/production/6kiloCafeProject/SIGNUP_BACKEND/.idea/modules.xml new file mode 100644 index 0000000..7b984dd --- /dev/null +++ b/out/production/6kiloCafeProject/SIGNUP_BACKEND/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/out/production/6kiloCafeProject/SIGNUP_BACKEND/SIGNUP_BACKEND.iml b/out/production/6kiloCafeProject/SIGNUP_BACKEND/SIGNUP_BACKEND.iml new file mode 100644 index 0000000..c90834f --- /dev/null +++ b/out/production/6kiloCafeProject/SIGNUP_BACKEND/SIGNUP_BACKEND.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/out/production/6kiloCafeProject/SignInService.class b/out/production/6kiloCafeProject/SignInService.class new file mode 100644 index 0000000..bdc331a Binary files /dev/null and b/out/production/6kiloCafeProject/SignInService.class differ diff --git a/out/production/6kiloCafeProject/SignupService.class b/out/production/6kiloCafeProject/SignupService.class new file mode 100644 index 0000000..e1d64e3 Binary files /dev/null and b/out/production/6kiloCafeProject/SignupService.class differ diff --git a/out/production/6kiloCafeProject/Student.class b/out/production/6kiloCafeProject/Student.class new file mode 100644 index 0000000..ea1ace7 Binary files /dev/null and b/out/production/6kiloCafeProject/Student.class differ