Merge branch 'master' of https://github.com/TCD-Computer-Science-hackathons/Exercise-Website

Author: borsakv

frontend/styles/shared-styles.css

@@ -10,3 +10,10 @@
   max-width: 250px;
 }
 
+.mygroups {
+        margin: 0 auto;
+        max-width: 250px;
+		/*background-color: #14c7c7;
+        background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='50' height='40' viewBox='0 0 50 40'%3E%3Cg fill-rule='evenodd'%3E%3Cg fill='%23000000' fill-opacity='0.4'%3E%3Cpath d='M40 10L36.67 0h-2.11l3.33 10H20l-2.28 6.84L12.11 0H10l6.67 20H10l-2.28 6.84L2.11 10 5.44 0h-2.1L0 10l6.67 20-3.34 10h2.11l2.28-6.84L10 40h20l2.28-6.84L34.56 40h2.1l-3.33-10H40l2.28-6.84L47.89 40H50l-6.67-20L50 0h-2.1l-5.62 16.84L40 10zm1.23 10l-2.28-6.84L34 28h4.56l2.67-8zm-10.67 8l-2-6h-9.12l2 6h9.12zm-12.84-4.84L12.77 38h15.79l2.67-8H20l-2.28-6.84zM18.77 20H30l2.28 6.84L37.23 12H21.44l-2.67 8zm-7.33 2H16l-4.95 14.84L8.77 30l2.67-8z' /%3E%3C/g%3E%3C/g%3E%3C/svg%3E");
+*/}
+

src/main/java/ie/tcd/pavel/JoinCreateGroupPage.java

@@ -5,17 +5,17 @@
 import com.vaadin.flow.component.Text;
 import com.vaadin.flow.component.applayout.AppLayout;
 import com.vaadin.flow.component.applayout.DrawerToggle;
+import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.dependency.CssImport;
-import com.vaadin.flow.component.html.Anchor;
-import com.vaadin.flow.component.html.H1;
-import com.vaadin.flow.component.html.Image;
-import com.vaadin.flow.component.html.Span;
+import com.vaadin.flow.component.dialog.Dialog;
+import com.vaadin.flow.component.html.*;
 import com.vaadin.flow.component.orderedlayout.FlexComponent;
 import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
 import com.vaadin.flow.component.tabs.Tab;
 import com.vaadin.flow.component.tabs.TabVariant;
 import com.vaadin.flow.component.tabs.Tabs;
+import com.vaadin.flow.component.textfield.TextField;
 import com.vaadin.flow.router.BeforeEnterEvent;
 import com.vaadin.flow.router.BeforeEnterObserver;
 import com.vaadin.flow.router.Route;
