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.

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

primer_view_components を導入 #564

Open
wants to merge 35 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
6c5dbe0
primer_view_componentsを追加
YutaGoto Oct 15, 2023
d0b8d1e
primer/view_components の初期設定
YutaGoto Oct 15, 2023
ca74328
LoginFormクラスを実装
YutaGoto Oct 15, 2023
2c68713
FlashメッセージをPrimerに置換する
YutaGoto Oct 15, 2023
1882d50
Loginフォームを再実装
YutaGoto Oct 15, 2023
164d90b
flashタイプの修正
YutaGoto Oct 15, 2023
9028dcb
Merge branch 'main' into add-primer_view_components
YutaGoto Dec 14, 2023
9823138
primer_view_componentsをアップグレード
YutaGoto Dec 14, 2023
f01b4ab
header menuのレイアウトを調整
YutaGoto Jan 10, 2024
21ed721
flashメッセージのコンポーネントを置き換え
YutaGoto Jan 10, 2024
1692746
ログインフォームのコンポーネントを修正
YutaGoto Jan 10, 2024
71e24eb
Merge branch 'main' into add-primer_view_components
YutaGoto Jan 11, 2024
9b1ab53
spec: componentテストを修正
YutaGoto Jan 11, 2024
ca47bd8
feat: イベント一覧ページのスタイル修正
YutaGoto Feb 8, 2024
05794f2
Merge branch 'main' into add-primer_view_components
YutaGoto Feb 8, 2024
d962b2f
Merge branch 'main' into add-primer_view_components
YutaGoto Feb 8, 2024
89a78c3
feat: SignupFormを実装
YutaGoto Feb 8, 2024
12129b2
feat: EventFormを実装
YutaGoto Feb 8, 2024
5c08bb4
Merge branch 'main' into add-primer_view_components
YutaGoto Feb 9, 2024
0e25b51
update primer_view_components
YutaGoto Feb 12, 2024
aa791ca
adapt primer for event show page
YutaGoto Feb 12, 2024
4b6fc06
fix for layout
YutaGoto Feb 12, 2024
100b80d
Merge branch 'main' into add-primer_view_components
YutaGoto Mar 14, 2024
a166b9c
bootstrap gemを削除
YutaGoto Mar 14, 2024
16270d2
FlashではなくBannerを使用するように変更
YutaGoto Mar 14, 2024
79d9254
Merge branch 'main' into add-primer_view_components
YutaGoto Mar 14, 2024
c84496e
system specのボタン文言などを修正
YutaGoto Mar 14, 2024
5886ba0
ciのテストを修正
YutaGoto Mar 14, 2024
644f41d
Merge branch 'main' into add-primer_view_components
YutaGoto Apr 11, 2024
67eefff
fix: bootstrapを削除
YutaGoto Apr 11, 2024
2647fc2
Merge branch 'main' into add-primer_view_components
YutaGoto Apr 11, 2024
1538de3
Merge branch 'main' into add-primer_view_components
YutaGoto Apr 12, 2024
9345e33
AppliationFormでtypoしていたので、ApplicationFormに修正
greendrop Jun 13, 2024
f46341c
Merge branch 'main' into add-primer_view_components
YutaGoto Jul 11, 2024
908be19
primer view componentのバージョンアップ
YutaGoto Jul 11, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ gem "rails", github: "rails/rails", branch: "main"

