vanloc's version

src/main/java/com/itsol/quantrivanphong/access/homepage/business/CatalogiBusiness.java

@@ -21,4 +21,7 @@ public class CatalogiBusiness {
         return catalogiRepository.findAllCatalogi();
     }
 
+    public Catalogi save(Catalogi catalogi){
+        return catalogiRepository.save(catalogi);
+    }
 }

src/main/java/com/itsol/quantrivanphong/access/homepage/business/NewsBusiness.java

@@ -18,24 +18,25 @@ public class NewsBusiness {
         return newsRepository.findAllNews();
     }
     // Find News By News Id
-    public Optional<News> findById(int newsId){
-        return newsRepository.findById(newsId);
+    public News findNewsById(int newsId){
+        return newsRepository.findNewsById(newsId);
     }
     //Find news By Employee Id
     public List<News> findByEmployeeId(int employeeId){
         return newsRepository.findByEmployeeId(employeeId);
     }
+
     // Find news By Catalogi
     public List<News> findByCatalogiId(int catalogiId){
         return newsRepository.findByCatalogiId(catalogiId);
     }
 
 
-    public Optional<News> findByIdAndEmployeeId(int id, int employeeId){
+    public News findNewsByIdAndEmployeeId(int id, int employeeId){
         return newsRepository.findByIdAndEmployeeId(id,employeeId);
     }
 
-    public Optional<News> findByIdAndAndCatalogiId(int id, int catalogiId){
+    public News findNewsByIdAndAndCatalogiId(int id, int catalogiId){
         return newsRepository.findByIdAndAndCatalogiId(id,catalogiId);
     }
 
@@ -54,11 +55,11 @@ public class NewsBusiness {
     }
 
     public String deleteNews(int employeeId,int newsId){
-        newsRepository.findByIdAndEmployeeId(employeeId,newsId).map(news ->{
-            newsRepository.delete(news);
-            return "ok";
-        }).orElseThrow(() -> new ResourceNotFoundException("News" ,"newsId",newsId));
-        return "Ok";
+        News news = newsRepository.findByIdAndEmployeeId(employeeId,newsId);
+        if(news == null){
+          throw new ResourceNotFoundException("News" ,"newsId",newsId);
+        }
+        return "Delete Ok";
     }
 
 }

src/main/java/com/itsol/quantrivanphong/access/homepage/controller/CatalogiController.java

@@ -5,12 +5,13 @@ import com.itsol.quantrivanphong.exception.ResourceNotFoundException;
 import com.itsol.quantrivanphong.model.Catalogi;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.util.List;
-import java.util.Optional;
 
+@RestController
+@RequestMapping("/api")
 public class CatalogiController {
     @Autowired
     private CatalogiBusiness catalogiBusiness;
@@ -25,4 +26,9 @@ public class CatalogiController {
         return catalogiBusiness.findById(catalogiId).orElseThrow(()-> new ResourceNotFoundException("Catalogi","catalogiId",catalogiId));
     }
 
+    @PostMapping("/catalogi")
+    public Catalogi createCatalogi(@Valid@RequestBody Catalogi catalogi) {
+        return catalogiBusiness.save(catalogi);
+    }
+
 }

src/main/java/com/itsol/quantrivanphong/access/homepage/controller/NewsController.java

@@ -7,8 +7,6 @@ import com.itsol.quantrivanphong.exception.ResourceNotFoundException;
 import com.itsol.quantrivanphong.model.Employee;
 import com.itsol.quantrivanphong.model.News;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
@@ -33,25 +31,25 @@ public class NewsController {
     }
 
     // get news by employeeId
-    @GetMapping("/news/employees/{employeeId}")
+    @GetMapping("/employees/{employeeId}/news")
     public List<News> getAllNewsByEmployeeId(@PathVariable(value = "employeeId") int employeeId) {
         return newsBusiness.findByEmployeeId(employeeId);
     }
     // get News by catalogiId
-    @GetMapping("/news/catalogi/{catalogiId}")
+    @GetMapping("/catalogi/{catalogiId}/news")
     public List<News> getAllNewsByCatalogiId(@PathVariable(value="catalogiId") int catalogiId){
         return newsBusiness.findByCatalogiId(catalogiId);
     }
 
-
     // create news by employeesId
-    @PostMapping("/news/employees/{employeeId}")
+    @PostMapping("/employees/{employeeId}/news")
     public News createNews(@PathVariable (value = "employeeId") int employeeId,
                            @Valid @RequestBody News news) {
-        return employeeBusiness.findById(employeeId).map(employee -> {
-            news.setEmployee(employee);
-            return newsBusiness.save(news);
-        }).orElseThrow(() -> new ResourceNotFoundException("Employee" ,"employeeId",employeeId));
+        Employee employee =  employeeBusiness.findEmployeeById(employeeId);
+        if(employee == null){
+            throw  new  ResourceNotFoundException("Employee" ,"employeeId",employeeId);
+        }
+        return newsBusiness.save(news);
     }
 
     // Edit news by EmployeeId
@@ -59,10 +57,10 @@ public class NewsController {
     public News updateNews(@PathVariable (value = "employeeId") int employeeId,
                            @PathVariable (value = "newsId") int newsId,
                            @Valid @RequestBody News newsRequest) {
-        if(!employeeBusiness.findById(employeeId).isPresent()) {
+        if(employeeBusiness.findEmployeeById(employeeId)==null) {
             throw new ResourceNotFoundException("Employee" ,"employeeId",employeeId);
         }
-        if (!newsBusiness.findById(newsId).isPresent()) {
+        if (newsBusiness.findNewsById(newsId)== null) {
             throw  new ResourceNotFoundException("News", "id", newsId);
         }
         return newsBusiness.updateNews(newsId,newsRequest);
@@ -72,7 +70,7 @@ public class NewsController {
     @DeleteMapping("/employees/{employeeId}/news/{newsId}")
     public ResponseEntity<?> deleteNews(@PathVariable (value = "employeeId") int employeeId,
                                            @PathVariable (value = "newsId") int newsId) {
-        if(!newsBusiness.findByIdAndEmployeeId(employeeId,newsId).isPresent()){
+        if(newsBusiness.findNewsByIdAndEmployeeId(employeeId,newsId)== null){
             throw  new ResourceNotFoundException("News","newsId",newsId);
         }
         return ResponseEntity.ok(newsBusiness.deleteNews(employeeId,newsId));

src/main/java/com/itsol/quantrivanphong/access/homepage/repository/CatalogiRepository.java

@@ -11,7 +11,6 @@ import java.util.List;
 public interface CatalogiRepository extends JpaRepository<Catalogi, Integer> {
     @Query("SELECT u from Catalogi u")
     List<Catalogi> findAllCatalogi();
-
-//    @Query("SELECT u FROM Catalogi u where u.id=:id")
-//    Catalogi findCatalogiById(int id);
+    @Query("SELECT u FROM Catalogi u where u.id=:id")
+    Catalogi findCatalogiById(int id);
 }

src/main/java/com/itsol/quantrivanphong/access/homepage/repository/NewsRepository.java

@@ -16,6 +16,6 @@ public interface NewsRepository extends JpaRepository<News, Integer> {
     News findNewsById(int id);
     List<News> findByEmployeeId(int employeeId);
     List<News> findByCatalogiId(int catalogiId);
-    Optional<News> findByIdAndEmployeeId(int id,int employeeId);
-    Optional<News> findByIdAndAndCatalogiId(int id,int catalogiId);
+    News findByIdAndEmployeeId(int id,int employeeId);
+    News findByIdAndAndCatalogiId(int id,int catalogiId);
 }

src/main/java/com/itsol/quantrivanphong/employee/bussiness/EmployeeBussiness.java

-package com.itsol.quantrivanphong.employee.bussiness;
-
-import com.itsol.quantrivanphong.employee.repository.EmployeeRepository;
-import com.itsol.quantrivanphong.model.Employee;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Optional;
-
-@Service
-public class EmployeeBussiness {
-    @Autowired
-    EmployeeRepository employeeRepository;
-//    public List<Employee> findAll(){
-//        return employeeRepository.findAll();
-//    }
-//
-    public Optional<Employee> findById(int newsId){
-        return  employeeRepository.findById(newsId);
-    }
-//    public User save(User user){
-//        return userRepository.save(user);
-//    }
-//    public User updateUser(Long newsId, User signUpDTO){
-//        User user = userRepository.findUserById(newsId);
-//        user.setUsername(signUpDTO.getUsername());
-//        user.setPassword(signUpDTO.getPassword());
-//        user.setEmail(signUpDTO.getEmail());
-//        user.setFullname(signUpDTO.getFullname());
-//        user.setImage(signUpDTO.getImage());
-//        user.setKnowledge(signUpDTO.getKnowledge());
-//        user.setUniversity(signUpDTO.getUniversity());
-//        user.setPhonenumber(signUpDTO.getPhonenumber());
-//        user.setPosition(signUpDTO.getPosition());
-//        user.setVillage(signUpDTO.getVillage());
-//        user.setYearOfGraduation(signUpDTO.getYearOfGraduation());
-//        user.setRole(signUpDTO.getRole());
-//        return userRepository.save(user);
-//    }
-//
-//    public void deleteUser(Long newsId){
-//        userRepository.deleteById(newsId);
-//    }
-}

src/main/java/com/itsol/quantrivanphong/employee/controller/UserController.java

-//package com.itsol.quantrivanphong.employee.controller;
-//
-//import com.example.easynotes.exception.ResourceNotFoundException;
-//import com.example.easynotes.login.model.User;
-//import com.example.easynotes.users.bussiness.UserBussiness;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.http.ResponseEntity;
-//import org.springframework.web.bind.annotation.*;
-//
-//import javax.validation.Valid;
-//import java.util.List;
-//
-//@RestController
-//@RequestMapping("/api")
-//public class UserController {
-//
-//    @Autowired
-//    private UserBussiness userBussiness;
-//
-//    @GetMapping("/users")
-//    public List<User> getAllUser(){ return userBussiness.findAll();}
-//
-//    @GetMapping("/users/{id}")
-//    public User getUserById(@PathVariable(value = "id") Long userId){
-//        return userBussiness.findById(userId).orElseThrow(()-> new ResourceNotFoundException("News", "id", userId));
-//    }
-//
-//    @PutMapping("/users/{id}")
-//    public ResponseEntity<User> updateUser(@PathVariable(value = "id") Long userId,
-//                                           @Valid @RequestBody User userDetails) {
-//        if (!userBussiness.findById(userId).isPresent()) {
-//            throw  new ResourceNotFoundException("User", "id", userId);
-//        }
-//        return ResponseEntity.ok(userBussiness.updateUser(userId,userDetails));
-//    }
-//}

src/main/java/com/itsol/quantrivanphong/employee/repository/EmployeeRepository.java

-package com.itsol.quantrivanphong.employee.repository;
-
-import com.itsol.quantrivanphong.model.Employee;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-
-public interface EmployeeRepository extends JpaRepository<Employee,Integer> {
-    @Query("SELECT u FROM Employee u where u.id=:id")
-    Employee findEmployeeById(int id);
-}

src/main/java/com/itsol/quantrivanphong/model/Catalogi.java

 package com.itsol.quantrivanphong.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.itsol.quantrivanphong.audit.DateAudit;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 import javax.persistence.*;
 import java.util.ArrayList;
@@ -14,10 +17,12 @@ import java.util.List;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-
+@EntityListeners(AuditingEntityListener.class)
+@JsonIgnoreProperties(value = {"createdAt", "updatedAt"},
+        allowGetters = true)
 
 @Table(name = "catalogi")
-public class Catalogi {
+public class Catalogi extends DateAudit {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

src/main/resources/public/fonts/Lato/OFL.txt

+Copyright (c) 2010-2014 by tyPoland Lukasz Dziedzic (team@latofonts.com) with Reserved Font Name "Lato"
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

src/main/resources/public/fonts/font-awesome-4.7.0/HELP-US-OUT.txt

+I hope you love Font Awesome. If you've found it useful, please do me a favor and check out my latest project,
+Fort Awesome (https://fortawesome.com). It makes it easy to put the perfect icons on your website. Choose from our awesome,
+comprehensive icon sets or copy and paste your own.
+
+Please. Check it out.
+
+-Dave Gandy

src/main/resources/public/fonts/font-awesome-4.7.0/less/animated.less

+// Animated Icons
+// --------------------------
+
+.@{fa-css-prefix}-spin {
+  -webkit-animation: fa-spin 2s infinite linear;
+          animation: fa-spin 2s infinite linear;
+}
+
+.@{fa-css-prefix}-pulse {
+  -webkit-animation: fa-spin 1s infinite steps(8);
+          animation: fa-spin 1s infinite steps(8);
+}
+
+@-webkit-keyframes fa-spin {
+  0% {
+    -webkit-transform: rotate(0deg);
+            transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(359deg);
+            transform: rotate(359deg);
+  }
+}
+
+@keyframes fa-spin {
+  0% {
+    -webkit-transform: rotate(0deg);
+            transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(359deg);
+            transform: rotate(359deg);
+  }
+}

src/main/resources/public/fonts/font-awesome-4.7.0/less/bordered-pulled.less

+// Bordered & Pulled
+// -------------------------
+
+.@{fa-css-prefix}-border {
+  padding: .2em .25em .15em;
+  border: solid .08em @fa-border-color;
+  border-radius: .1em;
+}
+
+.@{fa-css-prefix}-pull-left { float: left; }
+.@{fa-css-prefix}-pull-right { float: right; }
+
+.@{fa-css-prefix} {
+  &.@{fa-css-prefix}-pull-left { margin-right: .3em; }
+  &.@{fa-css-prefix}-pull-right { margin-left: .3em; }
+}
+
+/* Deprecated as of 4.4.0 */
+.pull-right { float: right; }
+.pull-left { float: left; }
+
+.@{fa-css-prefix} {
+  &.pull-left { margin-right: .3em; }
+  &.pull-right { margin-left: .3em; }
+}

src/main/resources/public/fonts/font-awesome-4.7.0/less/core.less

+// Base Class Definition
+// -------------------------
+
+.@{fa-css-prefix} {
+  display: inline-block;
+  font: normal normal normal @fa-font-size-base/@fa-line-height-base FontAwesome; // shortening font declaration
+  font-size: inherit; // can't have font-size inherit on line above, so need to override
+  text-rendering: auto; // optimizelegibility throws things off #1094
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+
+}

src/main/resources/public/fonts/font-awesome-4.7.0/less/fixed-width.less

+// Fixed Width Icons
+// -------------------------
+.@{fa-css-prefix}-fw {
+  width: (18em / 14);
+  text-align: center;
+}

src/main/resources/public/fonts/font-awesome-4.7.0/less/font-awesome.less

+/*!
+ *  Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
+ *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
+ */
+
+@import "variables.less";
+@import "mixins.less";
+@import "path.less";
+@import "core.less";
+@import "larger.less";
+@import "fixed-width.less";
+@import "list.less";
+@import "bordered-pulled.less";
+@import "animated.less";
+@import "rotated-flipped.less";
+@import "stacked.less";
+@import "icons.less";
+@import "screen-reader.less";

src/main/resources/public/fonts/font-awesome-4.7.0/less/larger.less

+// Icon Sizes
+// -------------------------
+
+/* makes the font 33% larger relative to the icon container */
+.@{fa-css-prefix}-lg {
+  font-size: (4em / 3);
+  line-height: (3em / 4);
+  vertical-align: -15%;
+}
+.@{fa-css-prefix}-2x { font-size: 2em; }
+.@{fa-css-prefix}-3x { font-size: 3em; }
+.@{fa-css-prefix}-4x { font-size: 4em; }
+.@{fa-css-prefix}-5x { font-size: 5em; }

src/main/resources/public/fonts/font-awesome-4.7.0/less/list.less

+// List Icons
+// -------------------------
+
+.@{fa-css-prefix}-ul {
+  padding-left: 0;
+  margin-left: @fa-li-width;
+  list-style-type: none;
+  > li { position: relative; }
+}
+.@{fa-css-prefix}-li {
+  position: absolute;
+  left: -@fa-li-width;
+  width: @fa-li-width;
+  top: (2em / 14);
+  text-align: center;
+  &.@{fa-css-prefix}-lg {
+    left: (-@fa-li-width + (4em / 14));
+  }
+}

src/main/resources/public/fonts/font-awesome-4.7.0/less/mixins.less

+// Mixins
+// --------------------------
+
+.fa-icon() {
+  display: inline-block;
+  font: normal normal normal @fa-font-size-base/@fa-line-height-base FontAwesome; // shortening font declaration
+  font-size: inherit; // can't have font-size inherit on line above, so need to override
+  text-rendering: auto; // optimizelegibility throws things off #1094
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+
+}
+
+.fa-icon-rotate(@degrees, @rotation) {
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=@{rotation})";
+  -webkit-transform: rotate(@degrees);
+      -ms-transform: rotate(@degrees);
+          transform: rotate(@degrees);
+}
+
+.fa-icon-flip(@horiz, @vert, @rotation) {
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=@{rotation}, mirror=1)";
+  -webkit-transform: scale(@horiz, @vert);
+      -ms-transform: scale(@horiz, @vert);
+          transform: scale(@horiz, @vert);
+}
+
+
+// Only display content to screen readers. A la Bootstrap 4.
+//
+// See: http://a11yproject.com/posts/how-to-hide-content/
+
+.sr-only() {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: -1px;
+  overflow: hidden;
+  clip: rect(0,0,0,0);
+  border: 0;
+}
+
+// Use in conjunction with .sr-only to only display content when it's focused.
+//
+// Useful for "Skip to main content" links; see http://www.w3.org/TR/2013/NOTE-WCAG20-TECHS-20130905/G1
+//
+// Credit: HTML5 Boilerplate
+
+.sr-only-focusable() {
+  &:active,
+  &:focus {
+    position: static;
+    width: auto;
+    height: auto;
+    margin: 0;
+    overflow: visible;
+    clip: auto;
+  }
+}

src/main/resources/public/fonts/font-awesome-4.7.0/less/path.less

+/* FONT PATH
+ * -------------------------- */
+
+@font-face {
+  font-family: 'FontAwesome';
+  src: url('@{fa-font-path}/fontawesome-webfont.eot?v=@{fa-version}');
+  src: url('@{fa-font-path}/fontawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype'),
+    url('@{fa-font-path}/fontawesome-webfont.woff2?v=@{fa-version}') format('woff2'),
+    url('@{fa-font-path}/fontawesome-webfont.woff?v=@{fa-version}') format('woff'),
+    url('@{fa-font-path}/fontawesome-webfont.ttf?v=@{fa-version}') format('truetype'),
+    url('@{fa-font-path}/fontawesome-webfont.svg?v=@{fa-version}#fontawesomeregular') format('svg');
+  // src: url('@{fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts
+  font-weight: normal;
+  font-style: normal;
+}

src/main/resources/public/fonts/font-awesome-4.7.0/less/rotated-flipped.less

+// Rotated & Flipped Icons
+// -------------------------
+
+.@{fa-css-prefix}-rotate-90  { .fa-icon-rotate(90deg, 1);  }
+.@{fa-css-prefix}-rotate-180 { .fa-icon-rotate(180deg, 2); }
+.@{fa-css-prefix}-rotate-270 { .fa-icon-rotate(270deg, 3); }
+
+.@{fa-css-prefix}-flip-horizontal { .fa-icon-flip(-1, 1, 0); }
+.@{fa-css-prefix}-flip-vertical   { .fa-icon-flip(1, -1, 2); }
+
+// Hook for IE8-9
+// -------------------------
+
+:root .@{fa-css-prefix}-rotate-90,
+:root .@{fa-css-prefix}-rotate-180,
+:root .@{fa-css-prefix}-rotate-270,
+:root .@{fa-css-prefix}-flip-horizontal,
+:root .@{fa-css-prefix}-flip-vertical {
+  filter: none;
+}

src/main/resources/public/fonts/font-awesome-4.7.0/less/screen-reader.less

+// Screen Readers
+// -------------------------
+
+.sr-only { .sr-only(); }
+.sr-only-focusable { .sr-only-focusable(); }

src/main/resources/public/fonts/font-awesome-4.7.0/less/stacked.less

+// Stacked Icons
+// -------------------------
+
+.@{fa-css-prefix}-stack {
+  position: relative;
+  display: inline-block;
+  width: 2em;
+  height: 2em;
+  line-height: 2em;
+  vertical-align: middle;
+}
+.@{fa-css-prefix}-stack-1x, .@{fa-css-prefix}-stack-2x {
+  position: absolute;
+  left: 0;
+  width: 100%;
+  text-align: center;
+}
+.@{fa-css-prefix}-stack-1x { line-height: inherit; }
+.@{fa-css-prefix}-stack-2x { font-size: 2em; }
+.@{fa-css-prefix}-inverse { color: @fa-inverse; }

src/main/resources/public/fonts/font-awesome-4.7.0/scss/_animated.scss

+// Spinning Icons
+// --------------------------
+
+.#{$fa-css-prefix}-spin {
+  -webkit-animation: fa-spin 2s infinite linear;
+          animation: fa-spin 2s infinite linear;
+}
+
+.#{$fa-css-prefix}-pulse {
+  -webkit-animation: fa-spin 1s infinite steps(8);
+          animation: fa-spin 1s infinite steps(8);
+}
+
+@-webkit-keyframes fa-spin {
+  0% {
+    -webkit-transform: rotate(0deg);
+            transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(359deg);
+            transform: rotate(359deg);
+  }
+}
+
+@keyframes fa-spin {
+  0% {
+    -webkit-transform: rotate(0deg);
+            transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(359deg);
+            transform: rotate(359deg);
+  }
+}

src/main/resources/public/fonts/font-awesome-4.7.0/scss/_bordered-pulled.scss

+// Bordered & Pulled
+// -------------------------
+
+.#{$fa-css-prefix}-border {
+  padding: .2em .25em .15em;
+  border: solid .08em $fa-border-color;
+  border-radius: .1em;
+}
+
+.#{$fa-css-prefix}-pull-left { float: left; }
+.#{$fa-css-prefix}-pull-right { float: right; }
+
+.#{$fa-css-prefix} {
+  &.#{$fa-css-prefix}-pull-left { margin-right: .3em; }
+  &.#{$fa-css-prefix}-pull-right { margin-left: .3em; }
+}
+
+/* Deprecated as of 4.4.0 */
+.pull-right { float: right; }
+.pull-left { float: left; }
+
+.#{$fa-css-prefix} {
+  &.pull-left { margin-right: .3em; }
+  &.pull-right { margin-left: .3em; }
+}

src/main/resources/public/fonts/font-awesome-4.7.0/scss/_core.scss

+// Base Class Definition
+// -------------------------
+
+.#{$fa-css-prefix} {
+  display: inline-block;
+  font: normal normal normal #{$fa-font-size-base}/#{$fa-line-height-base} FontAwesome; // shortening font declaration
+  font-size: inherit; // can't have font-size inherit on line above, so need to override
+  text-rendering: auto; // optimizelegibility throws things off #1094
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+
+}

src/main/resources/public/fonts/font-awesome-4.7.0/scss/_fixed-width.scss

+// Fixed Width Icons
+// -------------------------
+.#{$fa-css-prefix}-fw {
+  width: (18em / 14);
+  text-align: center;
+}

src/main/resources/public/fonts/font-awesome-4.7.0/scss/_larger.scss

+// Icon Sizes
+// -------------------------
+
+/* makes the font 33% larger relative to the icon container */
+.#{$fa-css-prefix}-lg {
+  font-size: (4em / 3);
+  line-height: (3em / 4);
+  vertical-align: -15%;
+}
+.#{$fa-css-prefix}-2x { font-size: 2em; }
+.#{$fa-css-prefix}-3x { font-size: 3em; }
+.#{$fa-css-prefix}-4x { font-size: 4em; }
+.#{$fa-css-prefix}-5x { font-size: 5em; }

src/main/resources/public/fonts/font-awesome-4.7.0/scss/_list.scss

+// List Icons
+// -------------------------
+
+.#{$fa-css-prefix}-ul {
+  padding-left: 0;
+  margin-left: $fa-li-width;
+  list-style-type: none;
+  > li { position: relative; }
+}
+.#{$fa-css-prefix}-li {
+  position: absolute;
+  left: -$fa-li-width;
+  width: $fa-li-width;
+  top: (2em / 14);
+  text-align: center;
+  &.#{$fa-css-prefix}-lg {
+    left: -$fa-li-width + (4em / 14);
+  }
+}

