Skip to content

Commit

Permalink
Merge pull request #114 from kufu/features/farewell_smarthr_ui_welcom…
Browse files Browse the repository at this point in the history
…e_tailwind

Farewell smarthr UI, welcome tailwind
  • Loading branch information
kinoppyd authored Mar 25, 2024
2 parents 6c50052 + d09638f commit e3cdb3a
Show file tree
Hide file tree
Showing 89 changed files with 3,087 additions and 5,609 deletions.
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

0 comments on commit e3cdb3a

Please sign in to comment.