Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

企業個別ページ傘下のユーザー一覧をVueからRailsに変更 #7956

Open
wants to merge 14 commits into
base: main
Choose a base branch
from
Open

企業個別ページ傘下のユーザー一覧をVueからRailsに変更 #7956

wants to merge 14 commits into from
+39 −6

Commits on Nov 12, 2024

  1. Vueから既存のslimを利用する形に変更

    @Judeeeee
    Judeeeee committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    8b6cba0 View commit details
    Browse the repository at this point in the history

  2. コンフリクトの解消&変更によりページネーションが表示されなくなっていたので修正

    @Judeeeee
    Judeeeee committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    770c6f9 View commit details
    Browse the repository at this point in the history

  3. ユーザー数を正しく表示できていなかったため、他の表記に合わせてtotal_countを使う

    @Judeeeee
    Judeeeee committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    9921264 View commit details
    Browse the repository at this point in the history

  4. 変更の前後で、ブラウザでの表示が異なっていたため修正

    @Judeeeee
    Judeeeee committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    610c50a View commit details
    Browse the repository at this point in the history

  5. CIで落ちていたRuboCop指摘の修正 

    ローカルでRuboCopを実行した時にはパスしていた🤔
    @Judeeeee
    Judeeeee committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    73da165 View commit details
    Browse the repository at this point in the history

  6. 余白を変更前に合わせる

    @Judeeeee
    Judeeeee committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    87811c8 View commit details
    Browse the repository at this point in the history

  7. 最初のページではページネーション先頭の矢印(<<)表示を非リンクにする 

    ref: #7956 (comment)
    @Judeeeee
    Judeeeee committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    d3fcf59 View commit details
    Browse the repository at this point in the history

  8. 可読性を考慮し、文字数が少ないcollectionオプションを指定 

    ref: https://github.com/fjordllc/bootcamp/pull/7956/files/9144eb9f48640594d0dcda12c550d570feea2ebd#r1730211184
    @Judeeeee
    Judeeeee committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    7a08baa View commit details
    Browse the repository at this point in the history

  9. RuboCopのStyle/UnlessElseとSQLの発行回数を考慮し、present?を採用 

    #7956 (comment)
    @Judeeeee
    Judeeeee committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    dcc961f View commit details
    Browse the repository at this point in the history

  10. ページネーション先頭の矢印(<<)表示を非リンク化で統一する 

    企業個別ユーザーページだけ特別扱いせず、大元のkaminariのページネーションを変更した
- #7956 (comment)
- https://github.com/fjordllc/bootcamp/pull/7956/files#r1757220135
    @Judeeeee
    Judeeeee committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    8f3c4ce View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2024

  1. 不必要な記述を削除

    @Judeeeee
    Judeeeee committed Nov 16, 2024
    Configuration menu
    Copy the full SHA
    c613f4e View commit details
    Browse the repository at this point in the history

  2. ユーザー一覧のslimを使い回せるので、企業ユーザー用に作成していたslimを削除した

    @Judeeeee
    Judeeeee committed Nov 16, 2024
    Configuration menu
    Copy the full SHA
    2e5d7b6 View commit details
    Browse the repository at this point in the history

  3. コンフリクトしたため、最新mainを取り込んでmergeコミットを積む 

    Merge branch 'main' into chore/change-company-user-list-vue-to-rails
    @Judeeeee
    Judeeeee committed Nov 16, 2024
    Configuration menu
    Copy the full SHA
    38c956f View commit details
    Browse the repository at this point in the history

  4. nav.pagenationはkaminariのpagenatorで定義してあるので、重複する記述を削除

    @Judeeeee
    Judeeeee committed Nov 16, 2024
    Configuration menu
    Copy the full SHA
    ba73ddb View commit details
    Browse the repository at this point in the history