Project spa samples page

src/main/java/ca/corefacility/bioinformatics/irida/ria/web/DashboardController.java

@@ -11,7 +11,7 @@
  */
 @Controller
 public class DashboardController {
-	private static final String DASHBOARD_PAGE = "index";
+	private static final String DASHBOARD_PAGE = "dashboard";
 	private static final Logger logger = LoggerFactory.getLogger(DashboardController.class);
 
 	/**

src/main/java/ca/corefacility/bioinformatics/irida/ria/web/SPAController.java

@@ -0,0 +1,22 @@
+package ca.corefacility.bioinformatics.irida.ria.web;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+
+/**
+ * Only controller to be used for IRIDA SPA
+ */
+@Controller
+public class SPAController {
+
+    /**
+     * Entry point for IRIDA SPA.
+     *
+     * @return Index page.
+     */
+    @GetMapping("/projects/**")
+    public String getSPAEntry() {
+        return "index";
+    }
+
+}

src/main/java/ca/corefacility/bioinformatics/irida/ria/web/ajax/dto/CurrentUser.java

@@ -12,13 +12,17 @@ public class CurrentUser {
 	private String firstName;
 	private String lastName;
 	private boolean isAdmin;
+	private boolean isManager;
+	private boolean isTechnician;
 
 	public CurrentUser(User user) {
 		this.identifier = user.getId();
 		this.username = user.getUsername();
 		this.firstName = user.getFirstName();
 		this.lastName = user.getLastName();
 		this.isAdmin = user.getSystemRole().equals(Role.ROLE_ADMIN);
+		this.isManager = user.getSystemRole().equals(Role.ROLE_MANAGER);
+		this.isTechnician = user.getSystemRole().equals(Role.ROLE_TECHNICIAN);
 	}
 
 	public Long getIdentifier() {
@@ -37,7 +41,15 @@ public String getLastName() {
 		return lastName;
 	}
 
-	public boolean isAdmin() {
+	public boolean getIsAdmin() {
 		return isAdmin;
 	}
+
+	public boolean getIsManager() {
+		return isManager;
+	}
+
+	public boolean getIsTechnician() {
+		return isTechnician;
+	}
 }

src/main/java/ca/corefacility/bioinformatics/irida/ria/web/announcements/AnnouncementAjaxController.java

@@ -1,21 +1,20 @@
 package ca.corefacility.bioinformatics.irida.ria.web.announcements;
 
-import java.security.Principal;
-import java.util.List;
-
-import ca.corefacility.bioinformatics.irida.model.announcements.AnnouncementUserJoin;
-import ca.corefacility.bioinformatics.irida.ria.web.announcements.dto.AnnouncementUserReadDetails;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
 import ca.corefacility.bioinformatics.irida.model.announcements.Announcement;
+import ca.corefacility.bioinformatics.irida.model.announcements.AnnouncementUserJoin;
 import ca.corefacility.bioinformatics.irida.ria.web.announcements.dto.AnnouncementRequest;
 import ca.corefacility.bioinformatics.irida.ria.web.announcements.dto.AnnouncementTableModel;
+import ca.corefacility.bioinformatics.irida.ria.web.announcements.dto.AnnouncementUserReadDetails;
 import ca.corefacility.bioinformatics.irida.ria.web.announcements.dto.AnnouncementUserTableModel;
 import ca.corefacility.bioinformatics.irida.ria.web.models.tables.TableRequest;
 import ca.corefacility.bioinformatics.irida.ria.web.models.tables.TableResponse;
 import ca.corefacility.bioinformatics.irida.ria.web.services.UIAnnouncementsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.security.Principal;
+import java.util.List;
 
 /**
  * Controller for all ajax requests from the UI for announcements.
@@ -41,6 +40,16 @@ public TableResponse<AnnouncementTableModel> getAnnouncementsAdmin(@RequestBody
 		return service.getAnnouncementsAdmin(tableRequest);
 	}
 
+	/**
+	 * Get the total number of unread announcement for a user.
+	 *
+	 * @return number of unread announcements
+	 */
+	@GetMapping("/count")
+	public int getUnreadAnnouncementCount() {
+		return service.getUnreadAnnouncementsCount();
+	}
+
 	/**
 	 * Handle request for getting a list of read and unread announcements for a user.
 	 *