Index: FullyStocked/pom.xml
===================================================================
--- FullyStocked/pom.xml	(revision 6489bb9ee7f5f68c2af6f82b08de1df69dca4034)
+++ FullyStocked/pom.xml	(revision e44097149220ebd655f32ad1542689073ebd0ba2)
@@ -33,12 +33,4 @@
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.thymeleaf.extras</groupId>
-            <artifactId>thymeleaf-extras-springsecurity5</artifactId>
         </dependency>
         <dependency>
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Controller/HomeController.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Controller/HomeController.java	(revision e44097149220ebd655f32ad1542689073ebd0ba2)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Controller/HomeController.java	(revision e44097149220ebd655f32ad1542689073ebd0ba2)
@@ -0,0 +1,18 @@
+package com.bazi.fullystocked.Controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Controller
+@RequestMapping(value = {"/","/home"})
+public class HomeController {
+    @GetMapping
+    public String getHomePage()
+    {
+        return "home";
+    }
+
+
+}
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Controller/LogOutController.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Controller/LogOutController.java	(revision e44097149220ebd655f32ad1542689073ebd0ba2)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Controller/LogOutController.java	(revision e44097149220ebd655f32ad1542689073ebd0ba2)
@@ -0,0 +1,18 @@
+package com.bazi.fullystocked.Controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Controller
+@RequestMapping("/logout")
+public class LogOutController {
+    @GetMapping
+    public String loguot(HttpServletRequest request)
+    {
+        request.getSession().invalidate();
+        return "redirect:/login";
+    }
+}
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Controller/LoginController.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Controller/LoginController.java	(revision 6489bb9ee7f5f68c2af6f82b08de1df69dca4034)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Controller/LoginController.java	(revision e44097149220ebd655f32ad1542689073ebd0ba2)
@@ -2,5 +2,7 @@
 
 import com.bazi.fullystocked.Models.Exceptions.InvalidUserCredentialsException;
+import com.bazi.fullystocked.Models.Managers;
 import com.bazi.fullystocked.Models.User;
+import com.bazi.fullystocked.Models.Workers;
 import com.bazi.fullystocked.Services.AuthService;
 import org.springframework.stereotype.Controller;
