From 0a07042797c6588da594f202f7adc763678298b3 Mon Sep 17 00:00:00 2001 From: Torsten Date: Sat, 21 Jan 2023 22:47:59 +0200 Subject: [PATCH 01/12] fix form stuff --- Gemfile.lock | 4 ++-- config/initializers/lib.rb | 1 + config/routes.rb | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 config/initializers/lib.rb diff --git a/Gemfile.lock b/Gemfile.lock index 0755bfd..7ed70e7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/HubFeenixMakers/merged - revision: 05ee69ce24b7c5a593b8c57c87a3e1f8e50f3b32 + revision: accb6682675f92eed6e1c306995017b1c8da1289 specs: merged (0.1.0) active_hash @@ -294,7 +294,7 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.4) + rails-html-sanitizer (1.5.0) loofah (~> 2.19, >= 2.19.1) rails_gravatar (1.0.4) actionview diff --git a/config/initializers/lib.rb b/config/initializers/lib.rb new file mode 100644 index 0000000..905dcc7 --- /dev/null +++ b/config/initializers/lib.rb @@ -0,0 +1 @@ +require "form_handler" diff --git a/config/routes.rb b/config/routes.rb index 2cf0176..a2be4e2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -10,8 +10,9 @@ Rails.application.routes.draw do mount Thredded::Engine => '/forum' - mount Merged::Engine => "/merged" + mount Merged::Engine => "/merged" unless Rails.env.production? + post "/form" , to: "merged/form#post" , as: :post_form get "/news/:id" , to: "merged/view#page" , id: :id , as: :view_blog get ":id" , to: "merged/view#page" , id: :id , as: :view_page From 10bdfa39cdb55e8a1a0ec753d23dae3d859279dd Mon Sep 17 00:00:00 2001 From: Torsten Date: Sat, 21 Jan 2023 23:34:57 +0200 Subject: [PATCH 02/12] fix menues --- app/helpers/application_helper.rb | 18 ++++++++++++++++++ app/views/layouts/_header.haml | 6 ++---- app/views/layouts/_member_menu.haml | 10 +++------- app/views/layouts/_mobile_menu.haml | 15 +++++++++++---- 4 files changed, 34 insertions(+), 15 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 69188e1..8487591 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -54,4 +54,22 @@ module ApplicationHelper rows end + def main_menu + [["/members" , "Volunteers"],["/stories" , "Stories"], ["/info" , "Info"], + ["/arriving" , "Arriving"],["/about" , "About"], ] + end + def member_memu + items =[["/forum" ,"Forum"] , [main_app.member_path(current_member) , "Settings"]] + if current_member.admin? and !Rails.env.production? + items << [merged.pages_path(), "CMS" ] + end + items + end + def mobile_menu + if current_member + member_memu + else + [main_app.member_session_path, "Login"] + end + end end diff --git a/app/views/layouts/_header.haml b/app/views/layouts/_header.haml index 93a8fd3..28ea087 100644 --- a/app/views/layouts/_header.haml +++ b/app/views/layouts/_header.haml @@ -4,11 +4,9 @@ = image_tag("feenix_lintu.webp" , class: "h-20") %span.ml-2.text-xl.font-bold.tracking-wide.text-gray-800.uppercase Hub Feenix %ul.flex.items-center.hidden.space-x-8.lg:flex - %li - %a.font-medium.tracking-wide.text-gray-700.transition-colors.duration-400.hover:text-cyan-800{"aria-label" => "Our product", :href => "/members", :title => "Volunteers"} Volunteers - - [ :stories , :info , :arriving, :about].each do |link| + - main_menu.each do |link , text| %li - %a.font-medium.tracking-wide.text-gray-700.transition-colors.duration-400.hover:text-cyan-800{"aria-label" => "Our product", :href => "/#{link}", :title => link.capitalize}= link.capitalize + %a.font-medium.tracking-wide.text-gray-700.transition-colors.duration-400.hover:text-cyan-800{"aria-label" => "Our product", :href => link, :title => text}= text %li = link_to "https://www.facebook.com/hubfeenix" , :target => "_blank" do = image_tag("fb.webp" , class: "h-10 rounded-md") diff --git a/app/views/layouts/_member_menu.haml b/app/views/layouts/_member_menu.haml index beb6759..933cff5 100644 --- a/app/views/layouts/_member_menu.haml +++ b/app/views/layouts/_member_menu.haml @@ -1,12 +1,8 @@ #menu-dropdown.hidden.absolute.right-0.z-10.mt-4.w-36.origin-top-right.rounded-md.border.border-gray-100.bg-white.shadow-lg{:role => "menu"} .p-2 - %a.block.rounded-lg.px-4.py-2.text-sm.text-gray-500.hover:bg-gray-50.hover:text-gray-700{:href => "/forum", :role => "menuitem"} - Forum - %a.block.rounded-lg.px-4.py-2.text-sm.text-gray-500.hover:bg-gray-50.hover:text-gray-700{:href => main_app.member_path(current_member), :role => "menuitem"} - Profile - - unless Rails.env.production? - %a.block.rounded-lg.px-4.py-2.text-sm.text-gray-500.hover:bg-gray-50.hover:text-gray-700{:href => merged.pages_path(), :role => "menuitem"} - CMS + - member_memu.each do |link , text| + %a.block.rounded-lg.px-4.py-2.text-sm.text-gray-500.hover:bg-gray-50.hover:text-gray-700{:href => link, :role => "menuitem"} + =text = form_tag( main_app.destroy_member_session_path , {method: :delete } ) do %button.flex.w-full.items-center.gap-2.rounded-lg.px-4.py-2.text-sm.text-blue-700.hover:bg-red-50{:role => "menuitem", :type => "submit"} %svg.h-4.w-4{:fill => "none", :stroke => "currentColor", "stroke-width" => "2", :viewbox => "0 0 24 24", :xmlns => "http://www.w3.org/2000/svg"} diff --git a/app/views/layouts/_mobile_menu.haml b/app/views/layouts/_mobile_menu.haml index 4f9a31b..d66c423 100644 --- a/app/views/layouts/_mobile_menu.haml +++ b/app/views/layouts/_mobile_menu.haml @@ -1,4 +1,4 @@ -#mobile-menu.absolute.top-0.left-0.w-full.hidden +#mobile-menu.absolute.top-0.left-0.w-full.hidden.z-10 .p-5.bg-white.border.rounded.shadow-sm .flex.items-center.justify-between.mb-4 %div @@ -10,10 +10,17 @@ %svg.w-5.text-gray-600{:viewbox => "0 0 24 24"} %path{:d => "M19.7,4.3c-0.4-0.4-1-0.4-1.4,0L12,10.6L5.7,4.3c-0.4-0.4-1-0.4-1.4,0s-0.4,1,0,1.4l6.3,6.3l-6.3,6.3 c-0.4,0.4-0.4,1,0,1.4C4.5,19.9,4.7,20,5,20s0.5-0.1,0.7-0.3l6.3-6.3l6.3,6.3c0.2,0.2,0.5,0.3,0.7,0.3s0.5-0.1,0.7-0.3 c0.4-0.4,0.4-1,0-1.4L13.4,12l6.3-6.3C20.1,5.3,20.1,4.7,19.7,4.3z", :fill => "currentColor"} %nav - %ul.space-y-6.px-20 - - [:volunteers , :stories , :info , :arriving, :about].each do |link| + %ul.space-y-6.px-20.w-lg.text-center + - main_menu.each do |link , text| %li - %a.font-medium.tracking-wide.text-xl{ :href => "/#{link}" , :title => link.capitalize}= link.capitalize + %a.w-full.h-full.block.tracking-wide.text-xl.p-2.rounded-lg.hover:bg-cyan-200{ :href => link , :title => text} + = text + %li + %hr + - mobile_menu.each do |link , text| + %li + %a.w-full.h-full.block.tracking-wide.text-xl.p-2.rounded-lg.hover:bg-cyan-200{ :href => link , :title => text} + = text :javascript var drop_hidden = true; function menu_on() { From 3513b2ada478458cb548919045a1bc7c0876bb96 Mon Sep 17 00:00:00 2001 From: Torsten Date: Sun, 22 Jan 2023 13:17:27 +0200 Subject: [PATCH 03/12] story cleanup, form, policy --- app/controllers/stories_controller.rb | 9 ++------- app/helpers/application_helper.rb | 5 +++-- app/policies/edit_own_policy.rb | 14 ++++++++++++++ app/policies/story_policy.rb | 2 +- app/views/stories/_form.haml | 17 +++++++++++++++++ app/views/stories/edit.html.haml | 21 +++++---------------- app/views/stories/new.html.haml | 25 +++++-------------------- 7 files changed, 47 insertions(+), 46 deletions(-) create mode 100644 app/policies/edit_own_policy.rb create mode 100644 app/views/stories/_form.haml diff --git a/app/controllers/stories_controller.rb b/app/controllers/stories_controller.rb index fdf670d..a666c9f 100644 --- a/app/controllers/stories_controller.rb +++ b/app/controllers/stories_controller.rb @@ -1,26 +1,21 @@ class StoriesController < ApplicationController before_action :set_story, only: %i[ show edit update destroy ] - # GET /stories def index @stories = Story.all.page params[:page] end - # GET /stories/1 def show end - # GET /stories/new def new @story = Story.new end - # GET /stories/1/edit def edit authorize @story end - # POST /stories def create @story = Story.new(story_params) @story.member = current_member @@ -32,8 +27,8 @@ class StoriesController < ApplicationController end end - # PATCH/PUT /stories/1 def update + authorize @story if @story.update(story_params) redirect_to @story, notice: "Story was successfully updated." else @@ -41,8 +36,8 @@ class StoriesController < ApplicationController end end - # DELETE /stories/1 def destroy + authorize @story @story.destroy redirect_to stories_url, notice: "Story was successfully destroyed." end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 8487591..814de4c 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -5,10 +5,11 @@ module ApplicationHelper # different template according to the amount of text def render_story(story) return "" unless story + puts story.text.length text_length = story.text.length template = "text" - template = "half" if text_length < 400 - template = "pic" if text_length < 200 + template = "half" if text_length < 500 + template = "pic" if text_length < 300 render partial: "stories/#{template}" , locals: {story: story} end diff --git a/app/policies/edit_own_policy.rb b/app/policies/edit_own_policy.rb new file mode 100644 index 0000000..0882e81 --- /dev/null +++ b/app/policies/edit_own_policy.rb @@ -0,0 +1,14 @@ +# allows to edit/detroy own data +# which can be viewed by anyone +class EditOwnPolicy < ApplicationPolicy + def edit? + return true if member.admin? + owner? + end + def owner? + member == record.member + end + alias :update? :edit? + alias :destroy? :edit? + +end diff --git a/app/policies/story_policy.rb b/app/policies/story_policy.rb index 53b3bb4..fb142fb 100644 --- a/app/policies/story_policy.rb +++ b/app/policies/story_policy.rb @@ -1,4 +1,4 @@ -class StoryPolicy < ApplicationPolicy +class StoryPolicy < EditOwnPolicy def edit? (member == record.member) or member.admin? diff --git a/app/views/stories/_form.haml b/app/views/stories/_form.haml new file mode 100644 index 0000000..19d1fda --- /dev/null +++ b/app/views/stories/_form.haml @@ -0,0 +1,17 @@ +%div + Story layout changes with the amount of text. + For short lext a wide picture is best. Otherwise square, and for + longer text a high picture also works. += simple_form_for @story do |f| + = f.error_notification + + = f.input :picture , as: :file , label: (@story.picture.blank? ? "Add picture" : "Change picture") + = f.input :header + = f.input :text , input_html: {rows: rows(@story.text)} + = f.input :happened , wrapper_class: "flex mt-4 align-center" + .flex.justify-between.mt-6 + %button.bg-cyan-200.rounded-lg.px-4.py-3.text-md.font-medium.border.border-gray-400 + = f.submit 'Save' + = link_to @story do + %button.ml-20.rounded-lg.px-4.py-3.text-md.font-medium.border.border-gray-400 + Back diff --git a/app/views/stories/edit.html.haml b/app/views/stories/edit.html.haml index ca3044e..b1694ec 100644 --- a/app/views/stories/edit.html.haml +++ b/app/views/stories/edit.html.haml @@ -1,16 +1,5 @@ -.grid.grid-cols-3 - %div - %div - %h1 Editing story - = simple_form_for @story do |f| - = f.error_notification - - = f.input :picture , as: :file , label: (@story.picture.blank? ? "Add picture" : "Change picture") - = f.input :header - = f.input :text , input_html: {rows: rows(@story.text)} - = f.input :happened , wrapper_class: "flex mt-4 align-center" - %button.mt-6.bg-cyan-200.mr-3.inline-block.rounded-lg.px-4.py-3.text-md.font-medium.border.border-gray-400 - = f.submit 'Save' - %button.ml-20.mr-3.inline-block.rounded-lg.px-4.py-3.text-md.font-medium.border.border-gray-400 - = link_to 'Back', @story - %div +.flex.justify-center + .column{class: "w-10/12 md:w-8/12 lg:w-5/12 xl:w-4/12"} + .text-2xl.font-bold.my-4 + Edit Story + = render 'form' diff --git a/app/views/stories/new.html.haml b/app/views/stories/new.html.haml index 80c3028..bb00576 100644 --- a/app/views/stories/new.html.haml +++ b/app/views/stories/new.html.haml @@ -1,20 +1,5 @@ - -.grid.grid-cols-3 - %div - %div - %h1 New story - = form_for @story do |f| - - if @story.errors.any? - #error_explanation - %h2= "#{pluralize(@story.errors.count, "error")} prohibited this story from being saved:" - %ul - - @story.errors.full_messages.each do |message| - %li= message - - = f.input :picture , as: :file - = f.input :header - = f.input :text - = f.input :happened , class: "flex" - = f.submit 'Save' - = link_to 'Back', stories_path - %div +.flex.justify-center + .column{class: "w-10/12 md:w-8/12 lg:w-5/12 xl:w-4/12"} + .text-2xl.font-bold.my-4 + New Story + = render 'form' From 0ac1c341dfba4c60e029f00107f9297fd968c78c Mon Sep 17 00:00:00 2001 From: Torsten Date: Sun, 22 Jan 2023 15:37:39 +0200 Subject: [PATCH 04/12] js delivr links, remove asset --- Gemfile.lock | 2 +- app/javascript/marked.min.js | 6 ------ app/views/members/edit.html.haml | 4 ++-- app/views/stories/_form.haml | 2 +- app/views/stories/_half.haml | 2 +- app/views/stories/_pic.haml | 2 +- app/views/stories/edit.html.haml | 2 ++ app/views/stories/new.html.haml | 2 ++ config/initializers/assets.rb | 2 +- 9 files changed, 11 insertions(+), 13 deletions(-) delete mode 100644 app/javascript/marked.min.js diff --git a/Gemfile.lock b/Gemfile.lock index 7ed70e7..c45fe09 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/HubFeenixMakers/merged - revision: accb6682675f92eed6e1c306995017b1c8da1289 + revision: ee228d48f4a20dc89a7c09ea9354b4b2c899271b specs: merged (0.1.0) active_hash diff --git a/app/javascript/marked.min.js b/app/javascript/marked.min.js deleted file mode 100644 index c61fd0a..0000000 --- a/app/javascript/marked.min.js +++ /dev/null @@ -1,6 +0,0 @@ -/** - * marked - a markdown parser - * Copyright (c) 2011-2022, Christopher Jeffrey. (MIT Licensed) - * https://github.com/markedjs/marked - */ -!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports):"function"==typeof define&&define.amd?define(["exports"],t):t((e="undefined"!=typeof globalThis?globalThis:e||self).marked={})}(this,function(r){"use strict";function i(e,t){for(var u=0;ue.length)&&(t=e.length);for(var u=0,n=new Array(t);u=e.length?{done:!0}:{done:!1,value:e[u++]}};throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function e(){return{async:!1,baseUrl:null,breaks:!1,extensions:null,gfm:!0,headerIds:!0,headerPrefix:"",highlight:null,langPrefix:"language-",mangle:!0,pedantic:!1,renderer:null,sanitize:!1,sanitizer:null,silent:!1,smartypants:!1,tokenizer:null,walkTokens:null,xhtml:!1}}r.defaults=e();function u(e){return t[e]}var n=/[&<>"']/,l=new RegExp(n.source,"g"),a=/[<>"']|&(?!(#\d{1,7}|#[Xx][a-fA-F0-9]{1,6}|\w+);)/,o=new RegExp(a.source,"g"),t={"&":"&","<":"<",">":">",'"':""","'":"'"};function c(e,t){if(t){if(n.test(e))return e.replace(l,u)}else if(a.test(e))return e.replace(o,u);return e}var h=/&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/gi;function x(e){return e.replace(h,function(e,t){return"colon"===(t=t.toLowerCase())?":":"#"===t.charAt(0)?"x"===t.charAt(1)?String.fromCharCode(parseInt(t.substring(2),16)):String.fromCharCode(+t.substring(1)):""})}var p=/(^|[^\[])\^/g;function f(u,e){u="string"==typeof u?u:u.source,e=e||"";var n={replace:function(e,t){return t=(t=t.source||t).replace(p,"$1"),u=u.replace(e,t),n},getRegex:function(){return new RegExp(u,e)}};return n}var g=/[^\w:]/g,Z=/^$|^[a-z][a-z0-9+.-]*:|^[?#]/i;function F(e,t,u){if(e){try{n=decodeURIComponent(x(u)).replace(g,"").toLowerCase()}catch(e){return null}if(0===n.indexOf("javascript:")||0===n.indexOf("vbscript:")||0===n.indexOf("data:"))return null}var n;t&&!Z.test(u)&&(e=u,A[" "+(n=t)]||(q.test(n)?A[" "+n]=n+"/":A[" "+n]=E(n,"/",!0)),t=-1===(n=A[" "+n]).indexOf(":"),u="//"===e.substring(0,2)?t?e:n.replace(O,"$1")+e:"/"===e.charAt(0)?t?e:n.replace(j,"$1")+e:n+e);try{u=encodeURI(u).replace(/%25/g,"%")}catch(e){return null}return u}var A={},q=/^[^:]+:\/*[^/]*$/,O=/^([^:]+:)[\s\S]*$/,j=/^([^:]+:\/*[^/]*)[\s\S]*$/;var d={exec:function(){}};function C(e){for(var t,u,n=1;nt)u.splice(t);else for(;u.length>=1,e+=e;return u+e}function B(e,t,u,n){var r=t.href,t=t.title?c(t.title):null,i=e[1].replace(/\\([\[\]])/g,"$1");return"!"!==e[0].charAt(0)?(n.state.inLink=!0,e={type:"link",raw:u,href:r,title:t,text:i,tokens:n.inlineTokens(i)},n.state.inLink=!1,e):{type:"image",raw:u,href:r,title:t,text:c(i)}}var w=function(){function e(e){this.options=e||r.defaults}var t=e.prototype;return t.space=function(e){e=this.rules.block.newline.exec(e);if(e&&0=r.length?e.slice(r.length):e}).join("\n")),{type:"code",raw:t,lang:e[2]&&e[2].trim().replace(this.rules.inline._escapes,"$1"),text:u}},t.heading=function(e){var t,u,e=this.rules.block.heading.exec(e);if(e)return t=e[2].trim(),/#$/.test(t)&&(u=E(t,"#"),!this.options.pedantic&&u&&!/ $/.test(u)||(t=u.trim())),{type:"heading",raw:e[0],depth:e[1].length,text:t,tokens:this.lexer.inline(t)}},t.hr=function(e){e=this.rules.block.hr.exec(e);if(e)return{type:"hr",raw:e[0]}},t.blockquote=function(e){var t,u,n,e=this.rules.block.blockquote.exec(e);if(e)return t=e[0].replace(/^ *>[ \t]?/gm,""),u=this.lexer.state.top,this.lexer.state.top=!0,n=this.lexer.blockTokens(t),this.lexer.state.top=u,{type:"blockquote",raw:e[0],tokens:n,text:t}},t.list=function(e){var t=this.rules.block.list.exec(e);if(t){var u,n,r,i,s,l,a,o,D,c,h,p=1<(g=t[1].trim()).length,f={type:"list",raw:"",ordered:p,start:p?+g.slice(0,-1):"",loose:!1,items:[]},g=p?"\\d{1,9}\\"+g.slice(-1):"\\"+g;this.options.pedantic&&(g=p?g:"[*+-]");for(var F=new RegExp("^( {0,3}"+g+")((?:[\t ][^\\n]*)?(?:\\n|$))");e&&(h=!1,t=F.exec(e))&&!this.rules.block.hr.test(e);){if(u=t[0],e=e.substring(u.length),a=t[2].split("\n",1)[0].replace(/^\t+/,function(e){return" ".repeat(3*e.length)}),o=e.split("\n",1)[0],this.options.pedantic?(i=2,c=a.trimLeft()):(i=t[2].search(/[^ ]/),c=a.slice(i=4=i||!o.trim())c+="\n"+o.slice(i);else{if(s)break;if(4<=a.search(/[^ ]/))break;if(C.test(a))break;if(k.test(a))break;if(d.test(a))break;c+="\n"+o}s||o.trim()||(s=!0),u+=D+"\n",e=e.substring(D.length+1),a=o.slice(i)}f.loose||(l?f.loose=!0:/\n *\n *$/.test(u)&&(l=!0)),this.options.gfm&&(n=/^\[[ xX]\] /.exec(c))&&(r="[ ] "!==n[0],c=c.replace(/^\[[ xX]\] +/,"")),f.items.push({type:"list_item",raw:u,task:!!n,checked:r,loose:!1,text:c}),f.raw+=u}f.items[f.items.length-1].raw=u.trimRight(),f.items[f.items.length-1].text=c.trimRight(),f.raw=f.raw.trimRight();for(var E,x=f.items.length,m=0;m$/,"$1").replace(this.rules.inline._escapes,"$1"):"",n=e[3]&&e[3].substring(1,e[3].length-1).replace(this.rules.inline._escapes,"$1"),{type:"def",tag:t,raw:e[0],href:u,title:n}},t.table=function(e){e=this.rules.block.table.exec(e);if(e){var t={type:"table",header:k(e[1]).map(function(e){return{text:e}}),align:e[2].replace(/^ *|\| *$/g,"").split(/ *\| */),rows:e[3]&&e[3].trim()?e[3].replace(/\n[ \t]*$/,"").split("\n"):[]};if(t.header.length===t.align.length){t.raw=e[0];for(var u,n,r,i=t.align.length,s=0;s/i.test(e[0])&&(this.lexer.state.inLink=!1),!this.lexer.state.inRawBlock&&/^<(pre|code|kbd|script)(\s|>)/i.test(e[0])?this.lexer.state.inRawBlock=!0:this.lexer.state.inRawBlock&&/^<\/(pre|code|kbd|script)(\s|>)/i.test(e[0])&&(this.lexer.state.inRawBlock=!1),{type:this.options.sanitize?"text":"html",raw:e[0],inLink:this.lexer.state.inLink,inRawBlock:this.lexer.state.inRawBlock,text:this.options.sanitize?this.options.sanitizer?this.options.sanitizer(e[0]):c(e[0]):e[0]}},t.link=function(e){e=this.rules.inline.link.exec(e);if(e){var t=e[2].trim();if(!this.options.pedantic&&/^$/.test(t))return;var u=E(t.slice(0,-1),"\\");if((t.length-u.length)%2==0)return}else{u=function(e,t){if(-1!==e.indexOf(t[1]))for(var u=e.length,n=0,r=0;r$/.test(t)?u.slice(1):u.slice(1,-1):u)&&u.replace(this.rules.inline._escapes,"$1"),title:r&&r.replace(this.rules.inline._escapes,"$1")},e[0],this.lexer)}},t.reflink=function(e,t){var u;if(u=(u=this.rules.inline.reflink.exec(e))||this.rules.inline.nolink.exec(e))return(e=t[(e=(u[2]||u[1]).replace(/\s+/g," ")).toLowerCase()])?B(u,e,u[0],this.lexer):{type:"text",raw:t=u[0].charAt(0),text:t}},t.emStrong=function(e,t,u){void 0===u&&(u="");var n=this.rules.inline.emStrong.lDelim.exec(e);if(n&&(!n[3]||!u.match(/(?:[0-9A-Za-z\xAA\xB2\xB3\xB5\xB9\xBA\xBC-\xBE\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0560-\u0588\u05D0-\u05EA\u05EF-\u05F2\u0620-\u064A\u0660-\u0669\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07C0-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u0860-\u086A\u0870-\u0887\u0889-\u088E\u08A0-\u08C9\u0904-\u0939\u093D\u0950\u0958-\u0961\u0966-\u096F\u0971-\u0980\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09E6-\u09F1\u09F4-\u09F9\u09FC\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A66-\u0A6F\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0AE6-\u0AEF\u0AF9\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B66-\u0B6F\u0B71-\u0B77\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0BE6-\u0BF2\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58-\u0C5A\u0C5D\u0C60\u0C61\u0C66-\u0C6F\u0C78-\u0C7E\u0C80\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDD\u0CDE\u0CE0\u0CE1\u0CE6-\u0CEF\u0CF1\u0CF2\u0D04-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D54-\u0D56\u0D58-\u0D61\u0D66-\u0D78\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0DE6-\u0DEF\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E50-\u0E59\u0E81\u0E82\u0E84\u0E86-\u0E8A\u0E8C-\u0EA3\u0EA5\u0EA7-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0ED0-\u0ED9\u0EDC-\u0EDF\u0F00\u0F20-\u0F33\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F-\u1049\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u1090-\u1099\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1369-\u137C\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u1711\u171F-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u17E0-\u17E9\u17F0-\u17F9\u1810-\u1819\u1820-\u1878\u1880-\u1884\u1887-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1946-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u19D0-\u19DA\u1A00-\u1A16\u1A20-\u1A54\u1A80-\u1A89\u1A90-\u1A99\u1AA7\u1B05-\u1B33\u1B45-\u1B4C\u1B50-\u1B59\u1B83-\u1BA0\u1BAE-\u1BE5\u1C00-\u1C23\u1C40-\u1C49\u1C4D-\u1C7D\u1C80-\u1C88\u1C90-\u1CBA\u1CBD-\u1CBF\u1CE9-\u1CEC\u1CEE-\u1CF3\u1CF5\u1CF6\u1CFA\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2070\u2071\u2074-\u2079\u207F-\u2089\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2150-\u2189\u2460-\u249B\u24EA-\u24FF\u2776-\u2793\u2C00-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2CFD\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303C\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312F\u3131-\u318E\u3192-\u3195\u31A0-\u31BF\u31F0-\u31FF\u3220-\u3229\u3248-\u324F\u3251-\u325F\u3280-\u3289\u32B1-\u32BF\u3400-\u4DBF\u4E00-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6EF\uA717-\uA71F\uA722-\uA788\uA78B-\uA7CA\uA7D0\uA7D1\uA7D3\uA7D5-\uA7D9\uA7F2-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA830-\uA835\uA840-\uA873\uA882-\uA8B3\uA8D0-\uA8D9\uA8F2-\uA8F7\uA8FB\uA8FD\uA8FE\uA900-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF-\uA9D9\uA9E0-\uA9E4\uA9E6-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA50-\uAA59\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB69\uAB70-\uABE2\uABF0-\uABF9\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF10-\uFF19\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD07-\uDD33\uDD40-\uDD78\uDD8A\uDD8B\uDE80-\uDE9C\uDEA0-\uDED0\uDEE1-\uDEFB\uDF00-\uDF23\uDF2D-\uDF4A\uDF50-\uDF75\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDCA0-\uDCA9\uDCB0-\uDCD3\uDCD8-\uDCFB\uDD00-\uDD27\uDD30-\uDD63\uDD70-\uDD7A\uDD7C-\uDD8A\uDD8C-\uDD92\uDD94\uDD95\uDD97-\uDDA1\uDDA3-\uDDB1\uDDB3-\uDDB9\uDDBB\uDDBC\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67\uDF80-\uDF85\uDF87-\uDFB0\uDFB2-\uDFBA]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC58-\uDC76\uDC79-\uDC9E\uDCA7-\uDCAF\uDCE0-\uDCF2\uDCF4\uDCF5\uDCFB-\uDD1B\uDD20-\uDD39\uDD80-\uDDB7\uDDBC-\uDDCF\uDDD2-\uDE00\uDE10-\uDE13\uDE15-\uDE17\uDE19-\uDE35\uDE40-\uDE48\uDE60-\uDE7E\uDE80-\uDE9F\uDEC0-\uDEC7\uDEC9-\uDEE4\uDEEB-\uDEEF\uDF00-\uDF35\uDF40-\uDF55\uDF58-\uDF72\uDF78-\uDF91\uDFA9-\uDFAF]|\uD803[\uDC00-\uDC48\uDC80-\uDCB2\uDCC0-\uDCF2\uDCFA-\uDD23\uDD30-\uDD39\uDE60-\uDE7E\uDE80-\uDEA9\uDEB0\uDEB1\uDF00-\uDF27\uDF30-\uDF45\uDF51-\uDF54\uDF70-\uDF81\uDFB0-\uDFCB\uDFE0-\uDFF6]|\uD804[\uDC03-\uDC37\uDC52-\uDC6F\uDC71\uDC72\uDC75\uDC83-\uDCAF\uDCD0-\uDCE8\uDCF0-\uDCF9\uDD03-\uDD26\uDD36-\uDD3F\uDD44\uDD47\uDD50-\uDD72\uDD76\uDD83-\uDDB2\uDDC1-\uDDC4\uDDD0-\uDDDA\uDDDC\uDDE1-\uDDF4\uDE00-\uDE11\uDE13-\uDE2B\uDE80-\uDE86\uDE88\uDE8A-\uDE8D\uDE8F-\uDE9D\uDE9F-\uDEA8\uDEB0-\uDEDE\uDEF0-\uDEF9\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3D\uDF50\uDF5D-\uDF61]|\uD805[\uDC00-\uDC34\uDC47-\uDC4A\uDC50-\uDC59\uDC5F-\uDC61\uDC80-\uDCAF\uDCC4\uDCC5\uDCC7\uDCD0-\uDCD9\uDD80-\uDDAE\uDDD8-\uDDDB\uDE00-\uDE2F\uDE44\uDE50-\uDE59\uDE80-\uDEAA\uDEB8\uDEC0-\uDEC9\uDF00-\uDF1A\uDF30-\uDF3B\uDF40-\uDF46]|\uD806[\uDC00-\uDC2B\uDCA0-\uDCF2\uDCFF-\uDD06\uDD09\uDD0C-\uDD13\uDD15\uDD16\uDD18-\uDD2F\uDD3F\uDD41\uDD50-\uDD59\uDDA0-\uDDA7\uDDAA-\uDDD0\uDDE1\uDDE3\uDE00\uDE0B-\uDE32\uDE3A\uDE50\uDE5C-\uDE89\uDE9D\uDEB0-\uDEF8]|\uD807[\uDC00-\uDC08\uDC0A-\uDC2E\uDC40\uDC50-\uDC6C\uDC72-\uDC8F\uDD00-\uDD06\uDD08\uDD09\uDD0B-\uDD30\uDD46\uDD50-\uDD59\uDD60-\uDD65\uDD67\uDD68\uDD6A-\uDD89\uDD98\uDDA0-\uDDA9\uDEE0-\uDEF2\uDFB0\uDFC0-\uDFD4]|\uD808[\uDC00-\uDF99]|\uD809[\uDC00-\uDC6E\uDC80-\uDD43]|\uD80B[\uDF90-\uDFF0]|[\uD80C\uD81C-\uD820\uD822\uD840-\uD868\uD86A-\uD86C\uD86F-\uD872\uD874-\uD879\uD880-\uD883][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD811[\uDC00-\uDE46]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDE60-\uDE69\uDE70-\uDEBE\uDEC0-\uDEC9\uDED0-\uDEED\uDF00-\uDF2F\uDF40-\uDF43\uDF50-\uDF59\uDF5B-\uDF61\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDE40-\uDE96\uDF00-\uDF4A\uDF50\uDF93-\uDF9F\uDFE0\uDFE1\uDFE3]|\uD821[\uDC00-\uDFF7]|\uD823[\uDC00-\uDCD5\uDD00-\uDD08]|\uD82B[\uDFF0-\uDFF3\uDFF5-\uDFFB\uDFFD\uDFFE]|\uD82C[\uDC00-\uDD22\uDD50-\uDD52\uDD64-\uDD67\uDD70-\uDEFB]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99]|\uD834[\uDEE0-\uDEF3\uDF60-\uDF78]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB\uDFCE-\uDFFF]|\uD837[\uDF00-\uDF1E]|\uD838[\uDD00-\uDD2C\uDD37-\uDD3D\uDD40-\uDD49\uDD4E\uDE90-\uDEAD\uDEC0-\uDEEB\uDEF0-\uDEF9]|\uD839[\uDFE0-\uDFE6\uDFE8-\uDFEB\uDFED\uDFEE\uDFF0-\uDFFE]|\uD83A[\uDC00-\uDCC4\uDCC7-\uDCCF\uDD00-\uDD43\uDD4B\uDD50-\uDD59]|\uD83B[\uDC71-\uDCAB\uDCAD-\uDCAF\uDCB1-\uDCB4\uDD01-\uDD2D\uDD2F-\uDD3D\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD83C[\uDD00-\uDD0C]|\uD83E[\uDFF0-\uDFF9]|\uD869[\uDC00-\uDEDF\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF38\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D\uDC20-\uDFFF]|\uD873[\uDC00-\uDEA1\uDEB0-\uDFFF]|\uD87A[\uDC00-\uDFE0]|\uD87E[\uDC00-\uDE1D]|\uD884[\uDC00-\uDF4A])/))){var r=n[1]||n[2]||"";if(!r||""===u||this.rules.inline.punctuation.exec(u)){var i=n[0].length-1,s=i,l=0,a="*"===n[0][0]?this.rules.inline.emStrong.rDelimAst:this.rules.inline.emStrong.rDelimUnd;for(a.lastIndex=0,t=t.slice(-1*e.length+i);null!=(n=a.exec(t));){var o,D=n[1]||n[2]||n[3]||n[4]||n[5]||n[6];if(D)if(o=D.length,n[3]||n[4])s+=o;else if((n[5]||n[6])&&i%3&&!((i+o)%3))l+=o;else if(!(0<(s-=o)))return o=Math.min(o,o+s+l),D=e.slice(0,i+n.index+(n[0].length-D.length)+o),Math.min(i,o)%2?(o=D.slice(1,-1),{type:"em",raw:D,text:o,tokens:this.lexer.inlineTokens(o)}):(o=D.slice(2,-2),{type:"strong",raw:D,text:o,tokens:this.lexer.inlineTokens(o)})}}}},t.codespan=function(e){var t,u,n,e=this.rules.inline.code.exec(e);if(e)return n=e[2].replace(/\n/g," "),t=/[^ ]/.test(n),u=/^ /.test(n)&&/ $/.test(n),n=c(n=t&&u?n.substring(1,n.length-1):n,!0),{type:"codespan",raw:e[0],text:n}},t.br=function(e){e=this.rules.inline.br.exec(e);if(e)return{type:"br",raw:e[0]}},t.del=function(e){e=this.rules.inline.del.exec(e);if(e)return{type:"del",raw:e[0],text:e[2],tokens:this.lexer.inlineTokens(e[2])}},t.autolink=function(e,t){var u,e=this.rules.inline.autolink.exec(e);if(e)return t="@"===e[2]?"mailto:"+(u=c(this.options.mangle?t(e[1]):e[1])):u=c(e[1]),{type:"link",raw:e[0],text:u,href:t,tokens:[{type:"text",raw:u,text:u}]}},t.url=function(e,t){var u,n,r,i;if(u=this.rules.inline.url.exec(e)){if("@"===u[2])r="mailto:"+(n=c(this.options.mangle?t(u[0]):u[0]));else{for(;i=u[0],u[0]=this.rules.inline._backpedal.exec(u[0])[0],i!==u[0];);n=c(u[0]),r="www."===u[1]?"http://"+u[0]:u[0]}return{type:"link",raw:u[0],text:n,href:r,tokens:[{type:"text",raw:n,text:n}]}}},t.inlineText=function(e,t){e=this.rules.inline.text.exec(e);if(e)return t=this.lexer.state.inRawBlock?this.options.sanitize?this.options.sanitizer?this.options.sanitizer(e[0]):c(e[0]):e[0]:c(this.options.smartypants?t(e[0]):e[0]),{type:"text",raw:e[0],text:t}},e}(),y={newline:/^(?: *(?:\n|$))+/,code:/^( {4}[^\n]+(?:\n(?: *(?:\n|$))*)?)+/,fences:/^ {0,3}(`{3,}(?=[^`\n]*\n)|~{3,})([^\n]*)\n(?:|([\s\S]*?)\n)(?: {0,3}\1[~`]* *(?=\n|$)|$)/,hr:/^ {0,3}((?:-[\t ]*){3,}|(?:_[ \t]*){3,}|(?:\*[ \t]*){3,})(?:\n+|$)/,heading:/^ {0,3}(#{1,6})(?=\s|$)(.*)(?:\n+|$)/,blockquote:/^( {0,3}> ?(paragraph|[^\n]*)(?:\n|$))+/,list:/^( {0,3}bull)([ \t][^\n]+?)?(?:\n|$)/,html:"^ {0,3}(?:<(script|pre|style|textarea)[\\s>][\\s\\S]*?(?:[^\\n]*\\n+|$)|comment[^\\n]*(\\n+|$)|<\\?[\\s\\S]*?(?:\\?>\\n*|$)|\\n*|$)|\\n*|$)|)[\\s\\S]*?(?:(?:\\n *)+\\n|$)|<(?!script|pre|style|textarea)([a-z][\\w-]*)(?:attribute)*? */?>(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:(?:\\n *)+\\n|$)|(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:(?:\\n *)+\\n|$))",def:/^ {0,3}\[(label)\]: *(?:\n *)?([^<\s][^\s]*|<.*?>)(?:(?: +(?:\n *)?| *\n *)(title))? *(?:\n+|$)/,table:d,lheading:/^((?:.|\n(?!\n))+?)\n {0,3}(=+|-+) *(?:\n+|$)/,_paragraph:/^([^\n]+(?:\n(?!hr|heading|lheading|blockquote|fences|list|html|table| +\n)[^\n]+)*)/,text:/^[^\n]+/,_label:/(?!\s*\])(?:\\.|[^\[\]\\])+/,_title:/(?:"(?:\\"?|[^"\\])*"|'[^'\n]*(?:\n[^'\n]+)*\n?'|\([^()]*\))/},v=(y.def=f(y.def).replace("label",y._label).replace("title",y._title).getRegex(),y.bullet=/(?:[*+-]|\d{1,9}[.)])/,y.listItemStart=f(/^( *)(bull) */).replace("bull",y.bullet).getRegex(),y.list=f(y.list).replace(/bull/g,y.bullet).replace("hr","\\n+(?=\\1?(?:(?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$))").replace("def","\\n+(?="+y.def.source+")").getRegex(),y._tag="address|article|aside|base|basefont|blockquote|body|caption|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption|figure|footer|form|frame|frameset|h[1-6]|head|header|hr|html|iframe|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option|p|param|section|source|summary|table|tbody|td|tfoot|th|thead|title|tr|track|ul",y._comment=/|$)/,y.html=f(y.html,"i").replace("comment",y._comment).replace("tag",y._tag).replace("attribute",/ +[a-zA-Z:_][\w.:-]*(?: *= *"[^"\n]*"| *= *'[^'\n]*'| *= *[^\s"'=<>`]+)?/).getRegex(),y.paragraph=f(y._paragraph).replace("hr",y.hr).replace("heading"," {0,3}#{1,6} ").replace("|lheading","").replace("|table","").replace("blockquote"," {0,3}>").replace("fences"," {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n").replace("list"," {0,3}(?:[*+-]|1[.)]) ").replace("html",")|<(?:script|pre|style|textarea|!--)").replace("tag",y._tag).getRegex(),y.blockquote=f(y.blockquote).replace("paragraph",y.paragraph).getRegex(),y.normal=C({},y),y.gfm=C({},y.normal,{table:"^ *([^\\n ].*\\|.*)\\n {0,3}(?:\\| *)?(:?-+:? *(?:\\| *:?-+:? *)*)(?:\\| *)?(?:\\n((?:(?! *\\n|hr|heading|blockquote|code|fences|list|html).*(?:\\n|$))*)\\n*|$)"}),y.gfm.table=f(y.gfm.table).replace("hr",y.hr).replace("heading"," {0,3}#{1,6} ").replace("blockquote"," {0,3}>").replace("code"," {4}[^\\n]").replace("fences"," {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n").replace("list"," {0,3}(?:[*+-]|1[.)]) ").replace("html",")|<(?:script|pre|style|textarea|!--)").replace("tag",y._tag).getRegex(),y.gfm.paragraph=f(y._paragraph).replace("hr",y.hr).replace("heading"," {0,3}#{1,6} ").replace("|lheading","").replace("table",y.gfm.table).replace("blockquote"," {0,3}>").replace("fences"," {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n").replace("list"," {0,3}(?:[*+-]|1[.)]) ").replace("html",")|<(?:script|pre|style|textarea|!--)").replace("tag",y._tag).getRegex(),y.pedantic=C({},y.normal,{html:f("^ *(?:comment *(?:\\n|\\s*$)|<(tag)[\\s\\S]+? *(?:\\n{2,}|\\s*$)|\\s]*)*?/?> *(?:\\n{2,}|\\s*$))").replace("comment",y._comment).replace(/tag/g,"(?!(?:a|em|strong|small|s|cite|q|dfn|abbr|data|time|code|var|samp|kbd|sub|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo|span|br|wbr|ins|del|img)\\b)\\w+(?!:|[^\\w\\s@]*@)\\b").getRegex(),def:/^ *\[([^\]]+)\]: *]+)>?(?: +(["(][^\n]+[")]))? *(?:\n+|$)/,heading:/^(#{1,6})(.*)(?:\n+|$)/,fences:d,lheading:/^(.+?)\n {0,3}(=+|-+) *(?:\n+|$)/,paragraph:f(y.normal._paragraph).replace("hr",y.hr).replace("heading"," *#{1,6} *[^\n]").replace("lheading",y.lheading).replace("blockquote"," {0,3}>").replace("|fences","").replace("|list","").replace("|html","").getRegex()}),{escape:/^\\([!"#$%&'()*+,\-./:;<=>?@\[\]\\^_`{|}~])/,autolink:/^<(scheme:[^\s\x00-\x1f<>]*|email)>/,url:d,tag:"^comment|^|^<[a-zA-Z][\\w-]*(?:attribute)*?\\s*/?>|^<\\?[\\s\\S]*?\\?>|^|^",link:/^!?\[(label)\]\(\s*(href)(?:\s+(title))?\s*\)/,reflink:/^!?\[(label)\]\[(ref)\]/,nolink:/^!?\[(ref)\](?:\[\])?/,reflinkSearch:"reflink|nolink(?!\\()",emStrong:{lDelim:/^(?:\*+(?:([punct_])|[^\s*]))|^_+(?:([punct*])|([^\s_]))/,rDelimAst:/^(?:[^_*\\]|\\.)*?\_\_(?:[^_*\\]|\\.)*?\*(?:[^_*\\]|\\.)*?(?=\_\_)|(?:[^*\\]|\\.)+(?=[^*])|[punct_](\*+)(?=[\s]|$)|(?:[^punct*_\s\\]|\\.)(\*+)(?=[punct_\s]|$)|[punct_\s](\*+)(?=[^punct*_\s])|[\s](\*+)(?=[punct_])|[punct_](\*+)(?=[punct_])|(?:[^punct*_\s\\]|\\.)(\*+)(?=[^punct*_\s])/,rDelimUnd:/^(?:[^_*\\]|\\.)*?\*\*(?:[^_*\\]|\\.)*?\_(?:[^_*\\]|\\.)*?(?=\*\*)|(?:[^_\\]|\\.)+(?=[^_])|[punct*](\_+)(?=[\s]|$)|(?:[^punct*_\s\\]|\\.)(\_+)(?=[punct*\s]|$)|[punct*\s](\_+)(?=[^punct*_\s])|[\s](\_+)(?=[punct*])|[punct*](\_+)(?=[punct*])/},code:/^(`+)([^`]|[^`][\s\S]*?[^`])\1(?!`)/,br:/^( {2,}|\\)\n(?!\s*$)/,del:d,text:/^(`+|[^`])(?:(?= {2,}\n)|[\s\S]*?(?:(?=[\\?@\\[\\]`^{|}~",v.punctuation=f(v.punctuation).replace(/punctuation/g,v._punctuation).getRegex(),v.blockSkip=/\[[^\]]*?\]\([^\)]*?\)|`[^`]*?`|<[^>]*?>/g,v.escapedEmSt=/(?:^|[^\\])(?:\\\\)*\\[*_]/g,v._comment=f(y._comment).replace("(?:--\x3e|$)","--\x3e").getRegex(),v.emStrong.lDelim=f(v.emStrong.lDelim).replace(/punct/g,v._punctuation).getRegex(),v.emStrong.rDelimAst=f(v.emStrong.rDelimAst,"g").replace(/punct/g,v._punctuation).getRegex(),v.emStrong.rDelimUnd=f(v.emStrong.rDelimUnd,"g").replace(/punct/g,v._punctuation).getRegex(),v._escapes=/\\([!"#$%&'()*+,\-./:;<=>?@\[\]\\^_`{|}~])/g,v._scheme=/[a-zA-Z][a-zA-Z0-9+.-]{1,31}/,v._email=/[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+(@)[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+(?![-_])/,v.autolink=f(v.autolink).replace("scheme",v._scheme).replace("email",v._email).getRegex(),v._attribute=/\s+[a-zA-Z:_][\w.:-]*(?:\s*=\s*"[^"]*"|\s*=\s*'[^']*'|\s*=\s*[^\s"'=<>`]+)?/,v.tag=f(v.tag).replace("comment",v._comment).replace("attribute",v._attribute).getRegex(),v._label=/(?:\[(?:\\.|[^\[\]\\])*\]|\\.|`[^`]*`|[^\[\]\\`])*?/,v._href=/<(?:\\.|[^\n<>\\])+>|[^\s\x00-\x1f]*/,v._title=/"(?:\\"?|[^"\\])*"|'(?:\\'?|[^'\\])*'|\((?:\\\)?|[^)\\])*\)/,v.link=f(v.link).replace("label",v._label).replace("href",v._href).replace("title",v._title).getRegex(),v.reflink=f(v.reflink).replace("label",v._label).replace("ref",y._label).getRegex(),v.nolink=f(v.nolink).replace("ref",y._label).getRegex(),v.reflinkSearch=f(v.reflinkSearch,"g").replace("reflink",v.reflink).replace("nolink",v.nolink).getRegex(),v.normal=C({},v),v.pedantic=C({},v.normal,{strong:{start:/^__|\*\*/,middle:/^__(?=\S)([\s\S]*?\S)__(?!_)|^\*\*(?=\S)([\s\S]*?\S)\*\*(?!\*)/,endAst:/\*\*(?!\*)/g,endUnd:/__(?!_)/g},em:{start:/^_|\*/,middle:/^()\*(?=\S)([\s\S]*?\S)\*(?!\*)|^_(?=\S)([\s\S]*?\S)_(?!_)/,endAst:/\*(?!\*)/g,endUnd:/_(?!_)/g},link:f(/^!?\[(label)\]\((.*?)\)/).replace("label",v._label).getRegex(),reflink:f(/^!?\[(label)\]\s*\[([^\]]*)\]/).replace("label",v._label).getRegex()}),v.gfm=C({},v.normal,{escape:f(v.escape).replace("])","~|])").getRegex(),_extended_email:/[A-Za-z0-9._+-]+(@)[a-zA-Z0-9-_]+(?:\.[a-zA-Z0-9-_]*[a-zA-Z0-9])+(?![-_])/,url:/^((?:ftp|https?):\/\/|www\.)(?:[a-zA-Z0-9\-]+\.?)+[^\s<]*|^email/,_backpedal:/(?:[^?!.,:;*_'"~()&]+|\([^)]*\)|&(?![a-zA-Z0-9]+;$)|[?!.,:;*_'"~)]+(?!$))+/,del:/^(~~?)(?=[^\s~])([\s\S]*?[^\s~])\1(?=[^~]|$)/,text:/^([`~]+|[^`~])(?:(?= {2,}\n)|(?=[a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-]+@)|[\s\S]*?(?:(?=[\\'+(u?e:c(e,!0))+"\n":"
"+(u?e:c(e,!0))+"
\n"},t.blockquote=function(e){return"
\n"+e+"
\n"},t.html=function(e){return e},t.heading=function(e,t,u,n){return this.options.headerIds?"'+e+"\n":""+e+"\n"},t.hr=function(){return this.options.xhtml?"
\n":"
\n"},t.list=function(e,t,u){var n=t?"ol":"ul";return"<"+n+(t&&1!==u?' start="'+u+'"':"")+">\n"+e+"\n"},t.listitem=function(e){return"
  • "+e+"
  • \n"},t.checkbox=function(e){return" "},t.paragraph=function(e){return"

    "+e+"

    \n"},t.table=function(e,t){return"\n\n"+e+"\n"+(t=t&&""+t+"")+"
    \n"},t.tablerow=function(e){return"\n"+e+"\n"},t.tablecell=function(e,t){var u=t.header?"th":"td";return(t.align?"<"+u+' align="'+t.align+'">':"<"+u+">")+e+"\n"},t.strong=function(e){return""+e+""},t.em=function(e){return""+e+""},t.codespan=function(e){return""+e+""},t.br=function(){return this.options.xhtml?"
    ":"
    "},t.del=function(e){return""+e+""},t.link=function(e,t,u){return null===(e=F(this.options.sanitize,this.options.baseUrl,e))?u:(e='"+u+"")},t.image=function(e,t,u){return null===(e=F(this.options.sanitize,this.options.baseUrl,e))?u:(e=''+u+'":">"))},t.text=function(e){return e},e}(),S=function(){function e(){}var t=e.prototype;return t.strong=function(e){return e},t.em=function(e){return e},t.codespan=function(e){return e},t.del=function(e){return e},t.html=function(e){return e},t.text=function(e){return e},t.link=function(e,t,u){return""+u},t.image=function(e,t,u){return""+u},t.br=function(){return""},e}(),T=function(){function e(){this.seen={}}var t=e.prototype;return t.serialize=function(e){return e.toLowerCase().trim().replace(/<[!\/a-z].*?>/gi,"").replace(/[\u2000-\u206F\u2E00-\u2E7F\\'!"#$%&()*+,./:;<=>?@[\]^`{|}~]/g,"").replace(/\s/g,"-")},t.getNextSafeSlug=function(e,t){var u=e,n=0;if(this.seen.hasOwnProperty(u))for(n=this.seen[e];u=e+"-"+ ++n,this.seen.hasOwnProperty(u););return t||(this.seen[e]=n,this.seen[u]=0),u},t.slug=function(e,t){void 0===t&&(t={});e=this.serialize(e);return this.getNextSafeSlug(e,t.dryrun)},e}(),R=function(){function u(e){this.options=e||r.defaults,this.options.renderer=this.options.renderer||new $,this.renderer=this.options.renderer,this.renderer.options=this.options,this.textRenderer=new S,this.slugger=new T}u.parse=function(e,t){return new u(t).parse(e)},u.parseInline=function(e,t){return new u(t).parseInline(e)};var e=u.prototype;return e.parse=function(e,t){void 0===t&&(t=!0);for(var u,n,r,i,s,l,a,o,D,c,h,p,f,g,F,A,d="",C=e.length,k=0;kAn error occurred:

    "+c(e.message+"",!0)+"
    ";throw e}try{var a=z.lex(e,u);if(u.walkTokens){if(u.async)return Promise.all(I.walkTokens(a,u.walkTokens)).then(function(){return R.parse(a,u)}).catch(t);I.walkTokens(a,u.walkTokens)}return R.parse(a,u)}catch(e){t(e)}}I.options=I.setOptions=function(e){return C(I.defaults,e),e=I.defaults,r.defaults=e,I},I.getDefaults=e,I.defaults=r.defaults,I.use=function(){for(var o=I.defaults.extensions||{renderers:{},childTokens:{}},e=arguments.length,t=new Array(e),u=0;uAn error occurred:

    "+c(e.message+"",!0)+"
    ";throw e}},I.Parser=R,I.parser=R.parse,I.Renderer=$,I.TextRenderer=S,I.Lexer=z,I.lexer=z.lex,I.Tokenizer=w,I.Slugger=T;var d=(I.parse=I).options,P=I.setOptions,Q=I.use,U=I.walkTokens,M=I.parseInline,N=I,X=R.parse,G=z.lex;r.Lexer=z,r.Parser=R,r.Renderer=$,r.Slugger=T,r.TextRenderer=S,r.Tokenizer=w,r.getDefaults=e,r.lexer=G,r.marked=I,r.options=d,r.parse=N,r.parseInline=M,r.parser=X,r.setOptions=P,r.use=Q,r.walkTokens=U}); \ No newline at end of file diff --git a/app/views/members/edit.html.haml b/app/views/members/edit.html.haml index 1c8062d..4e24bc4 100644 --- a/app/views/members/edit.html.haml +++ b/app/views/members/edit.html.haml @@ -1,5 +1,5 @@ -= javascript_include_tag "merged/vue.min.js" -= javascript_include_tag "marked.min.js" +%script{:src => "https://cdn.jsdelivr.net/npm/vue@2.7.14/dist/vue.js"} +%script{:src => "https://cdn.jsdelivr.net/npm/marked/marked.min.js"} .flex.justify-center.m-20 .flex.flex-col diff --git a/app/views/stories/_form.haml b/app/views/stories/_form.haml index 19d1fda..789559c 100644 --- a/app/views/stories/_form.haml +++ b/app/views/stories/_form.haml @@ -7,7 +7,7 @@ = f.input :picture , as: :file , label: (@story.picture.blank? ? "Add picture" : "Change picture") = f.input :header - = f.input :text , input_html: {rows: rows(@story.text)} + = render "merged/form/editor" , object: @story , field: :text, form: f = f.input :happened , wrapper_class: "flex mt-4 align-center" .flex.justify-between.mt-6 %button.bg-cyan-200.rounded-lg.px-4.py-3.text-md.font-medium.border.border-gray-400 diff --git a/app/views/stories/_half.haml b/app/views/stories/_half.haml index 0a4b080..e8d32ce 100644 --- a/app/views/stories/_half.haml +++ b/app/views/stories/_half.haml @@ -7,6 +7,6 @@ = story.header %h4.text-xl.mt-10.md:text-2xl = distance_of_time_in_words_to_now story.happened - ago half + ago .mt-8{ prose_classes } = markdown(story.text) diff --git a/app/views/stories/_pic.haml b/app/views/stories/_pic.haml index 8b15553..00456fc 100644 --- a/app/views/stories/_pic.haml +++ b/app/views/stories/_pic.haml @@ -8,6 +8,6 @@ = story.header %h4.text-xl.mt-4.lg:mt-8.md:text-2xl = distance_of_time_in_words_to_now story.happened - ago pic + ago .mt-3{ prose_classes } = markdown(story.text) diff --git a/app/views/stories/edit.html.haml b/app/views/stories/edit.html.haml index b1694ec..1a691be 100644 --- a/app/views/stories/edit.html.haml +++ b/app/views/stories/edit.html.haml @@ -1,3 +1,5 @@ +%script{:src => "https://cdn.jsdelivr.net/npm/vue@2.7.14/dist/vue.js"} +%script{:src => "https://cdn.jsdelivr.net/npm/marked/marked.min.js"} .flex.justify-center .column{class: "w-10/12 md:w-8/12 lg:w-5/12 xl:w-4/12"} .text-2xl.font-bold.my-4 diff --git a/app/views/stories/new.html.haml b/app/views/stories/new.html.haml index bb00576..441bee3 100644 --- a/app/views/stories/new.html.haml +++ b/app/views/stories/new.html.haml @@ -1,3 +1,5 @@ +%script{:src => "https://cdn.jsdelivr.net/npm/vue@2.7.14/dist/vue.js"} +%script{:src => "https://cdn.jsdelivr.net/npm/marked/marked.min.js"} .flex.justify-center .column{class: "w-10/12 md:w-8/12 lg:w-5/12 xl:w-4/12"} .text-2xl.font-bold.my-4 diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index 9bfb6e1..ba525a9 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -9,4 +9,4 @@ Rails.application.config.assets.version = "1.0" # Precompile additional assets. # application.js, application.css, and all non-JS/CSS in the app/assets # folder are already added. -Rails.application.config.assets.precompile += %w( marked.min.js images/*.webp) +Rails.application.config.assets.precompile += %w( images/*.webp) From f6bac888007b17848a075f1d9e497b9d17f2eeb6 Mon Sep 17 00:00:00 2001 From: Torsten Date: Sun, 22 Jan 2023 20:29:10 +0200 Subject: [PATCH 05/12] story editor polish --- Gemfile.lock | 2 +- app/controllers/members_controller.rb | 3 +- app/models/member.rb | 3 ++ app/models/story.rb | 4 +- app/uploaders/picture_uploader.rb | 10 ++--- app/views/members/_form.html.haml | 3 -- app/views/members/edit.html.haml | 57 ++++++++++----------------- app/views/stories/_form.haml | 11 ++++-- 8 files changed, 40 insertions(+), 53 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c45fe09..b59516a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/HubFeenixMakers/merged - revision: ee228d48f4a20dc89a7c09ea9354b4b2c899271b + revision: a452bd5d8daf83387172fe635ba3ccbb4bdd9ace specs: merged (0.1.0) active_hash diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 04b1266..51926d9 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -48,6 +48,7 @@ class MembersController < ApplicationController # Only allow a list of trusted parameters through. def member_params - params.require(:member).permit(:name, :public, :bio , :picture, :arrived ,:left) + params.require(:member).permit(:name, :public, :bio , :picture, + :picture_cache , :arrived ,:left) end end diff --git a/app/models/member.rb b/app/models/member.rb index 11298f7..4c73a86 100644 --- a/app/models/member.rb +++ b/app/models/member.rb @@ -7,6 +7,9 @@ class Member < ApplicationRecord mount_uploader :picture, PictureUploader has_many :stories + validates :bio, length: { maximum: 1000 } + validates :name , length: { minimum: 3 } + def admin self.email == "torsten@villataika.fi" end diff --git a/app/models/story.rb b/app/models/story.rb index 1f6685e..e55ab4b 100644 --- a/app/models/story.rb +++ b/app/models/story.rb @@ -3,8 +3,8 @@ class Story < ApplicationRecord mount_uploader :picture, PictureUploader - validates :text, length: { maximum: 1000 } - validates :header , length: { minimum: 5 } + validates :text, length: { minimum: 5 , maximum: 1000 } + validates :header , length: { minimum: 5 , maximum: 400} def name header diff --git a/app/uploaders/picture_uploader.rb b/app/uploaders/picture_uploader.rb index fbe8e09..42856bd 100644 --- a/app/uploaders/picture_uploader.rb +++ b/app/uploaders/picture_uploader.rb @@ -14,12 +14,10 @@ class PictureUploader < CarrierWave::Uploader::Base 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 + def default_url(*args) + # For Rails 3.1+ asset pipeline compatibility: + ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_')) + end # Process files as they are uploaded: # process scale: [200, 300] diff --git a/app/views/members/_form.html.haml b/app/views/members/_form.html.haml index fe415a0..1f97f5b 100644 --- a/app/views/members/_form.html.haml +++ b/app/views/members/_form.html.haml @@ -11,9 +11,6 @@ .field = f.label :name = f.text_field :name - .field - = f.label :public - = f.check_box :public .field = f.label :picture = f.file_field :picture diff --git a/app/views/members/edit.html.haml b/app/views/members/edit.html.haml index 4e24bc4..86961f0 100644 --- a/app/views/members/edit.html.haml +++ b/app/views/members/edit.html.haml @@ -3,42 +3,27 @@ .flex.justify-center.m-20 .flex.flex-col - %h1.text-4xl Editing profile + %h1.text-4xl Edit your profile = simple_form_for @member do |f| - = f.error_notification - .grid.grid-cols-4.mx-20 - .info.mr-8 - = f.input :name - .grid.grid-cols-2.gap-10 - = f.input :arrived - = f.input :left - = f.input :public , label: "Public: (Click box below)" - = f.input :picture , as: :file , label: (@member.picture.blank? ? "Add picture" : "Change picture") - .flex.justify-center.actions.m-10 - = f.button :button, "Update", class: button_classes + " bg-cyan-200" - = link_to member_path(@member) do - %button.ml-10{type: :submit, class: button_classes} - Back - .field.flex.flex-col.pr-2.border-r-8.border-slate-600 - = f.text_area :bio ,rows: 18 , "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.h-90 - -if @member.picture_url - %div.overflow-hidden.ml-2.mr-8 - = image_tag @member.picture_url, class: "object-contain w-full" - -else - No Picture - .preview.prose - %b.text-2xl Preview - %div{"v-html" => "compiledMarkdown"} -:ruby2js - class Mark < Vue - options el: '.grid' - def initialize - @markdown = "#{@member.bio.to_s.html_safe}" - end - def compiledMarkdown - marked.parse(@markdown) - end - end + .flex.justify-center + .column{class: "w-11/12 md:w-10/12 lg:w-8/12 xl:w-6/12"} + .grid.grid-cols-1.md:grid-cols-2.mx-20.gap-10 + = render "merged/form/editor" , object: @member , field: :bio, form: f + .info.mr-8 + .text-red-700= f.error_notification + = f.input :name + .grid.grid-cols-2.gap-10 + = f.input :arrived + = f.input :left + .flex.h-16.mt-2 + = image_tag(@member.picture_url , class: "align-middle mr-2") if @member.picture? + = f.input :picture , as: :file , input_html: {wrapper_class: "w-full"}, + label: (@member.picture.blank? ? "Add picture" : "Change picture") + = f.hidden_field :picture_cache + .flex.justify-center.actions.m-10 + = f.button :button, "Update", class: button_classes + " bg-cyan-200" + = link_to member_path(@member) do + %button.ml-10{type: :submit, class: button_classes} + Back diff --git a/app/views/stories/_form.haml b/app/views/stories/_form.haml index 789559c..d3c2ec9 100644 --- a/app/views/stories/_form.haml +++ b/app/views/stories/_form.haml @@ -1,17 +1,20 @@ %div Story layout changes with the amount of text. - For short lext a wide picture is best. Otherwise square, and for + For short text a wide picture is best. Otherwise square, and for longer text a high picture also works. = simple_form_for @story do |f| = f.error_notification - - = f.input :picture , as: :file , label: (@story.picture.blank? ? "Add picture" : "Change picture") + .flex.h-16.mt-2 + = image_tag(@story.picture_url , class: "align-middle mr-2") if @story.picture? + = f.input :picture , as: :file , input_html: {wrapper_class: "w-full"}, + label: (@story.picture.blank? ? "Add picture" : "Change picture") + = f.hidden_field :picture_cache = f.input :header = render "merged/form/editor" , object: @story , field: :text, form: f = f.input :happened , wrapper_class: "flex mt-4 align-center" .flex.justify-between.mt-6 %button.bg-cyan-200.rounded-lg.px-4.py-3.text-md.font-medium.border.border-gray-400 = f.submit 'Save' - = link_to @story do + = link_to member_path(current_member) do %button.ml-20.rounded-lg.px-4.py-3.text-md.font-medium.border.border-gray-400 Back From 4f33e475e51c7a0bedf9d6a948c76a1c57e9ee67 Mon Sep 17 00:00:00 2001 From: Torsten Date: Sun, 22 Jan 2023 23:17:44 +0200 Subject: [PATCH 06/12] heroicon --- app/helpers/heroicon_helper.rb | 5 +++++ config/initializers/heroicon.rb | 10 ++++++++++ 2 files changed, 15 insertions(+) create mode 100644 app/helpers/heroicon_helper.rb create mode 100644 config/initializers/heroicon.rb diff --git a/app/helpers/heroicon_helper.rb b/app/helpers/heroicon_helper.rb new file mode 100644 index 0000000..c4f9665 --- /dev/null +++ b/app/helpers/heroicon_helper.rb @@ -0,0 +1,5 @@ +# frozen_string_literal: true + +module HeroiconHelper + include Heroicon::Engine.helpers +end \ No newline at end of file diff --git a/config/initializers/heroicon.rb b/config/initializers/heroicon.rb new file mode 100644 index 0000000..db7d89e --- /dev/null +++ b/config/initializers/heroicon.rb @@ -0,0 +1,10 @@ +# frozen_string_literal: true + +Heroicon.configure do |config| + config.variant = :solid # Options are :solid, :outline and :mini + + ## + # You can set a default class, which will get applied to every icon with + # the given variant. To do so, un-comment the line below. + # config.default_class = {solid: "h-5 w-5", outline: "h-6 w-6", mini: "h-4 w-4"} +end From af824775bba3091cf4fa2b51bd3b3351a26733d3 Mon Sep 17 00:00:00 2001 From: Torsten Date: Sun, 22 Jan 2023 23:17:59 +0200 Subject: [PATCH 07/12] fix sign up --- app/controllers/registrations_controller.rb | 17 ++++++------- app/views/devise/registrations/new.html.haml | 5 ++++ app/views/members/_form.html.haml | 26 -------------------- 3 files changed, 12 insertions(+), 36 deletions(-) delete mode 100644 app/views/members/_form.html.haml diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb index 08429f1..0286699 100644 --- a/app/controllers/registrations_controller.rb +++ b/app/controllers/registrations_controller.rb @@ -5,20 +5,22 @@ class RegistrationsController < Devise::RegistrationsController # before_action :configure_account_update_params, only: [:update] prepend_before_action :authenticate_scope!, only: [:edit_email] - def new build_resource super end - # POST /resource + def create if message = math_check + puts message flash.now.alert = message + build_resource(sign_up_params) + render :new + else + super end - super end - # GET /resource/edit def edit_email build_resource puts "EDIT" @@ -28,17 +30,12 @@ class RegistrationsController < Devise::RegistrationsController build_resource super end - # PUT /resource + def update puts "UPDATE" super end - # DELETE /resource - # def destroy - # super - # end - protected def math_check diff --git a/app/views/devise/registrations/new.html.haml b/app/views/devise/registrations/new.html.haml index 1204781..4d80568 100644 --- a/app/views/devise/registrations/new.html.haml +++ b/app/views/devise/registrations/new.html.haml @@ -5,6 +5,11 @@ html: { class: "bg-white mb-4 px-8 pt-6 pb-8 rounded shadow-md" } , url: registration_path(resource_name) ) do |f| = render "devise/shared/error_messages", resource: resource + .mb-4 + = f.label :name, class: "block font-bold mb-2 text-gray-700 text-sm" + = f.input :name, + placeholder: "Pekka Virtanen", + class: "appearance-none border rounded w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none shadow focus:shadow-outline" .mb-4 = f.label :email, class: "block font-bold mb-2 text-gray-700 text-sm" = f.email_field :email, diff --git a/app/views/members/_form.html.haml b/app/views/members/_form.html.haml deleted file mode 100644 index 1f97f5b..0000000 --- a/app/views/members/_form.html.haml +++ /dev/null @@ -1,26 +0,0 @@ -= form_for @member do |f| - .flex.flex-col - - 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 - - .grid.grid-cols-2.m-20.gap-10 - .field - = f.label :name - = f.text_field :name - .field - = f.label :picture - = f.file_field :picture - -if @member.picture - %div.overflow-hidden - .my-5 Currently - = image_tag @member.picture, class: "object-contain h-40" - - .field - = f.label :Bio - = f.rich_text_area :bio - .flex.justify-center.actions - = f.submit 'Save' From 8140dcc722dc84878956d808241a6077ede9167d Mon Sep 17 00:00:00 2001 From: Torsten Date: Sun, 22 Jan 2023 23:24:28 +0200 Subject: [PATCH 08/12] add defualt image --- app/assets/images/fallback/default.png | Bin 0 -> 23737 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/assets/images/fallback/default.png diff --git a/app/assets/images/fallback/default.png b/app/assets/images/fallback/default.png new file mode 100644 index 0000000000000000000000000000000000000000..ef843ce8fd8c169f5e3b4748a2780711538930ec GIT binary patch literal 23737 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 literal 0 HcmV?d00001 From 175a89cfb499cfc9ef99012bcc88bdb6d5939d8d Mon Sep 17 00:00:00 2001 From: Torsten Date: Sun, 22 Jan 2023 23:36:47 +0200 Subject: [PATCH 09/12] member responsiveness and max width for body --- app/views/layouts/application.haml | 2 +- app/views/members/index.html.haml | 27 +++++++++++++-------------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/app/views/layouts/application.haml b/app/views/layouts/application.haml index 5eecd05..e487f79 100644 --- a/app/views/layouts/application.haml +++ b/app/views/layouts/application.haml @@ -32,7 +32,7 @@ - if false %script{:src => "https://cdn.tailwindcss.com"} - %body + %body.max-w-screen-2xl.xl:mx-auto = render "layouts/header" = render "layouts/messages" = yield diff --git a/app/views/members/index.html.haml b/app/views/members/index.html.haml index c1e9f7f..5b0a765 100644 --- a/app/views/members/index.html.haml +++ b/app/views/members/index.html.haml @@ -1,16 +1,15 @@ = paginate @members -.flex.justify-center - .grid.grid-cols-4 - - @members.each do |member| - .fex.flex-col.overflow-hidden.rounded-lg.border.border-gray-100.shadow-sm.m-10 - =link_to member do - = image_for( member , class: "h-60 w-full object-cover") - %h3.pt-5.text-2xl.bg-gray-100.text-black.font-bold.text-center - = member.name - .p-2.text-xs.bg-gray-50.text-black.font-bold.text-center - = stayed member - %div.h-full - .p-5.text-center - .m-2.text-sm.leading-relaxed.line-clamp-3{ prose_classes } - = shorten markdown(member.bio) +.grid.grid-cols-1.md:grid-cols-2.lg:grid-cols-4 + - @members.each do |member| + .fex.flex-col.overflow-hidden.rounded-lg.border.border-gray-100.shadow-sm.m-10 + =link_to member do + = image_for( member , class: "h-60 w-full object-cover") + %h3.pt-5.text-2xl.bg-gray-100.text-black.font-bold.text-center + = member.name + .p-2.text-xs.bg-gray-50.text-black.font-bold.text-center + = stayed member + %div.h-full + .p-5.text-center + .m-2.text-sm.leading-relaxed.line-clamp-3{ prose_classes } + = shorten markdown(member.bio) From 105f0c09b1db12cf067a1a30390545785817e8c6 Mon Sep 17 00:00:00 2001 From: Torsten Date: Mon, 23 Jan 2023 12:22:57 +0200 Subject: [PATCH 10/12] login/out for mobile menu --- app/views/layouts/_mobile_menu.haml | 9 +++++++++ app/views/members/edit.html.haml | 2 +- app/views/stories/edit.html.haml | 2 +- app/views/stories/new.html.haml | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/app/views/layouts/_mobile_menu.haml b/app/views/layouts/_mobile_menu.haml index d66c423..d16ff01 100644 --- a/app/views/layouts/_mobile_menu.haml +++ b/app/views/layouts/_mobile_menu.haml @@ -21,6 +21,15 @@ %li %a.w-full.h-full.block.tracking-wide.text-xl.p-2.rounded-lg.hover:bg-cyan-200{ :href => link , :title => text} = text + -if(current_member) + = form_tag( main_app.destroy_member_session_path , {method: :delete ,class: "text-center"}) do + %button.w-full.items-center.gap-2.rounded-lg.px-4.py-2.text-sm.text-blue-700.hover:bg-red-50{:role => "menuitem", :type => "submit"} + %svg.h-4.w-4{:fill => "none", :stroke => "currentColor", "stroke-width" => "2", :viewbox => "0 0 24 24", :xmlns => "http://www.w3.org/2000/svg"} + %path{:d => "M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16", "stroke-linecap" => "round", "stroke-linejoin" => "round"} + Sign out + -else + %a.inline-flex.items-center.justify-center.h-12.px-6.font-medium.tracking-wide.text-white.transition.duration-200.rounded-lg.shadow-md.bg-green-800.hover:bg-blue-800.focus:shadow-outline.focus:outline-none{"aria-label" => "Sign up", :href => main_app.member_session_path, :title => "Log in or Sign up"} + Login :javascript var drop_hidden = true; function menu_on() { diff --git a/app/views/members/edit.html.haml b/app/views/members/edit.html.haml index 86961f0..46e22cb 100644 --- a/app/views/members/edit.html.haml +++ b/app/views/members/edit.html.haml @@ -8,7 +8,7 @@ = simple_form_for @member do |f| .flex.justify-center - .column{class: "w-11/12 md:w-10/12 lg:w-8/12 xl:w-6/12"} + .column{class: "w-11/12 md:w-10/12"} .grid.grid-cols-1.md:grid-cols-2.mx-20.gap-10 = render "merged/form/editor" , object: @member , field: :bio, form: f .info.mr-8 diff --git a/app/views/stories/edit.html.haml b/app/views/stories/edit.html.haml index 1a691be..0c469f4 100644 --- a/app/views/stories/edit.html.haml +++ b/app/views/stories/edit.html.haml @@ -1,7 +1,7 @@ %script{:src => "https://cdn.jsdelivr.net/npm/vue@2.7.14/dist/vue.js"} %script{:src => "https://cdn.jsdelivr.net/npm/marked/marked.min.js"} .flex.justify-center - .column{class: "w-10/12 md:w-8/12 lg:w-5/12 xl:w-4/12"} + .column{class: "w-10/12 md:w-8/12 lg:w-7/12 xl:w-6/12"} .text-2xl.font-bold.my-4 Edit Story = render 'form' diff --git a/app/views/stories/new.html.haml b/app/views/stories/new.html.haml index 441bee3..0c18074 100644 --- a/app/views/stories/new.html.haml +++ b/app/views/stories/new.html.haml @@ -1,7 +1,7 @@ %script{:src => "https://cdn.jsdelivr.net/npm/vue@2.7.14/dist/vue.js"} %script{:src => "https://cdn.jsdelivr.net/npm/marked/marked.min.js"} .flex.justify-center - .column{class: "w-10/12 md:w-8/12 lg:w-5/12 xl:w-4/12"} + .column{class: "w-10/12 md:w-8/12 lg:w-7/12 xl:w-6/12"} .text-2xl.font-bold.my-4 New Story = render 'form' From 4b3cab6e9b13986ecb6f042492075b6a7a942a09 Mon Sep 17 00:00:00 2001 From: Torsten Date: Mon, 23 Jan 2023 12:50:22 +0200 Subject: [PATCH 11/12] better member profile edit on mobile --- app/views/members/edit.html.haml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/app/views/members/edit.html.haml b/app/views/members/edit.html.haml index 46e22cb..9f33dd2 100644 --- a/app/views/members/edit.html.haml +++ b/app/views/members/edit.html.haml @@ -1,15 +1,14 @@ %script{:src => "https://cdn.jsdelivr.net/npm/vue@2.7.14/dist/vue.js"} %script{:src => "https://cdn.jsdelivr.net/npm/marked/marked.min.js"} -.flex.justify-center.m-20 - .flex.flex-col +.flex.justify-center.m-5.m-5.md:m-12.lg:m-20 + .flex.flex-col.text-center %h1.text-4xl Edit your profile -= simple_form_for @member do |f| - - .flex.justify-center - .column{class: "w-11/12 md:w-10/12"} - .grid.grid-cols-1.md:grid-cols-2.mx-20.gap-10 +.flex.justify-center.m-5.m-5.md:m-12.lg:m-20 + .flex.flex-col.text-center{class: "w-full md:w-10/12"} + = simple_form_for @member do |f| + .grid.grid-cols-1.md:grid-cols-2.gap-10 = render "merged/form/editor" , object: @member , field: :bio, form: f .info.mr-8 .text-red-700= f.error_notification From 54848956c8a2725eea7ee8674875282bef98715d Mon Sep 17 00:00:00 2001 From: Torsten Date: Mon, 23 Jan 2023 13:10:31 +0200 Subject: [PATCH 12/12] fix data --- Gemfile.lock | 2 +- merged/sections.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b59516a..8eb5779 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/HubFeenixMakers/merged - revision: a452bd5d8daf83387172fe635ba3ccbb4bdd9ace + revision: 528cd025880bdb656e19736654e6621e8a4b27b3 specs: merged (0.1.0) active_hash diff --git a/merged/sections.yml b/merged/sections.yml index 928b71b..3a9adba 100644 --- a/merged/sections.yml +++ b/merged/sections.yml @@ -188,7 +188,7 @@ :image_id: 89 - :template: section_cards :index: 1 - :page_id: 9 + :page_id: 10 :updated_at: 2023-01-19 14:26:59.100565929 +02:00 :updated_by: torsten@villataika.fi :id: 50