Merge pull request #104 from JudahSan/fix/cta-rubyconf-2025

Add DevContainer setup and update README with setup instructions`

Author: JudahSan

.devcontainer/Dockerfile

@@ -0,0 +1,3 @@
+# Make sure RUBY_VERSION matches the Ruby version in .ruby-version
+ARG RUBY_VERSION=3.4.1
+FROM ghcr.io/rails/devcontainer/images/ruby:$RUBY_VERSION

.devcontainer/compose.yaml

@@ -0,0 +1,48 @@
+name: "arc_platform"
+
+services:
+  rails-app:
+    build:
+      context: ..
+      dockerfile: .devcontainer/Dockerfile
+
+    volumes:
+    - ../..:/workspaces:cached
+
+    # Overrides default command so things don't shut down after the process ends.
+    command: sleep infinity
+
+    # Uncomment the next line to use a non-root user for all processes.
+    # user: vscode
+
+    # Use "forwardPorts" in **devcontainer.json** to forward an app port locally.
+    # (Adding the "ports" property to this file will not forward from a Codespace.)
+    depends_on:
+    - selenium
+    - redis
+    - postgres
+
+  selenium:
+    image: selenium/standalone-chromium
+    restart: unless-stopped
+
+  redis:
+    image: redis:7.2
+    restart: unless-stopped
+    volumes:
+    - redis-data:/data
+
+  postgres:
+    image: postgres:16.1
+    restart: unless-stopped
+    networks:
+    - default
+    volumes:
+    - postgres-data:/var/lib/postgresql/data
+    environment:
+        POSTGRES_USER: postgres
+        POSTGRES_PASSWORD: postgres
+
+volumes:
+  redis-data:
+  postgres-data:

.devcontainer/devcontainer.json

@@ -0,0 +1,36 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/ruby
+{
+  "name": "arc_platform",
+  "dockerComposeFile": "compose.yaml",
+  "service": "rails-app",
+  "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
+
+  // Features to add to the dev container. More info: https://containers.dev/features.
+  "features": {
+    "ghcr.io/devcontainers/features/github-cli:1": {},
+    "ghcr.io/rails/devcontainer/features/activestorage": {},
+    "ghcr.io/devcontainers/features/node:1": {},
+    "ghcr.io/rails/devcontainer/features/postgres-client": {}
+  },
+
+  "containerEnv": {
+    "CAPYBARA_SERVER_PORT": "45678",
+    "SELENIUM_HOST": "selenium",
+    "REDIS_URL": "redis://redis:6379/1",
+    "DB_HOST": "postgres"
+  },
+
+  // Use 'forwardPorts' to make a list of ports inside the container available locally.
+  "forwardPorts": [3000, 5432, 6379],
+
+  // Configure tool-specific properties.
+  // "customizations": {},
+
+  // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+  // "remoteUser": "root",
+
+
+  // Use 'postCreateCommand' to run commands after the container is created.
+  "postCreateCommand": "bin/setup"
+}

.ruby-version

@@ -1 +1 @@
-3.0.2
+3.4.1

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:3.0.2-alpine
+FROM ruby:3.4.1-alpine
 
 ENV APP_PATH /var/app
 ENV BUNDLE_VERSION 2.3.1

README.md

@@ -13,6 +13,28 @@ The Africa Ruby Community (ARC) Platform is a project aimed at creating a hub fo
 *Note: This project is open source, and contributions are encouraged.*
 
 ## Application Setup
+
+### Dev Containers
+
+#### Prerequisites
+- Docker Desktop
+- VS Code with Dev Containers extension
+
+#### Setup
+1. Open project in VS Code
+2. Click green "><" icon in bottom-left corner
+3. Select "Reopen in Container"
+
+## First Run
+- Initial build may take several minutes
+- All dependencies will be installed automatically
+
+## Running Rails
+```bash
+bundle exec rails server -b 0.0.0.0
+```
+Access app at `http://localhost:3000`
+
 - To follow along, watch this youtube tutorial on how to set up the application step by step on WSL.
 
 [![Application Setup](https://img.youtube.com/vi/-mz76HidnGA/0.jpg)](https://www.youtube.com/watch?v=-mz76HidnGA)
@@ -29,7 +51,7 @@ The Africa Ruby Community (ARC) Platform is a project aimed at creating a hub fo
 Install dependencies for compiling Ruby:
 
 * macOS: Install Homebrew
-
+ 
 ```sh
 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
 ```

app/views/landing/home/_intro.html.erb

@@ -1,10 +1,7 @@
-<div class="bg-gradient-to-r from-red-600 to-red-700 text-center py-5 sm:py-6 md:py-8 px-4 sm:px-6 md:px-8 shadow-lg rounded-box mx-auto max-w-lg">
-  <div class="tooltip" data-tip="Click to visit Ruby Conf Africa 2025">
-    <a href="https://rubyconf.africa" class="btn btn-lg btn-primary btn-block text-xl sm:text-l font-extrabold flex items-center justify-center space-x-3 underline decoration-dashed hover:decoration-solid ">
-      <span class="text-xl font-bold tracking-wide">Ruby Conf Africa 2025</span>
-      <span class="text-3xl animate-pulse text-red-200">🔗</span>
-    </a>
-  </div>
+<div class="text-center shadow-lg rounded-box mx-auto">
+  <a href="https://rubyconf.africa" title="Click to visit Ruby Conf Africa 2025" class="btn btn-lg btn-primary btn-block text-xl sm:text-l font-extrabold flex items-center justify-center space-x-3 underline decoration-dashed hover:decoration-solid">
+    <span class="text-xl font-bold tracking-wide">Ruby Conf Africa 2025 🔗</span>
+  </a>
 </div>
 
 <div class="grid md:grid-cols-2 pt-10 pb-10 gap-10">

config/database.yml

@@ -4,8 +4,6 @@
 #   gem install pg
 # On macOS with Homebrew:
 #   gem install pg -- --with-pg-config=/usr/local/bin/pg_config
-# On macOS with MacPorts:
-#   gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config
 # On Windows:
 #   gem install pg
 #       Choose the win32 build.
@@ -20,18 +18,24 @@ default: &default
   # For details on connection pooling, see Rails configuration guide
   # https://guides.rubyonrails.org/configuring.html#database-pooling
   pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
+  <% if ENV["DB_HOST"] %>
+  host: <%= ENV["DB_HOST"] %>
+  username: postgres
+  password: postgres
+  <% end %>
+
 
 development:
   <<: *default
   database: arc_platform_development
 
-  # The specified database role being used to connect to postgres.
-  # To create additional roles in postgres see `$ createuser --help`.
-  # When left blank, postgres will use the default role. This is
+  # The specified database role being used to connect to PostgreSQL.
+  # To create additional roles in PostgreSQL see `$ createuser --help`.
+  # When left blank, PostgreSQL will use the default role. This is
   # the same name as the operating system user running Rails.
   #username: arc_platform
 
-  # The password associated with the postgres role (username).
+  # The password associated with the PostgreSQL role (username).
   #password:
 
   # Connect on a TCP socket. Omitted by default since the client uses a

test/application_system_test_case.rb

@@ -3,5 +3,14 @@
 require 'test_helper'
 
 class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
-  driven_by :selenium, using: :chrome, screen_size: [1400, 1400]
+  if ENV['CAPYBARA_SERVER_PORT']
+    served_by host: 'rails-app', port: ENV['CAPYBARA_SERVER_PORT']
+
+    driven_by :selenium, using: :headless_chrome, screen_size: [1400, 1400], options: {
+      browser: :remote,
+      url: "http://#{ENV.fetch('SELENIUM_HOST', nil)}:4444"
+    }
+  else
+    driven_by :selenium, using: :headless_chrome, screen_size: [1400, 1400]
+  end
 end