Skip to content

Commit

Permalink
[Update] Update origin (#62)
Browse files Browse the repository at this point in the history
* [Edit] Edit index.js, user.js

Edit routing GET '/logout' in index.js
Edit routing DELETE '/user' in user.js and try-catch syntax

* [Edit] Login routing and delete index.constants.js

Edit login controller to load different page for admin user and delete
index.constants.js

* [Edit] Edit admin.js

Edit routing POST 'admin/register'
Add routing GET 'admin/users'

* [Edit] Admin routing url

Edit routing url for different name with previous one

* [Edit] Show usrname on sidebar

modified layout.controller.js and sidebar.html

* [Edit] Show username on sidebar

Edit layout.controller.js and sidebar.html

* [Edit] Delete admin.sidebar.html and change page title

Deleted admin.sidebar.html and change project page title

* [Edit] Edit admin.js

Add routing GET 'admin/project/:pid'
Add routing PUT 'admin/project/:pid'
Add routing DELETE 'admin/project/:pid'
Edit routing GET 'admin/users/default'

* [Add] Admin user approve page
Add new admin page to approve default users and routing in
index.route.js file

* [Edit] AdminProjectController

* [Edit] AdminProject Page

* [Edit] AdminProjectView Page`

* [Edit] AdminProjectWrite Page

* [Edit] Change params in index.route.js

* [Edit] Admin sidebar
Edit admin sidebar to access default user approve page

* [Edit] Fix sidebar menu

Edit index.route.js and layout.controller.js

* [Edit] AdminProject Controller and View Page

* [Edit] Admin.js

* [Edit] AdminProject View/Write/Modify Page and Controller

* [Edit] AdminProject Page Routing

* [Edit] Project.js to apply autoincrement

* [Edit] AdminProject Modify Page

* [Edit] Resolve User List Button's Miss Opening

* [Edit] Add refuse button at user approve page

Edit admin.users.approve.controller.js and admin.users.approve.html
Change Korean to English - admin.project.html

* [Edit] Admin Project View Page

* [Edit] Add refuse button at User Approve page

Edit admin.users.approve.controller.js and admin.users.approve.html

* [Edit] Admiin Project Page

* [Edit] Admin User Approve Controller

* [Edit] Admin Project Page

* [Edit] Change Korean to English and fix refuse button error

Edit admin.project.html and main.controller.js
Fix refuse button at user approve page

* [Edit] Change Korean to English

Edit admin.project.controller.js and admin.project.html
Fix error of admin project page

* [Edit] Change cursor icon on header

Edit header.html
Change cursor icon from default to pointer

* [Edit] admin.js

Edit routing GET 'admin/users'

* [Edit] Change Korean to English

Edit pm.project.controller.js, admin.users.controller.js,
admin.users.modify.controller.js, admin.users.todo.controller.js and
login.controller.js.

* [Add] Account Page and Controller

* [Edit] Edit User Routing And Index Routing

Edit user routing due to wrong parameter at get function. Add new status
about userAccount.

* [Add] Add Account Link On Sidebar

Add account link on sidebar.

* [Edit] Sidebar menu

Distinguish admin sidebar and developer sidebar

* [Edit] Account Controller

* [Edit] Account Page

* [Fix] project.js

Fix routing GET 'project/:uid' in project.js

* [Edit] project.js

Add routing GET '/pm/:uid'

* [Edit] Show launching projects on project list

Edit main.controller.js and main.html

* [Edit] Change Routing About PM

Change link about pm-routing. Show specific information about project to
PM. Make init-function about project main page.

* [Edit] Sidebar

Edit sidebar to make it different depending on user

* [Edit] Sidebar

Edit sidebar to link locally and delete log

* [Edit] Layout controller

Edit variable name in layout controller

* [Add] Add Todo List On Project View Page

Add todo list on project view page. Show componets, updatedAt, duedate
and Done of todo information.

* [Edit] Delete Ng-click

Delete ng-click of toggle.left to solve the problem that when click the
user list button, open the side bar.

* [Edit] Edit Project Routing

Edit project.js to get the imformation about users in project. Show the
users' information on the project view page.

* [Edit] index.js to handle login errors.

* [Edit] PM project controller to handle errors.

* [Edit] Fix Eslint Errors

* [Edit] login controller to handle errors.

* [Edit] Edit PMController And CSS About Placeholder

Edit pmcontroller to modify project. Edit CSS about placeholder to show
value.

* [Edit] Edit Date Format On Input At Modifypage

Edit html to show previous date befor modifing.

* [Edit] Change Placeholder Color

Change css to change color of placeholder from white to black.

* [Edit] Sidebar

Edit sidebar and fix eslint

* [Edit] Index.route.js

Edit index.route.js to add user project view page

* [Delete] Pm page in admin folder

Delete disuse pm page

* [Edit] Edit Project Modify Controller On PM

Edit project-modify-controller to edit the imformation about project
using right values.

* [Edit] project.js

Add routing GET '/todo/:uid/:pid' in project.js

* [Edit] Sidebar css

Edit sidebar css class

* [Edit] project.js

Fix routing GET '/todo/:uid/:pid' in project.js

* [Delete] Todo routing in project.js

Delete Todo routing in project/uid/pid

* [Edit] Project information routing in project.js

Edit routing to get project information

* [Edit] Project routing in project.js

Delete uid parameter

* [Add] Add Todo Page

Add todo page and todo routing. Edit error about wrong link which gets
the todo list.

* [Edit] Project and todo routing in project.js

Edit get todo list routing to fix response type

* [Add] Developer page and controller

Add developer page and controller for general users

* [Edit] Edit Routing About Adding Todo

Edit routing about addition todo.

* [Add] Add Delete Button About Todo

Add delete button to erase todoes. Edit routing about erasing todo.

* [Edit] Edit Routing To Get Imformation About Todo

Edit routing to get imformation about todo using todo, list, user
tables.

* [Edit] index.route.js to make a new page that can join developers in a
particular project.

* [Add] Admin Project User Page to Make it Possible for Admin to include
Developers.

* [Add] Add Todo View Page

Add todo view page : todo's imformation and assigned developer.

* [Edit] Admin Project Controller and View Page to apply
developer-including application

* [Edit] Edit Routing About Todo View Page

Edit routing about todo view page to solve a problem about overlapping routing.

* [Edit] Admin Project Pages and Routing to integrate stateParams.

* [Edit] admin.js, project.js and user.js

Add exception 'else' in admin.js, project.js and user.js

* [Add] Add Done Button

Add button to make todo done.

* [Edit] Admin Project Page to integrate stateParams.

* [Edit] project.js

Fix routing POST '/project/:uid/:pid'

* [Edit] App.js

Give restriction to non user

* [Edit] Main Account Page to Add ID-Editing Applications.

* [Edit] Edit Routing About Editting Todo

Edit routing aobut editting todo

* [Edit] Sidebar menu and controller

Edit pm sidebar menu and controller

* [Add] Add Todo Edit Page

Add todo edit page and edit project routing to edit todo.

* [Edit] Main Account Page to Enable Name-Editing Applications

* [Add] Add Button To Delete User

Add delete button which delete use.

* [Edit] Main page

Edit main page for developers and pm

* [Edit] Location path and delete unnecessary code

Edit location path to state.go and delete unnecessary code in main page

* [Edit] Pm project routing

Edit pm project routing

* [Edit] Edit Routing About User Addition

Edit routing about user addition.

* [Add] User list in admin project write page

Add user list select box to assign pm

* [Edit] Developer Main Controller to fix routing/

* [Edit] Developer Maing Page to fix routing.

* [Edit] Developer Main Page to fix parameters.

* [Edit] Fix eslint and delete unnecessary log

Fix eslint in admin project page and developer page

* [Add] Add User Addition Page Of Todo

Add user addition page of todo.

* [Edit] Edit Wrong Value Name

Edit wrong value name to show the rest developer who are in the todo.

* [Edit] Admin.js

Edit admin routing to get uid for given project id

* [Edit] Edit Routing To Edit And Delete Project

Edit routing to edit and delete project.

* [Add] Admin project modify page

Add pm select box in admin project modify page

* [Edit] Project.js

Fix routing POST '/project/:uid/:pid' in project.js

* [Edit] Project.js

Fix rotuing POST '/project/:uid/:pid' in project.js

* [Edit] project.js

Restore project.js

* [Edit] App.js to fix access-blocking applications.

* [Add] Add Todo Page On Admin

Add todo page on admin page and function which add the todo on project.

* [Add] Add Delete Button On Todolist

Add delete button on todolist.

* [Edit] Edit Project Write Page

Edit project write page to set uid on the project when pm makes a project.

* [Edit] App.js to fix routing

* [Edit] LoginRegister Page to apply access-blocking application that
acts when written ID already exists.

* [Edit] Edit Async Function

Eelete async on function to show login page.

* [Edit] Edit Type Casting

Edit type casting from string to date when modify date type value such
as startdate, duedate and done.

* [Edit] Admin user todo title and user list

Edit admin page for consistency

* [Edit] Set The Date To Korea

Convert standard time to Korean time.

* [Edit] Edit Date Format

Edit date format on pm and todo page.

* [Edit] Edit PM Controller

Edit PM controller to solve the problem which doesn't show page.

* [Edit] Admin project page

Edit admin project modify page to handle errors

* [Edit] Make Time Difference

Make time dirrefence using function.

* [Edit] Admin routing and controller

Edit admin routing to update user auth when assigning pm

* [Edit] Admin Project Controller to fix $state function.

* [Edit] Main page and developer page

Edit main and developer to match Korea standard time

* [Edit] Main page

Edit main page to hide done column when the value is null

* [Edit] Admin project view page

Edit admin project view page to add function for adding project manager
and match to Korea standard time

* [Add] Add PM Information On Project View Page

Add pm information on project view page.

* [Edit] Developer Controller to change design.

* [Edit] DeveloperView Page to add user lists.

* [Edit] Admin.js, index.js, project.js and user.js

Fit in Airbnb style admin.js, index.js, project.js and user.js

* [Edit] Admin project view page

Edit admin project view page to see project manager

* [Edit] Developer View Page to block PM-only applications.

* [Edit] index.js

Restore index.js

* [Edit] Admin main page

Edit admin main page to add done button

* [Edit] Admin Project Page and Controller to demonstrate project
manager's name.

* [Edit] Project.js to fix parameters.

* [Edit] Correct eslint errors.

* [Edit] App.js to block access without admin's permission.

* [Edit] Login Controller to blcok access without admin's permission.

* [Edit] Login Controller to change warning message.

* [Edit] Fix Eslint Errors.

* [Edit] Fix Eslint Errors.

* [Edit] Edit app.js

Fix app.use function

* [Edit] Background

Edit background for balance
  • Loading branch information
lcw921 authored and pec9399 committed Jul 13, 2018
1 parent 72e36c7 commit 5a1395c
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 7 deletions.
8 changes: 4 additions & 4 deletions server/models/list.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
module.exports = (sequelize) => {
const list = sequelize.define('list', {},
{
tableName: 'list',
comment: '새 테이블 2'
});
{
tableName: 'list',
comment: '새 테이블 2'
});
list.associate = (models) => {
list.belongsTo(models.user, { foreignKey: { name: 'uid', allowNull: false }, onDelete: 'CASCADE', onUpdate: 'CASCADE' });
list.belongsTo(models.todo, { foreignKey: { name: 'tdid', allowNull: false }, onDelete: 'CASCADE', onUpdate: 'CASCADE' });
Expand Down
1 change: 0 additions & 1 deletion server/models/todo.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,3 @@ module.exports = (sequelize, DataTypes) => {
};
return todo;
};

3 changes: 2 additions & 1 deletion server/routes/user.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,5 @@ router.get('/:uid', wrap(async (req, res) => {
}
}));

module.exports = router;
module.exports = router;

4 changes: 3 additions & 1 deletion src/app/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ input, button {
.cont {
position: relative;
height: 100%;
background-image: url("/assets/images/background.jpg");
background-image: : #ADA996; /* fallback for old browsers */
background-image: -webkit-linear-gradient(to top, #EAEAEA, #DBDBDB, #F2F2F2, #ADA996); /* Chrome 10-25, Safari 5.1-6 */
background-image: linear-gradient(to top, #EAEAEA, #DBDBDB, #F2F2F2, #ADA996); /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */
background-size: cover;
background-color:none;
overflow: auto;
Expand Down

0 comments on commit 5a1395c

Please sign in to comment.