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
  • !3

Merged
Opened Jul 26, 2021 by Nguyen Hoang Mai Phuong@phuongnhm 
  • Report abuse
Report abuse

create top page ID1

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b page-ID1 origin/page-ID1

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 page-ID1

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 31
  • Commits 7
  • Pipelines 6
  • Changes 18
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Jul 26, 2021
    Resolved by Nguyen Hoang Mai Phuong Jul 27, 2021
    Gemfile
    7 7 gem 'rails', '~> 6.1.3', '>= 6.1.3.2'
    8 8 gem 'bootstrap', '~> 5.0.1'
    9 9 gem 'nokogiri', '~> 1.11', '>= 1.11.7'
    10 gem 'html2slim'
    • Thanh Hung Pham @hungpt commented Jul 26, 2021
      Master

      @phuongnhm Gem này chỉ cùng 1 lần để convert mấy file erb cũ thành slim à. Em không cần thêm vào source. Xóa đi và chạy bundle install rồi commit Gemfile vs Gemfile.lock lên là OK

      @phuongnhm Gem này chỉ cùng 1 lần để convert mấy file `erb` cũ thành `slim` à. Em không cần thêm vào source. Xóa đi và chạy `bundle install` rồi commit Gemfile vs Gemfile.lock lên là OK
    • Nguyen Hoang Mai Phuong @phuongnhm

      changed this line in version 2 of the diff

      Jul 27, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/3/diffs?diff_id=5360&start_sha=07c588589dabcc582d3abbec34cd942450a957fc#de3150c01c3a946a6168173c4116741379fe3579_10_10)
      Toggle commit list
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Jul 26, 2021
    Resolved by Nguyen Hoang Mai Phuong Jul 27, 2021
    app/assets/stylesheets/custom.scss 0 → 100644
    1 @import "bootstrap";
    2 @import url('https://fonts.googleapis.com/css2?family=Roboto:wght@100;300;400;500;700&display=swap');
    3 /* header */
    4 #logo {
    5 float: left;
    6 margin-right: 10px;
    7 margin-left: 80px;
    8 padding-top: 10px;
    9 padding-bottom: 10px;
    10
    • Thanh Hung Pham @hungpt commented Jul 26, 2021
      Master

      @phuongnhm Dư empty line nè em.

      @phuongnhm Dư empty line nè em.
    • Nguyen Hoang Mai Phuong @phuongnhm

      changed this line in version 2 of the diff

      Jul 27, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/3/diffs?diff_id=5360&start_sha=07c588589dabcc582d3abbec34cd942450a957fc#79a66919b2dd7890dc5d183a3a7a2dd60f7447b3_10_10)
      Toggle commit list
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Jul 26, 2021
    Resolved by Nguyen Hoang Mai Phuong Jul 27, 2021
    app/assets/stylesheets/custom.scss 0 → 100644
    1 @import "bootstrap";
    2 @import url('https://fonts.googleapis.com/css2?family=Roboto:wght@100;300;400;500;700&display=swap');
    3 /* header */
    4 #logo {
    5 float: left;
    6 margin-right: 10px;
    7 margin-left: 80px;
    8 padding-top: 10px;
    9 padding-bottom: 10px;
    10
    11 }
    12
    13 .navbar ul li a {
    14 color: rgb(255, 255, 255);
    • Thanh Hung Pham @hungpt commented Jul 26, 2021
      Master

      @phuongnhm rgb(255, 255, 255) ngắn hơn em có thể dùng white

      @phuongnhm `rgb(255, 255, 255)` ngắn hơn em có thể dùng `white`
    • Nguyen Hoang Mai Phuong @phuongnhm

      changed this line in version 2 of the diff

      Jul 27, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/3/diffs?diff_id=5360&start_sha=07c588589dabcc582d3abbec34cd942450a957fc#79a66919b2dd7890dc5d183a3a7a2dd60f7447b3_14_13)
      Toggle commit list
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Jul 26, 2021
    Resolved by Nguyen Hoang Mai Phuong Jul 27, 2021
    app/assets/stylesheets/custom.scss 0 → 100644
    10
    11 }
    12
    13 .navbar ul li a {
    14 color: rgb(255, 255, 255);
    15 font-size: 18px;
    16 font-weight: bold;
    17 padding: 4px 15px;
    18 text-decoration: none;
    19 &:hover {
    20 color: rgb(107, 107, 107);
    21 text-decoration: none;
    22 }
    23 }
    24
    25 .container a{
    • Thanh Hung Pham @hungpt commented Jul 26, 2021
      Master

      @phuongnhm Add space before {

      @phuongnhm Add space before `{`
    • Nguyen Hoang Mai Phuong @phuongnhm

      changed this line in version 2 of the diff

      Jul 27, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/3/diffs?diff_id=5360&start_sha=07c588589dabcc582d3abbec34cd942450a957fc#79a66919b2dd7890dc5d183a3a7a2dd60f7447b3_25_24)
      Toggle commit list
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on the diff Jul 26, 2021
    Resolved by Nguyen Hoang Mai Phuong Jul 27, 2021
    app/assets/stylesheets/custom.scss 0 → 100644
    17 padding: 4px 15px;
    18 text-decoration: none;
    19 &:hover {
    20 color: rgb(107, 107, 107);
    21 text-decoration: none;
    22 }
    23 }
    24
    25 .container a{
    26 color: rgb(14, 14, 14);
    27 text-decoration: none;
    28 &:hover {
    29 color: orange;
    30 }
    31 }
    32
    • Thanh Hung Pham @hungpt commented Jul 26, 2021
      Master

      @phuongnhm Dư nhiều empty lines

      Edited Jul 26, 2021 by Thanh Hung Pham
      @phuongnhm Dư nhiều empty lines
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Jul 26, 2021
    Resolved by Nguyen Hoang Mai Phuong Jul 27, 2021
    app/controllers/top_controller.rb 0 → 100644
    1 class TopController < ApplicationController
    2 def home
    3 @job = Job.joins(:cities).order('created_at DESC').limit(5)
    • Thanh Hung Pham @hungpt commented Jul 26, 2021
      Master

      @phuongnhm Mấy số cố định, em nên khai báo constan trong Model nha em. Ví du:

      • Line 3: số 5 -> Move vào model Job (LATEST_JOB_NUMBER = 5)
      • Line 4: số 9 -> Move vào model City (LATEST_CITY_NUMBER = 5)
      • Line 5: số 9 -> Move vào model Industry (LATEST_INDUSTRY_NUMBER = 5)
      @phuongnhm Mấy số cố định, em nên khai báo constan trong Model nha em. Ví du: - Line 3: số 5 -> Move vào model Job (LATEST_JOB_NUMBER = 5) - Line 4: số 9 -> Move vào model City (LATEST_CITY_NUMBER = 5) - Line 5: số 9 -> Move vào model Industry (LATEST_INDUSTRY_NUMBER = 5)
    • Thanh Hung Pham @hungpt commented Jul 26, 2021
      Master

      @phuongnhm Em tham khảo scope trong Model. Move hết mấy cái query này vào Model nha em. https://web-crunch.com/posts/how-to-use-scopes-ruby-on-rails

      @phuongnhm Em tham khảo `scope` trong Model. Move hết mấy cái query này vào Model nha em. https://web-crunch.com/posts/how-to-use-scopes-ruby-on-rails
    • Nguyen Hoang Mai Phuong @phuongnhm

      changed this line in version 2 of the diff

      Jul 27, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/3/diffs?diff_id=5360&start_sha=07c588589dabcc582d3abbec34cd942450a957fc#93acd18eb0d0191ba8ca8a8c5bce6ac5e1ef67a8_3_3)
      Toggle commit list
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Jul 26, 2021
    Resolved by Nguyen Hoang Mai Phuong Jul 27, 2021
    app/helpers/top_helper.rb 0 → 100644
    1 module TopHelper
    • Thanh Hung Pham @hungpt commented Jul 26, 2021
      Master

      @phuongnhm Không dùng thì xóa đi nha em.

      @phuongnhm Không dùng thì xóa đi nha em.
    • Nguyen Hoang Mai Phuong @phuongnhm

      changed this line in version 2 of the diff

      Jul 27, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/3/diffs?diff_id=5360&start_sha=07c588589dabcc582d3abbec34cd942450a957fc#45c1916ab6f1fce0dc34be3c44d391359684a1b1_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 Jul 26, 2021
    Resolved by Nguyen Hoang Mai Phuong Jul 27, 2021
    app/views/top/home.html.slim 0 → 100644
    13 .card-body.text-dark
    14 h5.mb-1
    15 = link_to job.title, "#"
    16 h6.mb-1
    17 = link_to job.company.name, "#"
    18 h6.mb-1
    19 | Lương:
    20 = job.salary
    21 h6.mb-1
    22 - job.cities.each do |city|
    23 = city.name
    24
    25 h4
    26 | Top Cities
    27 .row.my-3.text-center
    28 - @city.each do |name,amount|
    • Thanh Hung Pham @hungpt commented Jul 26, 2021
      Master

      @phuongnhm Add space after ,

      @phuongnhm Add space after `,`
    • Nguyen Hoang Mai Phuong @phuongnhm

      changed this line in version 2 of the diff

      Jul 27, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/3/diffs?diff_id=5360&start_sha=07c588589dabcc582d3abbec34cd942450a957fc#7452aa4b070bc54d0a15bd9deaf0c7b1a97d6478_28_27)
      Toggle commit list
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Jul 26, 2021
    Resolved by Nguyen Hoang Mai Phuong Jul 27, 2021
    app/views/top/home.html.slim 0 → 100644
    24
    25 h4
    26 | Top Cities
    27 .row.my-3.text-center
    28 - @city.each do |name,amount|
    29 .col-4.p-2.border.mb-1
    30 = link_to name, "#"
    31 p.mb-1
    32 = amount
    33 .d-flex.flex-row-reverse.p-2
    34 = link_to 'All Cities', "#"
    35
    36 h4
    37 | Top Industries
    38 .row.my-3.text-center
    39 - @industry.each do |name,amount|
    • Thanh Hung Pham @hungpt commented Jul 26, 2021
      Master

      @phuongnhm Add space after ,

      @phuongnhm Add space after `,`
    • Nguyen Hoang Mai Phuong @phuongnhm

      changed this line in version 2 of the diff

      Jul 27, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/3/diffs?diff_id=5360&start_sha=07c588589dabcc582d3abbec34cd942450a957fc#7452aa4b070bc54d0a15bd9deaf0c7b1a97d6478_39_37)
      Toggle commit list
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Jul 26, 2021
    Resolved by Nguyen Hoang Mai Phuong Jul 27, 2021
    app/views/top/home.html.slim 0 → 100644
    31 p.mb-1
    32 = amount
    33 .d-flex.flex-row-reverse.p-2
    34 = link_to 'All Cities', "#"
    35
    36 h4
    37 | Top Industries
    38 .row.my-3.text-center
    39 - @industry.each do |name,amount|
    40 .col-4.p-2.border.mb-1
    41 = link_to name, "#"
    42 p.mb-1
    43 = amount
    44 .d-flex.flex-row-reverse.p-2
    45 = link_to 'All Industries', "#"
    46
    • Thanh Hung Pham @hungpt commented Jul 26, 2021
      Master

      @phuongnhm Dư nhiều empty lines

      @phuongnhm Dư nhiều empty lines
    • Nguyen Hoang Mai Phuong @phuongnhm

      changed this line in version 2 of the diff

      Jul 27, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/3/diffs?diff_id=5360&start_sha=07c588589dabcc582d3abbec34cd942450a957fc#7452aa4b070bc54d0a15bd9deaf0c7b1a97d6478_46_43)
      Toggle commit list
    Please register or sign in to reply
  • Nguyen Hoang Mai Phuong @phuongnhm

    added 1 commit

    • 407d8972 - fix bug

    Compare with previous version

    Jul 27, 2021

    added 1 commit

    • 407d8972 - fix bug

    Compare with previous version

    added 1 commit * 407d8972 - fix bug [Compare with previous version](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/3/diffs?diff_id=5360&start_sha=07c588589dabcc582d3abbec34cd942450a957fc)
    Toggle commit list
  • Nguyen Hoang Mai Phuong @phuongnhm

    resolved all discussions

    Jul 27, 2021

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Jul 27, 2021
    Resolved by Nguyen Hoang Mai Phuong Jul 27, 2021
    app/controllers/top_controller.rb 0 → 100644
    1 class TopController < ApplicationController
    2 def home
    3 @job = Job.join_order
    • Thanh Hung Pham @hungpt commented Jul 27, 2021
      Master

      @phuongnhm Tên scope nó không rõ ràng lắm em. Đặt lại tên cho rõ ràng hơn nha em. Ví dụ: latest_jobs chẳng hạn...Tương tự đặt lại name scope bên City và Industry.

      @phuongnhm Tên scope nó không rõ ràng lắm em. Đặt lại tên cho rõ ràng hơn nha em. Ví dụ: `latest_jobs` chẳng hạn...Tương tự đặt lại name scope bên City và Industry.
    • Nguyen Hoang Mai Phuong @phuongnhm

      changed this line in version 3 of the diff

      Jul 27, 2021

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/3/diffs?diff_id=5361&start_sha=407d8972d08d4bd049330abd567dcd40a8e8162c#93acd18eb0d0191ba8ca8a8c5bce6ac5e1ef67a8_3_3)
      Toggle commit list
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Jul 27, 2021
    Resolved by Nguyen Hoang Mai Phuong Jul 27, 2021
    app/views/layouts/_shim.html.slim 0 → 100644
    1
    • Thanh Hung Pham @hungpt commented Jul 27, 2021
      Master

      @phuongnhm File này không dùng xóa đi em.

      @phuongnhm File này không dùng xóa đi em.
    • Nguyen Hoang Mai Phuong @phuongnhm

      changed this line in version 3 of the diff

      Jul 27, 2021

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/3/diffs?diff_id=5361&start_sha=407d8972d08d4bd049330abd567dcd40a8e8162c#6e3cf3270a3f8d36af1b9e958b5e9b4d2fed92f8_1_1)
      Toggle commit list
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Jul 27, 2021
    Last updated by Nguyen Hoang Mai Phuong Jul 27, 2021
    app/views/top/home.html.slim 0 → 100644
    1 - provide :title, 'Jobs'
    2
    3 .container
    4 .input-group.py-3
    5 input.form-control.rounded[type="search" placeholder="Search . . ." aria-label="Search" aria-describedby="search-addon"]
    6 button.btn.btn-outline-primary[type="button"]
    7 | search
    • Thanh Hung Pham @hungpt commented Jul 27, 2021
      Master

      @phuongnhm Chữ search -> Search Dư space ở cuối line

      Edited Jul 27, 2021 by Thanh Hung Pham
      @phuongnhm Chữ `search` -> `Search` Dư space ở cuối line
    • Thanh Hung Pham @hungpt commented Jul 27, 2021
      Master

      @phuongnhm Chỗ này chưa sửa nè.

      @phuongnhm Chỗ này chưa sửa nè.
    • Nguyen Hoang Mai Phuong @phuongnhm

      changed this line in version 4 of the diff

      Jul 27, 2021

      changed this line in version 4 of the diff

      changed this line in [version 4 of the diff](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/3/diffs?diff_id=5365&start_sha=0c9a14c9c56c68626acb14855feda378ff80a8ea#7452aa4b070bc54d0a15bd9deaf0c7b1a97d6478_10_10)
      Toggle commit list
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Jul 27, 2021
    Resolved by Nguyen Hoang Mai Phuong Jul 27, 2021
    app/views/top/home.html.slim 0 → 100644
    1 - provide :title, 'Jobs'
    2
    3 .container
    4 .input-group.py-3
    5 input.form-control.rounded[type="search" placeholder="Search . . ." aria-label="Search" aria-describedby="search-addon"]
    6 button.btn.btn-outline-primary[type="button"]
    7 | search
    8 h4.py-4
    9 | Latest Jobs
    10 - @job.each do |job|
    • Thanh Hung Pham @hungpt commented Jul 27, 2021
      Master

      @phuongnhm Dư một space cuối line

      @phuongnhm Dư một space cuối line
    • Nguyen Hoang Mai Phuong @phuongnhm

      changed this line in version 3 of the diff

      Jul 27, 2021

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/3/diffs?diff_id=5361&start_sha=407d8972d08d4bd049330abd567dcd40a8e8162c#7452aa4b070bc54d0a15bd9deaf0c7b1a97d6478_10_13)
      Toggle commit list
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Jul 27, 2021
    Resolved by Nguyen Hoang Mai Phuong Jul 27, 2021
    app/views/top/home.html.slim 0 → 100644
    8 h4.py-4
    9 | Latest Jobs
    10 - @job.each do |job|
    11 .card.my-3
    12 .card-body.text-dark
    13 h5.mb-1
    14 = link_to job.title, "#"
    15 p.mb-1
    16 = link_to job.company.name, "#"
    17 p.mb-1
    18 i.fas.fa-dollar-sign.m-1
    19 | Lương:
    20 = job.salary
    21 p.mb-1
    22 i.fas.fa-map-marker-alt.m-1
    23 - job.cities.each do |city|
    • Thanh Hung Pham @hungpt commented Jul 27, 2021
      Master

      @phuongnhm Dư space ở cuối line

      @phuongnhm Dư space ở cuối line
    • Nguyen Hoang Mai Phuong @phuongnhm

      changed this line in version 3 of the diff

      Jul 27, 2021

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/3/diffs?diff_id=5361&start_sha=407d8972d08d4bd049330abd567dcd40a8e8162c#7452aa4b070bc54d0a15bd9deaf0c7b1a97d6478_23_26)
      Toggle commit list
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Jul 27, 2021
    Resolved by Nguyen Hoang Mai Phuong Jul 27, 2021
    app/views/top/home.html.slim 0 → 100644
    24 = city.name
    25 h4
    26 | Top Cities
    27 .row.my-3.text-center.fs-5
    28 - @city.each do |name, amount|
    29 .col-4.p-2.border.mb-1.fw-normal
    30 = link_to name, "#"
    31 p.mb-1
    32 = amount
    33 .d-flex.flex-row-reverse.
    34 = link_to 'All Cities', "#", class: "more"
    35 h4
    36 | Top Industries
    37 .row.my-3.text-center.fs-5
    38 - @industry.each do |name, amount|
    39 .col-4.p-2.border.mb-1.fw-normal
    • Thanh Hung Pham @hungpt commented Jul 27, 2021
      Master

      @phuongnhm Thụt hàng dư từ Line39-42

      @phuongnhm Thụt hàng dư từ Line39-42
    • Nguyen Hoang Mai Phuong @phuongnhm

      changed this line in version 3 of the diff

      Jul 27, 2021

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/3/diffs?diff_id=5361&start_sha=407d8972d08d4bd049330abd567dcd40a8e8162c#7452aa4b070bc54d0a15bd9deaf0c7b1a97d6478_39_41)
      Toggle commit list
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Jul 27, 2021
    Resolved by Nguyen Hoang Mai Phuong Jul 27, 2021
    config/routes.rb
    1 1 Rails.application.routes.draw do
    2 # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html
    2 root 'top#home'
    3 get '/', to: 'top#home'
    • Thanh Hung Pham @hungpt commented Jul 27, 2021
      Master

      @phuongnhm Mình đã define root rồi thì không cần define thêm route này nha em.

      @phuongnhm Mình đã define `root` rồi thì không cần define thêm route này nha em.
    • Nguyen Hoang Mai Phuong @phuongnhm

      changed this line in version 3 of the diff

      Jul 27, 2021

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/3/diffs?diff_id=5361&start_sha=407d8972d08d4bd049330abd567dcd40a8e8162c#e801163eb9182955dca3eb9817d59af634f6665d_3_3)
      Toggle commit list
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Jul 27, 2021
    Resolved by Nguyen Hoang Mai Phuong Jul 27, 2021
    config/routes.rb
    1 1 Rails.application.routes.draw do
    2 # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html
    2 root 'top#home'
    3 get '/', to: 'top#home'
    4 resources :jobs
    • Thanh Hung Pham @hungpt commented Jul 27, 2021
      Master

      @phuongnhm Xóa routes này đi. Task này mình chưa làm dùng đến route của job mà em?

      @phuongnhm Xóa routes này đi. Task này mình chưa làm dùng đến route của job mà em?
    • Nguyen Hoang Mai Phuong @phuongnhm

      changed this line in version 3 of the diff

      Jul 27, 2021

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/3/diffs?diff_id=5361&start_sha=407d8972d08d4bd049330abd567dcd40a8e8162c#e801163eb9182955dca3eb9817d59af634f6665d_4_3)
      Toggle commit list
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on the diff Jul 27, 2021
    Resolved by Thanh Hung Pham Jul 27, 2021
    app/views/top/home.html.slim 0 → 100644
    1 - provide :title, 'Jobs'
    2
    3 .container
    4 .input-group.py-3
    5 input.form-control.rounded[type="search" placeholder="Search . . ." aria-label="Search" aria-describedby="search-addon"]
    6 button.btn.btn-outline-primary[type="button"]
    7 | search
    8 h4.py-4
    9 | Latest Jobs
    10 - @job.each do |job|
    11 .card.my-3
    12 .card-body.text-dark
    13 h5.mb-1
    14 = link_to job.title, "#"
    15 p.mb-1
    16 = link_to job.company.name, "#"
    • Thanh Hung Pham @hungpt commented Jul 27, 2021
      Master

      @phuongnhm Em bị 2 chỗ đang bị N+1 query nha.

      • job.company
      • job.cities ở Line 23
      Edited Jul 27, 2021
      @phuongnhm Em bị 2 chỗ đang bị N+1 query nha. - `job.company` - `job.cities` ở Line 23
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on the diff Jul 27, 2021
    Resolved by Nguyen Hoang Mai Phuong Jul 27, 2021
    app/views/top/home.html.slim 0 → 100644
    1 - provide :title, 'Jobs'
    2
    • Thanh Hung Pham @hungpt commented Jul 27, 2021
      Master

      @phuongnhm

      • Em thiếu Total Jobs: Mục số 6 trong mô tả chi tiết
      • Em thiếu Key visual Mục số 17 trong mô tả chi tiết Key visual là gì: https://colorme.vn/blog/key-visual-la-gi-cach-tao-key-visual-thu-hut-nguoi-xem
      Edited Jul 27, 2021 by Thanh Hung Pham
      @phuongnhm - Em thiếu `Total Jobs:` Mục số 6 trong mô tả chi tiết - Em thiếu `Key visual` Mục số 17 trong mô tả chi tiết Key visual là gì: https://colorme.vn/blog/key-visual-la-gi-cach-tao-key-visual-thu-hut-nguoi-xem
    Please register or sign in to reply
  • Nguyen Hoang Mai Phuong @phuongnhm

    added 1 commit

    • 0c9a14c9 - fix page-ID1

    Compare with previous version

    Jul 27, 2021

    added 1 commit

    • 0c9a14c9 - fix page-ID1

    Compare with previous version

    added 1 commit * 0c9a14c9 - fix page-ID1 [Compare with previous version](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/3/diffs?diff_id=5361&start_sha=407d8972d08d4bd049330abd567dcd40a8e8162c)
    Toggle commit list
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Jul 27, 2021
    Last updated by Nguyen Hoang Mai Phuong Jul 27, 2021
    db/schema.rb
    10 10 #
    11 11 # It's strongly recommended that you check this file into your version control system.
    12 12
    13 ActiveRecord::Schema.define(version: 2021_07_23_035105) do
    13 ActiveRecord::Schema.define(version: 2021_07_26_154353) do
    • Thanh Hung Pham @hungpt commented Jul 27, 2021
      Master

      @phuongnhm Sao version chỗ này bị change vậy em?

      Edited Jul 27, 2021
      @phuongnhm Sao version chỗ này bị change vậy em?
    • Thanh Hung Pham @hungpt commented Jul 27, 2021
      Master

      @phuongnhm chỗ này chưa revert lại hả em?

      @phuongnhm chỗ này chưa revert lại hả em?
    • Nguyen Hoang Mai Phuong @phuongnhm

      changed this line in version 5 of the diff

      Jul 27, 2021

      changed this line in version 5 of the diff

      changed this line in [version 5 of the diff](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/3/diffs?diff_id=5369&start_sha=56d4d17adf5b9dac2b0b3df13e39b9d1373bfaad#2cda0c6171fa7d04989507a1dd112e34c40df46d_13_13)
      Toggle commit list
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Jul 27, 2021
    Last updated by Nguyen Hoang Mai Phuong Jul 27, 2021
    app/assets/stylesheets/custom.scss 0 → 100644
    14 font-size: 18px;
    15 font-weight: bold;
    16 padding: 4px 15px;
    17 text-decoration: none;
    18 &:hover {
    19 color: rgb(107, 107, 107);
    20 text-decoration: none;
    21 }
    22 }
    23
    24 .container p {
    25 font-weight: 400;
    26 font-size: medium;
    27 }
    28 a {
    29 color: rgb(14, 14, 14);
    • Thanh Hung Pham @hungpt commented Jul 27, 2021
      Master

      @phuongnhm Thụt hàng chỗ này bị sai nè em. Từ L29-33

      Edited Jul 27, 2021
      @phuongnhm Thụt hàng chỗ này bị sai nè em. Từ L29-33
    • Thanh Hung Pham @hungpt commented Jul 27, 2021
      Master

      @phuongnhm chưa fix nè em

      @phuongnhm chưa fix nè em
    • Nguyen Hoang Mai Phuong @phuongnhm

      changed this line in version 4 of the diff

      Jul 27, 2021

      changed this line in version 4 of the diff

      changed this line in [version 4 of the diff](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/3/diffs?diff_id=5365&start_sha=0c9a14c9c56c68626acb14855feda378ff80a8ea#79a66919b2dd7890dc5d183a3a7a2dd60f7447b3_29_29)
      Toggle commit list
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Jul 27, 2021
    Last updated by Nguyen Hoang Mai Phuong Jul 27, 2021
    app/models/city.rb
    2 2 belongs_to :region
    3 3 has_and_belongs_to_many :jobs
    4 4 has_and_belongs_to_many :companies
    5 LATEST_CITY_NUMBER = 9
    6 scope :top_cities, -> { joins(:jobs).group(:name).order('count_all DESC').count.take(LATEST_CITY_NUMBER) }
    5 7 end
    8
    • Thanh Hung Pham @hungpt commented Jul 27, 2021
      Master

      @phuongnhm Dư 1 empty line nha em

      Edited Jul 27, 2021
      @phuongnhm Dư 1 empty line nha em
    • Thanh Hung Pham @hungpt commented Jul 27, 2021
      Master

      @phuongnhm chỗ này chưa fix nè em

      @phuongnhm chỗ này chưa fix nè em
    • Nguyen Hoang Mai Phuong @phuongnhm

      changed this line in version 4 of the diff

      Jul 27, 2021

      changed this line in version 4 of the diff

      changed this line in [version 4 of the diff](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/3/diffs?diff_id=5365&start_sha=0c9a14c9c56c68626acb14855feda378ff80a8ea#28495972e963898abf2919ffeaeb92fbdf49fb8e_8_7)
      Toggle commit list
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Jul 27, 2021
    Resolved by Nguyen Hoang Mai Phuong Jul 27, 2021
    app/views/layouts/_shim.html.slim 0 → 100644
    1 <!--[if lt IE 9]>
    • Thanh Hung Pham @hungpt commented Jul 27, 2021
      Master

      @phuongnhm Cái này để làm gì vậy em? Không cần thiết trong project của mình nên xóa đi em.

      @phuongnhm Cái này để làm gì vậy em? Không cần thiết trong project của mình nên xóa đi em.
    • Nguyen Hoang Mai Phuong @phuongnhm

      changed this line in version 4 of the diff

      Jul 27, 2021

      changed this line in version 4 of the diff

      changed this line in [version 4 of the diff](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/3/diffs?diff_id=5365&start_sha=0c9a14c9c56c68626acb14855feda378ff80a8ea#6e3cf3270a3f8d36af1b9e958b5e9b4d2fed92f8_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 Jul 27, 2021
    Resolved by Nguyen Hoang Mai Phuong Jul 27, 2021
    app/views/top/home.html.slim 0 → 100644
    1 - provide :title, 'Jobs'
    2
    3 h3.p-2
    4 |Total Jobs:
    5 = Job.all.count
    • Thanh Hung Pham @hungpt commented Jul 27, 2021
      Master

      @phuongnhm Kết quả hiển thị trên web: Total Jobs:655

      • Add space after :
      • Dùng method này để hiển thị thêm chữ jobs ở sau nha em. Ví du Total Jobs: 1 job hay Total Jobs: 655 jobs https://jacopretorius.net/2014/02/using-pluralize-in-your-models-in-rails.html

      • Job.all.count Không được query DB trực tiếp từ Views, gán vào biến ở Controller nha em.

      Edited Jul 27, 2021 by Thanh Hung Pham
      @phuongnhm Kết quả hiển thị trên web: `Total Jobs:655` - Add space after `:` - Dùng method này để hiển thị thêm chữ jobs ở sau nha em. Ví du `Total Jobs: 1 job` hay `Total Jobs: 655 jobs` https://jacopretorius.net/2014/02/using-pluralize-in-your-models-in-rails.html - `Job.all.count` Không được query DB trực tiếp từ Views, gán vào biến ở Controller nha em.
    • Nguyen Hoang Mai Phuong @phuongnhm

      changed this line in version 4 of the diff

      Jul 27, 2021

      changed this line in version 4 of the diff

      changed this line in [version 4 of the diff](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/3/diffs?diff_id=5365&start_sha=0c9a14c9c56c68626acb14855feda378ff80a8ea#7452aa4b070bc54d0a15bd9deaf0c7b1a97d6478_5_4)
      Toggle commit list
    Please register or sign in to reply
  • Thanh Hung Pham
    @hungpt started a discussion on an old version of the diff Jul 27, 2021
    Resolved by Nguyen Hoang Mai Phuong Jul 27, 2021
    app/views/top/home.html.slim 0 → 100644
    11 h4.py-4
    12 | Latest Jobs
    13 - @jobs.each do |job|
    14 .card.my-3
    15 .card-body.text-dark
    16 h5.mb-1
    17 = link_to job.title, "#"
    18 p.mb-1
    19 = link_to job.company.name, "#"
    20 p.mb-1
    21 i.fas.fa-dollar-sign.m-1
    22 | Lương:
    23 = job.salary
    24 p.mb-1
    25 i.fas.fa-map-marker-alt.m-1
    26 - job.cities.each do |job|
    • Thanh Hung Pham @hungpt commented Jul 27, 2021
      Master

      @phuongnhm

      • Chỗ này đang loop trên cities mà |job| em đặt biến vậy đâu đúng. Sửa lại |city|
      • Kết quả hiển thị trên web Thừa Thiên- HuếThừa Thiên- Huế. Em check lại data xem, có bị dupplicate dữ liệu không nha.
      Edited Jul 27, 2021 by Thanh Hung Pham
      @phuongnhm - Chỗ này đang loop trên `cities` mà `|job|` em đặt biến vậy đâu đúng. Sửa lại `|city|` - Kết quả hiển thị trên web `Thừa Thiên- HuếThừa Thiên- Huế`. Em check lại data xem, có bị dupplicate dữ liệu không nha.
    • Nguyen Hoang Mai Phuong @phuongnhm

      changed this line in version 4 of the diff

      Jul 27, 2021

      changed this line in version 4 of the diff

      changed this line in [version 4 of the diff](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/3/diffs?diff_id=5365&start_sha=0c9a14c9c56c68626acb14855feda378ff80a8ea#7452aa4b070bc54d0a15bd9deaf0c7b1a97d6478_26_26)
      Toggle commit list
    Please register or sign in to reply
  • Nguyen Hoang Mai Phuong @phuongnhm

    added 2 commits

    • 72a3925d - fix page-ID1
    • 56d4d17a - fix page-ID1

    Compare with previous version

    Jul 27, 2021

    added 2 commits

    • 72a3925d - fix page-ID1
    • 56d4d17a - fix page-ID1

    Compare with previous version

    added 2 commits * 72a3925d - fix page-ID1 * 56d4d17a - fix page-ID1 [Compare with previous version](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/3/diffs?diff_id=5365&start_sha=0c9a14c9c56c68626acb14855feda378ff80a8ea)
    Toggle commit list
  • Nguyen Hoang Mai Phuong @phuongnhm

    added 1 commit

    • 6b1dd3ed - fix schema version

    Compare with previous version

    Jul 27, 2021

    added 1 commit

    • 6b1dd3ed - fix schema version

    Compare with previous version

    added 1 commit * 6b1dd3ed - fix schema version [Compare with previous version](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/3/diffs?diff_id=5369&start_sha=56d4d17adf5b9dac2b0b3df13e39b9d1373bfaad)
    Toggle commit list
  • Nguyen Hoang Mai Phuong @phuongnhm

    added 1 commit

    • 1e120c04 - fix view

    Compare with previous version

    Jul 28, 2021

    added 1 commit

    • 1e120c04 - fix view

    Compare with previous version

    added 1 commit * 1e120c04 - fix view [Compare with previous version](https://gitlab.zigexn.vn/phuongnhm/VeNJOB/merge_requests/3/diffs?diff_id=5370&start_sha=6b1dd3ed6e3237ba6da5d8b77eacfbbfb638aba2)
    Toggle commit list
  • Thanh Hung Pham @hungpt

    mentioned in commit efd46ea4

    Jul 28, 2021

    mentioned in commit efd46ea4

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

    merged

    Jul 28, 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!3
×

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.