빌드 오류 패치
This commit is contained in:
@@ -1,50 +1,62 @@
|
||||
package sample.ustraframework.java.fo.config;
|
||||
//package com.bs.group.java.fo.config;
|
||||
//
|
||||
//import java.util.ArrayList;
|
||||
//
|
||||
//import org.springframework.context.annotation.Bean;
|
||||
//import org.springframework.context.annotation.Configuration;
|
||||
//
|
||||
//import com.gsitm.ustra.java.security.authentication.UstraAuthenticationConfigurer;
|
||||
//import com.gsitm.ustra.java.security.authentication.authentication.UstraAuthentication;
|
||||
//import com.gsitm.ustra.java.security.authentication.processor.DefaultUstraAuthenticationProcessor;
|
||||
//import com.gsitm.ustra.java.security.authentication.processor.UstraAuthenticationProcessor;
|
||||
//import com.gsitm.ustra.java.security.authentication.request.token.UserNamePasswordAuthenticationRequestToken;
|
||||
//import com.gsitm.ustra.java.security.authentication.user.UstraAnonymousUser;
|
||||
//import com.gsitm.ustra.java.security.authentication.user.UstraUser;
|
||||
//import com.gsitm.ustra.java.security.authentication.user.UstraUserDetailProvider;
|
||||
//
|
||||
//@Configuration
|
||||
//public class AuthenticationConfiguration {
|
||||
//
|
||||
// @Bean
|
||||
// UstraAuthenticationProcessor<UserNamePasswordAuthenticationRequestToken, UstraAuthentication> authenticationProcessor() {
|
||||
//
|
||||
// return new DefaultUstraAuthenticationProcessor<>(
|
||||
// new UstraAuthenticationConfigurer<UserNamePasswordAuthenticationRequestToken, UstraAuthentication>() {
|
||||
//
|
||||
// public UstraUserDetailProvider<UserNamePasswordAuthenticationRequestToken,UstraAuthentication> userDetailProvider(
|
||||
// UstraAuthenticationProcessor<UserNamePasswordAuthenticationRequestToken, UstraAuthentication> processor) {
|
||||
//
|
||||
// return new UstraUserDetailProvider<UserNamePasswordAuthenticationRequestToken, UstraAuthentication>() {
|
||||
//
|
||||
// @Override
|
||||
// public UstraUser getUserDetails(
|
||||
// UserNamePasswordAuthenticationRequestToken authenticationRequestToken) {
|
||||
//
|
||||
// return new UstraAnonymousUser(new ArrayList<>());
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public UstraUser getUserDetails(UstraAuthentication authentication) {
|
||||
//
|
||||
// return new UstraAnonymousUser(new ArrayList<>());
|
||||
// }
|
||||
// };
|
||||
// };
|
||||
// }
|
||||
// , UstraAuthentication.class);
|
||||
// }
|
||||
//
|
||||
//}
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.security.config.annotation.web.builders.WebSecurity;
|
||||
|
||||
import com.gsitm.ustra.java.security.authentication.UstraAuthenticationConfigurer;
|
||||
import com.gsitm.ustra.java.security.authentication.authentication.UstraAuthentication;
|
||||
import com.gsitm.ustra.java.security.authentication.processor.DefaultUstraAuthenticationProcessor;
|
||||
import com.gsitm.ustra.java.security.authentication.processor.UstraAuthenticationProcessor;
|
||||
import com.gsitm.ustra.java.security.authentication.request.token.UserNamePasswordAuthenticationRequestToken;
|
||||
import com.gsitm.ustra.java.security.authentication.user.UstraAnonymousUser;
|
||||
import com.gsitm.ustra.java.security.authentication.user.UstraUser;
|
||||
import com.gsitm.ustra.java.security.authentication.user.UstraUserDetailProvider;
|
||||
import com.gsitm.ustra.java.security.config.UstraSecurityConfigure;
|
||||
|
||||
@Configuration
|
||||
public class AuthenticationConfiguration {
|
||||
|
||||
@Bean
|
||||
UstraSecurityConfigure securityConfigure() {
|
||||
return new UstraSecurityConfigure() {
|
||||
@Override
|
||||
public void postConfigure(WebSecurity web) throws Exception {
|
||||
web.ignoring()
|
||||
.antMatchers("/api/auth/login");
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
@Bean
|
||||
UstraAuthenticationProcessor<UserNamePasswordAuthenticationRequestToken, UstraAuthentication> authenticationProcessor() {
|
||||
|
||||
return new DefaultUstraAuthenticationProcessor<>(
|
||||
new UstraAuthenticationConfigurer<UserNamePasswordAuthenticationRequestToken, UstraAuthentication>() {
|
||||
|
||||
public UstraUserDetailProvider<UserNamePasswordAuthenticationRequestToken,UstraAuthentication> userDetailProvider(
|
||||
UstraAuthenticationProcessor<UserNamePasswordAuthenticationRequestToken, UstraAuthentication> processor) {
|
||||
|
||||
return new UstraUserDetailProvider<UserNamePasswordAuthenticationRequestToken, UstraAuthentication>() {
|
||||
|
||||
@Override
|
||||
public UstraUser getUserDetails(
|
||||
UserNamePasswordAuthenticationRequestToken authenticationRequestToken) {
|
||||
|
||||
return new UstraAnonymousUser(new ArrayList<>());
|
||||
}
|
||||
|
||||
@Override
|
||||
public UstraUser getUserDetails(UstraAuthentication authentication) {
|
||||
|
||||
return new UstraAnonymousUser(new ArrayList<>());
|
||||
}
|
||||
};
|
||||
};
|
||||
}
|
||||
, UstraAuthentication.class);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
package sample.ustraframework.java.fo.config.auth;
|
||||
|
||||
import com.gsitm.ustra.java.security.authentication.user.UstraUser;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class SampleUser extends UstraUser {
|
||||
|
||||
/**
|
||||
* serialVersionUID
|
||||
*/
|
||||
private static final long serialVersionUID = -6807776765213734147L;
|
||||
|
||||
/**
|
||||
* 사용자 표시 명
|
||||
*/
|
||||
private String displayName;
|
||||
|
||||
public SampleUser(String username) {
|
||||
super(username);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,54 @@
|
||||
//package sample.ustraframework.java.fo.config.auth;
|
||||
//
|
||||
//import org.springframework.beans.factory.annotation.Autowired;
|
||||
//
|
||||
//import com.gsitm.ustra.java.security.authentication.request.token.UserNamePasswordAuthenticationRequestToken;
|
||||
//import com.gsitm.ustra.java.security.authentication.request.token.UstraAuthenticationRequestToken;
|
||||
//import com.gsitm.ustra.java.security.authentication.user.UstraUser;
|
||||
//import com.gsitm.ustra.java.security.authentication.user.UstraUserDetailProvider;
|
||||
//import com.gsitm.ustra.java.security.jwt.authentication.authentication.UstraJwtAuthentication;
|
||||
//
|
||||
//import sample.ustraframework.java.fo.sample.user.UserModel;
|
||||
//import sample.ustraframework.java.fo.sample.user.UserService;
|
||||
//
|
||||
///**
|
||||
// * 사용자 정보 조회
|
||||
// *
|
||||
// */
|
||||
//public class SampleUserDetailProvider implements UstraUserDetailProvider<UstraAuthenticationRequestToken, UstraJwtAuthentication> {
|
||||
//
|
||||
// @Autowired private UserService userService;
|
||||
//
|
||||
// @Override
|
||||
// public UstraUser getUserDetails(UstraAuthenticationRequestToken authenticationRequestToken) {
|
||||
//
|
||||
// if (authenticationRequestToken instanceof UserNamePasswordAuthenticationRequestToken) {
|
||||
//
|
||||
// UserNamePasswordAuthenticationRequestToken requestToken = (UserNamePasswordAuthenticationRequestToken)authenticationRequestToken;
|
||||
// userService.getUserByIdPassword(requestToken.getUserName(), requestToken.getPassword());
|
||||
// }
|
||||
//
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public UstraUser getUserDetails(UstraJwtAuthentication authentication) {
|
||||
// // TODO Auto-generated method stub
|
||||
// return null;
|
||||
// }
|
||||
//
|
||||
//
|
||||
// private SampleUser getUser(String usrId) {
|
||||
// UserModel userModel = userService.getUserById(usrId);
|
||||
//
|
||||
// if (userModel == null) {
|
||||
// return null;
|
||||
// }
|
||||
//
|
||||
// SampleUser user = new SampleUser(userModel.getUsrId());
|
||||
// user.setDisplayName(userModel.getUsrNm());
|
||||
//
|
||||
// return user;
|
||||
//
|
||||
// }
|
||||
//
|
||||
//}
|
||||
@@ -0,0 +1,16 @@
|
||||
package sample.ustraframework.java.fo.sample.user;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
@RestController
|
||||
public class UserController {
|
||||
|
||||
@Autowired private UserService userService;
|
||||
|
||||
@GetMapping("/api/user")
|
||||
public UserModel getUser(String usrId) {
|
||||
return userService.getUserById(usrId);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,46 @@
|
||||
package sample.ustraframework.java.fo.sample.user;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotEmpty;
|
||||
|
||||
import com.gsitm.ustra.java.management.models.base.UstraManagementBaseModel;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
/**
|
||||
* 사용자 모델
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
public class UserModel extends UstraManagementBaseModel {
|
||||
|
||||
/**
|
||||
* 사용자 아이디
|
||||
*/
|
||||
@NotBlank
|
||||
private String usrId;
|
||||
|
||||
/**
|
||||
* 사용자 명
|
||||
*/
|
||||
@NotBlank
|
||||
private String usrNm;
|
||||
|
||||
/**
|
||||
* 패스워드
|
||||
*/
|
||||
@NotEmpty
|
||||
private String pwd;
|
||||
|
||||
/**
|
||||
* 사용자 상태 코드
|
||||
*/
|
||||
private String usrSttCd;
|
||||
|
||||
/**
|
||||
* 로그인 실패 수
|
||||
*/
|
||||
private Integer loginFailCnt;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
package sample.ustraframework.java.fo.sample.user;
|
||||
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface UserRepository {
|
||||
|
||||
/**
|
||||
* 사용자 아이디와 패스워드 정보 조회
|
||||
* @param usrId 아이디
|
||||
* @param password 패스워드
|
||||
* @return
|
||||
*/
|
||||
UserModel selectUserByIdPassword(String usrId, String password);
|
||||
|
||||
/**
|
||||
* 사용자 아이디 조회
|
||||
* @param usrId 아이디
|
||||
* @return
|
||||
*/
|
||||
UserModel selectUserById(String usrId);
|
||||
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package sample.ustraframework.java.fo.sample.user;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
@Service
|
||||
@Transactional
|
||||
public class UserService {
|
||||
@Autowired private UserRepository userRepository;
|
||||
|
||||
|
||||
public UserModel getUserByIdPassword(String usrId, String password) {
|
||||
return userRepository.selectUserByIdPassword(usrId, password);
|
||||
}
|
||||
|
||||
public UserModel getUserById(String usrId) {
|
||||
return userRepository.selectUserById(usrId);
|
||||
}
|
||||
}
|
||||
@@ -9,39 +9,23 @@ spring:
|
||||
|
||||
|
||||
mybatis:
|
||||
type-aliases-package: com.gsitm.ustra.java.management.models
|
||||
configuration:
|
||||
jdbc-type-for-null: "NULL"
|
||||
|
||||
ustra:
|
||||
core:
|
||||
cache:
|
||||
map:
|
||||
additional-cache-names: USTRA-TEST-CACHE
|
||||
caffeine:
|
||||
caffeine-test:
|
||||
maximum-size: 200
|
||||
initial-capacity: 100
|
||||
expire-after-write-seconds: 1800
|
||||
expire-after-access-seconds: 1800
|
||||
data:
|
||||
file:
|
||||
enabled: false
|
||||
procedure-manager:
|
||||
enabled: true
|
||||
datasource:
|
||||
default-datasource-name: rds2
|
||||
default-datasource-name: rds1
|
||||
datasources:
|
||||
rds1:
|
||||
url: jdbc:log4jdbc:sqlserver://framework-sqlserver.c0uiyan5ae24.ap-northeast-2.rds.amazonaws.com:1433;databaseName=USTRA_FW_SPL
|
||||
driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
|
||||
username: ENC(p6rIPoShJklFLPxHKNJYFLooNCd2xnkayNZ2f+GexyA17qEMS77u8g==)
|
||||
password: ENC(ohS/a1/Q/lKriwUq3rqJqht76fQ0Bnge)
|
||||
rds2:
|
||||
url: jdbc:log4jdbc:oracle:thin:@framework-oracle.c0uiyan5ae24.ap-northeast-2.rds.amazonaws.com:1521/GSITMSI
|
||||
driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
|
||||
username: gsitm_si_admin
|
||||
password: gsitmsi6700!
|
||||
mvc:
|
||||
view:
|
||||
api-prefix: api
|
||||
|
||||
30
back/root/fo/src/main/resources/mapper/UserRepository.xml
Normal file
30
back/root/fo/src/main/resources/mapper/UserRepository.xml
Normal file
@@ -0,0 +1,30 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
|
||||
<mapper namespace="sample.ustraframework.java.fo.sample.user.UserRepository">
|
||||
|
||||
<select id="selectUserByIdPassword" resultType="sample.ustraframework.java.fo.sample.user.UserModel">
|
||||
SELECT USR_ID,
|
||||
USR_NM,
|
||||
PWD,
|
||||
USR_STT_CD,
|
||||
LST_LOGIN_DTTM,
|
||||
LOGIN_FAIL_CNT
|
||||
FROM USTRA_SAMPLE_USER
|
||||
WHERE USR_ID = #{arg0}
|
||||
AND PWD = #{arg1}
|
||||
</select>
|
||||
|
||||
<select id="selectUserById" resultType="sample.ustraframework.java.fo.sample.user.UserModel">
|
||||
SELECT USR_ID,
|
||||
USR_NM,
|
||||
PWD,
|
||||
USR_STT_CD,
|
||||
LST_LOGIN_DTTM,
|
||||
LOGIN_FAIL_CNT
|
||||
FROM USTRA_SAMPLE_USER
|
||||
WHERE USR_ID = #{arg0}
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
@@ -0,0 +1,30 @@
|
||||
package sample.ustraframework.java.fo.test;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
|
||||
import org.springframework.context.annotation.ComponentScan;
|
||||
import org.springframework.security.crypto.password.PasswordEncoder;
|
||||
|
||||
import com.gsitm.ustra.java.test.UstraSpringTest;
|
||||
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
@Slf4j
|
||||
@EnableAutoConfiguration
|
||||
@ComponentScan("sample.ustraframework.java.fo")
|
||||
public class PasswordTest extends UstraSpringTest {
|
||||
|
||||
@Autowired private PasswordEncoder passwordEncoder;
|
||||
|
||||
/**
|
||||
* 패스워드 생성 테스트
|
||||
*/
|
||||
@Test
|
||||
public void generateUserPassword() {
|
||||
|
||||
String generatedPassword = passwordEncoder.encode("password");
|
||||
log.info("generatedPassword : {}", generatedPassword);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,9 +1,60 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="34" height="34" viewBox="0 0 34 34">
|
||||
<g id="favicon_basic_34x34" transform="translate(-234.051 -243.552)">
|
||||
<circle id="타원_4" data-name="타원 4" cx="17" cy="17" r="17" transform="translate(234.051 243.552)" fill="#0354ff"/>
|
||||
<g id="그룹_8480" data-name="그룹 8480" transform="translate(242.64 251.376)">
|
||||
<path id="패스_5" data-name="패스 5" d="M279.06,278.113H276v5.352a3.823,3.823,0,0,1-7.646,0V274.29L265.3,272v11.469a6.847,6.847,0,0,0,1.16,3.823,6.881,6.881,0,0,0,12.6-3.823Z" transform="translate(-265.297 -271.996)" fill="#fff"/>
|
||||
<circle id="타원_5" data-name="타원 5" cx="1.529" cy="1.529" r="1.529" transform="translate(13.763 15.292)" fill="#fff"/>
|
||||
</g>
|
||||
</g>
|
||||
<?xml version="1.0" encoding="iso-8859-1"?>
|
||||
<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
width="548.291px" height="548.291px" viewBox="0 0 548.291 548.291" style="enable-background:new 0 0 548.291 548.291;"
|
||||
xml:space="preserve">
|
||||
<g>
|
||||
<g>
|
||||
<path d="M271.447,413.066c-5.995,0-10.058,0.577-12.192,1.155v38.51c2.523,0.577,5.617,0.776,9.87,0.776
|
||||
c15.676,0,25.347-7.938,25.347-21.286C294.471,420.22,286.156,413.066,271.447,413.066z"/>
|
||||
<path d="M159.015,413.066c-5.995,0-10.058,0.577-12.191,1.155v38.51c2.522,0.577,5.616,0.776,9.869,0.776
|
||||
c15.675,0,25.347-7.938,25.347-21.286C182.039,420.22,173.721,413.066,159.015,413.066z"/>
|
||||
<path d="M472.929,131.39c-0.031-2.514-0.839-4.997-2.566-6.96L364.656,3.677c-0.031-0.034-0.062-0.044-0.084-0.075
|
||||
c-0.63-0.704-1.365-1.284-2.142-1.796c-0.231-0.149-0.463-0.283-0.704-0.419c-0.672-0.365-1.376-0.667-2.121-0.888
|
||||
c-0.2-0.058-0.377-0.139-0.577-0.191C358.231,0.113,357.4,0,356.561,0H96.757C84.904,0,75.255,9.649,75.255,21.502V526.79
|
||||
c0,11.858,9.649,21.501,21.502,21.501h354.775c11.853,0,21.503-9.643,21.503-21.501V132.595
|
||||
C473.036,132.191,472.971,131.795,472.929,131.39z M199.265,462.4c-10.068,9.481-24.969,13.743-42.383,13.743
|
||||
c-3.867,0-7.35-0.2-10.058-0.582v46.63h-29.221V393.517c9.088-1.543,21.866-2.709,39.863-2.709
|
||||
c18.185,0,31.15,3.487,39.854,10.447c8.326,6.583,13.932,17.412,13.932,30.184C211.251,444.216,207.004,455.05,199.265,462.4z
|
||||
M311.7,462.4c-10.068,9.481-24.973,13.743-42.387,13.743c-3.866,0-7.349-0.2-10.058-0.582v46.63h-29.22V393.517
|
||||
c9.089-1.543,21.866-2.709,39.864-2.709c18.185,0,31.151,3.487,39.854,10.447c8.326,6.583,13.933,17.412,13.933,30.184
|
||||
C323.684,444.216,319.438,455.05,311.7,462.4z M432.834,416.546h-35.601v105.645h-29.607V416.546h-35.029v-24.768h100.228v24.768
|
||||
H432.834z M96.757,365.081V21.502H345.81v110.011c0,5.935,4.819,10.751,10.751,10.751h94.972v222.816H96.757z"/>
|
||||
<path d="M257.422,139.674c-48.614,0-88.011,39.407-88.011,88.017c0,48.606,39.396,88.008,88.011,88.008
|
||||
c48.607,0,88.011-39.402,88.011-88.008h-88.011V139.674z"/>
|
||||
<path d="M269.36,213.801v0.026h88.019c0-24.758-10.269-47.092-26.72-63.084L269.36,213.801z"/>
|
||||
<path d="M268.436,198.336l62.224-62.231c-17.501-17.507-39.339-26.048-62.289-25.72l0.044,87.93L268.436,198.336z"/>
|
||||
</g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
<g>
|
||||
</g>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 765 B After Width: | Height: | Size: 2.6 KiB |
@@ -1,52 +0,0 @@
|
||||
@font-face {
|
||||
font-family: 'fontagon-icons';
|
||||
font-style: normal;
|
||||
font-weight: 400;
|
||||
src: url("fontagon-icons.eot?40b9a2a122b523636d275a37c6e9a4ae?#iefix") format("embedded-opentype"),
|
||||
url("fontagon-icons.woff2?40b9a2a122b523636d275a37c6e9a4ae") format("woff2"),
|
||||
url("fontagon-icons.woff?40b9a2a122b523636d275a37c6e9a4ae") format("woff");
|
||||
}
|
||||
|
||||
.fontagon-icons, .ft-icons {
|
||||
-webkit-user-select: none;
|
||||
-moz-user-select: none;
|
||||
-ms-user-select: none;
|
||||
user-select: none;
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
.ft-icons {
|
||||
width: 1em;
|
||||
height: 1em;
|
||||
position: relative;
|
||||
fill: currentColor;
|
||||
}
|
||||
|
||||
.fontagon-icons {
|
||||
font-family: 'fontagon-icons';
|
||||
font-weight: normal;
|
||||
font-style: normal;
|
||||
display: inline-block;
|
||||
line-height: 1;
|
||||
text-transform: none;
|
||||
letter-spacing: normal;
|
||||
word-wrap: normal;
|
||||
white-space: nowrap;
|
||||
direction: ltr;
|
||||
|
||||
/* Support for all WebKit browsers. */
|
||||
-webkit-font-smoothing: antialiased;
|
||||
/* Support for Safari and Chrome. */
|
||||
text-rendering: optimizeLegibility;
|
||||
|
||||
/* Support for Firefox. */
|
||||
-moz-osx-font-smoothing: grayscale;
|
||||
|
||||
/* Support for IE. */
|
||||
font-feature-settings: 'liga';
|
||||
}
|
||||
|
||||
.ft-favicon:before { content: "\f101"; }
|
||||
Binary file not shown.
@@ -1,60 +0,0 @@
|
||||
.fontagon-contents(@value) {
|
||||
content: @value;
|
||||
}
|
||||
|
||||
@font-face {
|
||||
font-family: "fontagon-icons";
|
||||
src: url("fontagon-icons.eot?40b9a2a122b523636d275a37c6e9a4ae?#iefix") format("embedded-opentype");
|
||||
src: url("fontagon-icons.woff2?40b9a2a122b523636d275a37c6e9a4ae") format("woff2");
|
||||
src: url("fontagon-icons.woff?40b9a2a122b523636d275a37c6e9a4ae") format("woff");
|
||||
}
|
||||
|
||||
|
||||
.fontagon-icons, .ft-icons {
|
||||
-webkit-user-select: none;
|
||||
-moz-user-select: none;
|
||||
-ms-user-select: none;
|
||||
user-select: none;
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
.ft-icons {
|
||||
width: 1em;
|
||||
height: 1em;
|
||||
position: relative;
|
||||
fill: currentColor;
|
||||
}
|
||||
|
||||
|
||||
.fontagon-icons {
|
||||
font-family: 'fontagon-icons';
|
||||
font-weight: normal;
|
||||
font-style: normal;
|
||||
display: inline-block;
|
||||
line-height: 1;
|
||||
text-transform: none;
|
||||
letter-spacing: normal;
|
||||
word-wrap: normal;
|
||||
white-space: nowrap;
|
||||
direction: ltr;
|
||||
|
||||
/* Support for all WebKit browsers. */
|
||||
-webkit-font-smoothing: antialiased;
|
||||
/* Support for Safari and Chrome. */
|
||||
text-rendering: optimizeLegibility;
|
||||
|
||||
/* Support for Firefox. */
|
||||
-moz-osx-font-smoothing: grayscale;
|
||||
|
||||
/* Support for IE. */
|
||||
font-feature-settings: 'liga';
|
||||
}
|
||||
|
||||
.ft-favicon {
|
||||
&:before {
|
||||
.fontagon-contents("\f101");
|
||||
}
|
||||
}
|
||||
@@ -3,11 +3,11 @@
|
||||
|
||||
@font-face
|
||||
font-family: "fontagon-icons"
|
||||
src: url("fontagon-icons.eot?40b9a2a122b523636d275a37c6e9a4ae?#iefix") format("embedded-opentype")
|
||||
src: url("fontagon-icons.woff2?40b9a2a122b523636d275a37c6e9a4ae") format("woff2")
|
||||
src: url("fontagon-icons.woff?40b9a2a122b523636d275a37c6e9a4ae") format("woff")
|
||||
src: url("fontagon-icons.eot?0cd077f02bfb5caa99153ccb5d0d7d6e?#iefix") format("embedded-opentype")
|
||||
src: url("fontagon-icons.woff2?0cd077f02bfb5caa99153ccb5d0d7d6e") format("woff2")
|
||||
src: url("fontagon-icons.woff?0cd077f02bfb5caa99153ccb5d0d7d6e") format("woff")
|
||||
|
||||
.fontagon-icons, .ft-icons
|
||||
.nf-icons, .nft-icons
|
||||
-webkit-user-select: none
|
||||
-moz-user-select: none
|
||||
-ms-user-select: none
|
||||
@@ -18,14 +18,14 @@
|
||||
vertical-align: middle
|
||||
|
||||
|
||||
.ft-icons
|
||||
.nft-icons
|
||||
width: 1em
|
||||
height: 1em
|
||||
position: relative
|
||||
fill: currentColor
|
||||
|
||||
|
||||
.fontagon-icons
|
||||
.nf-icons
|
||||
font-family: 'fontagon-icons'
|
||||
font-weight: normal
|
||||
font-style: normal
|
||||
@@ -49,6 +49,6 @@
|
||||
font-feature-settings: 'liga'
|
||||
|
||||
|
||||
.ft-favicon
|
||||
.nft-favicon
|
||||
&:before
|
||||
@include fontagon-contents("\f101")
|
||||
|
||||
@@ -1,52 +0,0 @@
|
||||
fontagon-contents(value)
|
||||
content value
|
||||
|
||||
@font-face
|
||||
font-family "fontagon-icons"
|
||||
src url("fontagon-icons.eot?40b9a2a122b523636d275a37c6e9a4ae?#iefix") format("embedded-opentype")
|
||||
src url("fontagon-icons.woff2?40b9a2a122b523636d275a37c6e9a4ae") format("woff2")
|
||||
src url("fontagon-icons.woff?40b9a2a122b523636d275a37c6e9a4ae") format("woff")
|
||||
|
||||
.fontagon-icons, .ft-icons
|
||||
-webkit-user-select none
|
||||
-moz-user-select none
|
||||
-ms-user-select none
|
||||
user-select none
|
||||
display inline-flex
|
||||
align-items center
|
||||
justify-content center
|
||||
vertical-align middle
|
||||
|
||||
.ft-icons
|
||||
width 1em
|
||||
height 1em
|
||||
position relative
|
||||
fill currentColor
|
||||
|
||||
.fontagon-icons
|
||||
font-family 'fontagon-icons'
|
||||
font-weight normal
|
||||
font-style normal
|
||||
display inline-block
|
||||
line-height 1
|
||||
text-transform none
|
||||
letter-spacing normal
|
||||
word-wrap normal
|
||||
white-space nowrap
|
||||
direction ltr
|
||||
|
||||
/* Support for all WebKit browsers. */
|
||||
-webkit-font-smoothing antialiased
|
||||
/* Support for Safari and Chrome. */
|
||||
text-rendering optimizeLegibility
|
||||
|
||||
/* Support for Firefox. */
|
||||
-moz-osx-font-smoothing grayscale
|
||||
|
||||
/* Support for IE. */
|
||||
font-feature-settings 'liga'
|
||||
|
||||
|
||||
.ft-favicon
|
||||
&:before
|
||||
fontagon-contents "\f101"
|
||||
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 10 KiB |
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,5 +1,7 @@
|
||||
<template>
|
||||
<div style="display: flex; align-items: stretch; flex: 1; flex-grow: 1; flex-direction: column"></div>
|
||||
<div style="display: flex; align-items: stretch; flex: 1; flex-grow: 1; flex-direction: column">
|
||||
<i class="nf-icons" style="font-size: 25px; color: blue">favicon</i>
|
||||
</div>
|
||||
</template>
|
||||
<script lang="ts">
|
||||
import { Component } from 'vue-property-decorator'
|
||||
|
||||
@@ -35,6 +35,7 @@ export default async () => {
|
||||
},
|
||||
},
|
||||
nuxt: {
|
||||
css: ['~/assets/font/fontagon-icons.sass'],
|
||||
module: {
|
||||
useCookie: true,
|
||||
useUstraDx: {},
|
||||
@@ -54,13 +55,11 @@ export default async () => {
|
||||
moduleName: 'nuxt-fontagon',
|
||||
enabled: true,
|
||||
option: {
|
||||
iconFont: {
|
||||
fontName: 'fontagon-icons',
|
||||
style: 'sass',
|
||||
classOptions: {
|
||||
baseClass: 'nf-icons',
|
||||
classPrefix: 'nft',
|
||||
},
|
||||
fontName: 'fontagon-icons',
|
||||
style: 'sass',
|
||||
classOptions: {
|
||||
baseClass: 'nf-icons',
|
||||
classPrefix: 'nft',
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -80,6 +79,15 @@ export default async () => {
|
||||
return await NuxtConfigLoader.nuxtConfig(config, (_prop, _config) => {
|
||||
_config.env.SERVER_PROP_ENC_KEY = 'Z3NjLWNyeXB0by1rZXkxMQ=='
|
||||
|
||||
_config.iconFont = {
|
||||
fontName: 'fontagon-icons',
|
||||
style: 'sass',
|
||||
classOptions: {
|
||||
baseClass: 'nf-icons',
|
||||
classPrefix: 'nft',
|
||||
},
|
||||
}
|
||||
|
||||
_config.build.transpile.push('@ustra-sample/cmm')
|
||||
})
|
||||
}
|
||||
|
||||
@@ -17,9 +17,9 @@
|
||||
"test": "jest --detectOpenHandles --forceExit"
|
||||
},
|
||||
"dependencies": {
|
||||
"@ustra/nuxt": "^2.0.14-stable",
|
||||
"@ustra/nuxt-dx-mng-bo": "^2.0.14-stable",
|
||||
"@ustra/nuxt-mng-bo": "^2.0.14-stable",
|
||||
"@ustra/nuxt": "^2.0.17-stable",
|
||||
"@ustra/nuxt-dx-mng-bo": "^2.0.17-stable",
|
||||
"@ustra/nuxt-mng-bo": "^2.0.17-stable",
|
||||
"@ustra-sample/cmm": "1.0.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,6 +15,6 @@
|
||||
"test": "jest --detectOpenHandles --forceExit"
|
||||
},
|
||||
"dependencies": {
|
||||
"@ustra/nuxt": "^2.0.14-stable"
|
||||
"@ustra/nuxt": "^2.0.17-stable"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,8 +18,8 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"@ustra-sample/cmm": "1.0.0",
|
||||
"@ustra/nuxt": "^2.0.14-stable",
|
||||
"@ustra/nuxt-buefy": "^2.0.14-stable",
|
||||
"@ustra/nuxt": "^2.0.17-stable",
|
||||
"@ustra/nuxt-buefy": "^2.0.17-stable",
|
||||
"animejs": "^3.2.1"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -33,10 +33,11 @@
|
||||
"@babel/node": "7.13.13",
|
||||
"@babel/preset-env": "7.13.12",
|
||||
"@babel/runtime-corejs3": "7.13.10",
|
||||
"@nuxt/typescript-build": "1.0.3",
|
||||
"@nuxt/types": "2.15.7",
|
||||
"@nuxt/typescript-build": "2.1.0",
|
||||
"@nuxtjs/eslint-config-typescript": "6.0.1",
|
||||
"@nuxtjs/eslint-module": "3.0.2",
|
||||
"@nuxtjs/eslint-config": "3.1.0",
|
||||
"@nuxtjs/eslint-config-typescript": "2.1.0",
|
||||
"@nuxtjs/eslint-module": "2.0.0",
|
||||
"@types/cli-progress": "3.9.1",
|
||||
"@types/crypto-js": "4.0.1",
|
||||
"@types/jest": "26.0.22",
|
||||
|
||||
1131
front/yarn.lock
1131
front/yarn.lock
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user