Compare commits
1 Commits
feature-cs
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 962428ef1e |
@@ -82,7 +82,10 @@ const Header = () => {
|
|||||||
navLinkArray.push(<li key={'navDerived'}><NavLink to="/Management/Derived">Create Variable</NavLink></li>);
|
navLinkArray.push(<li key={'navDerived'}><NavLink to="/Management/Derived">Create Variable</NavLink></li>);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(token.isAdmin < 5 || ["정지예","한정민","박영","오수인"].includes(token.name)){
|
let exceptViewTeams = ["R701"];
|
||||||
|
let exceptViewUsers = [];
|
||||||
|
|
||||||
|
if(token.isAdmin < 5 || exceptViewTeams.includes(token.team) || exceptViewUsers.includes(token.id)){
|
||||||
navLinkArray.push(<li key={'navExim'}><NavLink to="/Management/Exim">Export/Import</NavLink></li>);
|
navLinkArray.push(<li key={'navExim'}><NavLink to="/Management/Exim">Export/Import</NavLink></li>);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import axios from 'axios'
|
|||||||
// Base URL
|
// Base URL
|
||||||
export const URL_KART_KON = "https://rapi.kric.com/api/v1";
|
export const URL_KART_KON = "https://rapi.kric.com/api/v1";
|
||||||
export const URL_KART_NS = "https://kapi.kric.com/api/v2";
|
export const URL_KART_NS = "https://kapi.kric.com/api/v2";
|
||||||
//export const URL_KART_NS = "https://localhost:7042/api/v2";
|
//export const URL_KART_NS = "http://localhost:5179/api/v2";
|
||||||
|
|
||||||
export const axiosOption = {
|
export const axiosOption = {
|
||||||
url:'',
|
url:'',
|
||||||
|
|||||||
@@ -8,6 +8,8 @@ export const tokenState = atom({
|
|||||||
default:{
|
default:{
|
||||||
status : 0,
|
status : 0,
|
||||||
token : '',
|
token : '',
|
||||||
|
id: '',
|
||||||
|
team: '',
|
||||||
name : '',
|
name : '',
|
||||||
isAdmin : 999,
|
isAdmin : 999,
|
||||||
message : ''
|
message : ''
|
||||||
|
|||||||
@@ -18,6 +18,8 @@ const External = (props) => {
|
|||||||
setToken({
|
setToken({
|
||||||
status : 0,
|
status : 0,
|
||||||
token : '',
|
token : '',
|
||||||
|
id: '',
|
||||||
|
team: '',
|
||||||
name : '',
|
name : '',
|
||||||
isAdmin : 999,
|
isAdmin : 999,
|
||||||
message : '',
|
message : '',
|
||||||
@@ -39,6 +41,8 @@ const External = (props) => {
|
|||||||
setToken({
|
setToken({
|
||||||
status : response.status,
|
status : response.status,
|
||||||
token : response.data.Token,
|
token : response.data.Token,
|
||||||
|
id: response.data.ID,
|
||||||
|
team: response.data.Team,
|
||||||
name : response.data.Name,
|
name : response.data.Name,
|
||||||
isAdmin : response.data.IsAdmin,
|
isAdmin : response.data.IsAdmin,
|
||||||
message : response.message,
|
message : response.message,
|
||||||
|
|||||||
@@ -33,6 +33,8 @@ const Login = () => {
|
|||||||
setToken({
|
setToken({
|
||||||
status : response.status,
|
status : response.status,
|
||||||
token : response.data.Token,
|
token : response.data.Token,
|
||||||
|
id: response.data.ID,
|
||||||
|
team: response.data.Team,
|
||||||
name : response.data.Name,
|
name : response.data.Name,
|
||||||
isAdmin : response.data.IsAdmin,
|
isAdmin : response.data.IsAdmin,
|
||||||
message : response.message,
|
message : response.message,
|
||||||
|
|||||||
@@ -19,6 +19,8 @@ const Logout = () => {
|
|||||||
setToken({
|
setToken({
|
||||||
status : 0,
|
status : 0,
|
||||||
token : '',
|
token : '',
|
||||||
|
id: '',
|
||||||
|
team: '',
|
||||||
name : '',
|
name : '',
|
||||||
isAdmin : 999,
|
isAdmin : 999,
|
||||||
message : '',
|
message : '',
|
||||||
|
|||||||
@@ -46,8 +46,18 @@ const Main = (props) => {
|
|||||||
useEffect(() =>{
|
useEffect(() =>{
|
||||||
SelectProject('','', '', 0, '', setPtoken, setQuestionList);
|
SelectProject('','', '', 0, '', setPtoken, setQuestionList);
|
||||||
VisitLog(window.location.href, token.token, pToken.skey);
|
VisitLog(window.location.href, token.token, pToken.skey);
|
||||||
const effectUser = ["백성희", "박준성"];
|
|
||||||
if(effectUser.includes(token.name)){
|
const effectUser = [
|
||||||
|
"jspark@kric.com",
|
||||||
|
"joohee@kric.com",
|
||||||
|
"choins@kric.com",
|
||||||
|
"shbaek@kric.com",
|
||||||
|
"seoyun@kric.com",
|
||||||
|
"cwpark@kric.com",
|
||||||
|
"hrsim@kric.com"
|
||||||
|
];
|
||||||
|
|
||||||
|
if(effectUser.includes(token.id)){
|
||||||
setSpecialEffect(Math.floor(Math.random()*2)===1?<FlowerPetals/>:<KringEffect/>)
|
setSpecialEffect(Math.floor(Math.random()*2)===1?<FlowerPetals/>:<KringEffect/>)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user