Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
V
venjob
  • Overview
    • Overview
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 0
    • Merge Requests 0
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Huỳnh Thiên Phước
  • venjob
  • Merge Requests
  • !10

Merged
Opened Aug 19, 2020 by Huỳnh Thiên Phước@phuocht 
  • Report abuse
Report abuse

Register

Edited Aug 19, 2020 by Huỳnh Thiên Phước
×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b register origin/register

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout master
git merge --no-ff register

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 23
  • Commits 9
  • Pipelines 10
  • Changes 49
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Huỳnh Thiên Phước @phuocht

    added 1 commit

    • fe8b0e2d - create email sending

    Compare with previous version

    Aug 19, 2020

    added 1 commit

    • fe8b0e2d - create email sending

    Compare with previous version

    added 1 commit * fe8b0e2d - create email sending [Compare with previous version](https://gitlab.zigexn.vn/phuocht/venjob/merge_requests/10/diffs?diff_id=5108&start_sha=d84887e5f987d71858566df94b23ee6e278ffa8b)
    Toggle commit list
  • Huỳnh Thiên Phước @phuocht

    unmarked as a Work In Progress

    Aug 19, 2020

    unmarked as a Work In Progress

    unmarked as a **Work In Progress**
    Toggle commit list
  • Huỳnh Thiên Phước @phuocht

    added 1 commit

    • 783bd215 - create Sign Up user

    Compare with previous version

    Aug 19, 2020

    added 1 commit

    • 783bd215 - create Sign Up user

    Compare with previous version

    added 1 commit * 783bd215 - create Sign Up user [Compare with previous version](https://gitlab.zigexn.vn/phuocht/venjob/merge_requests/10/diffs?diff_id=5111&start_sha=fe8b0e2d2771685fe2b8f29c69440fcf10c5ec93)
    Toggle commit list
  • Van Hau Le
    @haulv started a discussion on an old version of the diff Aug 20, 2020
    Last updated by Huỳnh Thiên Phước Aug 20, 2020
    config/routes.rb
    8 8 get '/login', to: 'sessions#new', as: :login
    9 9 delete '/logout', to: 'sessions#destroy', as: :logout
    10 10
    11 get '/register/1', to: 'confirmations#new', as: :register
    12 get '/register/2', to: 'confirmations#mail_register', as: :mail_register
    13
    14 get '/registation/3code=:confirm_token', to: 'users#registation', as: :registation
    • Van Hau Le @haulv commented Aug 20, 2020
      Master

      @phuocht url pattern sai rồi kìa e!

      @phuocht url pattern sai rồi kìa e!
    • Huỳnh Thiên Phước @phuocht commented Aug 20, 2020
      Master

      e thấy trong requirement của venjob a ơi

      e thấy trong requirement của venjob a ơi
    • Van Hau Le @haulv commented Aug 20, 2020
      Master

      @phuocht check lại xem đúng chuwa?

      @phuocht check lại xem đúng chuwa?
    • Huỳnh Thiên Phước @phuocht

      changed this line in version 4 of the diff

      Aug 20, 2020

      changed this line in version 4 of the diff

      changed this line in [version 4 of the diff](https://gitlab.zigexn.vn/phuocht/venjob/merge_requests/10/diffs?diff_id=5121&start_sha=02cc11928963f3cfaf60c00dc598a73b7f88ada8#e801163eb9182955dca3eb9817d59af634f6665d_14_14)
      Toggle commit list
    Please register or sign in to reply
  • Van Hau Le
    @haulv started a discussion on an old version of the diff Aug 20, 2020
    Last updated by Huỳnh Thiên Phước Aug 20, 2020
    config/routes.rb
    8 8 get '/login', to: 'sessions#new', as: :login
    9 9 delete '/logout', to: 'sessions#destroy', as: :logout
    10 10
    11 get '/register/1', to: 'confirmations#new', as: :register
    • Van Hau Le @haulv commented Aug 20, 2020
      Master

      @phuocht đặt tên alias theo kiểu này cho dễ hiểu đi em

      get '/register/1', to: 'confirmations#new', as: :register_step1
      get '/register/2', to: 'confirmations#mail_register', as: :register_step2
      Edited Aug 20, 2020 by Van Hau Le
      @phuocht đặt tên alias theo kiểu này cho dễ hiểu đi em ```ruby get '/register/1', to: 'confirmations#new', as: :register_step1 get '/register/2', to: 'confirmations#mail_register', as: :register_step2 ```
    • Huỳnh Thiên Phước @phuocht commented Aug 20, 2020
      Master

      dạ a

      dạ a
    • Huỳnh Thiên Phước @phuocht

      changed this line in version 3 of the diff

      Aug 20, 2020

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gitlab.zigexn.vn/phuocht/venjob/merge_requests/10/diffs?diff_id=5117&start_sha=783bd2159521b63c7b21a04a6461ef5b653ef9f8#e801163eb9182955dca3eb9817d59af634f6665d_11_11)
      Toggle commit list
    Please register or sign in to reply
  • Van Hau Le
    @haulv started a discussion on an old version of the diff Aug 20, 2020
    Last updated by Huỳnh Thiên Phước Aug 20, 2020
    app/models/confirmation.rb 0 → 100644
    1 class Confirmation < ApplicationRecord
    2 before_save { self.email = email.downcase }
    3 before_create :create_confirm_token
    • Van Hau Le @haulv commented Aug 20, 2020
      Master

      @phuocht

      before_save :create_confirm_token
      @phuocht ```ruby before_save :create_confirm_token ```
    • Huỳnh Thiên Phước @phuocht

      changed this line in version 3 of the diff

      Aug 20, 2020

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gitlab.zigexn.vn/phuocht/venjob/merge_requests/10/diffs?diff_id=5117&start_sha=783bd2159521b63c7b21a04a6461ef5b653ef9f8#351c0817184ba91c1ce94ba35049e4f8e1547c79_3_3)
      Toggle commit list
    Please register or sign in to reply
  • Van Hau Le
    @haulv started a discussion on an old version of the diff Aug 20, 2020
    Last updated by Huỳnh Thiên Phước Aug 20, 2020
    app/controllers/confirmations_controller.rb 0 → 100644
    1 class ConfirmationsController < ApplicationController
    2
    3 def new
    4 @user = Confirmation.new
    5 end
    6
    7 def create
    8 @user = Confirmation.new(email: params[:confirmation][:email].downcase)
    • Van Hau Le @haulv commented Aug 20, 2020
      Master

      @phuocht action này dùng lúc nào vậy?

      Edited Aug 20, 2020 by Van Hau Le
      @phuocht action này dùng lúc nào vậy?
    • Huỳnh Thiên Phước @phuocht commented Aug 20, 2020
      Master

      @haulv dùng để check validation đó a

      @haulv dùng để check validation đó a
    • Huỳnh Thiên Phước @phuocht

      changed this line in version 3 of the diff

      Aug 20, 2020

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gitlab.zigexn.vn/phuocht/venjob/merge_requests/10/diffs?diff_id=5117&start_sha=783bd2159521b63c7b21a04a6461ef5b653ef9f8#df145feadbe0c91e880b0441380065ffb4222c91_8_6)
      Toggle commit list
    Please register or sign in to reply
  • Huỳnh Thiên Phước @phuocht

    added 1 commit

    • 02cc1192 - create too expiration_date, modify condition email register

    Compare with previous version

    Aug 20, 2020

    added 1 commit

    • 02cc1192 - create too expiration_date, modify condition email register

    Compare with previous version

    added 1 commit * 02cc1192 - create too expiration_date, modify condition email register [Compare with previous version](https://gitlab.zigexn.vn/phuocht/venjob/merge_requests/10/diffs?diff_id=5117&start_sha=783bd2159521b63c7b21a04a6461ef5b653ef9f8)
    Toggle commit list
  • Van Hau Le
    @haulv started a discussion on an old version of the diff Aug 20, 2020
    Last updated by Huỳnh Thiên Phước Aug 20, 2020
    app/controllers/users_controller.rb
    17 18 end
    18 19 end
    19 20
    21 def registation
    22 @email = Confirmation.find_by(confirm_token: params[:confirm_token])
    23 return register_step1_path unless @email
    24 expiration_day = Time.zone.now - @email.updated_at
    • Van Hau Le @haulv commented Aug 20, 2020
      Master

      @phuocht move mấy cái message ra ngoài thành constant hoặc 1 file setting yaml cho dễ quản lý đi em! Check expire nhé!

      if @email.expired?
        flash[:danger] = "Link Confirmation is expiration too 24 hours to confirm. Please update your Email again!"
        redirect_to register_step1_path
      end
      @phuocht move mấy cái message ra ngoài thành constant hoặc 1 file setting yaml cho dễ quản lý đi em! Check expire nhé! ```ruby if @email.expired? flash[:danger] = "Link Confirmation is expiration too 24 hours to confirm. Please update your Email again!" redirect_to register_step1_path end ```
    • Huỳnh Thiên Phước @phuocht commented Aug 20, 2020
      Master

      dạ ok a để e tìm hiểu r move vào

      dạ ok a để e tìm hiểu r move vào
    • Huỳnh Thiên Phước @phuocht

      changed this line in version 4 of the diff

      Aug 20, 2020

      changed this line in version 4 of the diff

      changed this line in [version 4 of the diff](https://gitlab.zigexn.vn/phuocht/venjob/merge_requests/10/diffs?diff_id=5121&start_sha=02cc11928963f3cfaf60c00dc598a73b7f88ada8#28f48e0bc2718ddf87752d15b58a0016c13baf1c_24_22)
      Toggle commit list
    Please register or sign in to reply
  • Van Hau Le
    @haulv started a discussion on the diff Aug 20, 2020
    app/models/confirmation.rb 0 → 100644
    1 class Confirmation < ApplicationRecord
    2 before_save { self.email = email.downcase }
    3 before_save :create_confirm_token
    4 VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-]+(?:\.[a-z\d\-]+)*\.[a-z]+\z/i
    5 validates :email, presence: true, length: { maximum: 200 },
    6 format: { with: VALID_EMAIL_REGEX }, uniqueness: { case_sensitive: false }
    7
    8 def self.confirm_token
    9 SecureRandom.urlsafe_base64
    10 end
    11
    12 def self.digest(token)
    13 Digest::SHA1.hexdigest(token.to_s)
    14 end
    15
    • Van Hau Le @haulv commented Aug 20, 2020
      Master
      def expired?
        updated_at <= 24.hours.ago
      end
      ```ruby def expired? updated_at <= 24.hours.ago end ```
    Please register or sign in to reply
  • Van Hau Le
    @haulv started a discussion on the diff Aug 20, 2020
    Last updated by Huỳnh Thiên Phước Aug 20, 2020
    app/models/confirmation.rb 0 → 100644
    1 class Confirmation < ApplicationRecord
    2 before_save { self.email = email.downcase }
    3 before_save :create_confirm_token
    4 VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-]+(?:\.[a-z\d\-]+)*\.[a-z]+\z/i
    5 validates :email, presence: true, length: { maximum: 200 },
    6 format: { with: VALID_EMAIL_REGEX }, uniqueness: { case_sensitive: false }
    7
    8 def self.confirm_token
    9 SecureRandom.urlsafe_base64
    10 end
    11
    12 def self.digest(token)
    13 Digest::SHA1.hexdigest(token.to_s)
    14 end
    15
    • Van Hau Le @haulv commented Aug 20, 2020
      Master
      def expired?
        updated_at <= 24.hours.ago
      end
      ```ruby def expired? updated_at <= 24.hours.ago end ```
    • Huỳnh Thiên Phước @phuocht commented Aug 20, 2020
      Master

      tks a để e thử

      tks a để e thử
    Please register or sign in to reply
  • Huỳnh Thiên Phước @phuocht

    added 1 commit

    • 5f7e6e42 - create forgot password

    Compare with previous version

    Aug 20, 2020

    added 1 commit

    • 5f7e6e42 - create forgot password

    Compare with previous version

    added 1 commit * 5f7e6e42 - create forgot password [Compare with previous version](https://gitlab.zigexn.vn/phuocht/venjob/merge_requests/10/diffs?diff_id=5121&start_sha=02cc11928963f3cfaf60c00dc598a73b7f88ada8)
    Toggle commit list
  • Huỳnh Thiên Phước @phuocht

    added 1 commit

    • e5684e9f - move text flash to yaml file

    Compare with previous version

    Aug 21, 2020

    added 1 commit

    • e5684e9f - move text flash to yaml file

    Compare with previous version

    added 1 commit * e5684e9f - move text flash to yaml file [Compare with previous version](https://gitlab.zigexn.vn/phuocht/venjob/merge_requests/10/diffs?diff_id=5123&start_sha=5f7e6e42298814ece5841f7741cdc8d3c8d4ae8f)
    Toggle commit list
  • Van Hau Le
    @haulv started a discussion on an old version of the diff Aug 21, 2020
    Last updated by Huỳnh Thiên Phước Aug 24, 2020
    app/controllers/reset_passwords_controller.rb 0 → 100644
    1 class ResetPasswordsController < ApplicationController
    2
    3 def reset_password
    4 end
    5
    6 def sending_email
    7 @user = User.find_by(email: params[:reset_password][:email].downcase)
    8 unless @user
    9 flash[:danger] = ENV['sending_email_failed']
    10 redirect_to reset_password_step1_path
    • Van Hau Le @haulv commented Aug 21, 2020
      Master

      @phuocht move này ra dưới cùng, dùng 1 cái thôi, ko cần phải code ở cả trong if lẫn else

      @phuocht move này ra dưới cùng, dùng 1 cái thôi, ko cần phải code ở cả trong if lẫn else
    • Huỳnh Thiên Phước @phuocht commented Aug 21, 2020
      Master

      dạ a

      dạ a
    • Huỳnh Thiên Phước @phuocht

      changed this line in version 8 of the diff

      Aug 24, 2020

      changed this line in version 8 of the diff

      changed this line in [version 8 of the diff](https://gitlab.zigexn.vn/phuocht/venjob/merge_requests/10/diffs?diff_id=5135&start_sha=4fc05e8f4dab80b8aadd04144134780d6cec2ed7#0014cd558ad08dba453acf249899b31095f49e85_10_10)
      Toggle commit list
    Please register or sign in to reply
  • Van Hau Le
    @haulv started a discussion on an old version of the diff Aug 21, 2020
    Last updated by Huỳnh Thiên Phước Aug 24, 2020
    config/application.rb
    10 10 class Application < Rails::Application
    11 11 # Initialize configuration defaults for originally generated Rails version.
    12 12 config.load_defaults 5.2
    13 config.before_configuration do
    14 env_file = File.join(Rails.root, 'config', 'local_env.gitignore.yml')
    15 YAML.load(File.open(env_file)).each do |key, value|
    16 ENV[key.to_s] = value
    17 end if File.exists?(env_file)
    18
    19 text_file = File.join(Rails.root, 'config', 'text_flash.yml')
    • Van Hau Le @haulv commented Aug 21, 2020
      Master

      @phuocht file này là file config, nên để trong config nhe em! tham khảo thằng này https://github.com/rubyconfig/config

      @phuocht file này là file config, nên để trong config nhe em! tham khảo thằng này https://github.com/rubyconfig/config
    • Huỳnh Thiên Phước @phuocht commented Aug 21, 2020
      Master

      dạ ok e tham khảo r e sửa a

      dạ ok e tham khảo r e sửa a
    • Van Hau Le @haulv commented Aug 21, 2020
      Master

      @phuocht sửa code, chứ sửa a làm gì? png-clipart-rage-comic-internet-meme-trollface-internet-troll-meme-face-white-hand

      @phuocht sửa code, chứ sửa a làm gì? ![png-clipart-rage-comic-internet-meme-trollface-internet-troll-meme-face-white-hand](/uploads/d39165ce022681f884f7ac4e3e2967c9/png-clipart-rage-comic-internet-meme-trollface-internet-troll-meme-face-white-hand.png)
    • Huỳnh Thiên Phước @phuocht commented Aug 21, 2020
      Master

      :)))))

      :)))))
    • Huỳnh Thiên Phước @phuocht

      changed this line in version 6 of the diff

      Aug 24, 2020

      changed this line in version 6 of the diff

      changed this line in [version 6 of the diff](https://gitlab.zigexn.vn/phuocht/venjob/merge_requests/10/diffs?diff_id=5131&start_sha=e5684e9f6f6a810f3f42d498a88fe7393fe8b6ed#7ff7049c1c8745b54f0a9ef78996f60b38f36268_19_18)
      Toggle commit list
    Please register or sign in to reply
  • Van Hau Le
    @haulv started a discussion on an old version of the diff Aug 21, 2020
    Last updated by Huỳnh Thiên Phước Aug 24, 2020
    config/text_flash.yml 0 → 100644
    1 #GENERAL
    • Van Hau Le @haulv commented Aug 21, 2020
      Master

      phân cấp theo từng mục cho dễ đọc nhé em. Ví dụ:

      general_notify:
        update_success: "Updated Successfully"
        update_failure: "Updated failed!"
      
      user:
        sending_email_failed: 'Your Email invalid or not register
      ...
      phân cấp theo từng mục cho dễ đọc nhé em. Ví dụ: ```ruby general_notify: update_success: "Updated Successfully" update_failure: "Updated failed!" user: sending_email_failed: 'Your Email invalid or not register ... ```
    • Huỳnh Thiên Phước @phuocht commented Aug 21, 2020
      Master

      dạ a

      dạ a
    • Huỳnh Thiên Phước @phuocht

      changed this line in version 6 of the diff

      Aug 24, 2020

      changed this line in version 6 of the diff

      changed this line in [version 6 of the diff](https://gitlab.zigexn.vn/phuocht/venjob/merge_requests/10/diffs?diff_id=5131&start_sha=e5684e9f6f6a810f3f42d498a88fe7393fe8b6ed#0ea33f9e07b3ede238f0d2639596245e7b699f08_1_0)
      Toggle commit list
    Please register or sign in to reply
  • Huỳnh Thiên Phước @phuocht

    added 1 commit

    • 3ed5edd3 - set var for flash by gem config

    Compare with previous version

    Aug 24, 2020

    added 1 commit

    • 3ed5edd3 - set var for flash by gem config

    Compare with previous version

    added 1 commit * 3ed5edd3 - set var for flash by gem config [Compare with previous version](https://gitlab.zigexn.vn/phuocht/venjob/merge_requests/10/diffs?diff_id=5131&start_sha=e5684e9f6f6a810f3f42d498a88fe7393fe8b6ed)
    Toggle commit list
  • Van Hau Le
    @haulv started a discussion on an old version of the diff Aug 24, 2020
    Last updated by Huỳnh Thiên Phước Aug 24, 2020
    .gitignore
    29 29
    30 30 # Ignore master key for decrypting credentials and more.
    31 31 /config/master.key
    32
    33 config/settings.local.yml
    • Van Hau Le @haulv commented Aug 24, 2020
      Master

      @phuocht chỉ mấy file chứa biến env cần bảo mật nên ko đưa lên git. Còn những file setting / config thì phải đưa lên git nha e

      @phuocht chỉ mấy file chứa biến env cần bảo mật nên ko đưa lên git. Còn những file setting / config thì phải đưa lên git nha e
    • Huỳnh Thiên Phước @phuocht commented Aug 24, 2020
      Master

      dạ a v. để e set lại

      dạ a v. để e set lại
    • Huỳnh Thiên Phước @phuocht

      changed this line in version 7 of the diff

      Aug 24, 2020

      changed this line in version 7 of the diff

      changed this line in [version 7 of the diff](https://gitlab.zigexn.vn/phuocht/venjob/merge_requests/10/diffs?diff_id=5133&start_sha=3ed5edd3bc9255d710b7cffe1b298ee81b581c3d#a5cc2925ca8258af241be7e5b0381edf30266302_33_33)
      Toggle commit list
    Please register or sign in to reply
  • Huỳnh Thiên Phước @phuocht

    added 1 commit

    • 4fc05e8f - fix mentor's comment about .gitignore

    Compare with previous version

    Aug 24, 2020

    added 1 commit

    • 4fc05e8f - fix mentor's comment about .gitignore

    Compare with previous version

    added 1 commit * 4fc05e8f - fix mentor&#x27;s comment about .gitignore [Compare with previous version](https://gitlab.zigexn.vn/phuocht/venjob/merge_requests/10/diffs?diff_id=5133&start_sha=3ed5edd3bc9255d710b7cffe1b298ee81b581c3d)
    Toggle commit list
  • Huỳnh Thiên Phước @phuocht

    added 1 commit

    • 5aa6a5be - change level of development.yml, add callback in reset_password

    Compare with previous version

    Aug 24, 2020

    added 1 commit

    • 5aa6a5be - change level of development.yml, add callback in reset_password

    Compare with previous version

    added 1 commit * 5aa6a5be - change level of development.yml, add callback in reset_password [Compare with previous version](https://gitlab.zigexn.vn/phuocht/venjob/merge_requests/10/diffs?diff_id=5135&start_sha=4fc05e8f4dab80b8aadd04144134780d6cec2ed7)
    Toggle commit list
  • Huỳnh Thiên Phước @phuocht

    added 1 commit

    • f899b54c - Delete job_applieds_controller.rb

    Compare with previous version

    Aug 24, 2020

    added 1 commit

    • f899b54c - Delete job_applieds_controller.rb

    Compare with previous version

    added 1 commit * f899b54c - Delete job_applieds_controller.rb [Compare with previous version](https://gitlab.zigexn.vn/phuocht/venjob/merge_requests/10/diffs?diff_id=5139&start_sha=5aa6a5be41f5c865c1a034cba8f3064a5a3464bf)
    Toggle commit list
  • Van Hau Le @haulv

    mentioned in commit 7f1f8cc9

    Aug 24, 2020

    mentioned in commit 7f1f8cc9

    mentioned in commit 7f1f8cc9aa2ad1a42dce6a132a4d66a6253767fd
    Toggle commit list
  • Van Hau Le @haulv

    merged

    Aug 24, 2020

    merged

    merged
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
2
2 participants
Reference: phuocht/venjob!10
×

Revert this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.