diff --git a/.gitignore b/.gitignore index d6de502..7fde95c 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,7 @@ /tmp/storage/* !/tmp/storage/ !/tmp/storage/.keep +/public/uploads /public/assets diff --git a/Gemfile b/Gemfile index b27edf5..27841c8 100644 --- a/Gemfile +++ b/Gemfile @@ -17,6 +17,8 @@ gem 'devise' gem 'carrierwave', '>= 3.0.0.beta', '< 4.0' gem "ruby2js" , path: "../ruby2js" +gem "simple_form" , "5.1.0" +gem "simple_form_tailwind_css" #gem "merged" , git: "https://github.com/HubFeenixMakers/merged" gem "merged" , path: "../merged" diff --git a/Gemfile.lock b/Gemfile.lock index 599166b..50e4741 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -155,6 +155,8 @@ GEM activesupport (>= 5.1) haml (>= 4.0.6) railties (>= 5.1) + heroicon (1.0.0) + rails (>= 5.2) html2haml (2.3.0) erubis (~> 2.7.0) haml (>= 4.0) @@ -285,6 +287,12 @@ GEM websocket (~> 1.0) sexp_processor (4.16.1) shellany (0.0.1) + simple_form (5.1.0) + actionpack (>= 5.2) + activemodel (>= 5.2) + simple_form_tailwind_css (1.0.0) + heroicon + simple_form sprockets (4.1.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) @@ -343,6 +351,8 @@ DEPENDENCIES ruby2js! sassc-rails selenium-webdriver + simple_form (= 5.1.0) + simple_form_tailwind_css sprockets-rails tailwindcss-rails web-console diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 9a6dffa..8a15369 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,9 +1,23 @@ +require "redcarpet" + module ApplicationHelper - def markdown(text) - Merged::MergedHelper.markdown(text) + def renderer + options = {hard_wrap: true , autolink: true, no_intra_emphasis: true , + safe_links_only: true, no_styles: true , + link_attributes: { target: '_blank' }} + html = Redcarpet::Render::HTML.new(options) + Redcarpet::Markdown.new(html, options) end + + def markdown(text) + text = text.text unless text.is_a?(String) + return "" if text.blank? + self.renderer.render(text).html_safe + end + def main_app Rails.application.routes.url_helpers end + end diff --git a/app/views/home/torsten/code/hubfeenix.fi b/app/views/home/torsten/code/hubfeenix.fi new file mode 100644 index 0000000..e69de29 diff --git a/app/views/layouts/application.haml b/app/views/layouts/application.haml index 10c2014..c3a6a26 100644 --- a/app/views/layouts/application.haml +++ b/app/views/layouts/application.haml @@ -6,7 +6,7 @@ %meta{:content => "width=device-width,initial-scale=1", :name => "viewport"}/ = csrf_meta_tags = csp_meta_tag - = stylesheet_link_tag "tailwind" , "data-turbo-track": "reload" + = stylesheet_link_tag "tailwind" = stylesheet_link_tag "application" = javascript_importmap_tags diff --git a/app/views/members/edit.html.haml b/app/views/members/edit.html.haml index 5e76c99..41ffc96 100644 --- a/app/views/members/edit.html.haml +++ b/app/views/members/edit.html.haml @@ -5,31 +5,18 @@ .flex.flex-col %h1 Editing member -= form_for @member do |f| - - if @member.errors.any? - #error_explanation - %h2= "#{pluralize(@member.errors.count, "error")} prohibited this member from being saved:" - %ul - - @member.errors.full_messages.each do |message| - %li= message += simple_form_for @member , builder: SimpleForm::Tailwind::FormBuilder do |f| + = f.error_notification .grid.grid-cols-3.gap-10.mx-20 - .field - = f.label :name - = f.text_field :name - .field - = f.label :public - = f.check_box :public - .field - = f.label :picture - = f.file_field :picture + = f.input :name + = f.input :public + = f.input :picture , as: :file .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" - + = f.text_area :bio ,rows: 15 , "v-model" => "markdown" , class: "appearance-none block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm placeholder-gray-400 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm" %div -if @member.picture_url %div.overflow-hidden @@ -38,7 +25,7 @@ -else No Picture .flex.justify-center.actions.m-10 - = f.submit 'Save' + = f.button :button, "Get started", class: "w-full flex justify-center py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500" .ml-20= link_to 'Back', member_path(@member) :ruby2js diff --git a/config/application.rb b/config/application.rb index 43c532a..d89b24c 100644 --- a/config/application.rb +++ b/config/application.rb @@ -35,3 +35,5 @@ module HubfeenixFi end end + +ActionView::Base.default_form_builder = SimpleForm::Tailwind::FormBuilder diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb new file mode 100644 index 0000000..9293903 --- /dev/null +++ b/config/initializers/simple_form.rb @@ -0,0 +1,210 @@ +# frozen_string_literal: true +# +# Uncomment this and change the path if necessary to include your own +# components. +# See https://github.com/heartcombo/simple_form#custom-components to know +# more about custom components. +# Dir[Rails.root.join('lib/components/**/*.rb')].each { |f| require f } +# +# Use this setup block to configure all options available in SimpleForm. +SimpleForm.setup do |config| + # Wrappers are used by the form builder to generate a + # complete input. You can remove any component from the + # wrapper, change the order or even add your own to the + # stack. The options given below are used to wrap the + # whole input. + + config.wrappers :default, tag: 'div', class: '', error_class: '', valid_class: '' do |b| + b.use :html5 + b.use :placeholder + b.optional :maxlength + b.optional :minlength + b.optional :pattern + b.optional :min_max + b.optional :readonly + + b.use :label, class: "block text-sm font-medium text-gray-700" + b.use :input, + class: 'appearance-none block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm placeholder-gray-400 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm', + error_class: 'block w-full pr-10 border-red-300 text-red-900 placeholder-red-300 focus:outline-none focus:ring-red-500 focus:border-red-500 sm:text-sm rounded-md' + b.use :full_error, wrap_with: { tag: 'p', class: 'mt-2 text-sm text-red-600' } + b.use :hint, wrap_with: { tag: :p, class: "mt-2 text-sm text-gray-500" } + end + + config.wrappers :prepend_string, tag: 'div', class: '', error_class: '', valid_class: '' do |b| + b.use :html5 + b.use :placeholder + b.optional :maxlength + b.optional :minlength + b.optional :pattern + b.optional :min_max + b.optional :readonly + + b.use :label, class: "block text-sm font-medium text-gray-700" + + b.wrapper tag: 'div', class: 'mt-1 flex rounded-md shadow-sm' do |d| + d.use :prepend + d.use :input, + class: "flex-1 min-w-0 block w-full px-3 py-2 rounded-none rounded-r-md focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm border-gray-300", + error_class: "flex-1 min-w-0 block w-full px-3 py-2 rounded-none rounded-r-md focus:ring-red-500 focus:border-red-500 sm:text-sm border-red-300 text-red-900 placeholder-red-300" + end + b.use :full_error, wrap_with: { tag: "p", class: "mt-2 text-sm text-red-600" } + b.use :hint, wrap_with: { tag: :p, class: "mt-2 text-sm text-gray-500" } + end + + config.wrappers :append_string, tag: 'div', class: '', error_class: '', valid_class: '' do |b| + b.use :html5 + b.use :placeholder + b.optional :maxlength + b.optional :minlength + b.optional :pattern + b.optional :min_max + b.optional :readonly + + b.use :label, class: "block text-sm font-medium text-gray-700" + + b.wrapper tag: 'div', class: 'mt-1 flex rounded-md shadow-sm' do |d| + d.use :input, + class: "flex-1 min-w-0 block w-full px-3 py-2 rounded-none rounded-l-md focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm border-gray-300", + error_class: "flex-1 min-w-0 block w-full px-3 py-2 rounded-none rounded-l-md focus:ring-red-500 focus:border-red-500 sm:text-sm border-red-300 text-red-900 placeholder-red-300" + d.use :append + end + b.use :full_error, wrap_with: { tag: "p", class: "mt-2 text-sm text-red-600" } + b.use :hint, wrap_with: { tag: :p, class: "mt-2 text-sm text-gray-500" } + end + + config.wrappers :corner_hint, tag: :div do |b| + b.use :html5 + b.use :placeholder + b.optional :maxlength + b.optional :minlength + b.optional :pattern + b.optional :min_max + b.optional :readonly + + b.wrapper tag: :div, class: "flex justify-between", error_class: nil, valid_class: nil do |c| + c.use :label, class: "block text-sm font-medium text-gray-700" + c.use :hint, wrap_with: { tag: :span, class: "text-sm text-gray-500" } + end + + b.use :input, + class: "appearance-none block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm placeholder-gray-400 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm", + error_class: "block w-full pr-10 border-red-300 text-red-900 placeholder-red-300 focus:outline-none focus:ring-red-500 focus:border-red-500 sm:text-sm rounded-md" + b.use :full_error, wrap_with: { tag: "p", class: "mt-2 text-sm text-red-600" } + end + + # The default wrapper to be used by the FormBuilder. + config.default_wrapper = :default + + # Define the way to render check boxes / radio buttons with labels. + # Defaults to :nested for bootstrap config. + # inline: input + label + # nested: label > input + config.boolean_style = :nested + + # Default class for buttons + config.button_class = nil + + # Method used to tidy up errors. Specify any Rails Array method. + # :first lists the first message for each field. + # Use :to_sentence to list all errors for each field. + # config.error_method = :first + + # Default tag used for error notification helper. + config.error_notification_tag = :div + + # CSS class to add for error notification helper. + config.error_notification_class = '' + + # Series of attempts to detect a default label method for collection. + # config.collection_label_methods = [ :to_label, :name, :title, :to_s ] + + # Series of attempts to detect a default value method for collection. + # config.collection_value_methods = [ :id, :to_s ] + + # You can wrap a collection of radio/check boxes in a pre-defined tag, defaulting to none. + # config.collection_wrapper_tag = nil + + # You can define the class to use on all collection wrappers. Defaulting to none. + # config.collection_wrapper_class = nil + + # You can wrap each item in a collection of radio/check boxes with a tag, + # defaulting to :span. + # config.item_wrapper_tag = :span + + # You can define a class to use in all item wrappers. Defaulting to none. + # config.item_wrapper_class = nil + + # How the label text should be generated altogether with the required text. + config.label_text = lambda { |label, required, explicit_label| "#{label}" } + + # You can define the class to use on all labels. Default is nil. + # config.label_class = nil + + # You can define the default class to be used on forms. Can be overriden + # with `html: { :class }`. Defaulting to none. + config.default_form_class = nil + config.form_class = nil + + # You can define which elements should obtain additional classes + config.generate_additional_classes_for = [] + + # Whether attributes are required by default (or not). Default is true. + # config.required_by_default = true + + # Tell browsers whether to use the native HTML5 validations (novalidate form option). + # These validations are enabled in SimpleForm's internal config but disabled by default + # in this configuration, which is recommended due to some quirks from different browsers. + # To stop SimpleForm from generating the novalidate option, enabling the HTML5 validations, + # change this configuration to true. + config.browser_validations = false + + # Custom mappings for input types. This should be a hash containing a regexp + # to match as key, and the input type that will be used when the field name + # matches the regexp as value. + # config.input_mappings = { /count/ => :integer } + + # Custom wrappers for input types. This should be a hash containing an input + # type as key and the wrapper that will be used for all inputs with specified type. + config.wrapper_mappings = { + string: :default, + prepend_string: :prepend_string, + append_string: :append_string, + } + + # Namespaces where SimpleForm should look for custom input classes that + # override default inputs. + # config.custom_inputs_namespaces << "CustomInputs" + + # Default priority for time_zone inputs. + # config.time_zone_priority = nil + + # Default priority for country inputs. + # config.country_priority = nil + + # When false, do not use translations for labels. + # config.translate_labels = true + + # Automatically discover new inputs in Rails' autoload path. + # config.inputs_discovery = true + + # Cache SimpleForm inputs discovery + # config.cache_discovery = !Rails.env.development? + + # Default class for inputs + # config.input_class = nil + + # Define the default class of the input wrapper of the boolean input. + config.boolean_label_class = 'checkbox' + + # Defines if the default input wrapper class should be included in radio + # collection wrappers. + # config.include_default_input_wrapper_class = true + + # Defines which i18n scope will be used in Simple Form. + # config.i18n_scope = 'simple_form' + + # Defines validation classes to the input_field. By default it's nil. + # config.input_field_valid_class = 'is-valid' + # config.input_field_error_class = 'is-invalid' +end diff --git a/config/tailwind.config.js b/config/tailwind.config.js index fcca4e6..0cc866a 100644 --- a/config/tailwind.config.js +++ b/config/tailwind.config.js @@ -1,9 +1,11 @@ const defaultTheme = require('tailwindcss/defaultTheme') const execSync = require('child_process').execSync; -const output = execSync('bundle show merged', { encoding: 'utf-8' }); +const output = execSync('bundle show merged', { encoding: 'utf-8' }); const fullname = output.trim() + '/app/**/*.{haml,html,rb}' ; -console.log(fullname); + +const output2 = execSync('bundle show simple_form_tailwind_css', { encoding: 'utf-8' }); +const fullname2 = output2.trim() + '/lib/**/*.rb' ; module.exports = { content: [ @@ -11,7 +13,7 @@ module.exports = { './app/helpers/**/*.rb', './app/javascript/**/*.js', './app/views/**/*.{erb,haml,html,slim}' , - fullname + fullname , fullname2 ], theme: { extend: {