gem "bcrypt", "~> 3.1.20"
gem "bootsnap", require: false
gem "bootstrap", github: 'twbs/bootstrap-rubygem' # v 5.3.3 should fix the problem, but not released yet
gem "dartsass-rails", "~> 0.5.0"
gem "dartsass-rails"
gem "importmap-rails"
gem "jbuilder"
gem "pg", "~> 1.5"
gem "primer_view_components", "~> 0.27"
gem "propshaft"
gem "puma", "~> 6.4"
gem "rails-i18n"
Expand Down
230 changes: 113 additions & 117 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
GIT
remote: https://github.com/rails/rails.git
revision: e98f4d8496fbc6dd9ffb93202981b4f804e388c1
revision: 4bb73233413f30fd7217bd7f08af44963f5832b1
branch: main
specs:
actioncable (8.0.0.alpha)
actionpack (= 8.0.0.alpha)
activesupport (= 8.0.0.alpha)
actioncable (7.2.0.alpha)
actionpack (= 7.2.0.alpha)
activesupport (= 7.2.0.alpha)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
zeitwerk (~> 2.6)
actionmailbox (8.0.0.alpha)
actionpack (= 8.0.0.alpha)
activejob (= 8.0.0.alpha)
activerecord (= 8.0.0.alpha)
activestorage (= 8.0.0.alpha)
activesupport (= 8.0.0.alpha)
actionmailbox (7.2.0.alpha)
actionpack (= 7.2.0.alpha)
activejob (= 7.2.0.alpha)
activerecord (= 7.2.0.alpha)
activestorage (= 7.2.0.alpha)
activesupport (= 7.2.0.alpha)
mail (>= 2.8.0)
actionmailer (8.0.0.alpha)
actionpack (= 8.0.0.alpha)
actionview (= 8.0.0.alpha)
activejob (= 8.0.0.alpha)
activesupport (= 8.0.0.alpha)
actionmailer (7.2.0.alpha)
actionpack (= 7.2.0.alpha)
actionview (= 7.2.0.alpha)
activejob (= 7.2.0.alpha)
activesupport (= 7.2.0.alpha)
mail (>= 2.8.0)
rails-dom-testing (~> 2.2)
actionpack (8.0.0.alpha)
actionview (= 8.0.0.alpha)
activesupport (= 8.0.0.alpha)
actionpack (7.2.0.alpha)
actionview (= 7.2.0.alpha)
activesupport (= 7.2.0.alpha)
nokogiri (>= 1.8.5)
racc
rack (>= 2.2.4)
Expand All @@ -34,89 +34,78 @@ GIT
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
useragent (~> 0.16)
actiontext (8.0.0.alpha)
actionpack (= 8.0.0.alpha)
activerecord (= 8.0.0.alpha)
activestorage (= 8.0.0.alpha)
activesupport (= 8.0.0.alpha)
actiontext (7.2.0.alpha)
actionpack (= 7.2.0.alpha)
activerecord (= 7.2.0.alpha)
activestorage (= 7.2.0.alpha)
activesupport (= 7.2.0.alpha)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (8.0.0.alpha)
activesupport (= 8.0.0.alpha)
actionview (7.2.0.alpha)
activesupport (= 7.2.0.alpha)
builder (~> 3.1)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
activejob (8.0.0.alpha)
activesupport (= 8.0.0.alpha)
activejob (7.2.0.alpha)
activesupport (= 7.2.0.alpha)
globalid (>= 0.3.6)
activemodel (8.0.0.alpha)
activesupport (= 8.0.0.alpha)
activerecord (8.0.0.alpha)
activemodel (= 8.0.0.alpha)
activesupport (= 8.0.0.alpha)
activemodel (7.2.0.alpha)
activesupport (= 7.2.0.alpha)
activerecord (7.2.0.alpha)
activemodel (= 7.2.0.alpha)
activesupport (= 7.2.0.alpha)
timeout (>= 0.4.0)
activestorage (8.0.0.alpha)
actionpack (= 8.0.0.alpha)
activejob (= 8.0.0.alpha)
activerecord (= 8.0.0.alpha)
activesupport (= 8.0.0.alpha)
activestorage (7.2.0.alpha)
actionpack (= 7.2.0.alpha)
activejob (= 7.2.0.alpha)
activerecord (= 7.2.0.alpha)
activesupport (= 7.2.0.alpha)
marcel (~> 1.0)
activesupport (8.0.0.alpha)
activesupport (7.2.0.alpha)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.3.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
logger (>= 1.4.2)
minitest (>= 5.1)
minitest (>= 5.1, < 5.22.0)
tzinfo (~> 2.0, >= 2.0.5)
rails (8.0.0.alpha)
actioncable (= 8.0.0.alpha)
actionmailbox (= 8.0.0.alpha)
actionmailer (= 8.0.0.alpha)
actionpack (= 8.0.0.alpha)
actiontext (= 8.0.0.alpha)
actionview (= 8.0.0.alpha)
activejob (= 8.0.0.alpha)
activemodel (= 8.0.0.alpha)
activerecord (= 8.0.0.alpha)
activestorage (= 8.0.0.alpha)
activesupport (= 8.0.0.alpha)
rails (7.2.0.alpha)
actioncable (= 7.2.0.alpha)
actionmailbox (= 7.2.0.alpha)
actionmailer (= 7.2.0.alpha)
actionpack (= 7.2.0.alpha)
actiontext (= 7.2.0.alpha)
actionview (= 7.2.0.alpha)
activejob (= 7.2.0.alpha)
activemodel (= 7.2.0.alpha)
activerecord (= 7.2.0.alpha)
activestorage (= 7.2.0.alpha)
activesupport (= 7.2.0.alpha)
bundler (>= 1.15.0)
railties (= 8.0.0.alpha)
railties (8.0.0.alpha)
actionpack (= 8.0.0.alpha)
activesupport (= 8.0.0.alpha)
irb (~> 1.13)
railties (= 7.2.0.alpha)
railties (7.2.0.alpha)
actionpack (= 7.2.0.alpha)
activesupport (= 7.2.0.alpha)
irb
rackup (>= 1.0.0)
rake (>= 12.2)
thor (~> 1.0, >= 1.2.2)
zeitwerk (~> 2.6)