@@ -35,9 +35,13 @@
 public class MainPage extends AppLayout implements BeforeEnterObserver {
 
     private HashMap<Tab, Component> tabMap = new HashMap<>();
-    private Image background = new Image("https://i.imgur.com/4AhkxVz.jpg", "Background");
+
+    MongoDBOperations database;
+    private Image background = new Image("https://i.imgur.com/rrlI3vE.jpg", "Background");
+
 
     public MainPage() {
+        database = BeanUtil.getBean(MongoDBOperations.class);
         this.setContent(background);
         setPrimarySection(AppLayout.Section.DRAWER);
     }
@@ -52,14 +56,20 @@ public void beforeEnter(BeforeEnterEvent beforeEnterEvent) {
             tabs = new Tabs(
                     createHomeTab(),
                     createTab("Add Exercise", AddExercisePage.class),
-                    createTab("Create/Join Group", JoinCreateGroupPage.class),
+                    createJoinGroupTab(),
+                    createCreateGroupTab(),
                     createChartsTab(),
                     createMyGroupsTab()
             );
             tabs.addSelectedChangeListener(event -> {
                 final Tab selectedTab = event.getSelectedTab();
                 if(tabMap.containsKey(selectedTab)) {
-                    setContent(tabMap.get(selectedTab));
+                    if(!selectedTab.getLabel().equals("Join Group")&&!selectedTab.getLabel().equals("Create Group"))
+                        setContent(tabMap.get(selectedTab));
+                    else
+                    {
+                        ((Dialog) tabMap.get(selectedTab)).open();
+                    }
                 }
             });
 
@@ -84,6 +94,23 @@ public void beforeEnter(BeforeEnterEvent beforeEnterEvent) {
         addToDrawer(tabs);
     }
 
+    private Tab createJoinGroupTab()
+    {
+        Tab joinGroup = new Tab("Join Group");
+        joinGroup.addThemeVariants(TabVariant.LUMO_ICON_ON_TOP);
+        tabMap.put(joinGroup,createJoinGroupDialog());
+        return  joinGroup;
+    }
+
+    private Tab createCreateGroupTab()
+    {
+        Tab createGroup = new Tab("Create Group");
+        createGroup.addThemeVariants(TabVariant.LUMO_ICON_ON_TOP);
+        tabMap.put(createGroup,createCreateGroupDialog());
+        return  createGroup;
+    }
+
+
     private Tab createHomeTab()
     {
         Tab home = new Tab("Home");
@@ -149,4 +176,78 @@ private void createHeaderWithoutLogout() {
 
         addToNavbar(header);
     }
+
+    private Dialog createJoinGroupDialog()
+    {
+        Dialog dialog = new Dialog();
+        TextField joinGroupNameField = new TextField();
+        TextField joinGroupPassField = new TextField();
+        joinGroupNameField.getStyle().set("width", "15em");
+        joinGroupNameField.setMaxLength(13);
+        joinGroupNameField.setLabel("Group Name: ");
+        joinGroupPassField.getStyle().set("width", "15em");
+        joinGroupPassField.setMaxLength(13);
+        joinGroupPassField.setLabel("Group Password: ");
+        Label joinErrorLabel = new Label();
+        Button confirmJoinGroup = new Button("Confirm");
+        VerticalLayout vL = new VerticalLayout (joinGroupNameField, joinGroupPassField, confirmJoinGroup, joinErrorLabel);
+
+        confirmJoinGroup.addClickListener( event -> {
+            // User is attempting to join a group
+            if(!joinGroupNameField.getValue().equals("") && !joinGroupPassField.getValue().equals("")) {
+                if (database.groupExists(joinGroupNameField.getValue(), joinGroupPassField.getValue())) {
+                    database.insertGroup(joinGroupNameField.getValue(), joinGroupPassField.getValue(),
+                            SecurityUtils.getUsername());
+                    dialog.close();
+                    System.out.printf("[DEBUG] Group Joined: Name - %s | Password - %s%n", joinGroupNameField.getValue(), joinGroupPassField.getValue());
+                } else {
+                    System.out.printf("[DEBUG] Someone tried to join a group that does not exist. Password Incorrect.%n");
+                }
+            }
+            dialog.close();
+        });
+
+        dialog.add(vL);
+
+        return dialog;
+    }
+
+    private Dialog createCreateGroupDialog()
+    {
+        Dialog dialog = new Dialog();
+        TextField newGroupNameField = new TextField();
+        TextField newGroupPassField = new TextField();
+        newGroupNameField.getStyle().set("width", "15em");
+        newGroupNameField.setMaxLength(13);
+        newGroupNameField.setLabel("New Group Name: ");
+        newGroupPassField.getStyle().set("width", "15em");
+        newGroupPassField.setMaxLength(13);
+        newGroupPassField.setLabel("New Group Password: ");
+        Label createErrorLabel = new Label();
+        Button confirmCreateGroup = new Button ("Confirm");
+        VerticalLayout vL = new VerticalLayout (newGroupNameField, newGroupPassField, confirmCreateGroup, createErrorLabel);
+
+        confirmCreateGroup.addClickListener( event -> {
+            // User is creating a new group
+            if(!newGroupNameField.getValue().equals("") && !newGroupPassField.getValue().equals("")) {
+                if(!database.groupExists(newGroupNameField.getValue())) {
+                    database.insertGroup(newGroupNameField.getValue(), newGroupPassField.getValue(),
+                            SecurityUtils.getUsername());
+                    database.makeAdmin(SecurityUtils.getUsername(), newGroupNameField.getValue());
+                    dialog.close();
+                    System.out.printf("[DEBUG] Group Created: Name - %s | Password - %s%n", newGroupNameField.getValue(), newGroupPassField.getValue());
+                } else {
+                    vL.remove(createErrorLabel);
+                    createErrorLabel.setText("Group Name already exists");
+                    vL.add(createErrorLabel);
+                    System.out.printf("[DEBUG] Someone tried to create a group when the name already exists%n");
+                }
+            }
+            dialog.close();
+        });
+
+        dialog.add(vL);
+
+        return dialog;
+    }
 }

src/main/java/ie/tcd/pavel/MainPage.java

@@ -188,15 +188,32 @@ public void deleteExercise(String owner, String type, Date date)
     public void insertGroup(String name, String password, String user)
     {
         mongoTemplate.insert(new Group(name,user));
-        mongoTemplate.insert(new GroupPassword(name,encoder.encode(password)));
+        if(getUsersByGroup(name).size() < 2) {
+            mongoTemplate.insert(new GroupPassword(name,encoder.encode(password)));
+        }
     }
 
+
+    public Group findGroup(String user, String group)
+    {
+        Query searchGroup = new Query(Criteria.where("user").is(user).and("name").is(group));
+        Group groupResult = mongoTemplate.findOne(searchGroup,Group.class);
+        return groupResult;
+
+    }
+
+
     public boolean groupExists(String name, String password)
     {
         Query searchGroupPassword = new Query(Criteria.where("name").is(name));
         List<GroupPassword> resultGroups = mongoTemplate.query(GroupPassword.class).matching(searchGroupPassword).all();
-        System.out.println(resultGroups.get(0).getPassword());
-        return encoder.matches(password,resultGroups.get(0).getPassword());
+        if(resultGroups.size()>0) {
+            return encoder.matches(password, resultGroups.get(0).getPassword());
+        }
+        else
+        {
+            return false;
+        }
     }
 
     public boolean groupExists(String name)
@@ -298,22 +315,34 @@ else if(exerciseTypes.getTimeExercises().contains(type))
         return  cumulativeData;
     }
 
+    public void makeAdmin(String user, String group)
+    {
+        mongoTemplate.insert(new GroupAdmin(user,group));
+    }
 
+    public boolean checkIfAdmin(String user, String group)
+    {
+        Query checkAdmin = new Query(Criteria.where("admin").is(user).and("groupName").is(group));
+        List<GroupAdmin> admins = mongoTemplate.query(GroupAdmin.class).matching(checkAdmin).all();
+        return admins.size()>0;
+    }
 
+    public void removeUserFromGroup(String user, String group)
+    {
+        Group groupToRemove = this.findGroup(user,group);
+        mongoTemplate.remove(groupToRemove);
+    }
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+    public void deleteGroupFinal(String name)
+    {
+        Query findAdmins = new Query(Criteria.where("groupName").is(name));
+        List<GroupAdmin> admins = mongoTemplate.query(GroupAdmin.class).matching(findAdmins).all();
+        for(GroupAdmin admin : admins) {
+            mongoTemplate.remove(admin);
+        }
+        Query searchGroupPassword = new Query(Criteria.where("name").is(name));
+        GroupPassword password = mongoTemplate.findOne(searchGroupPassword,GroupPassword.class);
+        mongoTemplate.remove(password);
+    }
 }