Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
35 changes: 35 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Run tests

on:
push:
branches: [ main ]
pull_request:
branches: [ main ]

jobs:
test:
runs-on: ubuntu-latest

env:
RAILS_ENV: test

steps:
- uses: actions/checkout@v4

- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.3
bundler-cache: true

- name: Create .env file
run: cp env-example .env

- name: Set up test database
run: bin/rails db:setup

- name: Run tests
run: bin/test

- name: Check code standards
run: bundle exec rake code_standards
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,6 @@ yarn-debug.log*
.aider*
$GEM_HOME/
.gems/

/app/assets/builds/*
!/app/assets/builds/.keep
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ source "https://rubygems.org"
# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
gem "rails", "~> 8.0.1"

gem "sassc-rails"
gem "tailwindcss-rails"

gem "haml-rails"
gem "html2haml" # temporary
Expand Down
15 changes: 5 additions & 10 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ GEM
factory_bot (~> 6.5)
railties (>= 6.1.0)
fast_ignore (0.17.4)
ffi (1.17.2-x86_64-linux-gnu)
globalid (1.2.1)
activesupport (>= 6.1)
haml (6.3.0)
Expand Down Expand Up @@ -301,14 +300,6 @@ GEM
racc (~> 1.5)
sexp_processor (~> 4.16)
rubyzip (2.4.1)
sassc (2.4.0)
ffi (~> 1.9)
sassc-rails (2.1.2)
railties (>= 4.0.0)
sassc (>= 2.0)
sprockets (> 3.0)
sprockets-rails
tilt
securerandom (0.4.1)
selenium-webdriver (4.33.0)
base64 (~> 0.2)
Expand Down Expand Up @@ -355,6 +346,10 @@ GEM
lint_roller (~> 1.0)
rubocop-rails (~> 2.31.0)
stringio (3.1.7)
tailwindcss-rails (4.4.0)
railties (>= 7.0.0)
tailwindcss-ruby (~> 4.0)
tailwindcss-ruby (4.1.16-x86_64-linux-gnu)
temple (0.10.3)
thor (1.3.2)
tilt (2.6.0)
Expand Down Expand Up @@ -405,7 +400,6 @@ DEPENDENCIES
puma
rails (~> 8.0.1)
rails-controller-testing
sassc-rails
selenium-webdriver
shoulda-context
shoulda-matchers
Expand All @@ -415,6 +409,7 @@ DEPENDENCIES
sqlite3
standard
standard-rails
tailwindcss-rails
tzinfo-data
web-console

Expand Down
2 changes: 2 additions & 0 deletions Procfile.dev
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
web: bin/rails server
css: bin/rails tailwindcss:watch
1 change: 0 additions & 1 deletion app/assets/stylesheets/tailwind.css

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
@tailwind base;
@tailwind components;
@tailwind utilities;
@import "tailwindcss";

@layer base {
body {
Expand Down Expand Up @@ -198,7 +196,8 @@
}

.banner {
@apply min-w-16 inline-block p-4 pr-8 my-4 text-sm border animate-fade-in relative;
@apply min-w-16 inline-block p-4 pr-8 my-4 text-sm border relative;
animation: fade-in 1s ease;
&:has(input.hidden:checked) {
display: none;
}
Expand All @@ -224,7 +223,8 @@
}
}
&.info {
@apply p-4 my-4 text-sm text-sky-800 border border-sky-900 bg-sky-300 animate-fade-in;
@apply p-4 my-4 text-sm text-sky-800 border border-sky-900 bg-sky-300;
animation: fade-in 1s ease;
a {
@apply decoration-sky-600;
}
Expand Down Expand Up @@ -353,6 +353,15 @@
animation: fade-in 1s ease;
}

@keyframes fade-in {
from {
opacity: 0;
}
to {
opacity: 1;
}
}

body.admin-background {
@apply bg-gradient-to-r from-fuchsia-900 to-slate-900;
}
2 changes: 1 addition & 1 deletion app/services/ical_generator_service.rb
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def event_description(event)
description = event.description.to_s

if event.bands.any?
band_names = event.bands.map(&:name).join(", ")
band_names = event.bands.map(&:name).sort.join(", ")
description += "\n\nBands: #{band_names}"
end

Expand Down
16 changes: 16 additions & 0 deletions bin/dev
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/usr/bin/env sh

if ! gem list foreman -i --silent; then
echo "Installing foreman..."
gem install foreman
fi

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

# Let the debug gem allow remote connections,
# but avoid loading until `debugger` is called
export RUBY_DEBUG_OPEN="true"
export RUBY_DEBUG_LAZY="true"

exec foreman start -f Procfile.dev "$@"
Loading
Loading