GIT
remote: https://github.com/twbs/bootstrap-rubygem.git
revision: f240cae79fb1dcb55abcb4fc9710544134ef8ec2
specs:
bootstrap (5.3.3)
autoprefixer-rails (>= 9.1.0)
popper_js (>= 2.11.8, < 3)

GEM
remote: https://rubygems.org/
specs:
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
autoprefixer-rails (10.4.16.0)
execjs (~> 2)
base64 (0.2.0)
bcrypt (3.1.20)
bigdecimal (3.1.8)
bigdecimal (3.1.7)
bindex (0.8.1)
bootsnap (1.18.3)
msgpack (~> 1.2)
builder (3.3.0)
builder (3.2.4)
capybara (3.40.0)
addressable
matrix
Expand All @@ -126,42 +115,43 @@ GEM
rack-test (>= 0.6.3)
regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2)
concurrent-ruby (1.3.3)
concurrent-ruby (1.2.3)
connection_pool (2.4.1)
crass (1.0.6)
dartsass-rails (0.5.0)
railties (>= 6.0.0)
sass-embedded (~> 1.63)
date (3.3.4)
debug (1.9.2)
debug (1.9.1)
irb (~> 1.10)
reline (>= 0.3.8)
diff-lcs (1.5.1)
drb (2.2.1)
erubi (1.13.0)
execjs (2.9.1)
drb (2.2.0)
ruby2_keywords
erubi (1.12.0)
factory_bot (6.4.5)
activesupport (>= 5.0.0)
factory_bot_rails (6.4.3)
factory_bot (~> 6.4)
railties (>= 5.0.0)
globalid (1.2.1)
activesupport (>= 6.1)
google-protobuf (3.23.4)
i18n (1.14.5)
google-protobuf (4.27.2)
bigdecimal
rake (>= 13)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
importmap-rails (2.0.1)
actionpack (>= 6.0.0)
activesupport (>= 6.0.0)
railties (>= 6.0.0)
io-console (0.7.2)
irb (1.14.0)
rdoc (>= 4.0.0)
irb (1.11.2)
rdoc
reline (>= 0.4.2)
jbuilder (2.12.0)
jbuilder (2.11.5)
actionview (>= 5.0.0)
activesupport (>= 5.0.0)
logger (1.6.0)
loofah (2.22.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
Expand All @@ -174,23 +164,30 @@ GEM
matrix (0.4.2)
method_source (1.1.0)
mini_mime (1.1.5)
minitest (5.24.1)
mini_portile2 (2.8.5)
minitest (5.21.2)
msgpack (1.7.2)
net-imap (0.4.14)
net-imap (0.4.10)
date
net-protocol
net-pop (0.1.2)
net-protocol
net-protocol (0.2.2)
timeout
net-smtp (0.5.0)
net-smtp (0.4.0.1)
net-protocol
nio4r (2.7.3)
nokogiri (1.16.6-x86_64-linux)
nio4r (2.7.0)
nokogiri (1.16.2)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
pg (1.5.6)
popper_js (2.11.8)
propshaft (0.9.0)
octicons (19.10.0)
pg (1.5.4)
primer_view_components (0.27.0)
actionview (>= 5.0.0)
activesupport (>= 5.0.0)
octicons (>= 18.0.0)
view_component (>= 3.1, < 4.0)
propshaft (0.8.0)
actionpack (>= 7.0.0)
activesupport (>= 7.0.0)
rack
Expand All @@ -200,8 +197,8 @@ GEM
public_suffix (5.0.4)
puma (6.4.2)
nio4r (~> 2.0)
racc (1.8.0)
rack (3.1.7)
racc (1.7.3)
rack (3.0.9)
rack-session (2.0.0)
rack (>= 3.0.0)
rack-test (2.1.0)
Expand All @@ -219,51 +216,50 @@ GEM
rails-i18n (7.0.9)
i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 8)
rake (13.2.1)
rdoc (6.7.0)
rake (13.1.0)
rdoc (6.6.2)
psych (>= 4.0.0)
redis (5.2.0)
redis-client (>= 0.22.0)
redis-client (0.22.1)
redis-client (0.22.2)
connection_pool
regexp_parser (2.9.0)
reline (0.5.9)
reline (0.4.2)
io-console (~> 0.5)
rexml (3.3.0)
strscan
rexml (3.2.6)
rspec-core (3.13.0)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.1)
rspec-expectations (3.13.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-mocks (3.13.1)
rspec-mocks (3.13.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-rails (6.1.3)
rspec-rails (6.1.1)
actionpack (>= 6.1)
activesupport (>= 6.1)
railties (>= 6.1)
rspec-core (~> 3.13)
rspec-expectations (~> 3.13)
rspec-mocks (~> 3.13)
rspec-support (~> 3.13)
rspec-support (3.13.1)
rspec-core (~> 3.12)
rspec-expectations (~> 3.12)
rspec-mocks (~> 3.12)
rspec-support (~> 3.12)
rspec-support (3.13.0)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
sass-embedded (1.63.6-x86_64-linux-gnu)
google-protobuf (~> 3.23)
selenium-webdriver (4.22.0)
sass-embedded (1.77.5)
google-protobuf (>= 3.25, < 5.0)
rake (>= 13)
selenium-webdriver (4.17.0)
base64 (~> 0.2)
logger (~> 1.4)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
stimulus-rails (1.3.3)
railties (>= 6.0.0)
stringio (3.1.1)
strscan (3.1.0)
thor (1.3.1)
stringio (3.1.0)
thor (1.3.0)
timeout (0.4.1)
turbo-rails (2.0.5)
turbo-rails (2.0.0)
actionpack (>= 6.0.0)
activejob (>= 6.0.0)
railties (>= 6.0.0)
Expand All @@ -286,22 +282,22 @@ GEM
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.6.16)
zeitwerk (2.6.13)

PLATFORMS
x86_64-linux
ruby

DEPENDENCIES
bcrypt (~> 3.1.20)
bootsnap
bootstrap!
capybara
dartsass-rails (~> 0.5.0)
dartsass-rails
debug
factory_bot_rails
importmap-rails
jbuilder
pg (~> 1.5)
primer_view_components (~> 0.27)
propshaft
puma (~> 6.4)
rails!
Expand Down
Loading