Skip to content

Commit

Permalink
Merge pull request #240 from solver-it-sro/fix-dev
Browse files Browse the repository at this point in the history
Fix dev
  • Loading branch information
alhafoudh authored Dec 8, 2023
2 parents 325f76f + 61e2098 commit be480ad
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 27 deletions.
5 changes: 5 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,8 @@ GEM
net-protocol
netrc (0.11.0)
nio4r (2.7.0)
nokogiri (1.15.5-arm64-darwin)
racc (~> 1.4)
nokogiri (1.15.5-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.15.5-x86_64-linux)
Expand Down Expand Up @@ -426,6 +428,8 @@ GEM
stimulus-rails (1.3.0)
railties (>= 6.0.0)
stringio (3.1.0)
tailwindcss-rails (2.0.32-arm64-darwin)
railties (>= 6.0.0)
tailwindcss-rails (2.0.32-x86_64-darwin)
railties (>= 6.0.0)
tailwindcss-rails (2.0.32-x86_64-linux)
Expand Down Expand Up @@ -472,6 +476,7 @@ GEM
zeitwerk (2.6.12)

PLATFORMS
arm64-darwin-23
x86_64-darwin-21
x86_64-darwin-22
x86_64-linux
Expand Down
2 changes: 2 additions & 0 deletions Procfile.assets
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
css: bin/rails tailwindcss:watch
js: yarn build --watch
50 changes: 25 additions & 25 deletions app/models/concerns/colorized.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,31 @@ module Colorized
extend ActiveSupport::Concern

included do
enum :color,
{
slate: 'slate',
gray: 'gray',
zinc: 'zinc',
neutral: 'neutral',
stone: 'stone',
red: 'red',
orange: 'orange',
amber: 'amber',
yellow: 'yellow',
lime: 'lime',
green: 'green',
emerald: 'emerald',
teal: 'teal',
cyan: 'cyan',
sky: 'sky',
blue: 'blue',
indigo: 'indigo',
violet: 'violet',
purple: 'purple',
fuchsia: 'fuchsia',
pink: 'pink',
rose: 'rose'
}
enum(:color,
{
slate: 'slate',
gray: 'gray',
zinc: 'zinc',
neutral: 'neutral',
stone: 'stone',
red: 'red',
orange: 'orange',
amber: 'amber',
yellow: 'yellow',
lime: 'lime',
green: 'green',
emerald: 'emerald',
teal: 'teal',
cyan: 'cyan',
sky: 'sky',
blue: 'blue',
indigo: 'indigo',
violet: 'violet',
purple: 'purple',
fuchsia: 'fuchsia',
pink: 'pink',
rose: 'rose'
}) if self.columns.map(&:name).include?('color')
end

def self.colors
Expand Down
2 changes: 1 addition & 1 deletion db/schema.rb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion db/seeds.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@
tenant = Tenant.find_or_create_by!(name: 'Dummy Tenant')

ENV['SITE_ADMIN_EMAILS'].to_s.split(',').each.with_index(1) do |email, i|
tenant.users.find_or_create_by!(email: email, name: "Site ADMIN User #{i}")
tenant.users.find_or_create_by!(email: email, name: "Site ADMIN User #{i}").tap do |user|
user.groups << tenant.admin_group
user.save!
end
end

api_connection = Govbox::ApiConnection.find_or_create_by!(sub: "SPL_Irvin_83300252_KK_24022023", api_token_private_key: File.read(Rails.root + "security/govbox_api_fix.pem"))
Expand Down

0 comments on commit be480ad

Please sign in to comment.