Skip to content

Commit

Permalink
Merge pull request #8 from hedgeye-sdeming/overmind
Browse files Browse the repository at this point in the history
Overmind
  • Loading branch information
hedgeye-sdeming authored Sep 9, 2024
2 parents 1db645b + 29bd0ed commit 97e18cc
Show file tree
Hide file tree
Showing 8 changed files with 42 additions and 44 deletions.
27 changes: 0 additions & 27 deletions .github/workflows/main.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ jobs:
with:
ruby-version: ${{ matrix.ruby-version }}
bundler-cache: true
- name: Run tests
run: bundle exec rails test
- name: run specs
run: bundle exec rspec
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
gemspec

group :development do
gem "puma"
gem "sprockets-rails"
gem "foreman"
gem "github_changelog_generator", "~> 1.16"
gem "overmind"
gem "puma"
gem "rspec"
gem "sprockets-rails"

# gem 'better_errors'
# gem 'binding_of_caller'
Expand Down
8 changes: 6 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ GEM
fiber-local (1.1.0)
fiber-storage
fiber-storage (1.0.0)
foreman (0.88.1)
github_changelog_generator (1.16.4)
activesupport
async (>= 1.25.0)
Expand Down Expand Up @@ -200,6 +199,11 @@ GEM
octokit (4.25.1)
faraday (>= 1, < 3)
sawyer (~> 0.9)
overmind (2.5.1)
overmind (2.5.1-arm-linux)
overmind (2.5.1-arm64-darwin)
overmind (2.5.1-x86-linux)
overmind (2.5.1-x86_64-darwin)
phlex (1.10.3)
phlex-icons (0.11.0)
phlex (~> 1.10)
Expand Down Expand Up @@ -335,8 +339,8 @@ PLATFORMS
x86_64-linux

DEPENDENCIES
foreman
github_changelog_generator (~> 1.16)
overmind
phlex_storybook!
puma
rspec
Expand Down
8 changes: 4 additions & 4 deletions bin/dev
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#!/usr/bin/env sh

if gem list --no-installed --exact --silent foreman; then
echo "Installing foreman..."
gem install foreman
if gem list --no-installed --exact --silent overmind; then
echo "Installing overmind..."
gem install overmind
fi

# Default to port 3000 if not specified
export PORT="${PORT:-3000}"

exec foreman start -f Procfile.dev "$@"
exec overmind start -f Procfile.dev "$@"
4 changes: 2 additions & 2 deletions bin/foreman → bin/overmind
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# This file was generated by Bundler.
#
# The application 'foreman' is installed as part of a gem, and
# The application 'overmind' is installed as part of a gem, and
# this file is here to facilitate running it.
#

Expand All @@ -24,4 +24,4 @@ end
require "rubygems"
require "bundler/setup"

load Gem.bin_path("foreman", "foreman")
load Gem.bin_path("overmind", "overmind")
26 changes: 22 additions & 4 deletions lib/phlex_storybook/assets/phlex_storybook_application.css
Original file line number Diff line number Diff line change
Expand Up @@ -875,10 +875,22 @@ fieldset{
position: static;
}

.fixed{
position: fixed;
}

.relative{
position: relative;
}

.bottom-0{
bottom: 0px;
}

.right-0{
right: 0px;
}

.mb-4{
margin-bottom: 1rem;
}
Expand Down Expand Up @@ -1111,19 +1123,25 @@ fieldset{
line-height: 1.25rem;
}

.font-semibold{
font-weight: 600;
.text-xs{
font-size: 0.75rem;
line-height: 1rem;
}

.capitalize{
text-transform: capitalize;
.font-semibold{
font-weight: 600;
}

.text-gray-900{
--tw-text-opacity: 1;
color: rgb(17 24 39 / var(--tw-text-opacity));
}

.text-indigo-200{
--tw-text-opacity: 1;
color: rgb(199 210 254 / var(--tw-text-opacity));
}

.text-sky-500{
--tw-text-opacity: 1;
color: rgb(14 165 233 / var(--tw-text-opacity));
Expand Down
3 changes: 3 additions & 0 deletions lib/phlex_storybook/layouts/application_layout.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ def view_template(&)
stylesheet_link_tag "phlex_storybook_application", media: "all"
turbo_refreshes_with method: :morph, scroll: :preserve
end
span(class: "fixed bottom-0 right-0 p-2 text-xs text-indigo-200") do
"v#{PhlexStorybook::VERSION}"
end
body class: "bg-gray-100 text-gray-900 dark:bg-gray-900 dark:text-gray-100" do
yield
end
Expand Down

0 comments on commit 97e18cc

Please sign in to comment.