diff --git a/Gemfile b/Gemfile index 1967618..9b8c76f 100644 --- a/Gemfile +++ b/Gemfile @@ -2,6 +2,9 @@ source "https://rubygems.org" ruby "3.1.3" +gem "merged" , git: "https://github.com/HubFeenixMakers/merged" +#gem "merged" , path: "../merged" + gem "rails", "~> 7.0" gem "sprockets-rails" @@ -25,9 +28,6 @@ gem "pundit" gem "simple_form" , "5.1.0" gem "simple_form_tailwind_css" -gem "merged" , git: "https://github.com/HubFeenixMakers/merged" -#gem "merged" , path: "../merged" - gem "passenger" , require: "phusion_passenger/rack_handler" gem "bootsnap", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 9edc82f..57f9d62 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/HubFeenixMakers/merged - revision: a452bd5d8daf83387172fe635ba3ccbb4bdd9ace + revision: b0c2d46c4815bb08dd750f34ef3e2ae996a8c69e specs: merged (0.1.0) active_hash diff --git a/app/views/events/_form.html.haml b/app/views/events/_form.html.haml index 2bcaa3a..8c6c088 100644 --- a/app/views/events/_form.html.haml +++ b/app/views/events/_form.html.haml @@ -2,7 +2,7 @@ = f.error_notification = f.input :name - = f.input :text + = render "merged/form/editor" , object: @event , field: :text, form: f .grid.grid-cols-2.gap-10 = f.input :start_date = f.input :end_date diff --git a/app/views/events/edit.html.haml b/app/views/events/edit.html.haml index fc27b15..a798c2a 100644 --- a/app/views/events/edit.html.haml +++ b/app/views/events/edit.html.haml @@ -1,3 +1,6 @@ +%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-xl.m-4 diff --git a/app/views/events/new.html.haml b/app/views/events/new.html.haml index 0be0c2b..e4edd65 100644 --- a/app/views/events/new.html.haml +++ b/app/views/events/new.html.haml @@ -1,3 +1,6 @@ +%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-xl.m-4 diff --git a/app/views/members/_teacher_profile.haml b/app/views/members/_teacher_profile.haml index 4488b00..72dcfa5 100644 --- a/app/views/members/_teacher_profile.haml +++ b/app/views/members/_teacher_profile.haml @@ -9,9 +9,9 @@ %button.bg-red-200.mr-3.inline-block.rounded-lg.px-4.py-3.text-md.font-medium.border.border-gray-400{type: :submit} Delete Profile -.flex.flex-col.justify-center.mt-2 +.flex.flex-col.justify-center =link_to profile_path(profile) do - .px-2.py-2.text-center.bg-gray-200 + .my-2.px-2.py-2.text-center.bg-gray-200 %h1.text-xl.font-bold.tracking-tight.sm:text-4xl Your Events -if event = profile.events.length >0 diff --git a/app/views/profiles/_form.html.haml b/app/views/profiles/_form.html.haml index f7fafe8..bc86d26 100644 --- a/app/views/profiles/_form.html.haml +++ b/app/views/profiles/_form.html.haml @@ -2,7 +2,7 @@ = f.error_notification = f.input :name - = f.input :bio + = render "merged/form/editor" , object: @profile , field: :bio, form: f = f.input :kind, :as => :hidden .flex.h-16.mt-2 = image_tag(@profile.picture_url , class: "align-middle mr-2") if @profile.picture? diff --git a/app/views/profiles/edit.html.haml b/app/views/profiles/edit.html.haml index c395027..c1ed5c7 100644 --- a/app/views/profiles/edit.html.haml +++ b/app/views/profiles/edit.html.haml @@ -1,3 +1,6 @@ +%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-xl.m-4 diff --git a/app/views/profiles/new.html.haml b/app/views/profiles/new.html.haml index 1698c52..8bfe897 100644 --- a/app/views/profiles/new.html.haml +++ b/app/views/profiles/new.html.haml @@ -1,3 +1,6 @@ +%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-xl.m-4