nova/Chatto
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

added user change passphrase page and some general adjustments

Browse Source
This commit is contained in:
Rohan Sircar 2019-11-05 09:54:12 +05:30
parent 5c056cf5a0
commit 3692608d8f
12 changed files with 11943 additions and 379 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
chatto/src/main/java/org/ros/chatto/controller/AdminController.java
View File

@ -1,12 +1,11 @@
package org.ros.chatto.controller;
import java.security.Principal;
import org.ros.chatto.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
@Controller
@RequestMapping("/admin")
@ -15,11 +14,25 @@ public class AdminController {
@Autowired
private UserService userService;
@RequestMapping
public ModelAndView viewManageUsers(Principal principal) {
ModelAndView modelAndView = new ModelAndView("/admin/home");
modelAndView.addObject("user", new String());
modelAndView.addObject("userNames", userService.getAllRegularUsers());
return modelAndView;
// @RequestMapping
// public ModelAndView viewManageUsers(Principal principal) {
// ModelAndView modelAndView = new ModelAndView("/admin/home");
// modelAndView.addObject("user", new String());
// modelAndView.addObject("userNames", userService.getAllRegularUsers());
// return modelAndView;
// }
@GetMapping()
public String home()
{
// model.addAttribute("user", new String());
// model.addAttribute("userNames", userService.getAllRegularUsers());
return "admin/home";
}
@GetMapping("/change-passphrase")
public String changePassphrase(Model model) {
model.addAttribute("userNames", userService.getAllRegularUsers());
return "admin/change-passphrase";
}
}

15
chatto/src/main/resources/static/css/admin-custom.css
View File

@ -32,12 +32,12 @@
.sidebar .nav-item .collapse .collapse-inner .collapse-item:hover,
.sidebar .nav-item .collapsing .collapse-inner .collapse-item:hover {
background-color: #f17261;
background-color: blue;
}
.sidebar {
/* .sidebar {
min-height: 100%;
}
} */
.text-info {
color: #5bd6e8 !important;
@ -50,3 +50,12 @@
.sidebar-dark hr.sidebar-divider {
border-top: 1px solid rgba(255, 255, 255, 0.5);
}
body {
background: #333;
color: #fff;
}
#wrapper #content-wrapper {
background-color: #333;
}

11332
chatto/src/main/resources/static/css/sb-admin-2-old.css Normal file
View File

File diff suppressed because it is too large Load Diff

25
chatto/src/main/resources/static/css/sb-admin-2.css
View File

@ -66,9 +66,7 @@ body {
line-height: 1.5;
color: #858796;
text-align: left;
/* background-color: #fff; */
background: #333;
/* color: #ffffff; */
background-color: #fff;
}
[tabindex="-1"]:focus {
@ -6291,6 +6289,9 @@ button.bg-dark:focus {
background-color: #42444e !important;
}
.bg-white {
background-color: #fff !important;
}
.bg-transparent {
background-color: transparent !important;
@ -9767,39 +9768,39 @@ a:focus {
font-size: 1.2rem;
}
.text-white100 {
.text-gray-100 {
color: #f8f9fc !important;
}
.text-white200 {
.text-gray-200 {
color: #eaecf4 !important;
}
.text-white300 {
.text-gray-300 {
color: #dddfeb !important;
}
.text-white400 {
.text-gray-400 {
color: #d1d3e2 !important;
}
.text-white500 {
.text-gray-500 {
color: #b7b9cc !important;
}
.text-white600 {
.text-gray-600 {
color: #858796 !important;
}
.text-white700 {
.text-gray-700 {
color: #6e707e !important;
}
.text-white800 {
.text-gray-800 {
color: #5a5c69 !important;
}
.text-white900 {
.text-gray-900 {
color: #3a3b45 !important;
}

8
chatto/src/main/resources/static/js/demo/chart-area-demo.js
View File

@ -37,6 +37,7 @@ var myLineChart = new Chart(ctx, {
label: "Earnings",
lineTension: 0.3,
backgroundColor: "rgba(78, 115, 223, 0.05)",
// backgroundColor: "#fff",
borderColor: "rgba(78, 115, 223, 1)",
pointRadius: 3,
pointBackgroundColor: "rgba(78, 115, 223, 1)",
@ -69,11 +70,13 @@ var myLineChart = new Chart(ctx, {
drawBorder: false
},
ticks: {
fontColor: "white",
maxTicksLimit: 7
}
}],
yAxes: [{
ticks: {
fontColor: "white",
maxTicksLimit: 5,
padding: 10,
// Include a dollar sign in the ticks
@ -91,7 +94,10 @@ var myLineChart = new Chart(ctx, {
}],
},
legend: {
display: false
display: false,
// labels: {
// fontColor: "white"
// }
},
tooltips: {
backgroundColor: "rgb(255,255,255)",

116
chatto/src/main/resources/templates/admin/change-passphrase.html Normal file
View File

@ -0,0 +1,116 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<head>
<div th:replace="fragments/head :: headFragment">
<title id="pageTitle">Change Passphrase</title>
</div>
<script src="https://code.jquery.com/jquery-2.1.4.min.js" th:if="false"></script>
<script src="http://blackpeppersoftware.github.io/thymeleaf-fragment.js/thymeleaf-fragment.js" data-template-prefix="../" defer="defer" th:if="false"></script>
<script th:src="@{/js/admin.js}" src="../../static/js/admin.js" defer="defer"></script>
<script th:src="@{/js/sb-admin-2.js}" src="../../static/js/sb-admin-2.js" defer="defer"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.4.1/jquery.easing.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.8.0/Chart.js"></script>
<link th:href="@{/css/sb-admin-2.css}" href="../../static/css/sb-admin-2.css" rel="stylesheet">
<link th:href="@{/css/admin-custom.css}" href="../../static/css/admin-custom.css" rel="stylesheet">
</head>
<!-- TODO
Make user admin / remove user from admin
Change E2E passphrase
Delete Messages
-->
<!-- <div th:include="fragments/admin :: admin-sidebar"></div> -->
<body id="page-top">
<!-- Page Wrapper -->
<div id="wrapper">
<div th:include="fragments/admin :: sidebar-fragment"></div>
<!-- Content Wrapper -->
<div id="content-wrapper" class="d-flex flex-column" style="background-color: #333;">
<!-- Main Content -->
<div id="content">
<div th:include="fragments/admin :: topbar-fragment"></div>
<!-- Begin Page Content -->
<div class="container-fluid">
<!-- Page Heading -->
<div class="d-sm-flex align-items-center justify-content-between mb-4">
<h1 class="h3 mb-0 text-light">Dashboard</h1>
<a href="#" class="d-none d-sm-inline-block btn btn-sm btn-primary shadow-sm"><i class="fas fa-download fa-sm text-white-50"></i> Generate Report</a>
</div>
<!-- Content Row -->
<div class="row">
<div class="col-lg-4 mb-4 offset-lg-4">
<!-- Approach -->
<div class="card bg-dark border border-dark text-white shadow mb-4">
<div class="card-header bg-secondary border border-secondary py-3">
<h6 class="m-0 font-weight-bold text-white">Development Approach</h6>
</div>
<div class="card-body">
<h4>Change passphrases</h4>
<form id="changePassphraseForm">
<div class="form-group">
<label for="changePassphraseDropDown">Select User:</label>
<select class="form-control" id="changePassphraseDropDown">
<option th:each="userName : ${userNames}"
th:value="${userName}"
th:text="#{${userName}}">
Wireframe
</option>
</select>
</div>
<div class="form-group">
<label for="passphraseOld">Passphrase Old</label>
<input type="password" id="passphraseOld" class="form-control">
</div>
<div class="form-group">
<label for="passphraseNew">Passphrase New</label>
<input type="password" id="passphraseNew" class="form-control">
</div>
<div class="form-group">
<button class="btn btn-danger form-control">Change Passphrase</button>
</div>
</form>
</div>
</div>
</div>
</div>
</div>
<!-- /.container-fluid -->
</div>
<!-- End of Main Content -->
<div th:include="fragments/admin :: footer"></div>
</div>
<!-- End of Content Wrapper -->
</div>
<!-- End of Page Wrapper -->
<th:block th:include="fragments/admin :: modal"></th:block>
<div th:if="false">
<th:block th:include="admin :: modal"></th:block>
</div>
</body>
</html>

43
chatto/src/main/resources/templates/admin/home.html
View File

@ -29,7 +29,7 @@
<div id="wrapper">
<div th:include="fragments/admin :: sidebar-fragment"></div>
<th:block th:include="fragments/admin :: sidebar-fragment"></th:block>
<!-- Content Wrapper -->
<div id="content-wrapper" class="d-flex flex-column" style="background-color: #333;">
@ -94,7 +94,7 @@
<div class="text-xs font-weight-bold text-info text-uppercase mb-1">Tasks</div>
<div class="row no-gutters align-items-center">
<div class="col-auto">
<div class="h5 mb-0 mr-3 font-weight-bold text-gray-800">50%</div>
<div class="h5 mb-0 mr-3 font-weight-bold text-white">50%</div>
</div>
<div class="col">
<div class="progress progress-sm mr-2">
@ -118,7 +118,7 @@
<div class="row no-gutters align-items-center">
<div class="col mr-2">
<div class="text-xs font-weight-bold text-warning text-uppercase mb-1">Pending Requests</div>
<div class="h5 mb-0 font-weight-bold text-gray-800">18</div>
<div class="h5 mb-0 font-weight-bold text-white">18</div>
</div>
<div class="col-auto">
<i class="fas fa-comments fa-2x text-gray-300"></i>
@ -187,7 +187,7 @@
</div>
<div class="mt-4 text-center small">
<span class="mr-2">
<i class="fas fa-circle text-white"></i> Direct
<i class="fas fa-circle text-primary"></i> Direct
</span>
<span class="mr-2">
<i class="fas fa-circle text-success"></i> Social
@ -327,15 +327,7 @@
</div>
<!-- End of Main Content -->
<!-- Footer -->
<footer class="sticky-footer bg-dark">
<div class="container my-auto">
<div class="copyright text-center my-auto">
<span class="text-white">Copyright &copy; Your Website 2019</span>
</div>
</div>
</footer>
<!-- End of Footer -->
<div th:include="fragments/admin :: footer"></div>
</div>
<!-- End of Content Wrapper -->
@ -343,29 +335,8 @@
</div>
<!-- End of Page Wrapper -->
<!-- Scroll to Top Button-->
<a class="scroll-to-top rounded" href="#page-top">
<i class="fas fa-angle-up"></i>
</a>
<!-- Logout Modal-->
<div class="modal fade" id="logoutModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLabel">Ready to Leave?</h5>
<button class="close" type="button" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">×</span>
</button>
</div>
<div class="modal-body">Select "Logout" below if you are ready to end your current session.</div>
<div class="modal-footer">
<button class="btn btn-secondary" type="button" data-dismiss="modal">Cancel</button>
<a class="btn btn-primary" href="login.html">Logout</a>
</div>
</div>
</div>
</div>
<th:block th:include="fragments/admin :: modal"></th:block>
<div th:if="false"><th:block th:include="admin :: modal"></th:block></div>
<!-- Page level custom scripts -->
<script th:src="@{/js/demo/chart-area-demo.js}" src="../../static/js/demo/chart-area-demo.js"></script>

83
chatto/src/main/resources/templates/fragments/admin.html
View File

@ -17,10 +17,14 @@
<link href="../../static/css/admin-custom.css" rel="stylesheet" th:if="false">
</head>
<body>
<body id="page-top">
<!-- Page Wrapper -->
<div id="wrapper">
<th:block th:fragment="sidebar-fragment">
<!-- Sidebar -->
<ul class="navbar-nav bg-gradient-danger sidebar sidebar-dark accordion" id="accordionSidebar">
<ul class="navbar-nav bg-gradient-primary sidebar sidebar-dark accordion" id="accordionSidebar">
<!-- Sidebar - Brand -->
<a class="sidebar-brand d-flex align-items-center justify-content-center" th:href="@{/admin}" href="../admin/home.html">
@ -56,8 +60,8 @@
</a>
<div id="collapseOne" class="collapse" aria-labelledby="headingTwo" data-parent="#accordionSidebar">
<div class="bg-dark py-2 collapse-inner rounded">
<h6 class="collapse-header">Custom Components:</h6>
<a class="collapse-item" th:href="@{/admin/users.html}" href="../admin/users.html">Buttons</a>
<h6 class="collapse-header">Settings:</h6>
<a class="collapse-item" th:href="@{/admin/change-passphrase}" href="../admin/change-passphrase.html">Change Passphrase</a>
<a class="collapse-item" href="cards.html">Cards</a>
</div>
</div>
@ -157,6 +161,13 @@
</ul>
<!-- End of Sidebar -->
</th:block>
<!-- Content Wrapper -->
<div id="content-wrapper" class="d-flex flex-column">
<!-- Main Content -->
<div id="content">
<th:block th:fragment="topbar-fragment">
<!-- Topbar -->
<nav class="navbar navbar-expand navbar-dark bg-dark topbar mb-4 static-top shadow">
@ -178,6 +189,7 @@
</div>
</form>
<!-- <div th:include="fragments/navbar :: navbarContent"></div> -->
<!-- Topbar Navbar -->
<ul class="navbar-nav ml-auto">
@ -201,6 +213,12 @@
</div>
</li>
<div class="d-none d-lg-block" th:include="fragments/navbar :: navbarContent"></div>
<th:block th:if="false">
<th:block th:include="navbar :: navbarContent" class="d-none d-lg-block"></th:block>
</th:block>
<!-- <th:block th:include="fragments/navbar :: navbarFragment"></th:block> -->
<!-- Nav Item - Alerts -->
<li class="nav-item dropdown no-arrow mx-1">
<a class="nav-link dropdown-toggle" href="#" id="alertsDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@ -337,6 +355,63 @@
</nav>
<!-- End of Topbar -->
</th:block>
<!-- Begin Page Content -->
<div class="container-fluid">
<!-- Page Heading -->
<h1 class="h3 mb-4 text-gray-800">Blank Page</h1>
</div>
<!-- /.container-fluid -->
</div>
<!-- End of Main Content -->
<th:block th:fragment="footer">
<!-- Footer -->
<footer class="sticky-footer bg-dark">
<div class="container my-auto">
<div class="copyright text-center my-auto">
<span class="text-white">Copyright &copy; Your Website 2019</span>
</div>
</div>
</footer>
<!-- End of Footer -->
</th:block>
</div>
<!-- End of Content Wrapper -->
</div>
<!-- End of Page Wrapper -->
<th:block th:fragment="modal">
<!-- Scroll to Top Button-->
<a class="scroll-to-top rounded" href="#page-top">
<i class="fas fa-angle-up"></i>
</a>
<!-- Logout Modal-->
<div class="modal fade" id="logoutModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog" role="document">
<div class="modal-content bg-primary">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLabel">Ready to Leave?</h5>
<button class="close" type="button" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">×</span>
</button>
</div>
<div class="modal-body">Select "Logout" below if you are ready to end your current session.</div>
<div class="modal-footer">
<button class="btn btn-secondary" type="button" data-dismiss="modal">Cancel</button>
<a class="btn btn-danger" href="login.html">Logout</a>
</div>
</div>
</div>
</div>
</th:block>
</body>
</html>

2
chatto/src/main/resources/templates/fragments/head.html
View File

@ -3,7 +3,7 @@
<head>
<th:block th:fragment="headFragment">
<script th:src="@{js/scljs.js}" type="text/javascript"></script>
<script th:src="@{/js/scljs.js}" type="text/javascript"></script>
<!--<script th:src="@{js/my_Crypto.js}" type="text/javascript"></script>-->
<script src="https://cdnjs.cloudflare.com/ajax/libs/sprintf/1.1.2/sprintf.min.js" type="text/javascript"></script>

55
chatto/src/main/resources/templates/fragments/navbar.html
View File

@ -18,12 +18,56 @@
<nav class="navbar navbar-expand-sm bg-dark navbar-dark fixed-top">
<div class="container">
<a href="home.html" th:href="@{/}" class="navbar-brand">Chatto</a>
<!-- <div class="navbar-header">
<button class="navbar-toggler" data-toggle="collapse" data-target="#navbarCollapse">
<i class="fas fa-chevron-down"></i>
</button>
</div>
<div class="collapse navbar-collapse" id="navbarCollapse">
<ul class="navbar-nav ml-auto">
<li class="nav-item">
<a href="home.html" th:href="@{/}" class="nav-link">Home</a>
</li>
<li class="nav-item">
<a href="user/home.html" sec:authorize="isFullyAuthenticated()" th:href="@{/user}" class="nav-link">User Area</a>
</li>
<li class="nav-item">
<a th:href="chat" href="chat.html" class="nav-link">Chat</a>
</li>
<li class="nav-item">
<a th:href="login" sec:authorize="!isFullyAuthenticated()" href="login.html" class="nav-link">Login</a>
</li>
<li class="nav-item">
<a th:href="registration" sec:authorize="!isFullyAuthenticated()" href="registration.html" class="nav-link">Register</a>
</li>
<li class="nav-item">
<a href="#" class="nav-link">About</a>
</li>
<li class="nav-item">
<a href="#" class="nav-link">Contact</a>
</li>
<li class="nav-item">
<a href="#" sec:authorize="isFullyAuthenticated()" th:href="@{/admin}" class="nav-link">
Admin Area
</a>
</li>
<li class="nav-item">
<a href="#" sec:authorize="isFullyAuthenticated()" th:text="${#authentication.name}" class="nav-link text-white font-weight-bold">
nova
</a>
</li>
</ul>
</div> -->
<th:block th:include="fragments/navbar :: navbarContent"></th:block>
</div>
</nav>
<!-- </div> -->
</th:block>
<th:block th:fragment="navbarContent">
<div class="navbar-header">
<button class="navbar-toggler" data-toggle="collapse" data-target="#navbarCollapse">
<!-- <span class="navbar-toggle-icon">Menu</span> -->
<!-- Menu -->
<!-- <i class="fas fa-angle-double-up"></i> -->
<!-- <i class="glyphicon glyphicon-align-left"></i> -->
<i class="fas fa-chevron-down"></i>
</button>
@ -63,9 +107,6 @@
</li>
</ul>
</div>
</div>
</nav>
<!-- </div> -->
</th:block>
</body>

14
chatto/src/main/resources/templates/login.html
View File

@ -38,9 +38,9 @@
<header>
<div class="container">
<div class="row">
<div class=" col-lg-5 offset-lg-3 py-5">
<div class=" col-lg-6 offset-lg-3 py-5">
<!-- <h4 class="display-4 text-center py-2">Chat</h4> -->
<div class="card text-white bg-primary mb-3 text-center card-form rounded mx-auto" id="login-card">
<div class="card text-white bg-primary text-center card-form rounded p-5" id="login-card">
<div class="card-body rounded">
<!-- <h4 class="card-title">Chat</h4> -->
@ -53,7 +53,7 @@
<form action="#" th:action="@{/perform_login}" method="POST" id="loginForm">
<!-- <fieldset>
<legend>Please Sign In</legend> -->
<h2 class="card-title">Please Sign In</h2>
<h2 class="card-title mb-4">Please Sign In</h2>
<div th:if="${param.error}" class="alert alert-danger">
Error signing in. Please check your username and password.
</div>
@ -61,13 +61,13 @@
You have been logged out.
</div>
<div class="form-group">
<label for="username">Enter user name: </label>
<input class="form-control" type="text" name="username" id="username">
<!-- <label for="username">Enter user name: </label> -->
<input class="form-control" type="text" name="username" id="username" placeholder="Username">
</div>
<div class="form-group">
<label for="password">Enter password: </label>
<input class="form-control" type="password" name="password" id="password">
<!-- <label for="password">Enter password: </label> -->
<input class="form-control" type="password" name="password" id="password" placeholder="Password">
</div>
<div class="form-group">

6
chatto/src/main/resources/templates/registration.html
View File

@ -15,9 +15,9 @@
<header>
<div class="container">
<div class="row">
<div class="col-lg-5 offset-lg-3 py-5">
<div class="col-lg-6 offset-lg-3 py-5">
<!-- <h4 class="display-4 text-center py-2">Chat</h4> -->
<div class="card text-white bg-primary mb-3 card-form rounded mx-auto" id="registration-card">
<div class="card text-white bg-primary card-form rounded mx-auto p-5" id="registration-card">
<div class="card-body rounded">
<!-- <h4 class="card-title">Chat</h4> -->
@ -36,7 +36,7 @@
</div> -->
<div class="card-text">
<h2 class="card-title text-center">Register</h2>
<h2 class="card-title text-center mb-3">Register</h2>
<form action="#" th:action="@{/perform_registration}" th:object=${userRegistrationDTO} method="POST">
<div class="form-group">
<label>Enter username: </label>