Skip to content

Commit f9256d4

Browse files
Merge pull request #58 from wahanegi/PC-82
PC-82: Develop the Form Component for Customer Info page
2 parents abe41e8 + 8474e02 commit f9256d4

54 files changed

Lines changed: 1139 additions & 90 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Gemfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,16 @@ gem "activeadmin", "~> 3.3.0" # A framewor
66
# gem "bcrypt", "~> 3.1" # Use Active Model has_secure_password [https://guides.rubyonrails.org/active_model_basics.html#securepassword]
77
gem "bootsnap", '~> 1.18.4', require: false # Reduces boot times through caching; required in config/boot.rb
88
gem "cssbundling-rails", '~> 1.4.3' # Bundle and process CSS [https://github.com/rails/cssbundling-rails]
9-
# gem "image_processing", "~> 1.2" # Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images]
109
gem "devise", "~> 4.9.4" # Authentication
10+
gem "image_processing", "~> 1.2" # Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images]
1111
gem "jbuilder", '~> 2.13.0' # Build JSON APIs with ease [https://github.com/rails/jbuilder]
1212
gem "jsbundling-rails", '~> 1.3.1' # Bundle and transpile JavaScript [https://github.com/rails/jsbundling-rails]
1313
gem "jsonapi-serializer", "~> 2.2.0" # Fast, simple and easy to use JSON:API serialization library (also known as fast_jsonapi).
1414
gem "kamal", '~> 2.5.3', require: false # Deploy this application anywhere as a Docker container [https://kamal-deploy.org]
1515
gem "pg", "~> 1.5.9" # Use postgresql as the database for Active Record
1616
gem "puma", "~> 6.6.0" # Use the Puma web server [https://github.com/puma/puma]
1717
gem "rails", "~> 8.0.2" # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
18+
gem "ruby-vips", "~> 2.2" # Ruby extension for the libvips image processing library.
1819
gem 'sass-rails', '~> 6.0.0' # Ruby on Rails stylesheet engine for Sass
1920
gem "solid_cable", '~> 3.0.7' # Use the database-backed adapters for Action Cable
2021
gem "solid_cache", '~> 1.0.7' # Use the database-backed adapters for Rails.cache

Gemfile.lock

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,9 @@ GEM
165165
activesupport (>= 5.2)
166166
i18n (1.14.7)
167167
concurrent-ruby (~> 1.0)
168+
image_processing (1.14.0)
169+
mini_magick (>= 4.9.5, < 6)
170+
ruby-vips (>= 2.0.17, < 3)
168171
inherited_resources (1.14.0)
169172
actionpack (>= 6.0)
170173
has_scope (>= 0.6)
@@ -229,6 +232,9 @@ GEM
229232
net-pop
230233
net-smtp
231234
marcel (1.0.4)
235+
mini_magick (5.2.0)
236+
benchmark
237+
logger
232238
mini_mime (1.1.5)
233239
minitest (5.25.5)
234240
msgpack (1.8.0)
@@ -370,6 +376,9 @@ GEM
370376
rubocop (~> 1.72, >= 1.72.1)
371377
rubocop-rspec (~> 3.5)
372378
ruby-progressbar (1.13.0)
379+
ruby-vips (2.2.3)
380+
ffi (~> 1.12)
381+
logger
373382
ruby2_keywords (0.0.5)
374383
sass-rails (6.0.0)
375384
sassc-rails (~> 2.1, >= 2.1.1)
@@ -449,6 +458,7 @@ GEM
449458
zeitwerk (2.7.2)
450459

451460
PLATFORMS
461+
arm64-darwin-23
452462
arm64-darwin-24
453463
x86_64-darwin-24
454464
x86_64-linux
@@ -465,6 +475,7 @@ DEPENDENCIES
465475
dotenv
466476
factory_bot_rails
467477
faker
478+
image_processing (~> 1.2)
468479
jbuilder (~> 2.13.0)
469480
jsbundling-rails (~> 1.3.1)
470481
jsonapi-serializer (~> 2.2.0)
@@ -478,6 +489,7 @@ DEPENDENCIES
478489
rubocop
479490
rubocop-rails
480491
rubocop-rspec_rails
492+
ruby-vips (~> 2.2)
481493
sass-rails (~> 6.0.0)
482494
shoulda-matchers
483495
solid_cable (~> 3.0.7)
Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading

app/assets/images/icons/cross.svg

Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 6 additions & 0 deletions
Loading

app/assets/stylesheets/application.bootstrap.scss

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,7 @@ $utilities: map-merge(
2222
@import 'application/buttons';
2323
@import 'application/customer_info';
2424
@import 'application/layout';
25-
@import 'application/login_page';
25+
@import 'application/login_page';
26+
@import 'application/customer_form.scss';
27+
@import 'application/input.scss';
28+
@import 'application/header';

app/assets/stylesheets/application/buttons.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
}
1616

1717
&:disabled {
18-
border-color: $gray-disable !important;
19-
color: $text-gray-disable !important;
18+
border-color: $secondary!important;
19+
color: $secondary!important;
2020
background: $white !important;
2121
}
2222
}
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
.customer-form {
2+
max-width: 1120px;
3+
padding: 31px;
4+
}
5+
6+
.image-placeholder {
7+
max-width: 136px;
8+
width: 136px;
9+
10+
label:hover {
11+
cursor: pointer;
12+
}
13+
}
14+
15+
.client-input {
16+
max-width: 615px;
17+
}
18+
19+
.title-input {
20+
max-width: 241px;
21+
}
22+
23+
@media (max-width: 575px) {
24+
.title-input {
25+
max-width: 100%;
26+
}
27+
}
File renamed without changes.

0 commit comments

Comments
 (0)