src/main/resources/public/fonts/font-awesome-4.7.0/scss/_path.scss

+/* FONT PATH
+ * -------------------------- */
+
+@font-face {
+  font-family: 'FontAwesome';
+  src: url('#{$fa-font-path}/fontawesome-webfont.eot?v=#{$fa-version}');
+  src: url('#{$fa-font-path}/fontawesome-webfont.eot?#iefix&v=#{$fa-version}') format('embedded-opentype'),
+    url('#{$fa-font-path}/fontawesome-webfont.woff2?v=#{$fa-version}') format('woff2'),
+    url('#{$fa-font-path}/fontawesome-webfont.woff?v=#{$fa-version}') format('woff'),
+    url('#{$fa-font-path}/fontawesome-webfont.ttf?v=#{$fa-version}') format('truetype'),
+    url('#{$fa-font-path}/fontawesome-webfont.svg?v=#{$fa-version}#fontawesomeregular') format('svg');
+//  src: url('#{$fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts
+  font-weight: normal;
+  font-style: normal;
+}

src/main/resources/public/fonts/font-awesome-4.7.0/scss/_screen-reader.scss

+// Screen Readers
+// -------------------------
+
+.sr-only { @include sr-only(); }
+.sr-only-focusable { @include sr-only-focusable(); }