@@ -33,8 +35,17 @@
     public String login(HttpServletRequest request, Model model) {
         User user = null;
-        try{
+        try {
             user = this.authService.login(request.getParameter("username"),
                     request.getParameter("password"));
-            request.getSession().setAttribute("user", user);
+            if (user instanceof Workers) {
+                Workers w= (Workers) user;
+                request.getSession().setAttribute("user", w);
+                request.getSession().setAttribute("location",w.getLocation().getLocationname()+" "+w.getLocation().getCity());
+                return "redirect:/homeWorker";
+            } else if (user instanceof Managers) {
+                Managers m= (Managers) user;
+                request.getSession().setAttribute("user", m);
+                return "redirect:/homeManager";
+            }
             return "redirect:/home";
         }
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Controller/ManagerController.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Controller/ManagerController.java	(revision e44097149220ebd655f32ad1542689073ebd0ba2)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Controller/ManagerController.java	(revision e44097149220ebd655f32ad1542689073ebd0ba2)
@@ -0,0 +1,16 @@
+package com.bazi.fullystocked.Controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Controller
+@RequestMapping(value ="/homeManager")
+public class ManagerController {
+    @GetMapping
+    public String getManagerPage()
+    {
+
+        return "homeManager";
+    }
+}
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Controller/WorkerController.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Controller/WorkerController.java	(revision e44097149220ebd655f32ad1542689073ebd0ba2)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Controller/WorkerController.java	(revision e44097149220ebd655f32ad1542689073ebd0ba2)
@@ -0,0 +1,20 @@
+package com.bazi.fullystocked.Controller;
+
+import com.bazi.fullystocked.Models.Workers;
+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 javax.servlet.http.HttpServletRequest;
+
+@Controller
+@RequestMapping(value ="/homeWorker")
+public class WorkerController {
+    @GetMapping
+    public String getWorkerPage()
+    {
+
+        return "homeWorker";
+    }
+}
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/User.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Models/User.java	(revision 6489bb9ee7f5f68c2af6f82b08de1df69dca4034)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/User.java	(revision e44097149220ebd655f32ad1542689073ebd0ba2)
@@ -5,6 +5,4 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
 
 import java.util.Collection;
@@ -16,5 +14,5 @@
 @NoArgsConstructor
 @Table(name="users")
-public class User implements UserDetails {
+public class User {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -48,33 +46,3 @@
         this.userpassword = password;
     }
-
-    @Override
-    public Collection<? extends GrantedAuthority> getAuthorities() {
-        return null;
-    }
-
-    @Override
-    public String getPassword() {
-        return userpassword;
-    }
-
-    @Override
-    public boolean isAccountNonExpired() {
-        return true;
-    }
-
-    @Override
-    public boolean isAccountNonLocked() {
-        return true;
-    }
-
-    @Override
-    public boolean isCredentialsNonExpired() {
-        return true;
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return true;
-    }
 }
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Services/AuthService.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Services/AuthService.java	(revision 6489bb9ee7f5f68c2af6f82b08de1df69dca4034)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Services/AuthService.java	(revision e44097149220ebd655f32ad1542689073ebd0ba2)
@@ -5,7 +5,6 @@
 import com.bazi.fullystocked.Models.User;
 import com.bazi.fullystocked.Models.Workers;
-import org.springframework.security.core.userdetails.UserDetailsService;
 
-public interface AuthService extends UserDetailsService {
+public interface AuthService {
     User login(String username, String password);
     Workers registerWorker(String firstname, String lastname, String username, String email, String password);
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/AuthServiceImpl.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/AuthServiceImpl.java	(revision 6489bb9ee7f5f68c2af6f82b08de1df69dca4034)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/AuthServiceImpl.java	(revision e44097149220ebd655f32ad1542689073ebd0ba2)
@@ -14,5 +14,4 @@
 import com.bazi.fullystocked.Repositories.WorkersRepository;
 import com.bazi.fullystocked.Services.AuthService;
-import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
@@ -82,8 +81,3 @@
     }
 
-    @Override
-    public UserDetails loadUserByUsername(String username) throws UserNotFoundException {
-        return usersRepository.findByUsername(username).orElseThrow(() -> new UserNotFoundException(username));
-
-    }
 }
Index: llyStocked/src/main/java/com/bazi/fullystocked/config/CustomUsernamePasswordAuthenticationProvider.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/config/CustomUsernamePasswordAuthenticationProvider.java	(revision 6489bb9ee7f5f68c2af6f82b08de1df69dca4034)
+++ 	(revision )
@@ -1,46 +1,0 @@
-package com.bazi.fullystocked.config;
-
-import com.bazi.fullystocked.Models.Exceptions.InvalidUserCredentialsException;
-import com.bazi.fullystocked.Models.Exceptions.UserNotFoundException;
-import com.bazi.fullystocked.Services.AuthService;
-import com.bazi.fullystocked.Services.WorkersService;
-import org.springframework.security.authentication.AuthenticationProvider;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.stereotype.Component;
-
-@Component
-public class CustomUsernamePasswordAuthenticationProvider implements AuthenticationProvider {
-    private final AuthService authService;
-    private final PasswordEncoder passwordEncoder;
-
-    public CustomUsernamePasswordAuthenticationProvider(AuthService authService, PasswordEncoder passwordEncoder) {
-        this.authService = authService;
-        this.passwordEncoder = passwordEncoder;
-
-    }
-
-    @Override
-    public Authentication authenticate(Authentication authentication) throws AuthenticationException {
-        String username=authentication.getName();
-        String password=authentication.getCredentials().toString();
-        if("".equals(username) || "".equals(password))
-        {
-            throw new UserNotFoundException(username);
-        }
-        UserDetails userDetails=this.authService.loadUserByUsername(username);
-        if(!passwordEncoder.matches(password, userDetails.getPassword()))
-        {
-            throw new InvalidUserCredentialsException();
-        }
-        return new UsernamePasswordAuthenticationToken(userDetails,userDetails.getPassword(),userDetails.getAuthorities());
-    }
-
-    @Override
-    public boolean supports(Class<?> authentication) {
-        return authentication.equals(UsernamePasswordAuthenticationToken.class);
-    }
-}
Index: llyStocked/src/main/java/com/bazi/fullystocked/config/WebSecurityConfig.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/config/WebSecurityConfig.java	(revision 6489bb9ee7f5f68c2af6f82b08de1df69dca4034)
+++ 	(revision )
@@ -1,49 +1,0 @@
-package com.bazi.fullystocked.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-import org.springframework.security.crypto.password.PasswordEncoder;
-
-@Configuration
-@EnableWebSecurity
-@EnableGlobalMethodSecurity(securedEnabled = true,prePostEnabled = true)
-public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
-    private final PasswordEncoder passwordEncoder;
-    private final CustomUsernamePasswordAuthenticationProvider passwordAuthenticationProvider;
-
-    public WebSecurityConfig(PasswordEncoder passwordEncoder, CustomUsernamePasswordAuthenticationProvider passwordAuthenticationProvider) {
-        this.passwordEncoder = passwordEncoder;
-        this.passwordAuthenticationProvider = passwordAuthenticationProvider;
-    }
-
-    @Override
-    protected void configure(HttpSecurity http) throws Exception{
-        http.csrf().disable()
-                .authorizeRequests()
-                .antMatchers("/","/home","/register").permitAll()
-                .anyRequest().authenticated()
-                .and().formLogin().loginPage("/login").permitAll()
-                .failureUrl("/login?error=BadCredentials")
-                .defaultSuccessUrl("/home",true)
-                .and()
-                .logout()
-                .logoutUrl("/logout")
-                .clearAuthentication(true)
-                .invalidateHttpSession(true)
-                .deleteCookies("JESSEIONID")
-                .logoutSuccessUrl("/login")
-                .and()
-                .exceptionHandling().accessDeniedPage("/access_denied");
-
-    }
-
-    @Override
-    protected void configure(AuthenticationManagerBuilder auth) throws Exception {
-        auth.authenticationProvider(passwordAuthenticationProvider);
-
-    }
-}
Index: FullyStocked/src/main/resources/templates/home.html
===================================================================
--- FullyStocked/src/main/resources/templates/home.html	(revision e44097149220ebd655f32ad1542689073ebd0ba2)
+++ FullyStocked/src/main/resources/templates/home.html	(revision e44097149220ebd655f32ad1542689073ebd0ba2)
@@ -0,0 +1,55 @@
+<body xmlns:sec="http://www.w3.org/1999/xhtml">
+<header xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.w3.org/1999/xhtml">
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.0.0/dist/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
+    <meta charset="UTF-8">
+
+
+    <nav class="navbar navbar-expand-md navbar-dark bg-dark">
+        <div class="container">
+            <a class="navbar-brand" href="/">FULLYSTOCKED</a>
+            <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
+                    aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
+                <span class="navbar-toggler-icon"></span>
+            </button>
+
+            <div class="collapse navbar-collapse justify-content-end" id="navbarsExampleDefault">
+                <ul class="nav navbar-nav navbar-right">
+                    <li class="nav-item">
+                        <a class="btn btn-light btn-sm ml-3" href="/login">
+                            <i class="fa fa-shopping-cart"></i> Login
+                        </a>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </nav>
+</header>
+<main>
+    <div class="jumbotron">
+        <h1 class="text-center">FullyStocked</h1>
+        <hr />
+        <p class="lead text-center">Добредојдовте на FullyStocked</p>
+        <p class="lead text-center">Доколку немате профил</p>
+        <div class="col text-center">
+            <a class="btn btn btn-primary" href="/register">Регистрирај се</a>
+        </div>
+        <p class="lead text-center">Доколку имате профил</p>
+        <div class="col text-center">
+            <a class="btn btn btn-primary" href="/login">Најави се</a>
+        </div>
+    </div>
+
+    <div class="row">
+        <div class="col-md-6 text-center">
+            <h2>За апликацијата</h2>
+            <p>
+                This application will enable management, searching, review and assignment of tasks in an organization and will aim to facilitate all concerned and responsible employees in working with a large number of tasks...
+            </p>
+        </div>
+        <div class="col-md-6 text-center">
+            <h2>За развивачите</h2>
+            <p>Learn more about the developer of the application</p>
+        </div>
+    </div>
+</main>
+</body>
Index: FullyStocked/src/main/resources/templates/homeManager.html
===================================================================
--- FullyStocked/src/main/resources/templates/homeManager.html	(revision e44097149220ebd655f32ad1542689073ebd0ba2)
+++ FullyStocked/src/main/resources/templates/homeManager.html	(revision e44097149220ebd655f32ad1542689073ebd0ba2)
@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:sec="http://www.w3.org/1999/xhtml">
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.0.0/dist/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
+
+<head>
+  <meta charset="UTF-8">
+  <title>Worker</title>
+</head>
+
+<body>
+<nav class="navbar navbar-expand-md navbar-dark bg-dark">
+  <div class="container">
+    <a class="navbar-brand" href="/">FULLYSTOCKED</a>
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
+            aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+
+    <div class="collapse navbar-collapse justify-content-end" id="navbarsExampleDefault">
+      <ul class="navbar-nav m-auto">
+        <li class="nav-item m-auto">
+          <a class="nav-link active" href="#">Одговори прашање</a>
+        </li>
+        <li class="nav-item m-auto">
+          <a class="nav-link active" href="#">Креирај нарчка</a>
+        </li>
+        <li class="nav-item m-auto">
+          <a class="nav-link active" href="#">Внеси нови артикли</a>
+        </li>
+      </ul>
+
+      <ul class="nav navbar-nav navbar-right">
+
+        <li class="nav-item">
+          <a class="btn btn-light btn-sm ml-3" href="/logout">
+            <i class="fa fa-shopping-cart"></i> Logout
+          </a>
+        </li>
+      </ul>
+    </div>
+  </div>
+</nav>
+</header>
+<div class="jumbotron">
+  <h1 class="text-center">FullyStocked</h1>
+  <hr />
+  <h2 class="lead text-center">Добредојдовте на FullyStocked</h2>
+  <h3 class="lead text-center"><b>Информации за менаџер</b></h3>
+  <p class="lead text-center font-weight-bold">Име: <span th:text="${session.user.getFirstname()}"></span></p>
+  <p class="lead text-center font-weight-bold">Презиме: <span th:text="${session.user.getLastname()}"></span></p>
+</div>
+
+<div class="row">
+  <div class="col-md-6 text-center">
+    <h2>За апликацијата</h2>
+    <p>
+      This application will enable management, searching, review and assignment of tasks in an organization and will aim to facilitate all concerned and responsible employees in working with a large number of tasks...
+    </p>
+  </div>
+  <div class="col-md-6 text-center">
+    <h2>За развивачите</h2>
+    <p>Learn more about the developer of the application</p>
+  </div>
+</div>
+</body>
+</html>
Index: FullyStocked/src/main/resources/templates/homeWorker.html
===================================================================
--- FullyStocked/src/main/resources/templates/homeWorker.html	(revision e44097149220ebd655f32ad1542689073ebd0ba2)
+++ FullyStocked/src/main/resources/templates/homeWorker.html	(revision e44097149220ebd655f32ad1542689073ebd0ba2)
@@ -0,0 +1,70 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:sec="http://www.w3.org/1999/xhtml">
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.0.0/dist/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
+
+<head>
+    <meta charset="UTF-8">
+    <title>Worker</title>
+</head>
+
+<body>
+<nav class="navbar navbar-expand-md navbar-dark bg-dark">
+  <div class="container">
+    <a class="navbar-brand" href="/">FULLYSTOCKED</a>
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
+            aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+
+    <div class="collapse navbar-collapse justify-content-end" id="navbarsExampleDefault">
+      <ul class="navbar-nav m-auto">
+        <li class="nav-item m-auto">
+          <a class="nav-link active" href="#">Преглед на магацинот</a>
+        </li>
+        <li class="nav-item m-auto">
+          <a class="nav-link active" href="#">Постави прашање</a>
+        </li>
+        <li class="nav-item m-auto">
+          <a class="nav-link active" href="#">Погледни одговори</a>
+        </li>
+        <li class="nav-item m-auto">
+          <a class="nav-link active" href="#">Креирај фактура</a>
+        </li>
+      </ul>
+
+      <ul class="nav navbar-nav navbar-right">
+
+        <li class="nav-item">
+          <a class="btn btn-light btn-sm ml-3" href="/logout">
+            <i class="fa fa-shopping-cart"></i> Logout
+          </a>
+        </li>
+      </ul>
+    </div>
+  </div>
+</nav>
+</header>
+<div class="jumbotron">
+  <h1 class="text-center">FullyStocked</h1>
+  <hr />
+  <h2 class="lead text-center">Добредојдовте на FullyStocked</h2>
+  <h3 class="lead text-center"><b>Информации за магационерот</b></h3>
+<p class="lead text-center font-weight-bold">Име: <span th:text="${session.user.getFirstname()}"></span></p>
+  <p class="lead text-center font-weight-bold">Презиме: <span th:text="${session.user.getLastname()}"></span></p>
+  <p class="lead text-center font-weight-bold">Локација: <span th:text="${session.location}"></span></p>
+</div>
+
+<div class="row">
+  <div class="col-md-6 text-center">
+    <h2>За апликацијата</h2>
+    <p>
+      This application will enable management, searching, review and assignment of tasks in an organization and will aim to facilitate all concerned and responsible employees in working with a large number of tasks...
+    </p>
+  </div>
+  <div class="col-md-6 text-center">
+    <h2>За развивачите</h2>
+    <p>Learn more about the developer of the application</p>
+  </div>
+</div>
+</body>
+</html>