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
  • Nguyen Hoang Mai Phuong
  • VeNJOB
  • Merge Requests
  • !9

Merged
Opened Aug 25, 2021 by Nguyen Hoang Mai Phuong@phuongnhm 
  • Report abuse
Report abuse

User

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b user origin/user

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 user

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 10
  • Commits 11
  • Pipelines 11
  • Changes 36
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Nguyen Hoang Mai Phuong @phuongnhm

    added 1 commit

    • e6aa06bd - fix controller registration

    Compare with previous version

    Aug 25, 2021

    added 1 commit

    • e6aa06bd - fix controller registration

    Compare with previous version

    added 1 commit * e6aa06bd - fix controller registration [Compare with previous version](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/9/diffs?diff_id=5438&start_sha=e1e384499bac1bbfc492243be15437fe1e06b9ed)
    Toggle commit list
  • Nguyen Hoang Mai Phuong @phuongnhm

    added 1 commit

    • 4a80d625 - fix name routes to redirect right requirement

    Compare with previous version

    Aug 25, 2021

    added 1 commit

    • 4a80d625 - fix name routes to redirect right requirement

    Compare with previous version

    added 1 commit * 4a80d625 - fix name routes to redirect right requirement [Compare with previous version](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/9/diffs?diff_id=5439&start_sha=e6aa06bd6fd460243fa34c0e67d3353b959d67f3)
    Toggle commit list
  • Nguyen Hoang Mai Phuong @phuongnhm

    added 1 commit

    • 823bc0ff - refactor controller

    Compare with previous version

    Aug 25, 2021

    added 1 commit

    • 823bc0ff - refactor controller

    Compare with previous version

    added 1 commit * 823bc0ff - refactor controller [Compare with previous version](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/9/diffs?diff_id=5440&start_sha=4a80d625a14338fa931ec1d9218fca936fba16e7)
    Toggle commit list
  • Nguyen Hoang Mai Phuong @phuongnhm

    added 1 commit

    • 6f1d6333 - fix routes

    Compare with previous version

    Aug 26, 2021

    added 1 commit

    • 6f1d6333 - fix routes

    Compare with previous version

    added 1 commit * 6f1d6333 - fix routes [Compare with previous version](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/9/diffs?diff_id=5442&start_sha=823bc0ff8da0157e62d1ce700c084a1aad23e992)
    Toggle commit list
  • Nguyen Hoang Mai Phuong @phuongnhm

    added 1 commit

    • 8829b3b6 - fix style code

    Compare with previous version

    Aug 26, 2021

    added 1 commit

    • 8829b3b6 - fix style code

    Compare with previous version

    added 1 commit * 8829b3b6 - fix style code [Compare with previous version](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/9/diffs?diff_id=5443&start_sha=6f1d633347857217446cb0d781ab26ccec806002)
    Toggle commit list
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Aug 26, 2021
    Last updated by Nguyen Hoang Mai Phuong Aug 26, 2021
    app/assets/stylesheets/custom.scss
    157 157 .form-control {
    158 158 color: $danger;
    159 159 }
    160 }
    161
    162 .alert-error {
    163 background-color: #f2dede;
    • Thanh Hung Pham @hungpt commented Aug 26, 2021
      Master

      @phuongnhm mấy cái mã màu này em dùng lại nhiều. em khai báo biến để dùng lại nha.

      • Tham Khảo: https://sass-lang.com/documentation/variables

      • Anh thấy class .alert-error vs .alert-alert giống nhau mà. Em có thể define

      .alert-error .alert-alert {
        background-color: #f2dede;
        border-color: #eed3d7;
        color: #b94a48;
        text-align: left;
      }
      
      • Tương tự .alert-success vs .alert-notice
      Edited Aug 26, 2021 by Thanh Hung Pham
      @phuongnhm mấy cái mã màu này em dùng lại nhiều. em khai báo biến để dùng lại nha. - Tham Khảo: https://sass-lang.com/documentation/variables - Anh thấy class `.alert-error` vs `.alert-alert` giống nhau mà. Em có thể define ``` .alert-error .alert-alert { background-color: #f2dede; border-color: #eed3d7; color: #b94a48; text-align: left; } ``` - Tương tự `.alert-success` vs `.alert-notice`
    • Nguyen Hoang Mai Phuong @phuongnhm

      changed this line in version 8 of the diff

      Aug 26, 2021

      changed this line in version 8 of the diff

      changed this line in [version 8 of the diff](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/9/diffs?diff_id=5445&start_sha=d3fde0de01917d51cc5edf4dbb4ab24a53ac1dc9#79a66919b2dd7890dc5d183a3a7a2dd60f7447b3_163_164)
      Toggle commit list
    Please register or sign in to reply
  • Nguyen Hoang Mai Phuong @phuongnhm

    added 1 commit

    • d3fde0de - fix validate upload file

    Compare with previous version

    Aug 26, 2021

    added 1 commit

    • d3fde0de - fix validate upload file

    Compare with previous version

    added 1 commit * d3fde0de - fix validate upload file [Compare with previous version](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/9/diffs?diff_id=5444&start_sha=8829b3b6702d5f55ed7146e91872d6922d218dd8)
    Toggle commit list
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Aug 26, 2021
    Last updated by Nguyen Hoang Mai Phuong Aug 26, 2021
    app/views/layouts/application.html.slim
    13 13 body.bg-light
    14 14 = render 'layouts/header'
    15 15 .container
    16 / p.notice= notice
    • Thanh Hung Pham @hungpt commented Aug 26, 2021
      Master

      @phuongnhm code không dùng xóa nha em

      @phuongnhm code không dùng xóa nha em
    • Nguyen Hoang Mai Phuong @phuongnhm

      changed this line in version 8 of the diff

      Aug 26, 2021

      changed this line in version 8 of the diff

      changed this line in [version 8 of the diff](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/9/diffs?diff_id=5445&start_sha=d3fde0de01917d51cc5edf4dbb4ab24a53ac1dc9#58e8d4fee0064dd4b253a2ea5eeaa4c21becb071_16_16)
      Toggle commit list
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Aug 26, 2021
    Last updated by Nguyen Hoang Mai Phuong Aug 26, 2021
    db/migrate/20210818152915_authenticatable_registerable_trackable_confirmable_to_user.rb 0 → 100644
    1 class AuthenticatableRegisterableTrackableConfirmableToUser < ActiveRecord::Migration[6.1]
    2 def change
    3 change_table :users do |t|
    4 # Database authenticatable
    5 # t.string :email#, null: false, default: ""
    6 t.string :encrypted_password, null: false, default: ""
    7
    8 ## Recoverable
    9 t.string :reset_password_token
    10 t.datetime :reset_password_sent_at
    11
    12 ## Rememberable
    13 t.datetime :remember_created_at
    14
    15 ## Trackable
    16 t.integer :sign_in_count, default: 0, null: false
    • Thanh Hung Pham @hungpt commented Aug 26, 2021
      Master

      @phuongnhm Mình có cần chức năng Trackable không em? không cần implement hết của devise vào.

      @phuongnhm Mình có cần chức năng `Trackable` không em? không cần implement hết của devise vào.
    • Nguyen Hoang Mai Phuong @phuongnhm

      changed this line in version 8 of the diff

      Aug 26, 2021

      changed this line in version 8 of the diff

      changed this line in [version 8 of the diff](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/9/diffs?diff_id=5445&start_sha=d3fde0de01917d51cc5edf4dbb4ab24a53ac1dc9#a2ba03b0963ad9e7e9155c6dfebe49eb02791f88_16_16)
      Toggle commit list
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on the diff Aug 26, 2021
    Resolved by Thanh Hung Pham Aug 26, 2021
    app/models/user.rb
    1 1 class User < ApplicationRecord
    2 has_one_attached :cv
    2 3 has_many :apply_jobs, dependent: :destroy
    3 4 has_many :favorite_jobs, dependent: :destroy
    4 5 has_many :history_jobs, dependent: :destroy
    5 end
    6 VALID_FILE_UPLOAD = %w[application/msword application/pdf application/xls application/xlsx application/zip].freeze
    7 devise :database_authenticatable, :registerable,
    • Thanh Hung Pham @hungpt commented Aug 26, 2021
      Master

      @phuongnhm Mình có cần chức năng Trackable không em?

      Edited Aug 26, 2021
      @phuongnhm Mình có cần chức năng `Trackable` không em?
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Aug 26, 2021
    Last updated by Nguyen Hoang Mai Phuong Aug 26, 2021
    config/routes.rb
    8 8 get 'apply', to: 'apply_jobs#new'
    9 9 post 'confirm', to: 'apply_jobs#confirm'
    10 10 post 'done', to: 'apply_jobs#done'
    11 devise_for :users, skip: %i[sessions registrations passwords], controllers: { confirmations: 'users/confirmations' }
    12 resources :users, only: :show
    • Thanh Hung Pham @hungpt commented Aug 26, 2021
      Master

      @phuongnhm 2 paths này có vẻ giống nhau?

      resources :users, only: :show
      get '/my', to: 'users#show'
      @phuongnhm 2 paths này có vẻ giống nhau? ``` resources :users, only: :show get '/my', to: 'users#show' ```
    • Nguyen Hoang Mai Phuong @phuongnhm

      changed this line in version 8 of the diff

      Aug 26, 2021

      changed this line in version 8 of the diff

      changed this line in [version 8 of the diff](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/9/diffs?diff_id=5445&start_sha=d3fde0de01917d51cc5edf4dbb4ab24a53ac1dc9#e801163eb9182955dca3eb9817d59af634f6665d_12_12)
      Toggle commit list
    Please register or sign in to reply
  • Nguyen Hoang Mai Phuong @phuongnhm

    added 1 commit

    • 178c8547 - fix routes user and css flash

    Compare with previous version

    Aug 26, 2021

    added 1 commit

    • 178c8547 - fix routes user and css flash

    Compare with previous version

    added 1 commit * 178c8547 - fix routes user and css flash [Compare with previous version](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/9/diffs?diff_id=5445&start_sha=d3fde0de01917d51cc5edf4dbb4ab24a53ac1dc9)
    Toggle commit list
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Aug 26, 2021
    Last updated by Nguyen Hoang Mai Phuong Aug 27, 2021
    app/assets/stylesheets/flash.scss 0 → 100644
    1 $background-error-alert-color:#f2dede;
    • Thanh Hung Pham @hungpt commented Aug 26, 2021
      Master

      @phuongnhm Sửa lại tên file hợp lý hơn nha em. File này mình chỉ lưu colors cho cả project luôn, nên đặt colors.scss chẳng hạn

      @phuongnhm Sửa lại tên file hợp lý hơn nha em. File này mình chỉ lưu colors cho cả project luôn, nên đặt `colors.scss` chẳng hạn
    • Nguyen Hoang Mai Phuong @phuongnhm

      changed this line in version 9 of the diff

      Aug 27, 2021

      changed this line in version 9 of the diff

      changed this line in [version 9 of the diff](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/9/diffs?diff_id=5446&start_sha=178c8547a1d8937ff69480edf85697def3916daf#793c42cc849d1fc1ed2c04b29d2ba7a5ce97d574_1_0)
      Toggle commit list
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Aug 26, 2021
    Last updated by Nguyen Hoang Mai Phuong Aug 27, 2021
    app/assets/stylesheets/custom.scss
    162 }
    163
    164 .alert-error, .alert-alert {
    165 background-color: $background-error-alert-color;
    166 border-color: $border-error-alert-color;
    167 color: $error-alert-color;
    168 text-align: left;
    169 }
    170
    171 .alert-success {
    • Thanh Hung Pham @hungpt commented Aug 26, 2021
      Master

      @phuongnhm Còn 2 class này nữa em? Nội dung nó giống nhau kìa. .alert-success vs .alert-notice

      Edited Aug 26, 2021 by Thanh Hung Pham
      @phuongnhm Còn 2 class này nữa em? Nội dung nó giống nhau kìa. `.alert-success` vs `.alert-notice`
    • Nguyen Hoang Mai Phuong @phuongnhm

      changed this line in version 9 of the diff

      Aug 27, 2021

      changed this line in version 9 of the diff

      changed this line in [version 9 of the diff](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/9/diffs?diff_id=5446&start_sha=178c8547a1d8937ff69480edf85697def3916daf#79a66919b2dd7890dc5d183a3a7a2dd60f7447b3_171_171)
      Toggle commit list
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Aug 26, 2021
    Last updated by Nguyen Hoang Mai Phuong Aug 27, 2021
    app/models/user.rb
    1 1 class User < ApplicationRecord
    2 has_one_attached :cv
    2 3 has_many :apply_jobs, dependent: :destroy
    3 4 has_many :favorite_jobs, dependent: :destroy
    4 5 has_many :history_jobs, dependent: :destroy
    5 end
    6 devise :database_authenticatable, :registerable,
    7 :recoverable, :rememberable, :validatable,
    8 :confirmable
    9 validates :name, length: { maximum: 200 }
    10 validates :email, length: { maximum: 200 }, uniqueness: true
    • Thanh Hung Pham @hungpt commented Aug 26, 2021
      Master

      @phuongnhm Validate thêm email format nữa em. Giống bên Apply Job á

      @phuongnhm Validate thêm email format nữa em. Giống bên Apply Job á
    • Nguyen Hoang Mai Phuong @phuongnhm

      changed this line in version 9 of the diff

      Aug 27, 2021

      changed this line in version 9 of the diff

      changed this line in [version 9 of the diff](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/9/diffs?diff_id=5446&start_sha=178c8547a1d8937ff69480edf85697def3916daf#4ed0c03b53dbc8320da88e7887465514cd9e90a4_10_11)
      Toggle commit list
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Aug 26, 2021
    Last updated by Nguyen Hoang Mai Phuong Aug 27, 2021
    app/views/users/registrations/new.html.slim 0 → 100644
    1 h2.p-3.text-center
    2 | Register
    3 .row
    4 .col-md-6.offset-md-3.form-apply
    5 = form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|
    6 = render 'shared/error_messages', object: resource
    7 .card
    8 .card-body
    9 .field
    10 = f.label :name, "Full Name"
    11 br
    12 = f.text_field :name, required: true, length: { maximum: 200 }, class: 'form-control'
    13 .field
    14 = f.label :email
    15 br
    16 = f.email_field :email, required: true, length: { maximum: 200 }, autofocus: true, autocomplete: "email", class: 'form-control'
    • Thanh Hung Pham @hungpt commented Aug 26, 2021
      Master

      @phuongnhm em để thuộc tính autofocus: true ở email không hợp lý nha. Email nằm sau Full Name mà. Lúc mới vào form phải focus vào Full Name chứ Screenshot_from_2021-08-26_17-44-24

      Edited Aug 26, 2021 by Thanh Hung Pham
      @phuongnhm em để thuộc tính `autofocus: true` ở `email` không hợp lý nha. Email nằm sau `Full Name` mà. Lúc mới vào form phải focus vào `Full Name` chứ ![Screenshot_from_2021-08-26_17-44-24](/uploads/3e4e61e7f7212508130e29d5a10b3b56/Screenshot_from_2021-08-26_17-44-24.png)
    • Nguyen Hoang Mai Phuong @phuongnhm

      changed this line in version 9 of the diff

      Aug 27, 2021

      changed this line in version 9 of the diff

      changed this line in [version 9 of the diff](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/9/diffs?diff_id=5446&start_sha=178c8547a1d8937ff69480edf85697def3916daf#b50948823382b185b3e9128977620f9f0d9f1016_16_16)
      Toggle commit list
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on the diff Aug 26, 2021
    Resolved by Thanh Hung Pham Aug 27, 2021
    app/views/users/show.html.slim 0 → 100644
    1 h2.p-3.text-center
    • Thanh Hung Pham @hungpt commented Aug 26, 2021
      Master

      @phuongnhm Màn hình này show thông tin lên mà sao edit textboxđược vậy em? Screenshot_from_2021-08-26_17-49-26

      Edited Aug 27, 2021
      @phuongnhm Màn hình này show thông tin lên mà sao edit textboxđược vậy em? ![Screenshot_from_2021-08-26_17-49-26](/uploads/dd7c5c48ffcaaa7d85ce4b4c0aff3490/Screenshot_from_2021-08-26_17-49-26.png)
    Please register or sign in to reply
  • Nguyen Hoang Mai Phuong @phuongnhm

    added 1 commit

    • f0256ebb - add validate email and fix style code

    Compare with previous version

    Aug 27, 2021

    added 1 commit

    • f0256ebb - add validate email and fix style code

    Compare with previous version

    added 1 commit * f0256ebb - add validate email and fix style code [Compare with previous version](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/9/diffs?diff_id=5446&start_sha=178c8547a1d8937ff69480edf85697def3916daf)
    Toggle commit list
  • Thanh Hung Pham @hungpt

    mentioned in commit f99a3f7b

    Aug 27, 2021

    mentioned in commit f99a3f7b

    mentioned in commit f99a3f7bcca8af82b6074d82c21bee2141d0f663
    Toggle commit list
  • Thanh Hung Pham @hungpt

    merged

    Aug 27, 2021

    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: phuongnhm/VeNJOB!9
×

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.