Merge branch 'feature/BETERAN-BACKEND-APP-BROWSER-init' of https://gitlab.loafle.net/bet/beteran-backend-app-browser into feature/BETERAN-BACKEND-APP-BROWSER-init

This commit is contained in:
이담 정 2022-07-04 12:31:24 +09:00
commit 63c8663227
6 changed files with 52 additions and 32 deletions

60
package-lock.json generated
View File

@ -3475,9 +3475,9 @@
}
},
"node_modules/@types/eslint-scope": {
"version": "3.7.3",
"resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz",
"integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==",
"version": "3.7.4",
"resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
"integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==",
"dev": true,
"dependencies": {
"@types/eslint": "*",
@ -4962,9 +4962,9 @@
}
},
"node_modules/caniuse-lite": {
"version": "1.0.30001359",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001359.tgz",
"integrity": "sha512-Xln/BAsPzEuiVLgJ2/45IaqD9jShtk3Y33anKb4+yLwQzws3+v6odKfpgES/cDEaZMLzSChpIGdbOYtH9MyuHw==",
"version": "1.0.30001361",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001361.tgz",
"integrity": "sha512-ybhCrjNtkFji1/Wto6SSJKkWk6kZgVQsDq5QI83SafsF6FXv2JB4df9eEdH6g8sdGgqTXrFLjAxqBGgYoU3azQ==",
"dev": true,
"funding": [
{
@ -6186,9 +6186,9 @@
}
},
"node_modules/electron-to-chromium": {
"version": "1.4.172",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.172.tgz",
"integrity": "sha512-yDoFfTJnqBAB6hSiPvzmsBJSrjOXJtHSJoqJdI/zSIh7DYupYnIOHt/bbPw/WE31BJjNTybDdNAs21gCMnTh0Q==",
"version": "1.4.176",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.176.tgz",
"integrity": "sha512-92JdgyRlcNDwuy75MjuFSb3clt6DGJ2IXSpg0MCjKd3JV9eSmuUAIyWiGAp/EtT0z2D4rqbYqThQLV90maH3Zw==",
"dev": true
},
"node_modules/emoji-regex": {
@ -10765,9 +10765,9 @@
}
},
"node_modules/npm-registry-fetch/node_modules/lru-cache": {
"version": "7.10.2",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.10.2.tgz",
"integrity": "sha512-9zDbhgmXAUvUMPV81A705K3tVzcPiZL3Bf5/5JC/FjYJlLZ5AJCeqIRFHJqyBppiLosqF+uKB7p8/RDXylqBIw==",
"version": "7.12.0",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.12.0.tgz",
"integrity": "sha512-OIP3DwzRZDfLg9B9VP/huWBlpvbkmbfiBy8xmsXp4RPmE4A3MhwNozc5ZJ3fWnSg8fDcdlE/neRTPG2ycEKliw==",
"dev": true,
"engines": {
"node": ">=12"
@ -12014,9 +12014,9 @@
}
},
"node_modules/postcss-nesting": {
"version": "10.1.9",
"resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-10.1.9.tgz",
"integrity": "sha512-WlnqQecNMT7eizBpWwAnQOIk7Zr0A+OZJccEwQoTwmcIsZCVdcjT1LjXj1hBk6zR3BDLZQYsb5KZj2HquZgvTw==",
"version": "10.1.10",
"resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-10.1.10.tgz",
"integrity": "sha512-lqd7LXCq0gWc0wKXtoKDru5wEUNjm3OryLVNRZ8OnW8km6fSNUuFrjEhU3nklxXE2jvd4qrox566acgh+xQt8w==",
"dev": true,
"dependencies": {
"@csstools/selector-specificity": "^2.0.0",
@ -17444,9 +17444,9 @@
}
},
"@types/eslint-scope": {
"version": "3.7.3",
"resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz",
"integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==",
"version": "3.7.4",
"resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
"integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==",
"dev": true,
"requires": {
"@types/eslint": "*",
@ -18572,9 +18572,9 @@
"dev": true
},
"caniuse-lite": {
"version": "1.0.30001359",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001359.tgz",
"integrity": "sha512-Xln/BAsPzEuiVLgJ2/45IaqD9jShtk3Y33anKb4+yLwQzws3+v6odKfpgES/cDEaZMLzSChpIGdbOYtH9MyuHw==",
"version": "1.0.30001361",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001361.tgz",
"integrity": "sha512-ybhCrjNtkFji1/Wto6SSJKkWk6kZgVQsDq5QI83SafsF6FXv2JB4df9eEdH6g8sdGgqTXrFLjAxqBGgYoU3azQ==",
"dev": true
},
"chalk": {
@ -19471,9 +19471,9 @@
}
},
"electron-to-chromium": {
"version": "1.4.172",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.172.tgz",
"integrity": "sha512-yDoFfTJnqBAB6hSiPvzmsBJSrjOXJtHSJoqJdI/zSIh7DYupYnIOHt/bbPw/WE31BJjNTybDdNAs21gCMnTh0Q==",
"version": "1.4.176",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.176.tgz",
"integrity": "sha512-92JdgyRlcNDwuy75MjuFSb3clt6DGJ2IXSpg0MCjKd3JV9eSmuUAIyWiGAp/EtT0z2D4rqbYqThQLV90maH3Zw==",
"dev": true
},
"emoji-regex": {
@ -22821,9 +22821,9 @@
}
},
"lru-cache": {
"version": "7.10.2",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.10.2.tgz",
"integrity": "sha512-9zDbhgmXAUvUMPV81A705K3tVzcPiZL3Bf5/5JC/FjYJlLZ5AJCeqIRFHJqyBppiLosqF+uKB7p8/RDXylqBIw==",
"version": "7.12.0",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.12.0.tgz",
"integrity": "sha512-OIP3DwzRZDfLg9B9VP/huWBlpvbkmbfiBy8xmsXp4RPmE4A3MhwNozc5ZJ3fWnSg8fDcdlE/neRTPG2ycEKliw==",
"dev": true
},
"make-fetch-happen": {
@ -23669,9 +23669,9 @@
}
},
"postcss-nesting": {
"version": "10.1.9",
"resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-10.1.9.tgz",
"integrity": "sha512-WlnqQecNMT7eizBpWwAnQOIk7Zr0A+OZJccEwQoTwmcIsZCVdcjT1LjXj1hBk6zR3BDLZQYsb5KZj2HquZgvTw==",
"version": "10.1.10",
"resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-10.1.10.tgz",
"integrity": "sha512-lqd7LXCq0gWc0wKXtoKDru5wEUNjm3OryLVNRZ8OnW8km6fSNUuFrjEhU3nklxXE2jvd4qrox566acgh+xQt8w==",
"dev": true,
"requires": {
"@csstools/selector-specificity": "^2.0.0",

View File

@ -46,6 +46,13 @@ export const defaultNavigation: FuseNavigationItem[] = [
icon: 'heroicons_outline:academic-cap',
link: '/member/user',
},
{
id: 'member.user_view',
title: 'User-view',
type: 'basic',
icon: 'heroicons_outline:academic-cap',
link: '/member/user/view',
},
],
},
];

