vedas

register ujash

Download Browse

+358 −193

Author

Prashant K Gosai (PrashantGosai) 2021-01-11 13:01

Committer

Prashant K Gosai (PrashantGosai) 2021-01-11 13:01

Hash d0b7e0b461e5a0260f70635d9669ac7713e5db21

Parent cfef5c3bbf56e144be5a0b3600bc13bb3057c658

Reference git #vedas/d0b7e0b461e5a0260f70635d9669ac7713e5db21

Modified Files

List

Side by side diff

Inline diff

M src/main/java/com/GisSatellite/Server/Controller/LoginController.java

+35 −16

--- 'a/src/main/java/com/GisSatellite/Server/Controller/LoginController.java'

+++ b/src/main/java/com/GisSatellite/Server/Controller/LoginController.java

@@ -2,8 +2,7 @@ package com.GisSatellite.Server.Controll

import java.util.HashSet;

import java.util.Map;

+import java.util.OptionalDouble;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;

@@ -29,6 +28,9 @@ public class LoginController {

@Autowired

private UserRepository userRepository;

+ private Object Optional;

@RequestMapping("/")

public String Default() {

return "login";

@@ -51,7 +53,7 @@ public class LoginController {

}

@RequestMapping(value = "/register", method = RequestMethod.POST)

- public String saveRegisterPage(@Validated @ModelAttribute("user") User user, @RequestParam String role, BindingResult result, Model model,

+ public String saveRegisterPage(@Validated @ModelAttribute("user") User user, BindingResult result, Model model,

Map<String, Object> map) {

model.addAttribute("user", user);

@@ -61,21 +63,38 @@ public class LoginController {

else

{

+ long a=userRepository.countByUsername(user.getUsername());

+ if(a!=0)

+ {

+ map.put("message", "User already Exist");

+ return "register";

+ }

+ else

+ {

+ Role r=new Role();

+ r.setRole("user");

+ user.setRoles(new HashSet<Role>() {{

+ add(r);

+ }});

+ String pwd = user.getPassword();

+ String encryptPwd = passwordEncoder.encode(pwd);

+ user.setPassword(encryptPwd);

+ map.put("message", "Successful");

+ userRepository.save(user);

+ return "register";

+ }

- Role r=new Role();

- r.setRole(role);

- user.setRoles(new HashSet<Role>() {{

- add(r);

- }});

- String pwd = user.getPassword();

- String encryptPwd = passwordEncoder.encode(pwd);

- user.setPassword(encryptPwd);

- map.put("message", "Successful");

- userRepository.save(user);

- }

- return "register";

}

\ No newline at end of file

M src/main/java/com/GisSatellite/Server/Controller/SatelliteController.java

+2 −0

--- 'a/src/main/java/com/GisSatellite/Server/Controller/SatelliteController.java'

+++ b/src/main/java/com/GisSatellite/Server/Controller/SatelliteController.java

@@ -61,6 +61,8 @@ public class SatelliteController {

@GetMapping("/admin")

public String admin() {

return "attributenew";

}

A src/main/java/com/GisSatellite/Server/Controller/UserController.java

+16 −0

--- /dev/null

+++ b/src/main/java/com/GisSatellite/Server/Controller/UserController.java

@@ -0,0 +1,16 @@

+package com.GisSatellite.Server.Controller;

+import org.springframework.security.access.prepost.PreAuthorize;

+import org.springframework.stereotype.Controller;

+import org.springframework.web.bind.annotation.GetMapping;

+@Controller

+@PreAuthorize("hasRole('ROLE_user')")

+public class UserController {

+ @GetMapping("/user")

+ public String userRole() {

+ return "attributenew";

+ }

M src/main/java/com/GisSatellite/Server/Repository/UserRepository.java

+4 −0

--- 'a/src/main/java/com/GisSatellite/Server/Repository/UserRepository.java'

+++ b/src/main/java/com/GisSatellite/Server/Repository/UserRepository.java

@@ -1,5 +1,7 @@

package com.GisSatellite.Server.Repository;

+import java.util.Optional;

import org.springframework.data.jpa.repository.JpaRepository;

import com.GisSatellite.Server.Entities.User;

@@ -8,5 +10,7 @@ import com.GisSatellite.Server.Entities.

public interface UserRepository extends JpaRepository<User, Integer> {

User findByUsername(String username);

+ long countByUsername(String username);

}

\ No newline at end of file

M src/main/webapp/views/attributenew.jsp

+1 −1

--- 'a/src/main/webapp/views/attributenew.jsp'

+++ b/src/main/webapp/views/attributenew.jsp

@@ -309,7 +309,7 @@

- <li><a href="#"><i class="fa fa-power-off"></i> Logout</a></li>

+ <li><a href="/logout"><i class="fa fa-power-off"></i> Logout</a></li>

</ul>

</div>

</li>

M src/main/webapp/views/login.jsp

+2 −1

--- 'a/src/main/webapp/views/login.jsp'

+++ b/src/main/webapp/views/login.jsp

@@ -1,3 +1,4 @@

+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>

<%@ page language="java" contentType="text/html; charset=UTF-8"

pageEncoding="UTF-8"%>

@@ -79,7 +80,7 @@

- <div>Don't have an account? <a href="pages-register.html" class="text-info m-l-5"><b>Sign Up</b></a></div>

+ <div>Don't have an account? <a href="/register" class="text-info m-l-5"><b>Sign Up</b></a></div>

</div>

</form>

M src/main/webapp/views/register.jsp

+96 −175

--- 'a/src/main/webapp/views/register.jsp'

+++ b/src/main/webapp/views/register.jsp

@@ -1,191 +1,116 @@

<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>

<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>

-<!DOCTYPE html>

+<%@ page language="java" contentType="text/html; charset=UTF-8"

+ pageEncoding="UTF-8"%>

-

-<meta http-equiv="content-type" content="text/html;charset=utf-8" />

+

<head>

- <meta charset="utf-8" />

- <link rel="apple-touch-icon" sizes="76x76" href="assets/img/apple-icon.png">

- <link rel="icon" type="image/png" href="assets/img/favicon.png">

- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />

- <title>

- Material Dashboard PRO by Creative Tim

- </title>

- <meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no' name='viewport' />

-

-

- <!-- <link rel="canonical" href="https://www.creative-tim.com/product/material-dashboard-pro" />

- Social tags

- Fonts and icons

- <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Roboto+Slab:400,700|Material+Icons" />

- <link rel="stylesheet" href="../../../../maxcdn.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css"> -->

-

- <link href="assets/plugins/bootstrap/css/bootstrap.min.css" rel="stylesheet">

+ <meta charset="utf-8">

+ <meta http-equiv="X-UA-Compatible" content="IE=edge">

+

+ <meta name="viewport" content="width=device-width, initial-scale=1">

+ <meta name="description" content="">

+ <meta name="author" content="">

+

+ <link rel="icon" type="image/png" sizes="16x16" href="assets/images/fbisag_logo.png">

+ <title>SDIS</title>

+

+ <link href="assets/plugins/bootstrap/css/bootstrap.min.css" rel="stylesheet">

-

+

+

+ <!--[if lt IE 9]>

+ <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>

+ <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>

+<![endif]-->

</head>

-<body class="off-canvas-sidebar">

-

-

- <noscript>

- <iframe src="https://www.googletagmanager.com/ns.html?id=GTM-NKDMSK6" height="0" width="0" style="display:none;visibility:hidden"></iframe>

- </noscript>

-

-

- <nav class="navbar navbar-expand-lg navbar-transparent navbar-absolute fixed-top text-white">

- <div class="container">

- <div class="navbar-wrapper">

- <a class="navbar-brand" href="#pablo">Registration Page</a>

- </div>

- <!-- <div class="collapse navbar-collapse justify-content-end">

- <ul class="navbar-nav">

- <li class="nav-item">

- <a href="../dashboard.html" class="nav-link">

- <i class="material-icons">dashboard</i> Dashboard

- </a>

- </li>

- <li class="nav-item ">

- <a href="register.html" class="nav-link">

- <i class="material-icons">person_add</i> Register

- </a>

- </li>

- <li class="nav-item active ">

- <a href="login.html" class="nav-link">

- <i class="material-icons">fingerprint</i> Login

- </a>

- </li>

- <li class="nav-item ">

- <a href="lock.html" class="nav-link">

- <i class="material-icons">lock_open</i> Lock

- </a>

- </li>

- </ul>

- </div> -->

+<body>

+

+

+

+ <div class="preloader">

+ <svg class="circular" viewBox="25 25 50 50">

+ <circle class="path" cx="50" cy="50" r="20" fill="none" stroke-width="2" stroke-miterlimit="10" /> </svg>

</div>

- </nav>

-

- <div class="wrapper wrapper-full-page">

- <div class="page-header login-page header-filter" filter-color="black" style="background-image: url('assets/img/login.jpg'); background-size: cover; background-position: top center;">

- <div class="container">

- <div class="row">

- <div class="col-lg-4 col-md-6 col-sm-8 ml-auto mr-auto">

- <form:form action="register" modelAttribute="user" method="POST" class="form">

- <div class="card card-login card-hidden">

- <div class="card-header card-header-rose text-center">

- <h4 class="card-title">Registration</h4>

- </div>

- <div class="card-body ">

- ${message}

- <c:if test="${param.error != null}">

- <p class="card-description text-center">

- Invalid username or password.

- </p>

- </c:if>

- <span class="bmd-form-group">

- <div class="input-group">

- <div class="input-group-prepend">

- <span class="input-group-text">

- <i class="material-icons">face</i>

- </span>

- </div>

- <input type="text" class="form-control" name="username" placeholder="User Name">

- </div>

- </span>

+

+

+

+ <section id="wrapper">

+ <div class="login-register" style="background-image:Linear-gradient(rgba(0,0,0,.6),rgba(0,0,0,.6)),url(assets/images/6.jpg);">

+ <div class="login-box card" style="background-color: #09162ac9;">

+ <div class="card-body">

- <span class="bmd-form-group">

- <div class="input-group">

- <div class="input-group-prepend">

- <span class="input-group-text">

- <i class="material-icons">lock_outline</i>

- </span>

- </div>

- <input type="password" class="form-control" name="password" placeholder="Password">

- </div>

- </span>

- <span class="bmd-form-group">

- <div class="input-group">

- <div class="input-group-prepend">

- <span class="input-group-text">

- <i class="material-icons">shopping_bag</i>

- </span>

+ <form:form action="register" modelAttribute="user" method="POST" class="form-horizontal form-material">

+ <div class="form-group">

+ <div class="col-xs-12 text-center">

+ <div class="user-thumb text-center"> <img alt="thumbnail" class="" width="100" src="assets/images/bisag_logo.png">

+ </div>

</div>

- <select name="role" class="selectpicker" data-size="7" id="format" data-style="btn btn-primary btn-round" title="Single Select">

- <option value="admin" selected>admin</option>

- <option value="user">user</option>

- </select>

</div>

- </span>

- </div>

- <div class="card-footer justify-content-center">

- <input type="submit" class="btn btn-rose btn-link btn-lg" value="Submit" />

+ ${message}

+ <div class="form-group ">

+ <div class="col-xs-12">

+ <input class="form-control" type="text" required="" placeholder="Username" name="username"> </div>

+ </div>

+ <div class="form-group">

+ <div class="col-xs-12">

+ <input class="form-control" type="password" name="password" required="" placeholder="Password"> </div>

+ </div>

+ <div class="form-group row">

+

+ <!-- <div class="checkbox checkbox-primary pull-left p-t-0">

+ <input id="checkbox-signup" type="checkbox">

+ <label for="checkbox-signup"> Remember me </label>

+ </div> <a href="javascript:void(0)" id="to-recover" class="text-dark pull-right"><i class="fa fa-lock m-r-5"></i> Forgot pwd?</a> </div> -->

+ </div>

+ <div class="form-group text-center m-t-20">

+ <div class="col-xs-12">

+ <button class="btn btn-info btn-lg btn-block text-uppercase waves-effect waves-light" type="submit">Register</button>

+ </div>

+ <div class="form-group m-b-0">

+ <div class="col-sm-12 text-center">

+ <div>Do you have an account? <a href="/login" class="text-info m-l-5"><b>Sign In</b></a></div>

+ </div>

+ </form:form>

+ <form class="form-horizontal" id="recoverform" action="http://themedesigner.in/demo/admin-press/main/index.html">

+ <div class="form-group ">

+ <div class="col-xs-12">

+ <h3>Recover Password</h3>

+ <p class="text-muted">Enter your Email and instructions will be sent to you! </p>

+ </div>

+ <div class="form-group ">

+ <div class="col-xs-12">

+ <input class="form-control" type="text" required="" placeholder="Email"> </div>

+ </div>

+ <div class="form-group text-center m-t-20">

+ <div class="col-xs-12">

+ <button class="btn btn-primary btn-lg btn-block text-uppercase waves-effect waves-light" type="submit">Reset</button>

+ </div>

+ </form>

</div>

- </div>

- </form:form>

- </div>

- <footer class="footer">

- <div class="container">

- <nav class="float-left">

- <ul>

- <li>

- <a href="https://www.creative-tim.com/">

- Creative Tim

- </a>

- </li>

- <li>

- <a href="https://creative-tim.com/presentation">

- About Us

- </a>

- </li>

- <li>

- <a href="http://blog.creative-tim.com/">

- Blog

- </a>

- </li>

- <li>

- <a href="https://www.creative-tim.com/license">

- Licenses

- </a>

- </li>

- </ul>

- </nav>

- <div class="copyright float-right">

- ©

- <script>

- document.write(new Date().getFullYear())

- </script>, made with <i class="material-icons">favorite</i> by

- <a href="https://www.creative-tim.com/" target="_blank">Creative Tim</a> for a better web.

- </div>

+ </div>

</div>

- </footer>

- </div>

-

- <script src="assets/plugins/jquery/jquery.min.js"></script>

+ </section>

+

+

+

+

+

+ <script src="assets/plugins/jquery/jquery.min.js"></script>

@@ -207,9 +132,5 @@

</body>

-

+

</html>

A src/main/webapp/views/registerold.jsp

+202 −0

--- /dev/null

+++ b/src/main/webapp/views/registerold.jsp

@@ -0,0 +1,202 @@

+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>

+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>

+<!DOCTYPE html>

+<html lang="en">

+

+<meta http-equiv="content-type" content="text/html;charset=utf-8" />

+<head>

+ <meta charset="utf-8" />

+ <link rel="apple-touch-icon" sizes="76x76" href="assets/img/apple-icon.png">

+ <link rel="icon" type="image/png" href="assets/img/favicon.png">

+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />

+ <title>

+ Material Dashboard PRO by Creative Tim

+ </title>

+ <meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no' name='viewport' />

+

+

+ <!-- <link rel="canonical" href="https://www.creative-tim.com/product/material-dashboard-pro" />

+ Social tags

+ Fonts and icons

+ <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Roboto+Slab:400,700|Material+Icons" />

+ <link rel="stylesheet" href="../../../../maxcdn.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css"> -->

+

+ <link href="assets/plugins/bootstrap/css/bootstrap.min.css" rel="stylesheet">

+

+ <link href="assets/css/style.css" rel="stylesheet">

+

+ <link href="assets/css/colors/blue.css" id="theme" rel="stylesheet">

+

+</head>

+<body class="off-canvas-sidebar">

+

+

+ <noscript>

+ <iframe src="https://www.googletagmanager.com/ns.html?id=GTM-NKDMSK6" height="0" width="0" style="display:none;visibility:hidden"></iframe>

+ </noscript>

+

+

+ <nav class="navbar navbar-expand-lg navbar-transparent navbar-absolute fixed-top text-white">

+ <div class="container">

+ <div class="navbar-wrapper">

+ <a class="navbar-brand" href="#pablo">Registration Page</a>

+ </div>

+ <!-- <div class="collapse navbar-collapse justify-content-end">

+ <ul class="navbar-nav">

+ <li class="nav-item">

+ <a href="../dashboard.html" class="nav-link">

+ <i class="material-icons">dashboard</i> Dashboard

+ </a>

+ </li>

+ <li class="nav-item ">

+ <a href="register.html" class="nav-link">

+ <i class="material-icons">person_add</i> Register

+ </a>

+ </li>

+ <li class="nav-item active ">

+ <a href="login.html" class="nav-link">

+ <i class="material-icons">fingerprint</i> Login

+ </a>

+ </li>

+ <li class="nav-item ">

+ <a href="lock.html" class="nav-link">

+ <i class="material-icons">lock_open</i> Lock

+ </a>

+ </li>

+ </ul>

+ </div> -->

+ </div>

+ </nav>

+

+ <div class="wrapper wrapper-full-page">

+ <div class="page-header login-page header-filter" filter-color="black" style="background-image: url('assets/img/login.jpg'); background-size: cover; background-position: top center;">

+ <div class="container">

+ <div class="row">

+ <div class="col-lg-4 col-md-6 col-sm-8 ml-auto mr-auto">

+ <form:form action="register" modelAttribute="user" method="POST" class="form">

+ <div class="card card-login card-hidden">

+ <div class="card-header card-header-rose text-center">

+ <h4 class="card-title">Registration</h4>

+ </div>

+ <div class="card-body ">

+ ${message}

+ <c:if test="${param.error != null}">

+ <p class="card-description text-center">

+ Invalid username or password.

+ </p>

+ </c:if>

+ <span class="bmd-form-group">

+ <div class="input-group">

+ <div class="input-group-prepend">

+ <span class="input-group-text">

+ <i class="material-icons">face</i>

+ </span>

+ </div>

+ <input type="text" class="form-control" name="username" placeholder="User Name">

+ </div>

+ </span>

+ <span class="bmd-form-group">

+ <div class="input-group">

+ <div class="input-group-prepend">

+ <span class="input-group-text">

+ <i class="material-icons">lock_outline</i>

+ </span>

+ </div>

+ <input type="password" class="form-control" name="password" placeholder="Password">

+ </div>

+ </span>

+ </div>

+ <div class="card-footer justify-content-center">

+ <input type="submit" class="btn btn-rose btn-link btn-lg" value="Submit" />

+ </div>

+ </form:form>

+ </div>

+ <footer class="footer">

+ <div class="container">

+ <nav class="float-left">

+ <ul>

+ <li>

+ <a href="https://www.creative-tim.com/">

+ Creative Tim

+ </a>

+ </li>

+ <li>

+ <a href="https://creative-tim.com/presentation">

+ About Us

+ </a>

+ </li>

+ <li>

+ <a href="http://blog.creative-tim.com/">

+ Blog

+ </a>

+ </li>

+ <li>

+ <a href="https://www.creative-tim.com/license">

+ Licenses

+ </a>

+ </li>

+ </ul>

+ </nav>

+ <div class="copyright float-right">

+ ©

+ <script>

+ document.write(new Date().getFullYear())

+ </script>, made with <i class="material-icons">favorite</i> by

+ <a href="https://www.creative-tim.com/" target="_blank">Creative Tim</a> for a better web.

+ </div>

+ </footer>

+ </div>

+

+ <script src="assets/plugins/jquery/jquery.min.js"></script>

+

+ <script src="assets/plugins/bootstrap/js/popper.min.js"></script>

+ <script src="assets/plugins/bootstrap/js/bootstrap.min.js"></script>

+

+ <script src="assets/js/jquery.slimscroll.js"></script>

+

+ <script src="assets/js/waves.js"></script>

+

+ <script src="assets/js/sidebarmenu.js"></script>

+

+ <script src="assets/plugins/sticky-kit-master/dist/sticky-kit.min.js"></script>

+ <script src="assets/plugins/sparkline/jquery.sparkline.min.js"></script>

+

+ <script src="assets/js/custom.min.js"></script>

+

+

+

+ <script src="assets/plugins/styleswitcher/jQuery.style.switcher.js"></script>

+</body>

+

+</html>

Public

vedas

Clone or download

register ujash

Modified Files