Merge remote-tracking branch 'upstream/main' into k

3kh0 · 3kh0 · commit a172552ea6bc · 2025-10-19T12:11:23.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -37,4 +37,6 @@
 /config/credentials/development.key
 
 # mac os be like
-.DS_Store
+.DS_Store
+/app/assets/builds/*
+!/app/assets/builds/.keep
diff --git a/Gemfile b/Gemfile
@@ -38,7 +38,7 @@ gem "kamal", require: false
 gem "thruster", require: false
 
 # Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images]
-# gem "image_processing", "~> 1.2"
+gem "image_processing", "~> 1.2"
 
 group :development, :test do
   # See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem
@@ -82,3 +82,9 @@ gem "omniauth"
 gem "omniauth-rails_csrf_protection"
 gem "omniauth_openid_connect"
 gem "slack-ruby-client"
+
+gem "tailwindcss-ruby", "~> 4.1"
+
+gem "tailwindcss-rails", "~> 4.3"
+
+gem "active_storage_validations"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -46,6 +46,12 @@ GEM
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
+    active_storage_validations (3.0.2)
+      activejob (>= 6.1.4)
+      activemodel (>= 6.1.4)
+      activestorage (>= 6.1.4)
+      activesupport (>= 6.1.4)
+      marcel (>= 1.0.3)
     activejob (8.0.3)
       activesupport (= 8.0.3)
       globalid (>= 0.3.6)
@@ -153,6 +159,13 @@ GEM
       multipart-post (~> 2.0)
     faraday-net_http (3.4.1)
       net-http (>= 0.5.0)
+    ffi (1.17.2-aarch64-linux-gnu)
+    ffi (1.17.2-aarch64-linux-musl)
+    ffi (1.17.2-arm-linux-gnu)
+    ffi (1.17.2-arm-linux-musl)
+    ffi (1.17.2-arm64-darwin)
+    ffi (1.17.2-x86_64-linux-gnu)
+    ffi (1.17.2-x86_64-linux-musl)
     fiddle (1.1.8)
     fugit (1.11.2)
       et-orbi (~> 1, >= 1.2.11)
@@ -164,6 +177,9 @@ GEM
     hashie (5.0.0)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
+    image_processing (1.14.0)
+      mini_magick (>= 4.9.5, < 6)
+      ruby-vips (>= 2.0.17, < 3)
     importmap-rails (2.2.2)
       actionpack (>= 6.0.0)
       activesupport (>= 6.0.0)
@@ -209,6 +225,8 @@ GEM
       net-smtp
     marcel (1.1.0)
     matrix (0.4.3)
+    mini_magick (5.3.1)
+      logger
     mini_mime (1.1.5)
     minitest (5.26.0)
     msgpack (1.8.0)
@@ -392,6 +410,9 @@ GEM
       rubocop-performance (>= 1.24)
       rubocop-rails (>= 2.30)
     ruby-progressbar (1.13.0)
+    ruby-vips (2.2.5)
+      ffi (~> 1.12)
+      logger
     rubyzip (3.1.1)
     securerandom (0.4.1)
     selenium-webdriver (4.35.0)
@@ -439,6 +460,15 @@ GEM
       attr_required (>= 0.0.5)
       faraday (~> 2.0)
       faraday-follow_redirects
+    tailwindcss-rails (4.3.0)
+      railties (>= 7.0.0)
+      tailwindcss-ruby (~> 4.0)
+    tailwindcss-ruby (4.1.13)
+    tailwindcss-ruby (4.1.13-aarch64-linux-gnu)
+    tailwindcss-ruby (4.1.13-aarch64-linux-musl)
+    tailwindcss-ruby (4.1.13-arm64-darwin)
+    tailwindcss-ruby (4.1.13-x86_64-linux-gnu)
+    tailwindcss-ruby (4.1.13-x86_64-linux-musl)
     thor (1.4.0)
     thruster (0.1.15)
     thruster (0.1.15-aarch64-linux)
@@ -492,6 +522,7 @@ PLATFORMS
 
 DEPENDENCIES
   aasm
+  active_storage_validations
   annotaterb
   blind_index
   bootsnap
@@ -500,6 +531,7 @@ DEPENDENCIES
   capybara
   debug
   erb_lint
+  image_processing (~> 1.2)
   importmap-rails
   jbuilder
   kamal
@@ -522,6 +554,8 @@ DEPENDENCIES
   solid_cache
   solid_queue
   stimulus-rails
+  tailwindcss-rails (~> 4.3)
+  tailwindcss-ruby (~> 4.1)
   thruster
   turbo-rails
   tzinfo-data
diff --git a/Procfile.dev b/Procfile.dev
@@ -0,0 +1,2 @@
+web: bin/rails server
+css: bin/rails tailwindcss:watch
diff --git a/app/assets/builds/.keep b/app/assets/builds/.keep
diff --git a/app/assets/tailwind/application.css b/app/assets/tailwind/application.css
@@ -0,0 +1 @@
+@import "tailwindcss";
diff --git a/app/controllers/project/memberships_controller.rb b/app/controllers/project/memberships_controller.rb
@@ -0,0 +1,7 @@
+class Project::MembershipsController < ApplicationController
+  def create
+  end
+
+  def destroy
+  end
+end
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
@@ -0,0 +1,25 @@
+class ProjectsController < ApplicationController
+  def show
+    authorize @project
+  end
+
+  def new
+    authorize @project
+  end
+
+  def create
+    authorize @project
+  end
+
+  def edit
+    authorize @project
+  end
+
+  def update
+    authorize @project
+  end
+
+  def destroy
+    authorize @project
+  end
+end
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
@@ -26,7 +26,8 @@ def create
       reset_session
       session[:user_id] = user.id
       redirect_to root_path, notice: "Signed in with Slack"
-      nil
+    else
+      redirect_to root_path, alert: "Authentication failed or user already signed in"
     end
   end
 
diff --git a/app/helpers/project/memberships_helper.rb b/app/helpers/project/memberships_helper.rb
@@ -0,0 +1,2 @@
+module Project::MembershipsHelper
+end
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
@@ -0,0 +1,2 @@
+module ProjectsHelper
+end
diff --git a/app/models/project.rb b/app/models/project.rb
@@ -17,8 +17,34 @@ class Project < ApplicationRecord
     has_many :users, through: :memberships
 
     has_one_attached :demo_video
-    has_one_attached :banner
+    # https://github.com/rails/rails/pull/39135
+    has_one_attached :banner do |attachable|
+        # using resize_to_fill instead of resize_to_limit because consistency. might change it to resize_to_limit
+        # we're preprocessing them because its likely going to be used
+
+        # for explore and projects#index
+        attachable.variant :card,
+                           resize_to_fill: [ 1600, 900 ],
+                           format: :webp,
+                           preprocessed: true,
+                           saver: { strip: true, quality: 75 }
+
+        #   attachable.variant :not_sure,
+        #     resize_to_fill: [ 1200, 630 ],
+        #     format: :webp,
+        #     saver: { strip: true, quality: 75 }
+
+        # for voting
+        attachable.variant :thumb,
+                           resize_to_fill: [ 400, 210 ],
+                           format: :webp,
+                           preprocessed: true,
+                           saver: { strip: true, quality: 75 }
+    end
 
     validates :title, presence: true, length: { maximum: 120 }
     validates :description, length: { maximum: 1_000 }, allow_blank: true
+    validates :banner,
+              content_type: [ "image/jpeg", "image/png", "image/webp", "image/heic", "image/heif" ],
+              size: { less_than: 10.megabytes, message: "is too large (max 10 MB)" }
 end
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -18,15 +18,24 @@ class User < ApplicationRecord
   has_many :projects, through: :memberships
   has_many :roles, through: :role_assignments
 
-  # Add more providers if needed, but make sure to include each one in PROVIDERS inside user/identity.rb; otherwise, the validation will fail.
+  class << self
+    # Add more providers if needed, but make sure to include each one in PROVIDERS inside user/identity.rb; otherwise, the validation will fail.
+    def find_by_slack(uid)     = find_by_provider("slack", uid)
+    def find_by_hackatime(uid) = find_by_provider("hackatime", uid)
+    def find_by_idv(uid)       = find_by_provider("idv", uid)
 
-  def self.find_by_slack(uid)     = find_by_provider("slack", uid)
-  def self.find_by_hackatime(uid) = find_by_provider("hackatime", uid)
-  def self.find_by_idv(uid)       = find_by_provider("idv", uid)
+    private
 
-  def self.find_by_provider(provider, uid)
-    joins(:identities).find_by(user_identities: { provider:, uid: })
+    def find_by_provider(provider, uid)
+      joins(:identities).find_by(user_identities: { provider:, uid: })
+    end
   end
 
-  private_class_method :find_by_provider
+  def admin?
+    roles.exists?(name: [ "admin", "super_admin" ])
+  end
+
+  def super_admin?
+    roles.exists?(name: "super_admin")
+  end
 end
diff --git a/app/policies/application_policy.rb b/app/policies/application_policy.rb
@@ -50,4 +50,10 @@ def resolve
 
     attr_reader :user, :scope
   end
+
+  private
+
+  def logged_in?
+    user.present?
+  end
 end
diff --git a/app/policies/project_policy.rb b/app/policies/project_policy.rb
@@ -0,0 +1,32 @@
+class ProjectPolicy < ApplicationPolicy
+    def show?
+        true
+    end
+
+    def new?
+        logged_in?
+    end
+
+    def create?
+        logged_in?
+    end
+
+    def edit?
+        owns? || user.admin?
+    end
+
+    def update?
+        owns? || user.admin?
+    end
+
+    def destroy?
+        owns? || user.admin?
+    end
+
+    private
+
+    def owns?
+        return false unless user && record
+        user.membership.exists?(project: record, role: "owner")
+    end
+end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -28,6 +28,20 @@
   </head>
 
   <body>
-    <%= yield %>
+    <main>
+      <% if notice %>
+        <div class="bg-green-100 border border-green-400 text-green-700 px-4 py-3 rounded mb-4 mx-4 mt-4" role="alert">
+          <%= notice %>
+        </div>
+      <% end %>
+      
+      <% if alert %>
+        <div class="bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded mb-4 mx-4 mt-4" role="alert">
+          <%= alert %>
+        </div>
+      <% end %>
+      
+      <%= yield %>
+    </main>
   </body>
 </html>
diff --git a/app/views/project/memberships/create.html.erb b/app/views/project/memberships/create.html.erb
@@ -0,0 +1,2 @@
+<h1>Project::Memberships#create</h1>
+<p>Find me in app/views/project/memberships/create.html.erb</p>
diff --git a/app/views/project/memberships/destroy.html.erb b/app/views/project/memberships/destroy.html.erb
@@ -0,0 +1,2 @@
+<h1>Project::Memberships#destroy</h1>
+<p>Find me in app/views/project/memberships/destroy.html.erb</p>
diff --git a/app/views/projects/create.html.erb b/app/views/projects/create.html.erb
@@ -0,0 +1,2 @@
+<h1>Projects#create</h1>
+<p>Find me in app/views/projects/create.html.erb</p>
diff --git a/app/views/projects/destroy.html.erb b/app/views/projects/destroy.html.erb
@@ -0,0 +1,2 @@
+<h1>Projects#destroy</h1>
+<p>Find me in app/views/projects/destroy.html.erb</p>
diff --git a/app/views/projects/edit.html.erb b/app/views/projects/edit.html.erb
@@ -0,0 +1,2 @@
+<h1>Projects#edit</h1>
+<p>Find me in app/views/projects/edit.html.erb</p>
diff --git a/app/views/projects/new.html.erb b/app/views/projects/new.html.erb
@@ -0,0 +1,2 @@
+<h1>Projects#new</h1>
+<p>Find me in app/views/projects/new.html.erb</p>
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
@@ -0,0 +1,2 @@
+<h1>Projects#show</h1>
+<p>Find me in app/views/projects/show.html.erb</p>
diff --git a/app/views/projects/update.html.erb b/app/views/projects/update.html.erb
@@ -0,0 +1,2 @@
+<h1>Projects#update</h1>
+<p>Find me in app/views/projects/update.html.erb</p>
diff --git a/bin/dev b/bin/dev
@@ -1,2 +1,16 @@
-#!/usr/bin/env ruby
-exec "./bin/rails", "server", *ARGV
+#!/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 "$@"
diff --git a/config/routes.rb b/config/routes.rb
@@ -14,5 +14,12 @@
   get "/auth/failure", to: "sessions#failure"
   get "logout", to: "sessions#destroy"
 
+  # Projects
+
+  resources :projects, except: :index, shallow: true do
+    resources :memberships, only: [ :create, :destroy ], module: :project
+  end
+
+  # Landing
   root "landing#index"
 end
diff --git a/test/controllers/project/memberships_controller_test.rb b/test/controllers/project/memberships_controller_test.rb
@@ -0,0 +1,13 @@
+require "test_helper"
+
+class Project::MembershipsControllerTest < ActionDispatch::IntegrationTest
+  test "should get create" do
+    get project_memberships_create_url
+    assert_response :success
+  end
+
+  test "should get destroy" do
+    get project_memberships_destroy_url
+    assert_response :success
+  end
+end
diff --git a/test/controllers/projects_controller_test.rb b/test/controllers/projects_controller_test.rb

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+web: bin/rails server`
	`2`	`+css: bin/rails tailwindcss:watch`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+module Project::MembershipsHelper`
	`2`	`+end`