Skip to content

Commit

Permalink
[Edit] Index.route.js and three other files (#60)
Browse files Browse the repository at this point in the history
* [Edit] Main.html

Disabled modify, delete button.

* [Edit] Layout.controller.js / admin.sidebar.html and sidebar.html

Disable some buttons on sidebar
Add link on home button (to main page)

* [Edit] Index.route.js and three other files

Remove Korean and translate every word to English.
  • Loading branch information
mjk0618 authored and pec9399 committed Jun 27, 2018
1 parent 9891a68 commit 23faba6
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 20 deletions.
39 changes: 26 additions & 13 deletions src/app/index.route.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@
url: '/main',
templateUrl: 'app/main/main.html',
controllerAs: 'MainController',
params: { title: '메인 페이지' }
params: { title: 'Main Page'}
//메인 페이지
})
.state('login', {
url: '/login',
Expand All @@ -48,84 +49,96 @@
url: '/admin/project',
templateUrl: 'app/admin/project/admin.project.html',
controllerAs: 'AdminProjectController',
params: { title: '관리자 페이지' }
params: { title: 'Admin : Main Page' }
// 관리자 페이지
})
.state('adminProjectView', {
parent: 'pms',
url: '/admin/project/:pid',
templateUrl: 'app/admin/project/admin.project.view.html',
controllerAs: 'AdminProjectController',
params: { title: '프로젝트 페이지' }
params: { title: 'Admin : Main Page' }
// 프로젝트 페이지
})
.state('adminProjectWrite', {
parent: 'pms',
url: '/admin/project/write',
templateUrl: 'app/admin/project/admin.project.write.html',
controllerAs: 'AdminProjectController',
params: { title: '프로젝트 추가' }
params: { title: 'Admin : Add Project' }
// 프로젝트 추가
})
.state('adminProjectModify', {
parent: 'pms',
url: '/admin/project/modify/:pid',
templateUrl: 'app/admin/project/admin.project.modify.html',
controllerAs: 'AdminProjectController',
params: { title: '프로젝트 수정' }
params: { title: 'Admin : Modify Project' }
})
//프로젝트 수정
.state('adminUsers', {
parent: 'pms',
url: '/admin/users',
templateUrl: 'app/admin/account/admin.users.html',
controllerAs: 'AdminUsersController',
params: { title: '유저 목록' }
params: { title: 'Admin : User List' }
// 유저 목록
})
.state('adminUserModify', {
parent: 'pms',
url: '/admin/user/modify/:modify_id',
templateUrl: 'app/admin/account/admin.users.modify.html',
controllerAs: 'AdminUsersModifyController',
params: { title: '유저 상세 정보' }
params: { title: 'Admin : User Information' }
// 유저 상세 정보
})
.state('adminUsersTodo', {
parent: 'pms',
url: '/admin/user/todo/:todo_id/:todo_pid/:todo_proj',
templateUrl: 'app/admin/account/admin.users.todo.html',
controllerAs: 'AdminUsersTodoController',
params: { title: '유저 투두 상세 정보' }
params: { title: 'User Todo Information' }
// 유저 투두 상세 정보
})
.state('/project', {
parent: 'pms',
url: '/main',
templateUrl: 'app/main/main.html',
controllerAs: 'MainController',
params: { title: '메인 페이지' }
params: { title: 'Main Page' }
// 메인 페이지
})
.state('pmProject', {
parent: 'pms',
url: '/pm/project',
templateUrl: 'app/PM/project/pm.project.html',
controllerAs: 'PMController',
params: { title: 'PM 페이지' }
params: { title: 'PM : Main Page' }
// PM 페이지
})
.state('pmProjectView', {
parent: 'pms',
url: '/pm/project/:pid',
templateUrl: 'app/PM/project/pm.project.view.html',
controllerAs: 'PMController',
params: { title: '프로젝트 페이지' }
params: { title: 'PM : Main Page' }
})
// 프로젝트 페이지
.state('pmProjectWrite', {
parent: 'pms',
url: '/pm/project/write',
templateUrl: 'app/PM/project/pm.project.write.html',
controllerAs: 'PMController',
params: { title: '프로젝트 추가' }
params: { title: 'PM : Add Project' }
// 프로젝트 추가
})
.state('pmProjectModify', {
parent: 'pms',
url: '/pm/project/modify/:pid',
templateUrl: 'app/PM/project/pm.project.modify.html',
controllerAs: 'PMController',
params: { title: '프로젝트 수정' }
params: { title: 'PM : Modify Project' }
// 프로젝트 수정
});

// $urlRouterProvider.otherwise('/login');
Expand Down
6 changes: 3 additions & 3 deletions src/app/layout/layout.controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
else if (vm.act === 'block') vm.act = 'none';
};
// link에 state이름, title에 사이드바에 띄우는 항목명
vm.admin = [{
vm.admin = [/*{
link: 'notice',
title: '공지사항',
icon: 'announcement'
Expand All @@ -42,11 +42,11 @@
icon: 'dns'
}, */{
link: '/admin/users',
title: '사용자 관리',
title: 'Users List',
icon: 'face'
}, {
link: '/admin/project',
title: '프로젝트 관리',
title: 'PM page',
icon: 'event'
}, /*{
link: 'system',
Expand Down
4 changes: 2 additions & 2 deletions src/app/layout/login.controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
}).then((result) => {
if (result.data.result) {
$window.location.assign('/main');
} else if (vm.uid == null) alert('아이디를 입력해주세요.');
else alert('아이디 또는 비밀번호를 다시 확인해주세요.');
} else if (vm.uid == null) alert('Please enter valid ID.');
else alert('Please check your ID/PW.');

$sessionStorage.putObject('session', result.data);
});
Expand Down
5 changes: 3 additions & 2 deletions src/app/layout/login.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
-->
<div class="login__image">
<img src = "./assets/images/scg_logo_edit.png" style=" width: 80%; height: auto;">

</div>
<div class="login__form">
<div class="login__row">
Expand All @@ -23,5 +22,7 @@
</div>
<button type="button" class="login__submit" ng-click="login.login()">Sign in</button>
<p class="login__signup">Don't have an account? <a href="/loginRegister"> Sign up </a> </p>
</form>
<div>
</form>
<div>
</body>

0 comments on commit 23faba6

Please sign in to comment.