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 Ngoc Nghia
  • VeNJOB
  • Merge Requests
  • !12

Merged
Opened Dec 12, 2019 by Nguyen Ngoc Nghia@nghiann 
  • Report abuse
Report abuse

Feature/city page

  • Show 2 region: Vietnam and International, when click each region, scroll down to region's cities.
  • Show all cities in database on City page and also on Top page.
  • Not count jobs yet and not direct to job list when click city (will done later in another feature).

city_page

Edited Dec 12, 2019 by Nguyen Ngoc Nghia
×

Check out, review, and merge locally

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

git fetch origin
git checkout -b feature/city_page origin/feature/city_page

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 feature/city_page

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 14
  • Commits 14
  • Changes 15
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Son Do Hong
    @sondh started a discussion on an old version of the diff Dec 12, 2019
    Automatically resolved by Nguyen Ngoc Nghia with a push Dec 12, 2019
    app/controllers/cities_controller.rb
    1 1 class CitiesController < ApplicationController
    2 2 def index
    3 @cities = City.all
    3 @cities = City.page(params[:page]).per(Settings.col.page.per)
    • Son Do Hong @sondh commented Dec 12, 2019
      Master

      a nghĩ nên để là Settings.city.per_page Settings.job.per_page

      Mục đích của mình khi dùng setting là để đọc code dễ hiểu, và sau này khi muốn thay đổi thì sẽ dễ dàng.

      Nếu bây giờ đổi yêu cầu chút là show 6 city và 10 job, thì em sẽ phải đi sửa trong code rất nhiều chỗ thay vì chỉ sửa file settings.yml

      a nghĩ nên để là `Settings.city.per_page` `Settings.job.per_page` Mục đích của mình khi dùng setting là để đọc code dễ hiểu, và sau này khi muốn thay đổi thì sẽ dễ dàng. Nếu bây giờ đổi yêu cầu chút là show 6 city và 10 job, thì em sẽ phải đi sửa trong code rất nhiều chỗ thay vì chỉ sửa file `settings.yml`
    • Nguyen Ngoc Nghia @nghiann

      changed this line in version 2 of the diff

      Dec 12, 2019

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/12/diffs?diff_id=4458&start_sha=02011a75f06535e23cb3147f01de901d6280d917#9331f3d6803b80e59ba5cd648677b3c6869d2ac8_3_3)
      Toggle commit list
    Please register or sign in to reply
  • Nguyen Ngoc Nghia @nghiann

    resolved all discussions

    Dec 12, 2019

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Nguyen Ngoc Nghia @nghiann

    added 1 commit

    • 0affded5 - edit setting.yml

    Compare with previous version

    Dec 12, 2019

    added 1 commit

    • 0affded5 - edit setting.yml

    Compare with previous version

    added 1 commit * 0affded5 - edit setting.yml [Compare with previous version](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/12/diffs?diff_id=4458&start_sha=02011a75f06535e23cb3147f01de901d6280d917)
    Toggle commit list
  • Son Do Hong
    @sondh started a discussion on an old version of the diff Dec 12, 2019
    Automatically resolved by Nguyen Ngoc Nghia with a push Dec 12, 2019
    app/views/cities/index.html.erb
    2 <div class="container jumbotron">
    3 <h1>City List</h1>
    4 <div class="row">
    5 <div class="col-sm">
    6 <a href="#vietnam">
    7 <div class="tag">Vietnam</div>
    8 </a>
    9 </div>
    10 <div class="col-sm">
    11 <a href="#interational">
    12 <div class="tag">International</div>
    13 </a>
    14 </div>
    15 </div>
    16 </div>
    17 </div><br>
    • Son Do Hong @sondh commented Dec 12, 2019
      Master

      ko dùng br để tạo khoảng trống nhé, sử dụng css padding/margin để làm việc này

      ko dùng br để tạo khoảng trống nhé, sử dụng css padding/margin để làm việc này
    • Nguyen Ngoc Nghia @nghiann

      changed this line in version 3 of the diff

      Dec 12, 2019

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/12/diffs?diff_id=4459&start_sha=0affded55d3f9e98d4622e05019b399b706f9266#72745993370f54722877a5d8c7c16981ee972277_17_15)
      Toggle commit list
    Please register or sign in to reply
  • Son Do Hong
    @sondh started a discussion on an old version of the diff Dec 12, 2019
    Automatically resolved by Nguyen Ngoc Nghia with a push Dec 12, 2019
    app/views/jobs/index.html.erb
    1 <%= render partial: "jobs/job", collection: @jobs %>
    1 <table class="table">
    2 <tbody>
    3 <ul class="table">
    • Son Do Hong @sondh commented Dec 12, 2019
      Master

      sao lại có cá ul ở đây nhỉ,

      sao lại có cá ul ở đây nhỉ,
    • Nguyen Ngoc Nghia @nghiann

      changed this line in version 3 of the diff

      Dec 12, 2019

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/12/diffs?diff_id=4459&start_sha=0affded55d3f9e98d4622e05019b399b706f9266#fd4909543e4d41ae0af907baf233a50d8e08d125_3_3)
      Toggle commit list
    Please register or sign in to reply
  • Son Do Hong
    @sondh started a discussion on an old version of the diff Dec 12, 2019
    Automatically resolved by Nguyen Ngoc Nghia with a push Dec 12, 2019
    app/views/jobs/index.html.erb
    1 <%= render partial: "jobs/job", collection: @jobs %>
    1 <table class="table">
    • Son Do Hong @sondh commented Dec 12, 2019
      Master

      trang này sẽ không dùng table nhé, sử dụng div bình thường thôi

      trang này sẽ không dùng table nhé, sử dụng div bình thường thôi
    • Nguyen Ngoc Nghia @nghiann commented Dec 12, 2019
      Master

      trang này e làm để show tất cả các job trong table, còn các <td> e để bên _job.html.erb

      Edited Dec 12, 2019 by Nguyen Ngoc Nghia
      trang này e làm để show tất cả các job trong table, còn các `<td>` e để bên `_job.html.erb`
    • Son Do Hong @sondh commented Dec 12, 2019
      Master

      @nghiann ý a là layout trang này sẽ không dùng table ấy

      @nghiann ý a là layout trang này sẽ không dùng table ấy
    • Son Do Hong @sondh commented Dec 12, 2019
      Master

      đây là product của cty mình này, nhìn layout thử coi https://arubaito-ex.jp/search?kw=&form_type=header_search

      đây là product của cty mình này, nhìn layout thử coi https://arubaito-ex.jp/search?kw=&form_type=header_search
    • Nguyen Ngoc Nghia @nghiann

      changed this line in version 6 of the diff

      Dec 12, 2019

      changed this line in version 6 of the diff

      changed this line in [version 6 of the diff](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/12/diffs?diff_id=4462&start_sha=544d48b937a404a425470d395f0daf9925133f31#fd4909543e4d41ae0af907baf233a50d8e08d125_1_1)
      Toggle commit list
    Please register or sign in to reply
  • Son Do Hong
    @sondh started a discussion on an old version of the diff Dec 12, 2019
    Automatically resolved by Nguyen Ngoc Nghia with a push Dec 12, 2019
    app/views/cities/index.html.erb
    1 <%= render partial: "cities/city", collection: @cities %>
    1 <div class="text-center">
    • Son Do Hong @sondh commented Dec 12, 2019
      Master

      nhiều div quá, e bỏ cái class text-center vào trong cái div dưới là được

      nhiều div quá, e bỏ cái class text-center vào trong cái div dưới là được
    • Nguyen Ngoc Nghia @nghiann

      changed this line in version 3 of the diff

      Dec 12, 2019

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/12/diffs?diff_id=4459&start_sha=0affded55d3f9e98d4622e05019b399b706f9266#72745993370f54722877a5d8c7c16981ee972277_1_1)
      Toggle commit list
    Please register or sign in to reply
  • Son Do Hong
    @sondh started a discussion on an old version of the diff Dec 12, 2019
    Resolved by Son Do Hong Dec 12, 2019
    app/views/cities/_city.html.erb
    1 <li class="list-group-item"><%= city.name %></li>
    1 <div class="col-show"><%= city.name %></div>
    • Son Do Hong @sondh commented Dec 12, 2019
      Master

      thiếu job count

      thiếu job count
    • Nguyen Ngoc Nghia @nghiann commented Dec 12, 2019
      Master

      sau phần show job này e sẽ làm phần city_jobs để đếm job trong 1 feature khác luôn a

      Edited Dec 12, 2019 by Nguyen Ngoc Nghia
      sau phần show job này e sẽ làm phần city_jobs để đếm job trong 1 feature khác luôn a
    • Nguyen Ngoc Nghia @nghiann

      changed this line in version 8 of the diff

      Dec 12, 2019

      changed this line in version 8 of the diff

      changed this line in [version 8 of the diff](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/12/diffs?diff_id=4464&start_sha=b196b898de2836d81aa73affb3414bf66af4de81#140e9386497ae5ab399fa6c34c5e8d27cd92fd63_1_1)
      Toggle commit list
    Please register or sign in to reply
  • Nguyen Ngoc Nghia @nghiann

    added 1 commit

    • 4c505547 - delete <br>

    Compare with previous version

    Dec 12, 2019

    added 1 commit

    • 4c505547 - delete <br>

    Compare with previous version

    added 1 commit * 4c505547 - delete &lt;br&gt; [Compare with previous version](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/12/diffs?diff_id=4459&start_sha=0affded55d3f9e98d4622e05019b399b706f9266)
    Toggle commit list
  • Nguyen Ngoc Nghia @nghiann

    changed the description

    Dec 12, 2019

    changed the description

    changed the description
    Toggle commit list
  • Nguyen Ngoc Nghia @nghiann

    changed the description

    Dec 12, 2019

    changed the description

    changed the description
    Toggle commit list
  • Nguyen Ngoc Nghia @nghiann

    changed the description

    Dec 12, 2019

    changed the description

    changed the description
    Toggle commit list
  • Nguyen Ngoc Nghia @nghiann

    added 1 commit

    • 7837bc7e - smooth scroll

    Compare with previous version

    Dec 12, 2019

    added 1 commit

    • 7837bc7e - smooth scroll

    Compare with previous version

    added 1 commit * 7837bc7e - smooth scroll [Compare with previous version](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/12/diffs?diff_id=4460&start_sha=4c50554739cb0e20ac5137ca317654624cff78a8)
    Toggle commit list
  • Nguyen Ngoc Nghia @nghiann

    changed the description

    Dec 12, 2019

    changed the description

    changed the description
    Toggle commit list
  • Nguyen Ngoc Nghia @nghiann

    added 1 commit

    • 544d48b9 - edit top page

    Compare with previous version

    Dec 12, 2019

    added 1 commit

    • 544d48b9 - edit top page

    Compare with previous version

    added 1 commit * 544d48b9 - edit top page [Compare with previous version](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/12/diffs?diff_id=4461&start_sha=7837bc7edde65af23ffd059df174e3de962cba8b)
    Toggle commit list
  • Nguyen Ngoc Nghia @nghiann

    added 1 commit

    • 7cf836da - display job in div

    Compare with previous version

    Dec 12, 2019

    added 1 commit

    • 7cf836da - display job in div

    Compare with previous version

    added 1 commit * 7cf836da - display job in div [Compare with previous version](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/12/diffs?diff_id=4462&start_sha=544d48b937a404a425470d395f0daf9925133f31)
    Toggle commit list
  • Son Do Hong
    @sondh started a discussion on an old version of the diff Dec 12, 2019
    Automatically resolved by Nguyen Ngoc Nghia with a push Dec 12, 2019
    app/views/jobs/index.html.erb
    1 <%= render partial: "jobs/job", collection: @jobs %>
    1 <div class="job-list">
    • Son Do Hong @sondh commented Dec 12, 2019
      Master

      có sử dụng class này ở đâu không, nếu k thì bỏ đi

      có sử dụng class này ở đâu không, nếu k thì bỏ đi
    • Son Do Hong @sondh commented Dec 12, 2019
      Master

      tương tự các chố khác nữa

      tương tự các chố khác nữa
    • Nguyen Ngoc Nghia @nghiann

      changed this line in version 7 of the diff

      Dec 12, 2019

      changed this line in version 7 of the diff

      changed this line in [version 7 of the diff](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/12/diffs?diff_id=4463&start_sha=7cf836da0a07ca0eb44e4aa30b4b1e8d654b7b31#fd4909543e4d41ae0af907baf233a50d8e08d125_1_1)
      Toggle commit list
    Please register or sign in to reply
  • Son Do Hong
    @sondh started a discussion on an old version of the diff Dec 12, 2019
    Automatically resolved by Nguyen Ngoc Nghia with a push Dec 12, 2019
    app/views/cities/index.html.erb
    8 </div>
    9 <div class="col-sm">
    10 <a href="#interational">
    11 <div class="tag">International</div>
    12 </a>
    13 </div>
    14 </div>
    15 </div>
    16
    17 <div class="container-fluid">
    18 <div class="tag text-center" id="vietnam">Vietnam</div>
    19 <div class="row row-cols-5">
    20 <%= render partial: "cities/city", collection: @cities %>
    21 </div>
    22 </div>
    23 <%= paginate @cities %>
    • Son Do Hong @sondh commented Dec 12, 2019
      Master

      indent

      indent
    • Nguyen Ngoc Nghia @nghiann

      changed this line in version 7 of the diff

      Dec 12, 2019

      changed this line in version 7 of the diff

      changed this line in [version 7 of the diff](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/12/diffs?diff_id=4463&start_sha=7cf836da0a07ca0eb44e4aa30b4b1e8d654b7b31#72745993370f54722877a5d8c7c16981ee972277_23_23)
      Toggle commit list
    Please register or sign in to reply
  • Son Do Hong
    @sondh started a discussion on an old version of the diff Dec 12, 2019
    Automatically resolved by Nguyen Ngoc Nghia with a push Dec 12, 2019
    app/controllers/cities_controller.rb
    1 1 class CitiesController < ApplicationController
    2 2 def index
    3 @cities = City.all
    3 @cities = City.page(params[:page]).per(Settings.city.per_page)
    • Son Do Hong @sondh commented Dec 12, 2019
      Master

      em sẽ phải xử lí 2 loại cities ở đây, 1 là cities của Vietnam, 2 là cities khác Vietnam

      theo anh chỗ này k cần xử lí phân trang, vì khi phân trang sẽ làm việc xử lí ngoài view trở nên phức tạp hơn.

      em sẽ phải xử lí 2 loại cities ở đây, 1 là cities của Vietnam, 2 là cities khác Vietnam theo anh chỗ này k cần xử lí phân trang, vì khi phân trang sẽ làm việc xử lí ngoài view trở nên phức tạp hơn.
    • Nguyen Ngoc Nghia @nghiann

      changed this line in version 7 of the diff

      Dec 12, 2019

      changed this line in version 7 of the diff

      changed this line in [version 7 of the diff](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/12/diffs?diff_id=4463&start_sha=7cf836da0a07ca0eb44e4aa30b4b1e8d654b7b31#9331f3d6803b80e59ba5cd648677b3c6869d2ac8_3_3)
      Toggle commit list
    Please register or sign in to reply
  • Nguyen Ngoc Nghia @nghiann

    resolved all discussions

    Dec 12, 2019

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Nguyen Ngoc Nghia @nghiann

    added 1 commit

    • b196b898 - no need paginate city

    Compare with previous version

    Dec 12, 2019

    added 1 commit

    • b196b898 - no need paginate city

    Compare with previous version

    added 1 commit * b196b898 - no need paginate city [Compare with previous version](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/12/diffs?diff_id=4463&start_sha=7cf836da0a07ca0eb44e4aa30b4b1e8d654b7b31)
    Toggle commit list
  • Nguyen Ngoc Nghia @nghiann

    resolved all discussions

    Dec 12, 2019

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Nguyen Ngoc Nghia @nghiann

    added 2 commits

    • 806cc5e8 - delete unused class
    • 3559d8ab - using scope

    Compare with previous version

    Dec 12, 2019

    added 2 commits

    • 806cc5e8 - delete unused class
    • 3559d8ab - using scope

    Compare with previous version

    added 2 commits * 806cc5e8 - delete unused class * 3559d8ab - using scope [Compare with previous version](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/12/diffs?diff_id=4464&start_sha=b196b898de2836d81aa73affb3414bf66af4de81)
    Toggle commit list
  • Nguyen Ngoc Nghia @nghiann

    added 1 commit

    • ffc5ab70 - edit scope in city.rb

    Compare with previous version

    Dec 12, 2019

    added 1 commit

    • ffc5ab70 - edit scope in city.rb

    Compare with previous version

    added 1 commit * ffc5ab70 - edit scope in city.rb [Compare with previous version](https://gitlab.zigexn.vn/nghiann/VeNJOB/merge_requests/12/diffs?diff_id=4465&start_sha=3559d8ab3fa243d8c3627f27cdc18cbf8e8e8fd7)
    Toggle commit list
  • Nguyen Ngoc Nghia @nghiann

    changed the description

    Dec 12, 2019

    changed the description

    changed the description
    Toggle commit list
  • Son Do Hong @sondh

    mentioned in commit 98be312e

    Dec 12, 2019

    mentioned in commit 98be312e

    mentioned in commit 98be312e32d8038d09eae6308c797ea3c5fbfd78
    Toggle commit list
  • Son Do Hong @sondh

    merged

    Dec 12, 2019

    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
Nguyen Ngoc Nghia
Assignee
Nguyen Ngoc Nghia @nghiann
Assign to
None
Milestone
None
Assign milestone
Time tracking
2
2 participants
Reference: nghiann/VeNJOB!12
×

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.