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

Farewell smarthr UI, welcome tailwind #114

Merged
merged 58 commits into from
Mar 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
073e71e
bundle add tailwindcss-rails
kinoppyd Oct 30, 2023
d8d35f0
bin/rails tailwindcss:install
kinoppyd Oct 30, 2023
01224ad
bundle add erb-formatter
kinoppyd Oct 30, 2023
ee65dbd
Replace Navigation component
kinoppyd Feb 15, 2024
d29e138
Replace Top component
kinoppyd Feb 17, 2024
c65deba
Replace ScheduleTable component
kinoppyd Feb 19, 2024
5fe30d2
Add stimulus-rails
kinoppyd Feb 19, 2024
d8b4e64
Switch table with stimulus
kinoppyd Feb 19, 2024
6f9a45d
Replace ScheduleCard component on schedule table
kinoppyd Feb 20, 2024
04679e8
Fix schedule table styles
kinoppyd Feb 21, 2024
c332e9b
Fix header style
kinoppyd Feb 21, 2024
0bcb371
bundle add turbo-rails
kinoppyd Feb 21, 2024
6601b96
bin/rails turbo:install
kinoppyd Feb 21, 2024
e049bfc
Add stimulus schedule-modal controller
kinoppyd Feb 25, 2024
7fe0e6e
Add modal view
kinoppyd Feb 25, 2024
46ed6df
Replace ScheduleDetail component
kinoppyd Feb 25, 2024
9373e34
Extract normal-button
kinoppyd Feb 26, 2024
b97e3f9
Generalization schedule-modal controller
kinoppyd Feb 29, 2024
3d0656e
Replace PlanTable component
kinoppyd Feb 29, 2024
55d36dd
Remove useless components
kinoppyd Feb 29, 2024
f17f0e0
When a schedule added to plan, reload table turbo frame
kinoppyd Mar 3, 2024
9689520
Fix non uniq dialog id
kinoppyd Mar 3, 2024
85d19f6
Fix turbo frame broken when remove schedule on plan page
kinoppyd Mar 3, 2024
c45b8e1
Fix plan page modal tag
kinoppyd Mar 3, 2024
f7919fd
Replace Error and Oops components
kinoppyd Mar 3, 2024
3b4014d
Don't persist default plan object.
kinoppyd Mar 3, 2024
4d124ae
Replace TermsOfService component. Delete all components!!!
kinoppyd Mar 4, 2024
ad25725
Fix error when params[:plan] is empty
kinoppyd Mar 4, 2024
1ea2239
Move data-controller to parent element
kinoppyd Mar 4, 2024
6dbc870
Fix empty plan turbo frame
kinoppyd Mar 4, 2024
532d6a0
Apply dialog style
kinoppyd Mar 4, 2024
246f192
Remove ReactHelper
kinoppyd Mar 4, 2024
35a241e
Sort out Gemfile
kinoppyd Mar 4, 2024
61a5cd8
Fix detail dialog style
kinoppyd Mar 4, 2024
6eea9d8
Remove useless files
kinoppyd Mar 4, 2024
52e1f47
Remove useless node packages
kinoppyd Mar 4, 2024
a24fd86
Use esbuild instead of webpack
kinoppyd Mar 4, 2024
99b6091
Guess client locale when session has no locale info
kinoppyd Mar 5, 2024
44adf90
FOUT
kinoppyd Mar 6, 2024
562f40e
line-clamp
kinoppyd Mar 6, 2024
cfd0b40
Change body color
kinoppyd Mar 7, 2024
db0c362
Add ESLint
kinoppyd Mar 7, 2024
f0d9368
obey eslint
kinoppyd Mar 7, 2024
ace99e7
Bump node version up to 20.11.1
kinoppyd Mar 7, 2024
e932872
Bump Rails version up to 7.1.3.2
kinoppyd Mar 10, 2024
caf12ea
Bump Ruby version up to 3.3.0
kinoppyd Mar 10, 2024
699ce72
Extract dynamic color style from inline style to global style
kinoppyd Mar 10, 2024
90012d9
Move schedule and plan table array builder from helper to controller
kinoppyd Mar 10, 2024
e3007c1
Remove unused code
kinoppyd Mar 10, 2024
5835b3b
Fix dialog style
kinoppyd Mar 10, 2024
4a0d501
Fix style
kinoppyd Mar 10, 2024
ae891e1
ignore vscode config file
kinoppyd Mar 17, 2024
47dea9f
Remove useless tests
kinoppyd Mar 17, 2024
ea66b38
Create fixtures for system spec
kinoppyd Mar 18, 2024
12a7d2f
Enable system test
kinoppyd Mar 18, 2024
ddc6e4b
Add system test for schedule page
kinoppyd Mar 19, 2024
46cff2d
Obey rubocop
kinoppyd Mar 21, 2024
d09638f
Fix actions
kinoppyd Mar 21, 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
5 changes: 5 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module.exports = {
extends: [
'semistandard'
]
};
14 changes: 11 additions & 3 deletions .github/workflows/rspec.yml → .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,25 @@ jobs:

steps:
- uses: actions/checkout@v2

- uses: actions/setup-node@v3
with:
node-version: 16.19.1
node-version: 20.11.1

- uses: ruby/setup-ruby@v1
with:
bundler-cache: true

- uses: nanasess/setup-chromedriver@v2

- name: Create database
run: bin/rails db:setup

- name: yarn
run: yarn install
- name: Build frontend
run: yarn build

- name: Run tests
run: bin/rails test

- name: Run system tests
run: bin/rails test:system
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

# editor
/.idea/
/.vscode/

# Ignore bundler config.
/.bundle
Expand Down
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.19.1
20.11.1
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1.3
3.3.0
34 changes: 22 additions & 12 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,27 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '3.1.3'
ruby '3.3.0'

gem 'rails', '~> 7.0'
gem 'rails', '~> 7.1.3.2'

gem 'propshaft'

# Use postgresql as the database for Active Record
gem 'pg', '~> 1.1'
# Use Puma as the app server
gem 'puma', '~> 5.0'
# Use SCSS for stylesheets
gem 'sass-rails', '>= 6'
# Use Active Model has_secure_password
# gem 'bcrypt', '~> 3.1.7'
gem 'bcrypt', '~> 3.1.16'

gem 'rack-contrib', '~> 2.3.0'
gem 'rails-i18n', '~> 7.0.0'

gem 'jsbundling-rails', '~> 1.2'
gem 'stimulus-rails', '~> 1.3'
gem 'tailwindcss-rails', '~> 2.0'
gem 'turbo-rails', '~> 2.0'

gem 'imgkit'
install_if -> { RUBY_PLATFORM =~ /darwin/ } do
gem 'wkhtmltoimage-binary'
Expand All @@ -23,18 +32,19 @@ end
group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug', platforms: %i[mri mingw x64_mingw]
gem 'rubocop', '~> 1.18'
end

group :development do
gem 'erb-formatter', '~> 0.4.3'
gem 'listen', '~> 3.3'
end

group :test do
# Use system testing [https://guides.rubyonrails.org/testing.html#system-testing]
gem 'capybara'
gem 'selenium-webdriver'
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]

gem 'bcrypt', '~> 3.1.16'
gem 'jsbundling-rails', '~> 1.2'
gem 'rack-contrib', '~> 2.3.0'
gem 'rails-i18n', '~> 7.0.0'
gem 'react-rails', '~> 2.6.1'
gem 'rubocop', '~> 1.18'
Loading
Loading