View File

@ -15,11 +15,13 @@ import { MatTooltipModule } from '@angular/material/tooltip';
import { TranslocoModule } from '@ngneat/transloco';
import { SharedModule } from 'app/shared/shared.module';
import { ListComponent } from 'app/modules/admin/member/user/components/list.component';
import { COMPONENTS } from './components';
import { userRoutes } from 'app/modules/admin/member/user/user.routing';
@NgModule({
declarations: [ListComponent],
declarations: [COMPONENTS],
imports: [
TranslocoModule,
SharedModule,

View File

@ -1,6 +1,7 @@
import { Route } from '@angular/router';
import { ListComponent } from 'app/modules/admin/member/user/components/list.component';
import { ViewComponent } from 'app/modules/admin/member/user/components/view.component';
import { UsersResolver } from './resolvers/user.resolver';
@ -12,4 +13,8 @@ export const userRoutes: Route[] = [
users: UsersResolver,
},
},
{
path: 'view',
component: ViewComponent,
},
];

View File

@ -1,5 +1,10 @@
{
"welcome-back": "Welcome back",
"Dashboards": "Dashboards",
"Member": "Member",
"User": "User",
"User-view": "User View",
"Project": "Project",
"Partner": "Partner",
"Analytics": "Analytics"
}

View File

@ -3,6 +3,7 @@
"Dashboards": "대쉬보드",
"Member": "회원",
"User": "사용자",
"User-view": "사용자 상세보기",
"Project": "프로젝트",
"Partner": "파트너",
"Analytics": "Analytics"