diff --git a/Dockerfile b/Dockerfile index f2692e7..ff3eef7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,9 +9,9 @@ RUN curl -fsSL https://deb.nodesource.com/setup_lts.x | bash - RUN apt-get update && apt-get install -y nodejs WORKDIR /akkounts -COPY Gemfile /akkounts/Gemfile -COPY Gemfile.lock /akkounts/Gemfile.lock -COPY package.json /akkounts/package.json + +COPY ["Gemfile", "Gemfile.lock", "package.json", "./"] + RUN bundle install RUN gem install foreman RUN npm install -g yarn diff --git a/Gemfile b/Gemfile index 81aceee..1f0a7b3 100644 --- a/Gemfile +++ b/Gemfile @@ -57,6 +57,7 @@ gem "sentry-rails" # Services gem 'discourse_api' +gem "lnurl" gem 'nostr', git: 'https://gitea.kosmos.org/kosmos/nostr-gem.git', branch: 'feature/ruby_2.7_compat' group :development, :test do diff --git a/Gemfile.lock b/Gemfile.lock index 89b4814..439cd1e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -206,6 +206,8 @@ GEM listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) + lnurl (1.0.1) + bech32 (~> 1.1) lockbox (1.2.0) loofah (2.21.3) crass (~> 1.0.2) @@ -434,6 +436,7 @@ DEPENDENCIES letter_opener letter_opener_web listen (~> 3.2) + lnurl lockbox net-ldap nostr! diff --git a/README.md b/README.md index f14c3de..5a177e9 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,6 @@ so: 1. Make sure [Docker Compose is installed][1] and Docker is running (included in Docker Desktop) -2. Uncomment the `redis`, `web`, and `sidekiq` sections in `docker-compose.yml` 3. Run `docker compose up` and wait until 389ds announces its successful start in the log output 4. `docker-compose exec ldap dsconf localhost backend create --suffix="dc=kosmos,dc=org" --be-name="dev"` @@ -53,12 +52,14 @@ Running all specs: ### Docker (Compose) -There is a working Docker Compose config file, which allows you to spin up both +There is a working Docker Compose config file, which define a number of services including an app server for Rails as well as a local 389ds (LDAP) server. -By default, `docker-compose up` will only start the LDAP server, listening on -port 389 on your machine. Uncomment other services in `docker-compose.yml` if -you want to use them. +For Rails developers, you probably just want to start the LDAP server: `docker-compose up ldap`, +listening on port 389 on your machine. + +You can pick and choose your services adding them by name (listed in `docker-compose.yml`) at +the end of the docker compose command. eg. `docker compose up ldap redis` #### LDAP server diff --git a/app/components/form_elements/fieldset_component.html.erb b/app/components/form_elements/fieldset_component.html.erb index 2bde8ce..143da70 100644 --- a/app/components/form_elements/fieldset_component.html.erb +++ b/app/components/form_elements/fieldset_component.html.erb @@ -1,4 +1,6 @@ -<%= tag.public_send(@tag, class: "mb-6 last:mb-0") do %> +<%= tag.public_send(@tag, class: "mb-6 last:mb-0", data: { + :'field-name' => @field_name + }) do %> <% if @positioning == :vertical %> <% elsif @positioning == :horizontal %>