much better, now with carrierwave

This commit is contained in:
Torsten 2022-12-25 17:37:22 +02:00
parent e8a755af0e
commit 946f7625be
7 changed files with 94 additions and 36 deletions

View File

@ -14,6 +14,7 @@ gem "sassc-rails"
gem 'haml-rails' gem 'haml-rails'
gem 'html2haml' gem 'html2haml'
gem 'devise' gem 'devise'
gem 'carrierwave', '>= 3.0.0.beta', '< 4.0'
gem "ruby2js" , path: "../ruby2js" gem "ruby2js" , path: "../ruby2js"

View File

@ -104,6 +104,13 @@ GEM
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
regexp_parser (>= 1.5, < 3.0) regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2) xpath (~> 3.2)
carrierwave (3.0.0.beta)
activemodel (>= 6.0.0)
activesupport (>= 6.0.0)
addressable (~> 2.6)
image_processing (~> 1.1)
marcel (~> 1.0.0)
ssrf_filter (~> 1.0)
coderay (1.1.3) coderay (1.1.3)
concurrent-ruby (1.1.10) concurrent-ruby (1.1.10)
crass (1.0.6) crass (1.0.6)
@ -285,6 +292,7 @@ GEM
actionpack (>= 5.2) actionpack (>= 5.2)
activesupport (>= 5.2) activesupport (>= 5.2)
sprockets (>= 3.0.0) sprockets (>= 3.0.0)
ssrf_filter (1.1.1)
tailwindcss-rails (2.0.21-x86_64-linux) tailwindcss-rails (2.0.21-x86_64-linux)
railties (>= 6.0.0) railties (>= 6.0.0)
temple (0.9.1) temple (0.9.1)
@ -318,13 +326,13 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
bootsnap bootsnap
capybara capybara
carrierwave (>= 3.0.0.beta, < 4.0)
debug debug
devise devise
guard guard
guard-minitest guard-minitest
haml-rails haml-rails
html2haml html2haml
image_processing (~> 1.2)
importmap-rails importmap-rails
merged! merged!
mina mina

View File

@ -4,6 +4,8 @@ class Member < ApplicationRecord
devise :database_authenticatable, :registerable,:confirmable, devise :database_authenticatable, :registerable,:confirmable,
:recoverable, :rememberable, :validatable :recoverable, :rememberable, :validatable
mount_uploader :picture, PictureUploader
def admin? def admin?
true true
end end

View File

@ -0,0 +1,47 @@
class PictureUploader < CarrierWave::Uploader::Base
# Include RMagick or MiniMagick support:
# include CarrierWave::RMagick
include CarrierWave::MiniMagick
# Choose what kind of storage to use for this uploader:
storage :file
# storage :fog
# Override the directory where uploaded files will be stored.
# This is a sensible default for uploaders that are meant to be mounted:
def store_dir
"uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
end
# Provide a default URL as a default if there hasn't been a file uploaded:
# def default_url(*args)
# # For Rails 3.1+ asset pipeline compatibility:
# # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_'))
#
# "/images/fallback/" + [version_name, "default.png"].compact.join('_')
# end
# Process files as they are uploaded:
# process scale: [200, 300]
#
# def scale(width, height)
# # do something
# end
# Create different versions of your uploaded files:
# version :thumb do
# process resize_to_fit: [50, 50]
# end
# Add an allowlist of extensions which are allowed to be uploaded.
# For images you might use something like this:
# def extension_allowlist
# %w(jpg jpeg gif png)
# end
# Override the filename of the uploaded files:
# Avoid using model.id or version_name here, see uploader/store.rb for details.
# def filename
# "something.jpg" if original_filename
# end
end

View File

@ -5,8 +5,7 @@
.flex.flex-col .flex.flex-col
%h1 Editing member %h1 Editing member
= form_for @member do |f| = form_for @member do |f|
.flex.flex-col
- if @member.errors.any? - if @member.errors.any?
#error_explanation #error_explanation
%h2= "#{pluralize(@member.errors.count, "error")} prohibited this member from being saved:" %h2= "#{pluralize(@member.errors.count, "error")} prohibited this member from being saved:"
@ -14,7 +13,7 @@
- @member.errors.full_messages.each do |message| - @member.errors.full_messages.each do |message|
%li= message %li= message
.grid.grid-cols-3.gap-10 .grid.grid-cols-3.gap-10.mx-20
.field .field
= f.label :name = f.label :name
= f.text_field :name = f.text_field :name
@ -24,19 +23,20 @@
.field .field
= f.label :picture = f.label :picture
= f.file_field :picture = f.file_field :picture
.preview.prose
%b.text-2xl Preview
%div{"v-html" => "compiledMarkdown"}
.field.flex.flex-col
= f.label :bio
= f.text_area :bio ,rows: 15 , "v-model" => "markdown"
%div %div
-if @member.picture -if @member.picture_url
%div.overflow-hidden %div.overflow-hidden
.my-5 Currently .my-5 Currently
= image_tag @member.picture, class: "object-contain h-40" = image_tag @member.picture_url, class: "object-contain h-40"
-else -else
No Picture No Picture
.field
= f.label :bio
= f.text_area :bio , "v-model" => "markdown"
.preview.prose
%div{"v-html" => "compiledMarkdown"}
.flex.justify-center.actions.m-10 .flex.justify-center.actions.m-10
= f.submit 'Save' = f.submit 'Save'
.ml-20= link_to 'Back', member_path(@member) .ml-20= link_to 'Back', member_path(@member)

View File

@ -5,9 +5,9 @@
%div %div
%b Public: %b Public:
= @member.public = @member.public
-if @member.picture -if @member.picture_url
%div.overflow-hidden.items-align-right %div.overflow-hidden.items-align-right
= image_tag @member.picture, class: "object-contain h-80" = image_tag @member.picture_url, class: "object-contain h-80"
%div.prose= markdown(@member.bio) %div.prose= markdown(@member.bio)
= link_to 'Edit', edit_member_path(@member) = link_to 'Edit', edit_member_path(@member)

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 MiB