Terry Khoriyadi#3
Open
lifegrain wants to merge 9 commits into
Open
Conversation
.gitignore: - added gitignore for node_modules .env and .DS_store client/index.html: -empty index.html with jquery script client/script/main.js: -appends hello world into body server/config/config.json: -sequelize init server/controllers/index.js: -controller init server/controllers/taskController.js: -preparation for CRUD in Task server/controllers/userController.js: -preparation for register and login server/helpers/: -added helper for bcrypt -added helper for http-errors -added helper for googleAuth -added helper for jsonwebtoken server/index.js: -preparation of index server/middleware/authentication.js: -preparation for authentication server/middleware/authorization.js: -preparation for authorization server/middleware/errorHandler.js: -fill in errorhandling as much as i can server/migrations/: -added migration for user -added migration for task server/models/: -added models for user and task server/package.json: -package.json init and several dependencies server/routes/index.js: -created routes index server/routes/taskRouter.js: -prepared task routing server/routes/userRouter.js: -prepared user routing
client/index.html: - finished kanban layout
client/assets/script/main.js: - a simple test to check if it's able to contact the backend server client/index.html: - updated script src to reflect the moved script folder server/.env_template: - added template for environment variables server/models/index.js: server/config/config.js: - sequelize init server/controllers/taskController.js: - finished CRUD for task server/controllers/userController.js: - added User login and register server/migrations/20200309080826-create-task.js: - added UserId foreign key to Task migrate server/models/task.js: - updated task model with validation for title and category column as well as association server/models/user.js: - updated User model with validation for email and category column server/routes/index.js: - added routing for users, authentication, and tasks server/routes/taskRouter.js: - added routing for Task CRUD as well as authorization middleware server/routes/userRouter.js: - added routing for users/login and users/register
client/assets/css/style.css: - moved style in html to its own file - add height for id app - added css for class loginForm - added css for class alert client/assets/script/main.js: - added const variable for server url - added new Vue - added login method and error method - added created for token check - added mounted to hide everything until it is mounted - added computed for alertMsg, this will hopefully show error in a long string instead of array - added data for mounted style - added data for alert status, code, msg - added data for view, show which "page" client should see - added data for loginForm email and password - added temporary hardcode for the content of kanban client/index.html: - moved style to its own file - changed kanban to using vue - added login form - added alert box - added axios script - removed jquery script server/controllers/taskController.js: - fixed missing UserId foreign key column
.gitignore: - added gitignore for the folders fist and .cache client/assets/css/style.css: client/assets/script/main.js: client/css/style.css: - moved the files into a new folder client/index.html: - first attempts at converting index html for vue components client/package-lock.json: client/package.json: - npm install axios, vue client/src/app.vue: - created app.vue - added alert, login and register in app.vue client/src/component/alert.vue: - alert now shows up properly client/src/component/login.vue: - login works as intended client/src/component/register.vue: - register works as intended client/src/main.js: - converted main.js for vue components
client/css/style.css: - adjustment for new items client/index.html: - finally moved everything to vue components client/src/app.vue: - finished app.vue to include all components and functions as intended client/src/component/card.vue: - card component working client/src/component/login.vue: - slight adjustment to login component to include a register button client/src/component/main.vue: - main page of kanban is done client/src/component/navbar.vue: - added navbar client/src/component/register.vue: - register form is now similar to login form client/src/main.js: - added bootstrap vue server/controllers/taskController.js: - added order to prevent tasks gettings scrambled around
client/index.html: - added google sign-in meta and script client/src/app.vue: - added google sign-in methods client/src/component/navbar.vue: - added a working google sign-in button server/.env_template: - added env variable for google api key for google sign-in server/controllers/userController.js: - made controller for google sign-in server/routes/userRouter.js: - added route for google sign-in
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Deploy