From c9d23f829d7a7d57854eb311712db3c94dc7e31c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Wed, 28 May 2025 13:21:18 +0400 Subject: [PATCH 01/17] Add ActionText configs, update spec helpers/configs --- app/assets/stylesheets/actiontext.css | 440 ++++++++++++++++++ app/javascript/application.js | 3 + app/views/active_storage/blobs/_blob.html.erb | 14 + .../action_text/contents/_content.html.erb | 3 + config/application.rb | 2 +- config/importmap.rb | 2 + ...5_create_action_text_tables.action_text.rb | 26 ++ db/schema.rb | 12 +- package.json | 4 +- spec/rails_helper.rb | 34 +- spec/spec_helper.rb | 6 +- yarn.lock | 38 ++ 12 files changed, 563 insertions(+), 21 deletions(-) create mode 100644 app/assets/stylesheets/actiontext.css create mode 100644 app/views/active_storage/blobs/_blob.html.erb create mode 100644 app/views/layouts/action_text/contents/_content.html.erb create mode 100644 db/migrate/20250528090505_create_action_text_tables.action_text.rb diff --git a/app/assets/stylesheets/actiontext.css b/app/assets/stylesheets/actiontext.css new file mode 100644 index 0000000..9b6bcb0 --- /dev/null +++ b/app/assets/stylesheets/actiontext.css @@ -0,0 +1,440 @@ +/* + * Default Trix editor styles. See Action Text overwrites below. +*/ + +trix-editor { + border: 1px solid #bbb; + border-radius: 3px; + margin: 0; + padding: 0.4em 0.6em; + min-height: 5em; + outline: none; } + +trix-toolbar * { + box-sizing: border-box; } + +trix-toolbar .trix-button-row { + display: flex; + flex-wrap: nowrap; + justify-content: space-between; + overflow-x: auto; } + +trix-toolbar .trix-button-group { + display: flex; + margin-bottom: 10px; + border: 1px solid #bbb; + border-top-color: #ccc; + border-bottom-color: #888; + border-radius: 3px; } + trix-toolbar .trix-button-group:not(:first-child) { + margin-left: 1.5vw; } + @media (max-width: 768px) { + trix-toolbar .trix-button-group:not(:first-child) { + margin-left: 0; } } + +trix-toolbar .trix-button-group-spacer { + flex-grow: 1; } + @media (max-width: 768px) { + trix-toolbar .trix-button-group-spacer { + display: none; } } + +trix-toolbar .trix-button { + position: relative; + float: left; + color: rgba(0, 0, 0, 0.6); + font-size: 0.75em; + font-weight: 600; + white-space: nowrap; + padding: 0 0.5em; + margin: 0; + outline: none; + border: none; + border-bottom: 1px solid #ddd; + border-radius: 0; + background: transparent; } + trix-toolbar .trix-button:not(:first-child) { + border-left: 1px solid #ccc; } + trix-toolbar .trix-button.trix-active { + background: #cbeefa; + color: black; } + trix-toolbar .trix-button:not(:disabled) { + cursor: pointer; } + trix-toolbar .trix-button:disabled { + color: rgba(0, 0, 0, 0.125); } + @media (max-width: 768px) { + trix-toolbar .trix-button { + letter-spacing: -0.01em; + padding: 0 0.3em; } } + +trix-toolbar .trix-button--icon { + font-size: inherit; + width: 2.6em; + height: 1.6em; + max-width: calc(0.8em + 4vw); + text-indent: -9999px; } + @media (max-width: 768px) { + trix-toolbar .trix-button--icon { + height: 2em; + max-width: calc(0.8em + 3.5vw); } } + trix-toolbar .trix-button--icon::before { + display: inline-block; + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + opacity: 0.6; + content: ""; + background-position: center; + background-repeat: no-repeat; + background-size: contain; } + @media (max-width: 768px) { + trix-toolbar .trix-button--icon::before { + right: 6%; + left: 6%; } } + trix-toolbar .trix-button--icon.trix-active::before { + opacity: 1; } + trix-toolbar .trix-button--icon:disabled::before { + opacity: 0.125; } + +trix-toolbar .trix-button--icon-attach::before { + background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M10.5%2018V7.5c0-2.25%203-2.25%203%200V18c0%204.125-6%204.125-6%200V7.5c0-6.375%209-6.375%209%200V18%22%20stroke%3D%22%23000%22%20stroke-width%3D%222%22%20stroke-miterlimit%3D%2210%22%20stroke-linecap%3D%22round%22%20stroke-linejoin%3D%22round%22%2F%3E%3C%2Fsvg%3E"); + top: 8%; + bottom: 4%; } + +trix-toolbar .trix-button--icon-bold::before { + background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M6.522%2019.242a.5.5%200%200%201-.5-.5V5.35a.5.5%200%200%201%20.5-.5h5.783c1.347%200%202.46.345%203.24.982.783.64%201.216%201.562%201.216%202.683%200%201.13-.587%202.129-1.476%202.71a.35.35%200%200%200%20.049.613c1.259.56%202.101%201.742%202.101%203.22%200%201.282-.483%202.334-1.363%203.063-.876.726-2.132%201.12-3.66%201.12h-5.89ZM9.27%207.347v3.362h1.97c.766%200%201.347-.17%201.733-.464.38-.291.587-.716.587-1.27%200-.53-.183-.928-.513-1.198-.334-.273-.838-.43-1.505-.43H9.27Zm0%205.606v3.791h2.389c.832%200%201.448-.177%201.853-.497.399-.315.614-.786.614-1.423%200-.62-.22-1.077-.63-1.385-.418-.313-1.053-.486-1.905-.486H9.27Z%22%20fill%3D%22%23000%22%2F%3E%3C%2Fsvg%3E"); } + +trix-toolbar .trix-button--icon-italic::before { + background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M9%205h6.5v2h-2.23l-2.31%2010H13v2H6v-2h2.461l2.306-10H9V5Z%22%20fill%3D%22%23000%22%2F%3E%3C%2Fsvg%3E"); } + +trix-toolbar .trix-button--icon-link::before { + background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M18.948%205.258a4.337%204.337%200%200%200-6.108%200L11.217%206.87a.993.993%200%200%200%200%201.41c.392.39%201.027.39%201.418%200l1.623-1.613a2.323%202.323%200%200%201%203.271%200%202.29%202.29%200%200%201%200%203.251l-2.393%202.38a3.021%203.021%200%200%201-4.255%200l-.05-.049a1.007%201.007%200%200%200-1.418%200%20.993.993%200%200%200%200%201.41l.05.049a5.036%205.036%200%200%200%207.091%200l2.394-2.38a4.275%204.275%200%200%200%200-6.072Zm-13.683%2013.6a4.337%204.337%200%200%200%206.108%200l1.262-1.255a.993.993%200%200%200%200-1.41%201.007%201.007%200%200%200-1.418%200L9.954%2017.45a2.323%202.323%200%200%201-3.27%200%202.29%202.29%200%200%201%200-3.251l2.344-2.331a2.579%202.579%200%200%201%203.631%200c.392.39%201.027.39%201.419%200a.993.993%200%200%200%200-1.41%204.593%204.593%200%200%200-6.468%200l-2.345%202.33a4.275%204.275%200%200%200%200%206.072Z%22%20fill%3D%22%23000%22%2F%3E%3C%2Fsvg%3E"); } + +trix-toolbar .trix-button--icon-strike::before { + background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M6%2014.986c.088%202.647%202.246%204.258%205.635%204.258%203.496%200%205.713-1.728%205.713-4.463%200-.275-.02-.536-.062-.781h-3.461c.398.293.573.654.573%201.123%200%201.035-1.074%201.787-2.646%201.787-1.563%200-2.773-.762-2.91-1.924H6ZM6.432%2010h3.763c-.632-.314-.914-.715-.914-1.273%200-1.045.977-1.739%202.432-1.739%201.475%200%202.52.723%202.617%201.914h2.764c-.05-2.548-2.11-4.238-5.39-4.238-3.145%200-5.392%201.719-5.392%204.316%200%20.363.04.703.12%201.02ZM4%2011a1%201%200%201%200%200%202h15a1%201%200%201%200%200-2H4Z%22%20fill%3D%22%23000%22%2F%3E%3C%2Fsvg%3E"); } + +trix-toolbar .trix-button--icon-quote::before { + background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M4.581%208.471c.44-.5%201.056-.834%201.758-.995C8.074%207.17%209.201%207.822%2010%208.752c1.354%201.578%201.33%203.555.394%205.277-.941%201.731-2.788%203.163-4.988%203.56a.622.622%200%200%201-.653-.317c-.113-.205-.121-.49.16-.764.294-.286.567-.566.791-.835.222-.266.413-.54.524-.815.113-.28.156-.597.026-.908-.128-.303-.39-.524-.72-.69a3.02%203.02%200%200%201-1.674-2.7c0-.905.283-1.59.72-2.088Zm9.419%200c.44-.5%201.055-.834%201.758-.995%201.734-.306%202.862.346%203.66%201.276%201.355%201.578%201.33%203.555.395%205.277-.941%201.731-2.789%203.163-4.988%203.56a.622.622%200%200%201-.653-.317c-.113-.205-.122-.49.16-.764.294-.286.567-.566.791-.835.222-.266.412-.54.523-.815.114-.28.157-.597.026-.908-.127-.303-.39-.524-.72-.69a3.02%203.02%200%200%201-1.672-2.701c0-.905.283-1.59.72-2.088Z%22%20fill%3D%22%23000%22%2F%3E%3C%2Fsvg%3E"); } + +trix-toolbar .trix-button--icon-heading-1::before { + background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21.5%207.5v-3h-12v3H14v13h3v-13h4.5ZM9%2013.5h3.5v-3h-10v3H6v7h3v-7Z%22%20fill%3D%22%23000%22%2F%3E%3C%2Fsvg%3E"); } + +trix-toolbar .trix-button--icon-code::before { + background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M3.293%2011.293a1%201%200%200%200%200%201.414l4%204a1%201%200%201%200%201.414-1.414L5.414%2012l3.293-3.293a1%201%200%200%200-1.414-1.414l-4%204Zm13.414%205.414%204-4a1%201%200%200%200%200-1.414l-4-4a1%201%200%201%200-1.414%201.414L18.586%2012l-3.293%203.293a1%201%200%200%200%201.414%201.414Z%22%20fill%3D%22%23000%22%2F%3E%3C%2Fsvg%3E"); } + +trix-toolbar .trix-button--icon-bullet-list::before { + background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M5%207.5a1.5%201.5%200%201%200%200-3%201.5%201.5%200%200%200%200%203ZM8%206a1%201%200%200%201%201-1h11a1%201%200%201%201%200%202H9a1%201%200%200%201-1-1Zm1%205a1%201%200%201%200%200%202h11a1%201%200%201%200%200-2H9Zm0%206a1%201%200%201%200%200%202h11a1%201%200%201%200%200-2H9Zm-2.5-5a1.5%201.5%200%201%201-3%200%201.5%201.5%200%200%201%203%200ZM5%2019.5a1.5%201.5%200%201%200%200-3%201.5%201.5%200%200%200%200%203Z%22%20fill%3D%22%23000%22%2F%3E%3C%2Fsvg%3E"); } + +trix-toolbar .trix-button--icon-number-list::before { + background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M3%204h2v4H4V5H3V4Zm5%202a1%201%200%200%201%201-1h11a1%201%200%201%201%200%202H9a1%201%200%200%201-1-1Zm1%205a1%201%200%201%200%200%202h11a1%201%200%201%200%200-2H9Zm0%206a1%201%200%201%200%200%202h11a1%201%200%201%200%200-2H9Zm-3.5-7H6v1l-1.5%202H6v1H3v-1l1.667-2H3v-1h2.5ZM3%2017v-1h3v4H3v-1h2v-.5H4v-1h1V17H3Z%22%20fill%3D%22%23000%22%2F%3E%3C%2Fsvg%3E"); } + +trix-toolbar .trix-button--icon-undo::before { + background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M3%2014a1%201%200%200%200%201%201h6a1%201%200%201%200%200-2H6.257c2.247-2.764%205.151-3.668%207.579-3.264%202.589.432%204.739%202.356%205.174%205.405a1%201%200%200%200%201.98-.283c-.564-3.95-3.415-6.526-6.825-7.095C11.084%207.25%207.63%208.377%205%2011.39V8a1%201%200%200%200-2%200v6Zm2-1Z%22%20fill%3D%22%23000%22%2F%3E%3C%2Fsvg%3E"); } + +trix-toolbar .trix-button--icon-redo::before { + background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2014a1%201%200%200%201-1%201h-6a1%201%200%201%201%200-2h3.743c-2.247-2.764-5.151-3.668-7.579-3.264-2.589.432-4.739%202.356-5.174%205.405a1%201%200%200%201-1.98-.283c.564-3.95%203.415-6.526%206.826-7.095%203.08-.513%206.534.614%209.164%203.626V8a1%201%200%201%201%202%200v6Zm-2-1Z%22%20fill%3D%22%23000%22%2F%3E%3C%2Fsvg%3E"); } + +trix-toolbar .trix-button--icon-decrease-nesting-level::before { + background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M5%206a1%201%200%200%201%201-1h12a1%201%200%201%201%200%202H6a1%201%200%200%201-1-1Zm4%205a1%201%200%201%200%200%202h9a1%201%200%201%200%200-2H9Zm-3%206a1%201%200%201%200%200%202h12a1%201%200%201%200%200-2H6Zm-3.707-5.707a1%201%200%200%200%200%201.414l2%202a1%201%200%201%200%201.414-1.414L4.414%2012l1.293-1.293a1%201%200%200%200-1.414-1.414l-2%202Z%22%20fill%3D%22%23000%22%2F%3E%3C%2Fsvg%3E"); } + +trix-toolbar .trix-button--icon-increase-nesting-level::before { + background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M5%206a1%201%200%200%201%201-1h12a1%201%200%201%201%200%202H6a1%201%200%200%201-1-1Zm4%205a1%201%200%201%200%200%202h9a1%201%200%201%200%200-2H9Zm-3%206a1%201%200%201%200%200%202h12a1%201%200%201%200%200-2H6Zm-2.293-2.293%202-2a1%201%200%200%200%200-1.414l-2-2a1%201%200%201%200-1.414%201.414L3.586%2012l-1.293%201.293a1%201%200%201%200%201.414%201.414Z%22%20fill%3D%22%23000%22%2F%3E%3C%2Fsvg%3E"); } + +trix-toolbar .trix-dialogs { + position: relative; } + +trix-toolbar .trix-dialog { + position: absolute; + top: 0; + left: 0; + right: 0; + font-size: 0.75em; + padding: 15px 10px; + background: #fff; + box-shadow: 0 0.3em 1em #ccc; + border-top: 2px solid #888; + border-radius: 5px; + z-index: 5; } + +trix-toolbar .trix-input--dialog { + font-size: inherit; + font-weight: normal; + padding: 0.5em 0.8em; + margin: 0 10px 0 0; + border-radius: 3px; + border: 1px solid #bbb; + background-color: #fff; + box-shadow: none; + outline: none; + -webkit-appearance: none; + -moz-appearance: none; } + trix-toolbar .trix-input--dialog.validate:invalid { + box-shadow: #F00 0px 0px 1.5px 1px; } + +trix-toolbar .trix-button--dialog { + font-size: inherit; + padding: 0.5em; + border-bottom: none; } + +trix-toolbar .trix-dialog--link { + max-width: 600px; } + +trix-toolbar .trix-dialog__link-fields { + display: flex; + align-items: baseline; } + trix-toolbar .trix-dialog__link-fields .trix-input { + flex: 1; } + trix-toolbar .trix-dialog__link-fields .trix-button-group { + flex: 0 0 content; + margin: 0; } + +trix-editor [data-trix-mutable]:not(.attachment__caption-editor) { + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; } + +trix-editor [data-trix-mutable]::-moz-selection, +trix-editor [data-trix-cursor-target]::-moz-selection, trix-editor [data-trix-mutable] ::-moz-selection { + background: none; } + +trix-editor [data-trix-mutable]::selection, +trix-editor [data-trix-cursor-target]::selection, trix-editor [data-trix-mutable] ::selection { + background: none; } + +trix-editor .attachment__caption-editor:focus[data-trix-mutable]::-moz-selection { + background: highlight; } + +trix-editor .attachment__caption-editor:focus[data-trix-mutable]::selection { + background: highlight; } + +trix-editor [data-trix-mutable].attachment.attachment--file { + box-shadow: 0 0 0 2px highlight; + border-color: transparent; } + +trix-editor [data-trix-mutable].attachment img { + box-shadow: 0 0 0 2px highlight; } + +trix-editor .attachment { + position: relative; } + trix-editor .attachment:hover { + cursor: default; } + +trix-editor .attachment--preview .attachment__caption:hover { + cursor: text; } + +trix-editor .attachment__progress { + position: absolute; + z-index: 1; + height: 20px; + top: calc(50% - 10px); + left: 5%; + width: 90%; + opacity: 0.9; + transition: opacity 200ms ease-in; } + trix-editor .attachment__progress[value="100"] { + opacity: 0; } + +trix-editor .attachment__caption-editor { + display: inline-block; + width: 100%; + margin: 0; + padding: 0; + font-size: inherit; + font-family: inherit; + line-height: inherit; + color: inherit; + text-align: center; + vertical-align: top; + border: none; + outline: none; + -webkit-appearance: none; + -moz-appearance: none; } + +trix-editor .attachment__toolbar { + position: absolute; + z-index: 1; + top: -0.9em; + left: 0; + width: 100%; + text-align: center; } + +trix-editor .trix-button-group { + display: inline-flex; } + +trix-editor .trix-button { + position: relative; + float: left; + color: #666; + white-space: nowrap; + font-size: 80%; + padding: 0 0.8em; + margin: 0; + outline: none; + border: none; + border-radius: 0; + background: transparent; } + trix-editor .trix-button:not(:first-child) { + border-left: 1px solid #ccc; } + trix-editor .trix-button.trix-active { + background: #cbeefa; } + trix-editor .trix-button:not(:disabled) { + cursor: pointer; } + +trix-editor .trix-button--remove { + text-indent: -9999px; + display: inline-block; + padding: 0; + outline: none; + width: 1.8em; + height: 1.8em; + line-height: 1.8em; + border-radius: 50%; + background-color: #fff; + border: 2px solid highlight; + box-shadow: 1px 1px 6px rgba(0, 0, 0, 0.25); } + trix-editor .trix-button--remove::before { + display: inline-block; + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + opacity: 0.7; + content: ""; + background-image: url("data:image/svg+xml,%3Csvg%20height%3D%2224%22%20width%3D%2224%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M19%206.41%2017.59%205%2012%2010.59%206.41%205%205%206.41%2010.59%2012%205%2017.59%206.41%2019%2012%2013.41%2017.59%2019%2019%2017.59%2013.41%2012z%22%2F%3E%3Cpath%20d%3D%22M0%200h24v24H0z%22%20fill%3D%22none%22%2F%3E%3C%2Fsvg%3E"); + background-position: center; + background-repeat: no-repeat; + background-size: 90%; } + trix-editor .trix-button--remove:hover { + border-color: #333; } + trix-editor .trix-button--remove:hover::before { + opacity: 1; } + +trix-editor .attachment__metadata-container { + position: relative; } + +trix-editor .attachment__metadata { + position: absolute; + left: 50%; + top: 2em; + transform: translate(-50%, 0); + max-width: 90%; + padding: 0.1em 0.6em; + font-size: 0.8em; + color: #fff; + background-color: rgba(0, 0, 0, 0.7); + border-radius: 3px; } + trix-editor .attachment__metadata .attachment__name { + display: inline-block; + max-width: 100%; + vertical-align: bottom; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } + trix-editor .attachment__metadata .attachment__size { + margin-left: 0.2em; + white-space: nowrap; } + +.trix-content { + line-height: 1.5; + overflow-wrap: break-word; + word-break: break-word; } + .trix-content * { + box-sizing: border-box; + margin: 0; + padding: 0; } + .trix-content h1 { + font-size: 1.2em; + line-height: 1.2; } + .trix-content blockquote { + border: 0 solid #ccc; + border-left-width: 0.3em; + margin-left: 0.3em; + padding-left: 0.6em; } + .trix-content [dir=rtl] blockquote, + .trix-content blockquote[dir=rtl] { + border-width: 0; + border-right-width: 0.3em; + margin-right: 0.3em; + padding-right: 0.6em; } + .trix-content li { + margin-left: 1em; } + .trix-content [dir=rtl] li { + margin-right: 1em; } + .trix-content pre { + display: inline-block; + width: 100%; + vertical-align: top; + font-family: monospace; + font-size: 0.9em; + padding: 0.5em; + white-space: pre; + background-color: #eee; + overflow-x: auto; } + .trix-content img { + max-width: 100%; + height: auto; } + .trix-content .attachment { + display: inline-block; + position: relative; + max-width: 100%; } + .trix-content .attachment a { + color: inherit; + text-decoration: none; } + .trix-content .attachment a:hover, .trix-content .attachment a:visited:hover { + color: inherit; } + .trix-content .attachment__caption { + text-align: center; } + .trix-content .attachment__caption .attachment__name + .attachment__size::before { + content: ' \2022 '; } + .trix-content .attachment--preview { + width: 100%; + text-align: center; } + .trix-content .attachment--preview .attachment__caption { + color: #666; + font-size: 0.9em; + line-height: 1.2; } + .trix-content .attachment--file { + color: #333; + line-height: 1; + margin: 0 2px 2px 2px; + padding: 0.4em 1em; + border: 1px solid #bbb; + border-radius: 5px; } + .trix-content .attachment-gallery { + display: flex; + flex-wrap: wrap; + position: relative; } + .trix-content .attachment-gallery .attachment { + flex: 1 0 33%; + padding: 0 0.5em; + max-width: 33%; } + .trix-content .attachment-gallery.attachment-gallery--2 .attachment, .trix-content .attachment-gallery.attachment-gallery--4 .attachment { + flex-basis: 50%; + max-width: 50%; } + +/* + * We need to override trix.css’s image gallery styles to accommodate the + * element we wrap around attachments. Otherwise, + * images in galleries will be squished by the max-width: 33%; rule. +*/ +.trix-content .attachment-gallery > action-text-attachment, +.trix-content .attachment-gallery > .attachment { + flex: 1 0 33%; + padding: 0 0.5em; + max-width: 33%; +} + +.trix-content .attachment-gallery.attachment-gallery--2 > action-text-attachment, +.trix-content .attachment-gallery.attachment-gallery--2 > .attachment, .trix-content .attachment-gallery.attachment-gallery--4 > action-text-attachment, +.trix-content .attachment-gallery.attachment-gallery--4 > .attachment { + flex-basis: 50%; + max-width: 50%; +} + +.trix-content action-text-attachment .attachment { + padding: 0 !important; + max-width: 100% !important; +} diff --git a/app/javascript/application.js b/app/javascript/application.js index 0d7b494..9ae56c5 100644 --- a/app/javascript/application.js +++ b/app/javascript/application.js @@ -1,3 +1,6 @@ // Configure your import map in config/importmap.rb. Read more: https://github.com/rails/importmap-rails import "@hotwired/turbo-rails" import "controllers" + +import "trix" +import "@rails/actiontext" diff --git a/app/views/active_storage/blobs/_blob.html.erb b/app/views/active_storage/blobs/_blob.html.erb new file mode 100644 index 0000000..49ba357 --- /dev/null +++ b/app/views/active_storage/blobs/_blob.html.erb @@ -0,0 +1,14 @@ +
attachment--<%= blob.filename.extension %>"> + <% if blob.representable? %> + <%= image_tag blob.representation(resize_to_limit: local_assigns[:in_gallery] ? [ 800, 600 ] : [ 1024, 768 ]) %> + <% end %> + +
+ <% if caption = blob.try(:caption) %> + <%= caption %> + <% else %> + <%= blob.filename %> + <%= number_to_human_size blob.byte_size %> + <% end %> +
+
diff --git a/app/views/layouts/action_text/contents/_content.html.erb b/app/views/layouts/action_text/contents/_content.html.erb new file mode 100644 index 0000000..9e3c0d0 --- /dev/null +++ b/app/views/layouts/action_text/contents/_content.html.erb @@ -0,0 +1,3 @@ +
+ <%= yield -%> +
diff --git a/config/application.rb b/config/application.rb index 023e0e8..7726eb9 100644 --- a/config/application.rb +++ b/config/application.rb @@ -9,7 +9,7 @@ require "active_storage/engine" require "action_controller/railtie" require "action_mailer/railtie" require "action_mailbox/engine" -# require "action_text/engine" +require "action_text/engine" require "action_view/railtie" require "action_cable/engine" # require "rails/test_unit/railtie" diff --git a/config/importmap.rb b/config/importmap.rb index cb396cc..b78c72d 100644 --- a/config/importmap.rb +++ b/config/importmap.rb @@ -6,3 +6,5 @@ pin "@hotwired/stimulus", to: "stimulus.min.js", preload: true pin "@hotwired/stimulus-loading", to: "stimulus-loading.js", preload: true pin_all_from "app/javascript/controllers", under: "controllers" pin "tailwindcss-stimulus-components" # @4.0.3 +pin "trix" +pin "@rails/actiontext", to: "actiontext.esm.js" diff --git a/db/migrate/20250528090505_create_action_text_tables.action_text.rb b/db/migrate/20250528090505_create_action_text_tables.action_text.rb new file mode 100644 index 0000000..c1c0a9d --- /dev/null +++ b/db/migrate/20250528090505_create_action_text_tables.action_text.rb @@ -0,0 +1,26 @@ +# This migration comes from action_text (originally 20180528164100) +class CreateActionTextTables < ActiveRecord::Migration[6.0] + def change + # Use Active Record's configured type for primary and foreign keys + primary_key_type, foreign_key_type = primary_and_foreign_key_types + + create_table :action_text_rich_texts, id: primary_key_type do |t| + t.string :name, null: false + t.text :body, size: :long + t.references :record, null: false, polymorphic: true, index: false, type: foreign_key_type + + t.timestamps + + t.index [ :record_type, :record_id, :name ], name: "index_action_text_rich_texts_uniqueness", unique: true + end + end + + private + def primary_and_foreign_key_types + config = Rails.configuration.generators + setting = config.options[config.orm][:primary_key_type] + primary_key_type = setting || :primary_key + foreign_key_type = setting || :bigint + [ primary_key_type, foreign_key_type ] + end +end diff --git a/db/schema.rb b/db/schema.rb index b7746ac..2487997 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,17 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[8.0].define(version: 2025_05_27_113805) do +ActiveRecord::Schema[8.0].define(version: 2025_05_28_090505) do + create_table "action_text_rich_texts", force: :cascade do |t| + t.string "name", null: false + t.text "body" + t.string "record_type", null: false + t.bigint "record_id", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["record_type", "record_id", "name"], name: "index_action_text_rich_texts_uniqueness", unique: true + end + create_table "active_storage_attachments", force: :cascade do |t| t.string "name", null: false t.string "record_type", null: false diff --git a/package.json b/package.json index b42508e..c8385f1 100644 --- a/package.json +++ b/package.json @@ -2,6 +2,7 @@ "name": "akkounts", "private": true, "dependencies": { + "@rails/actiontext": "^8.0.200", "@tailwindcss/forms": "^0.5.3", "autoprefixer": "^10.4.13", "postcss": "^8.4.19", @@ -9,7 +10,8 @@ "postcss-import": "^15.0.1", "postcss-nested": "^6.0.0", "postcss-preset-env": "^7.8.3", - "tailwindcss": "^3.2.4" + "tailwindcss": "^3.2.4", + "trix": "^2.1.15" }, "version": "0.10.0", "scripts": { diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 7f6ac8c..f81e8a0 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -1,9 +1,12 @@ # This file is copied to spec/ when you run 'rails generate rspec:install' require 'spec_helper' ENV['RAILS_ENV'] ||= 'test' -require File.expand_path('../config/environment', __dir__) +require_relative '../config/environment' # Prevent database truncation if the environment is production abort("The Rails environment is running in production mode!") if Rails.env.production? +# Uncomment the line below in case you have `--require rails_helper` in the `.rspec` file +# that will avoid rails generators crashing because migrations haven't been run yet +# return unless Rails.env.test? require 'rspec/rails' # Add additional requires below this line. Rails is not loaded until this point! require 'capybara' @@ -27,41 +30,44 @@ require "capybara/rspec" # directory. Alternatively, in the individual `*_spec.rb` files, manually # require only the support files necessary. # -# Dir[Rails.root.join('spec', 'support', '**', '*.rb')].sort.each { |f| require f } +# Rails.root.glob('spec/support/**/*.rb').sort_by(&:to_s).each { |f| require f } # Checks for pending migrations and applies them before tests are run. # If you are not using ActiveRecord, you can remove these lines. begin ActiveRecord::Migration.maintain_test_schema! rescue ActiveRecord::PendingMigrationError => e - puts e.to_s.strip - exit 1 + abort e.to_s.strip end RSpec.configure do |config| # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures - config.fixture_paths = ["#{::Rails.root}/spec/fixtures"] + config.fixture_paths = [ + Rails.root.join('spec/fixtures') + ] # If you're not using ActiveRecord, or you'd prefer not to run each of your # examples within a transaction, remove the following line or assign false # instead of true. - config.use_transactional_fixtures = false + config.use_transactional_fixtures = true # You can uncomment this line to turn off ActiveRecord support entirely. # config.use_active_record = false - # RSpec Rails can automatically mix in different behaviours to your tests - # based on their file location, for example enabling you to call `get` and - # `post` in specs under `spec/controllers`. + # RSpec Rails uses metadata to mix in different behaviours to your tests, + # for example enabling you to call `get` and `post` in request specs. e.g.: # - # You can disable this behaviour by removing the line below, and instead - # explicitly tag your specs with their type, e.g.: - # - # RSpec.describe UsersController, type: :controller do + # RSpec.describe UsersController, type: :request do # # ... # end # # The different available types are documented in the features, such as in - # https://relishapp.com/rspec/rspec-rails/docs + # https://rspec.info/features/7-1/rspec-rails + # + # You can also this infer these behaviours automatically by location, e.g. + # /spec/models would pull in the same behaviour as `type: :model` but this + # behaviour is considered legacy and will be removed in a future version. + # + # To enable this behaviour uncomment the line below. config.infer_spec_type_from_file_location! # Filter lines from Rails gems in backtraces. diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 6a9a6c5..ae75aac 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -12,7 +12,7 @@ # the additional setup, and require it from the spec files that actually need # it. # -# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration +# See https://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration RSpec.configure do |config| # TODO Remove when Devise fixes https://github.com/heartcombo/devise/issues/5705 config.before(:each, type: :controller) do @@ -66,9 +66,7 @@ RSpec.configure do |config| # Limits the available syntax to the non-monkey patched syntax that is # recommended. For more details, see: - # - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/ - # - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/ - # - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode + # https://rspec.info/features/3-12/rspec-core/configuration/zero-monkey-patching-mode/ config.disable_monkey_patching! # Many RSpec users commonly either run the entire suite or an individual diff --git a/yarn.lock b/yarn.lock index e7395a2..16c888f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -129,6 +129,20 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" +"@rails/actiontext@^8.0.200": + version "8.0.200" + resolved "https://registry.yarnpkg.com/@rails/actiontext/-/actiontext-8.0.200.tgz#b0ed8ba50ec31dd8fcc7a8885403c58b2b4f378d" + integrity sha512-p9SVulDmWKMChQpNYFrRBGa2aIfMSw8vyCRW9bwHzihFB8eAZ1NE6ak88nr037gwurbCBv4UVdnwndtuh2piAA== + dependencies: + "@rails/activestorage" ">= 8.0.0-alpha" + +"@rails/activestorage@>= 8.0.0-alpha": + version "8.0.200" + resolved "https://registry.yarnpkg.com/@rails/activestorage/-/activestorage-8.0.200.tgz#147c088e2b4167d6d49292431bdbdf10b118d5bd" + integrity sha512-V7GnZXsAMPDWVOBv4/XpHwj5sOw5bWjidWCuUbK3Zx1xt2pOfFaeJDUG7fEWb1MwP4aW1oVVlGkJBdXVyvru0A== + dependencies: + spark-md5 "^3.0.1" + "@tailwindcss/forms@^0.5.3": version "0.5.3" resolved "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.3.tgz" @@ -136,6 +150,11 @@ dependencies: mini-svg-data-uri "^1.2.3" +"@types/trusted-types@^2.0.7": + version "2.0.7" + resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.7.tgz#baccb07a970b91707df3a3e8ba6896c57ead2d11" + integrity sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw== + acorn-node@^1.8.2: version "1.8.2" resolved "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz" @@ -285,6 +304,13 @@ dlv@^1.1.3: resolved "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz" integrity sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA== +dompurify@^3.2.5: + version "3.2.6" + resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.2.6.tgz#ca040a6ad2b88e2a92dc45f38c79f84a714a1cad" + integrity sha512-/2GogDQlohXPZe6D6NOgQvXLPSYBqIWMnZ8zzOhn09REE4eyAzb+Hed3jhoM9OkuaJ8P6ZGTTVWQKAi8ieIzfQ== + optionalDependencies: + "@types/trusted-types" "^2.0.7" + electron-to-chromium@^1.4.251: version "1.4.284" resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz" @@ -847,6 +873,11 @@ source-map-js@^1.0.2: resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== +spark-md5@^3.0.1: + version "3.0.2" + resolved "https://registry.yarnpkg.com/spark-md5/-/spark-md5-3.0.2.tgz#7952c4a30784347abcee73268e473b9c0167e3fc" + integrity sha512-wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw== + supports-preserve-symlinks-flag@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz" @@ -888,6 +919,13 @@ to-regex-range@^5.0.1: dependencies: is-number "^7.0.0" +trix@^2.1.15: + version "2.1.15" + resolved "https://registry.yarnpkg.com/trix/-/trix-2.1.15.tgz#fabad796ea779a8ae96522402fbc214cbfc4015f" + integrity sha512-LoaXWczdTUV8+3Box92B9b1iaDVbxD14dYemZRxi3PwY+AuDm97BUJV2aHLBUFPuDABhxp0wzcbf0CxHCVmXiw== + dependencies: + dompurify "^3.2.5" + update-browserslist-db@^1.0.9: version "1.0.10" resolved "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz" From 57246ea76d088f34003f2994874c1b6078edde52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Wed, 28 May 2025 15:35:57 +0400 Subject: [PATCH 02/17] Fix navbar current link --- app/views/shared/_admin_sidenav_settings_services.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/shared/_admin_sidenav_settings_services.html.erb b/app/views/shared/_admin_sidenav_settings_services.html.erb index e4ab082..7b42482 100644 --- a/app/views/shared/_admin_sidenav_settings_services.html.erb +++ b/app/views/shared/_admin_sidenav_settings_services.html.erb @@ -24,7 +24,7 @@ name: "E-Mail", path: admin_settings_service_path("email"), text_icon: Setting.email_enabled? ? "◉" : "○", - active: current_page?(admin_settings_services_path(params: { s: "email" })), + active: current_page?(admin_settings_service_path("email")), ) %> <%= render SidenavLinkComponent.new( level: 2, From 252b0f179253aaf125449d223a81111722e637ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Wed, 28 May 2025 16:53:31 +0400 Subject: [PATCH 03/17] Revert "Add ActionText configs, update spec helpers/configs" This reverts commit c9d23f829d7a7d57854eb311712db3c94dc7e31c. --- app/assets/stylesheets/actiontext.css | 440 ------------------ app/javascript/application.js | 3 - app/views/active_storage/blobs/_blob.html.erb | 14 - .../action_text/contents/_content.html.erb | 3 - config/application.rb | 2 +- config/importmap.rb | 2 - ...5_create_action_text_tables.action_text.rb | 26 -- db/schema.rb | 12 +- package.json | 4 +- spec/rails_helper.rb | 34 +- spec/spec_helper.rb | 6 +- yarn.lock | 38 -- 12 files changed, 21 insertions(+), 563 deletions(-) delete mode 100644 app/assets/stylesheets/actiontext.css delete mode 100644 app/views/active_storage/blobs/_blob.html.erb delete mode 100644 app/views/layouts/action_text/contents/_content.html.erb delete mode 100644 db/migrate/20250528090505_create_action_text_tables.action_text.rb diff --git a/app/assets/stylesheets/actiontext.css b/app/assets/stylesheets/actiontext.css deleted file mode 100644 index 9b6bcb0..0000000 --- a/app/assets/stylesheets/actiontext.css +++ /dev/null @@ -1,440 +0,0 @@ -/* - * Default Trix editor styles. See Action Text overwrites below. -*/ - -trix-editor { - border: 1px solid #bbb; - border-radius: 3px; - margin: 0; - padding: 0.4em 0.6em; - min-height: 5em; - outline: none; } - -trix-toolbar * { - box-sizing: border-box; } - -trix-toolbar .trix-button-row { - display: flex; - flex-wrap: nowrap; - justify-content: space-between; - overflow-x: auto; } - -trix-toolbar .trix-button-group { - display: flex; - margin-bottom: 10px; - border: 1px solid #bbb; - border-top-color: #ccc; - border-bottom-color: #888; - border-radius: 3px; } - trix-toolbar .trix-button-group:not(:first-child) { - margin-left: 1.5vw; } - @media (max-width: 768px) { - trix-toolbar .trix-button-group:not(:first-child) { - margin-left: 0; } } - -trix-toolbar .trix-button-group-spacer { - flex-grow: 1; } - @media (max-width: 768px) { - trix-toolbar .trix-button-group-spacer { - display: none; } } - -trix-toolbar .trix-button { - position: relative; - float: left; - color: rgba(0, 0, 0, 0.6); - font-size: 0.75em; - font-weight: 600; - white-space: nowrap; - padding: 0 0.5em; - margin: 0; - outline: none; - border: none; - border-bottom: 1px solid #ddd; - border-radius: 0; - background: transparent; } - trix-toolbar .trix-button:not(:first-child) { - border-left: 1px solid #ccc; } - trix-toolbar .trix-button.trix-active { - background: #cbeefa; - color: black; } - trix-toolbar .trix-button:not(:disabled) { - cursor: pointer; } - trix-toolbar .trix-button:disabled { - color: rgba(0, 0, 0, 0.125); } - @media (max-width: 768px) { - trix-toolbar .trix-button { - letter-spacing: -0.01em; - padding: 0 0.3em; } } - -trix-toolbar .trix-button--icon { - font-size: inherit; - width: 2.6em; - height: 1.6em; - max-width: calc(0.8em + 4vw); - text-indent: -9999px; } - @media (max-width: 768px) { - trix-toolbar .trix-button--icon { - height: 2em; - max-width: calc(0.8em + 3.5vw); } } - trix-toolbar .trix-button--icon::before { - display: inline-block; - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - opacity: 0.6; - content: ""; - background-position: center; - background-repeat: no-repeat; - background-size: contain; } - @media (max-width: 768px) { - trix-toolbar .trix-button--icon::before { - right: 6%; - left: 6%; } } - trix-toolbar .trix-button--icon.trix-active::before { - opacity: 1; } - trix-toolbar .trix-button--icon:disabled::before { - opacity: 0.125; } - -trix-toolbar .trix-button--icon-attach::before { - background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M10.5%2018V7.5c0-2.25%203-2.25%203%200V18c0%204.125-6%204.125-6%200V7.5c0-6.375%209-6.375%209%200V18%22%20stroke%3D%22%23000%22%20stroke-width%3D%222%22%20stroke-miterlimit%3D%2210%22%20stroke-linecap%3D%22round%22%20stroke-linejoin%3D%22round%22%2F%3E%3C%2Fsvg%3E"); - top: 8%; - bottom: 4%; } - -trix-toolbar .trix-button--icon-bold::before { - background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M6.522%2019.242a.5.5%200%200%201-.5-.5V5.35a.5.5%200%200%201%20.5-.5h5.783c1.347%200%202.46.345%203.24.982.783.64%201.216%201.562%201.216%202.683%200%201.13-.587%202.129-1.476%202.71a.35.35%200%200%200%20.049.613c1.259.56%202.101%201.742%202.101%203.22%200%201.282-.483%202.334-1.363%203.063-.876.726-2.132%201.12-3.66%201.12h-5.89ZM9.27%207.347v3.362h1.97c.766%200%201.347-.17%201.733-.464.38-.291.587-.716.587-1.27%200-.53-.183-.928-.513-1.198-.334-.273-.838-.43-1.505-.43H9.27Zm0%205.606v3.791h2.389c.832%200%201.448-.177%201.853-.497.399-.315.614-.786.614-1.423%200-.62-.22-1.077-.63-1.385-.418-.313-1.053-.486-1.905-.486H9.27Z%22%20fill%3D%22%23000%22%2F%3E%3C%2Fsvg%3E"); } - -trix-toolbar .trix-button--icon-italic::before { - background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M9%205h6.5v2h-2.23l-2.31%2010H13v2H6v-2h2.461l2.306-10H9V5Z%22%20fill%3D%22%23000%22%2F%3E%3C%2Fsvg%3E"); } - -trix-toolbar .trix-button--icon-link::before { - background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M18.948%205.258a4.337%204.337%200%200%200-6.108%200L11.217%206.87a.993.993%200%200%200%200%201.41c.392.39%201.027.39%201.418%200l1.623-1.613a2.323%202.323%200%200%201%203.271%200%202.29%202.29%200%200%201%200%203.251l-2.393%202.38a3.021%203.021%200%200%201-4.255%200l-.05-.049a1.007%201.007%200%200%200-1.418%200%20.993.993%200%200%200%200%201.41l.05.049a5.036%205.036%200%200%200%207.091%200l2.394-2.38a4.275%204.275%200%200%200%200-6.072Zm-13.683%2013.6a4.337%204.337%200%200%200%206.108%200l1.262-1.255a.993.993%200%200%200%200-1.41%201.007%201.007%200%200%200-1.418%200L9.954%2017.45a2.323%202.323%200%200%201-3.27%200%202.29%202.29%200%200%201%200-3.251l2.344-2.331a2.579%202.579%200%200%201%203.631%200c.392.39%201.027.39%201.419%200a.993.993%200%200%200%200-1.41%204.593%204.593%200%200%200-6.468%200l-2.345%202.33a4.275%204.275%200%200%200%200%206.072Z%22%20fill%3D%22%23000%22%2F%3E%3C%2Fsvg%3E"); } - -trix-toolbar .trix-button--icon-strike::before { - background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M6%2014.986c.088%202.647%202.246%204.258%205.635%204.258%203.496%200%205.713-1.728%205.713-4.463%200-.275-.02-.536-.062-.781h-3.461c.398.293.573.654.573%201.123%200%201.035-1.074%201.787-2.646%201.787-1.563%200-2.773-.762-2.91-1.924H6ZM6.432%2010h3.763c-.632-.314-.914-.715-.914-1.273%200-1.045.977-1.739%202.432-1.739%201.475%200%202.52.723%202.617%201.914h2.764c-.05-2.548-2.11-4.238-5.39-4.238-3.145%200-5.392%201.719-5.392%204.316%200%20.363.04.703.12%201.02ZM4%2011a1%201%200%201%200%200%202h15a1%201%200%201%200%200-2H4Z%22%20fill%3D%22%23000%22%2F%3E%3C%2Fsvg%3E"); } - -trix-toolbar .trix-button--icon-quote::before { - background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M4.581%208.471c.44-.5%201.056-.834%201.758-.995C8.074%207.17%209.201%207.822%2010%208.752c1.354%201.578%201.33%203.555.394%205.277-.941%201.731-2.788%203.163-4.988%203.56a.622.622%200%200%201-.653-.317c-.113-.205-.121-.49.16-.764.294-.286.567-.566.791-.835.222-.266.413-.54.524-.815.113-.28.156-.597.026-.908-.128-.303-.39-.524-.72-.69a3.02%203.02%200%200%201-1.674-2.7c0-.905.283-1.59.72-2.088Zm9.419%200c.44-.5%201.055-.834%201.758-.995%201.734-.306%202.862.346%203.66%201.276%201.355%201.578%201.33%203.555.395%205.277-.941%201.731-2.789%203.163-4.988%203.56a.622.622%200%200%201-.653-.317c-.113-.205-.122-.49.16-.764.294-.286.567-.566.791-.835.222-.266.412-.54.523-.815.114-.28.157-.597.026-.908-.127-.303-.39-.524-.72-.69a3.02%203.02%200%200%201-1.672-2.701c0-.905.283-1.59.72-2.088Z%22%20fill%3D%22%23000%22%2F%3E%3C%2Fsvg%3E"); } - -trix-toolbar .trix-button--icon-heading-1::before { - background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21.5%207.5v-3h-12v3H14v13h3v-13h4.5ZM9%2013.5h3.5v-3h-10v3H6v7h3v-7Z%22%20fill%3D%22%23000%22%2F%3E%3C%2Fsvg%3E"); } - -trix-toolbar .trix-button--icon-code::before { - background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M3.293%2011.293a1%201%200%200%200%200%201.414l4%204a1%201%200%201%200%201.414-1.414L5.414%2012l3.293-3.293a1%201%200%200%200-1.414-1.414l-4%204Zm13.414%205.414%204-4a1%201%200%200%200%200-1.414l-4-4a1%201%200%201%200-1.414%201.414L18.586%2012l-3.293%203.293a1%201%200%200%200%201.414%201.414Z%22%20fill%3D%22%23000%22%2F%3E%3C%2Fsvg%3E"); } - -trix-toolbar .trix-button--icon-bullet-list::before { - background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M5%207.5a1.5%201.5%200%201%200%200-3%201.5%201.5%200%200%200%200%203ZM8%206a1%201%200%200%201%201-1h11a1%201%200%201%201%200%202H9a1%201%200%200%201-1-1Zm1%205a1%201%200%201%200%200%202h11a1%201%200%201%200%200-2H9Zm0%206a1%201%200%201%200%200%202h11a1%201%200%201%200%200-2H9Zm-2.5-5a1.5%201.5%200%201%201-3%200%201.5%201.5%200%200%201%203%200ZM5%2019.5a1.5%201.5%200%201%200%200-3%201.5%201.5%200%200%200%200%203Z%22%20fill%3D%22%23000%22%2F%3E%3C%2Fsvg%3E"); } - -trix-toolbar .trix-button--icon-number-list::before { - background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M3%204h2v4H4V5H3V4Zm5%202a1%201%200%200%201%201-1h11a1%201%200%201%201%200%202H9a1%201%200%200%201-1-1Zm1%205a1%201%200%201%200%200%202h11a1%201%200%201%200%200-2H9Zm0%206a1%201%200%201%200%200%202h11a1%201%200%201%200%200-2H9Zm-3.5-7H6v1l-1.5%202H6v1H3v-1l1.667-2H3v-1h2.5ZM3%2017v-1h3v4H3v-1h2v-.5H4v-1h1V17H3Z%22%20fill%3D%22%23000%22%2F%3E%3C%2Fsvg%3E"); } - -trix-toolbar .trix-button--icon-undo::before { - background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M3%2014a1%201%200%200%200%201%201h6a1%201%200%201%200%200-2H6.257c2.247-2.764%205.151-3.668%207.579-3.264%202.589.432%204.739%202.356%205.174%205.405a1%201%200%200%200%201.98-.283c-.564-3.95-3.415-6.526-6.825-7.095C11.084%207.25%207.63%208.377%205%2011.39V8a1%201%200%200%200-2%200v6Zm2-1Z%22%20fill%3D%22%23000%22%2F%3E%3C%2Fsvg%3E"); } - -trix-toolbar .trix-button--icon-redo::before { - background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2014a1%201%200%200%201-1%201h-6a1%201%200%201%201%200-2h3.743c-2.247-2.764-5.151-3.668-7.579-3.264-2.589.432-4.739%202.356-5.174%205.405a1%201%200%200%201-1.98-.283c.564-3.95%203.415-6.526%206.826-7.095%203.08-.513%206.534.614%209.164%203.626V8a1%201%200%201%201%202%200v6Zm-2-1Z%22%20fill%3D%22%23000%22%2F%3E%3C%2Fsvg%3E"); } - -trix-toolbar .trix-button--icon-decrease-nesting-level::before { - background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M5%206a1%201%200%200%201%201-1h12a1%201%200%201%201%200%202H6a1%201%200%200%201-1-1Zm4%205a1%201%200%201%200%200%202h9a1%201%200%201%200%200-2H9Zm-3%206a1%201%200%201%200%200%202h12a1%201%200%201%200%200-2H6Zm-3.707-5.707a1%201%200%200%200%200%201.414l2%202a1%201%200%201%200%201.414-1.414L4.414%2012l1.293-1.293a1%201%200%200%200-1.414-1.414l-2%202Z%22%20fill%3D%22%23000%22%2F%3E%3C%2Fsvg%3E"); } - -trix-toolbar .trix-button--icon-increase-nesting-level::before { - background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M5%206a1%201%200%200%201%201-1h12a1%201%200%201%201%200%202H6a1%201%200%200%201-1-1Zm4%205a1%201%200%201%200%200%202h9a1%201%200%201%200%200-2H9Zm-3%206a1%201%200%201%200%200%202h12a1%201%200%201%200%200-2H6Zm-2.293-2.293%202-2a1%201%200%200%200%200-1.414l-2-2a1%201%200%201%200-1.414%201.414L3.586%2012l-1.293%201.293a1%201%200%201%200%201.414%201.414Z%22%20fill%3D%22%23000%22%2F%3E%3C%2Fsvg%3E"); } - -trix-toolbar .trix-dialogs { - position: relative; } - -trix-toolbar .trix-dialog { - position: absolute; - top: 0; - left: 0; - right: 0; - font-size: 0.75em; - padding: 15px 10px; - background: #fff; - box-shadow: 0 0.3em 1em #ccc; - border-top: 2px solid #888; - border-radius: 5px; - z-index: 5; } - -trix-toolbar .trix-input--dialog { - font-size: inherit; - font-weight: normal; - padding: 0.5em 0.8em; - margin: 0 10px 0 0; - border-radius: 3px; - border: 1px solid #bbb; - background-color: #fff; - box-shadow: none; - outline: none; - -webkit-appearance: none; - -moz-appearance: none; } - trix-toolbar .trix-input--dialog.validate:invalid { - box-shadow: #F00 0px 0px 1.5px 1px; } - -trix-toolbar .trix-button--dialog { - font-size: inherit; - padding: 0.5em; - border-bottom: none; } - -trix-toolbar .trix-dialog--link { - max-width: 600px; } - -trix-toolbar .trix-dialog__link-fields { - display: flex; - align-items: baseline; } - trix-toolbar .trix-dialog__link-fields .trix-input { - flex: 1; } - trix-toolbar .trix-dialog__link-fields .trix-button-group { - flex: 0 0 content; - margin: 0; } - -trix-editor [data-trix-mutable]:not(.attachment__caption-editor) { - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; } - -trix-editor [data-trix-mutable]::-moz-selection, -trix-editor [data-trix-cursor-target]::-moz-selection, trix-editor [data-trix-mutable] ::-moz-selection { - background: none; } - -trix-editor [data-trix-mutable]::selection, -trix-editor [data-trix-cursor-target]::selection, trix-editor [data-trix-mutable] ::selection { - background: none; } - -trix-editor .attachment__caption-editor:focus[data-trix-mutable]::-moz-selection { - background: highlight; } - -trix-editor .attachment__caption-editor:focus[data-trix-mutable]::selection { - background: highlight; } - -trix-editor [data-trix-mutable].attachment.attachment--file { - box-shadow: 0 0 0 2px highlight; - border-color: transparent; } - -trix-editor [data-trix-mutable].attachment img { - box-shadow: 0 0 0 2px highlight; } - -trix-editor .attachment { - position: relative; } - trix-editor .attachment:hover { - cursor: default; } - -trix-editor .attachment--preview .attachment__caption:hover { - cursor: text; } - -trix-editor .attachment__progress { - position: absolute; - z-index: 1; - height: 20px; - top: calc(50% - 10px); - left: 5%; - width: 90%; - opacity: 0.9; - transition: opacity 200ms ease-in; } - trix-editor .attachment__progress[value="100"] { - opacity: 0; } - -trix-editor .attachment__caption-editor { - display: inline-block; - width: 100%; - margin: 0; - padding: 0; - font-size: inherit; - font-family: inherit; - line-height: inherit; - color: inherit; - text-align: center; - vertical-align: top; - border: none; - outline: none; - -webkit-appearance: none; - -moz-appearance: none; } - -trix-editor .attachment__toolbar { - position: absolute; - z-index: 1; - top: -0.9em; - left: 0; - width: 100%; - text-align: center; } - -trix-editor .trix-button-group { - display: inline-flex; } - -trix-editor .trix-button { - position: relative; - float: left; - color: #666; - white-space: nowrap; - font-size: 80%; - padding: 0 0.8em; - margin: 0; - outline: none; - border: none; - border-radius: 0; - background: transparent; } - trix-editor .trix-button:not(:first-child) { - border-left: 1px solid #ccc; } - trix-editor .trix-button.trix-active { - background: #cbeefa; } - trix-editor .trix-button:not(:disabled) { - cursor: pointer; } - -trix-editor .trix-button--remove { - text-indent: -9999px; - display: inline-block; - padding: 0; - outline: none; - width: 1.8em; - height: 1.8em; - line-height: 1.8em; - border-radius: 50%; - background-color: #fff; - border: 2px solid highlight; - box-shadow: 1px 1px 6px rgba(0, 0, 0, 0.25); } - trix-editor .trix-button--remove::before { - display: inline-block; - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - opacity: 0.7; - content: ""; - background-image: url("data:image/svg+xml,%3Csvg%20height%3D%2224%22%20width%3D%2224%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M19%206.41%2017.59%205%2012%2010.59%206.41%205%205%206.41%2010.59%2012%205%2017.59%206.41%2019%2012%2013.41%2017.59%2019%2019%2017.59%2013.41%2012z%22%2F%3E%3Cpath%20d%3D%22M0%200h24v24H0z%22%20fill%3D%22none%22%2F%3E%3C%2Fsvg%3E"); - background-position: center; - background-repeat: no-repeat; - background-size: 90%; } - trix-editor .trix-button--remove:hover { - border-color: #333; } - trix-editor .trix-button--remove:hover::before { - opacity: 1; } - -trix-editor .attachment__metadata-container { - position: relative; } - -trix-editor .attachment__metadata { - position: absolute; - left: 50%; - top: 2em; - transform: translate(-50%, 0); - max-width: 90%; - padding: 0.1em 0.6em; - font-size: 0.8em; - color: #fff; - background-color: rgba(0, 0, 0, 0.7); - border-radius: 3px; } - trix-editor .attachment__metadata .attachment__name { - display: inline-block; - max-width: 100%; - vertical-align: bottom; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; } - trix-editor .attachment__metadata .attachment__size { - margin-left: 0.2em; - white-space: nowrap; } - -.trix-content { - line-height: 1.5; - overflow-wrap: break-word; - word-break: break-word; } - .trix-content * { - box-sizing: border-box; - margin: 0; - padding: 0; } - .trix-content h1 { - font-size: 1.2em; - line-height: 1.2; } - .trix-content blockquote { - border: 0 solid #ccc; - border-left-width: 0.3em; - margin-left: 0.3em; - padding-left: 0.6em; } - .trix-content [dir=rtl] blockquote, - .trix-content blockquote[dir=rtl] { - border-width: 0; - border-right-width: 0.3em; - margin-right: 0.3em; - padding-right: 0.6em; } - .trix-content li { - margin-left: 1em; } - .trix-content [dir=rtl] li { - margin-right: 1em; } - .trix-content pre { - display: inline-block; - width: 100%; - vertical-align: top; - font-family: monospace; - font-size: 0.9em; - padding: 0.5em; - white-space: pre; - background-color: #eee; - overflow-x: auto; } - .trix-content img { - max-width: 100%; - height: auto; } - .trix-content .attachment { - display: inline-block; - position: relative; - max-width: 100%; } - .trix-content .attachment a { - color: inherit; - text-decoration: none; } - .trix-content .attachment a:hover, .trix-content .attachment a:visited:hover { - color: inherit; } - .trix-content .attachment__caption { - text-align: center; } - .trix-content .attachment__caption .attachment__name + .attachment__size::before { - content: ' \2022 '; } - .trix-content .attachment--preview { - width: 100%; - text-align: center; } - .trix-content .attachment--preview .attachment__caption { - color: #666; - font-size: 0.9em; - line-height: 1.2; } - .trix-content .attachment--file { - color: #333; - line-height: 1; - margin: 0 2px 2px 2px; - padding: 0.4em 1em; - border: 1px solid #bbb; - border-radius: 5px; } - .trix-content .attachment-gallery { - display: flex; - flex-wrap: wrap; - position: relative; } - .trix-content .attachment-gallery .attachment { - flex: 1 0 33%; - padding: 0 0.5em; - max-width: 33%; } - .trix-content .attachment-gallery.attachment-gallery--2 .attachment, .trix-content .attachment-gallery.attachment-gallery--4 .attachment { - flex-basis: 50%; - max-width: 50%; } - -/* - * We need to override trix.css’s image gallery styles to accommodate the - * element we wrap around attachments. Otherwise, - * images in galleries will be squished by the max-width: 33%; rule. -*/ -.trix-content .attachment-gallery > action-text-attachment, -.trix-content .attachment-gallery > .attachment { - flex: 1 0 33%; - padding: 0 0.5em; - max-width: 33%; -} - -.trix-content .attachment-gallery.attachment-gallery--2 > action-text-attachment, -.trix-content .attachment-gallery.attachment-gallery--2 > .attachment, .trix-content .attachment-gallery.attachment-gallery--4 > action-text-attachment, -.trix-content .attachment-gallery.attachment-gallery--4 > .attachment { - flex-basis: 50%; - max-width: 50%; -} - -.trix-content action-text-attachment .attachment { - padding: 0 !important; - max-width: 100% !important; -} diff --git a/app/javascript/application.js b/app/javascript/application.js index 9ae56c5..0d7b494 100644 --- a/app/javascript/application.js +++ b/app/javascript/application.js @@ -1,6 +1,3 @@ // Configure your import map in config/importmap.rb. Read more: https://github.com/rails/importmap-rails import "@hotwired/turbo-rails" import "controllers" - -import "trix" -import "@rails/actiontext" diff --git a/app/views/active_storage/blobs/_blob.html.erb b/app/views/active_storage/blobs/_blob.html.erb deleted file mode 100644 index 49ba357..0000000 --- a/app/views/active_storage/blobs/_blob.html.erb +++ /dev/null @@ -1,14 +0,0 @@ -
attachment--<%= blob.filename.extension %>"> - <% if blob.representable? %> - <%= image_tag blob.representation(resize_to_limit: local_assigns[:in_gallery] ? [ 800, 600 ] : [ 1024, 768 ]) %> - <% end %> - -
- <% if caption = blob.try(:caption) %> - <%= caption %> - <% else %> - <%= blob.filename %> - <%= number_to_human_size blob.byte_size %> - <% end %> -
-
diff --git a/app/views/layouts/action_text/contents/_content.html.erb b/app/views/layouts/action_text/contents/_content.html.erb deleted file mode 100644 index 9e3c0d0..0000000 --- a/app/views/layouts/action_text/contents/_content.html.erb +++ /dev/null @@ -1,3 +0,0 @@ -
- <%= yield -%> -
diff --git a/config/application.rb b/config/application.rb index 7726eb9..023e0e8 100644 --- a/config/application.rb +++ b/config/application.rb @@ -9,7 +9,7 @@ require "active_storage/engine" require "action_controller/railtie" require "action_mailer/railtie" require "action_mailbox/engine" -require "action_text/engine" +# require "action_text/engine" require "action_view/railtie" require "action_cable/engine" # require "rails/test_unit/railtie" diff --git a/config/importmap.rb b/config/importmap.rb index b78c72d..cb396cc 100644 --- a/config/importmap.rb +++ b/config/importmap.rb @@ -6,5 +6,3 @@ pin "@hotwired/stimulus", to: "stimulus.min.js", preload: true pin "@hotwired/stimulus-loading", to: "stimulus-loading.js", preload: true pin_all_from "app/javascript/controllers", under: "controllers" pin "tailwindcss-stimulus-components" # @4.0.3 -pin "trix" -pin "@rails/actiontext", to: "actiontext.esm.js" diff --git a/db/migrate/20250528090505_create_action_text_tables.action_text.rb b/db/migrate/20250528090505_create_action_text_tables.action_text.rb deleted file mode 100644 index c1c0a9d..0000000 --- a/db/migrate/20250528090505_create_action_text_tables.action_text.rb +++ /dev/null @@ -1,26 +0,0 @@ -# This migration comes from action_text (originally 20180528164100) -class CreateActionTextTables < ActiveRecord::Migration[6.0] - def change - # Use Active Record's configured type for primary and foreign keys - primary_key_type, foreign_key_type = primary_and_foreign_key_types - - create_table :action_text_rich_texts, id: primary_key_type do |t| - t.string :name, null: false - t.text :body, size: :long - t.references :record, null: false, polymorphic: true, index: false, type: foreign_key_type - - t.timestamps - - t.index [ :record_type, :record_id, :name ], name: "index_action_text_rich_texts_uniqueness", unique: true - end - end - - private - def primary_and_foreign_key_types - config = Rails.configuration.generators - setting = config.options[config.orm][:primary_key_type] - primary_key_type = setting || :primary_key - foreign_key_type = setting || :bigint - [ primary_key_type, foreign_key_type ] - end -end diff --git a/db/schema.rb b/db/schema.rb index 2487997..b7746ac 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,17 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[8.0].define(version: 2025_05_28_090505) do - create_table "action_text_rich_texts", force: :cascade do |t| - t.string "name", null: false - t.text "body" - t.string "record_type", null: false - t.bigint "record_id", null: false - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.index ["record_type", "record_id", "name"], name: "index_action_text_rich_texts_uniqueness", unique: true - end - +ActiveRecord::Schema[8.0].define(version: 2025_05_27_113805) do create_table "active_storage_attachments", force: :cascade do |t| t.string "name", null: false t.string "record_type", null: false diff --git a/package.json b/package.json index c8385f1..b42508e 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,6 @@ "name": "akkounts", "private": true, "dependencies": { - "@rails/actiontext": "^8.0.200", "@tailwindcss/forms": "^0.5.3", "autoprefixer": "^10.4.13", "postcss": "^8.4.19", @@ -10,8 +9,7 @@ "postcss-import": "^15.0.1", "postcss-nested": "^6.0.0", "postcss-preset-env": "^7.8.3", - "tailwindcss": "^3.2.4", - "trix": "^2.1.15" + "tailwindcss": "^3.2.4" }, "version": "0.10.0", "scripts": { diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index f81e8a0..7f6ac8c 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -1,12 +1,9 @@ # This file is copied to spec/ when you run 'rails generate rspec:install' require 'spec_helper' ENV['RAILS_ENV'] ||= 'test' -require_relative '../config/environment' +require File.expand_path('../config/environment', __dir__) # Prevent database truncation if the environment is production abort("The Rails environment is running in production mode!") if Rails.env.production? -# Uncomment the line below in case you have `--require rails_helper` in the `.rspec` file -# that will avoid rails generators crashing because migrations haven't been run yet -# return unless Rails.env.test? require 'rspec/rails' # Add additional requires below this line. Rails is not loaded until this point! require 'capybara' @@ -30,44 +27,41 @@ require "capybara/rspec" # directory. Alternatively, in the individual `*_spec.rb` files, manually # require only the support files necessary. # -# Rails.root.glob('spec/support/**/*.rb').sort_by(&:to_s).each { |f| require f } +# Dir[Rails.root.join('spec', 'support', '**', '*.rb')].sort.each { |f| require f } # Checks for pending migrations and applies them before tests are run. # If you are not using ActiveRecord, you can remove these lines. begin ActiveRecord::Migration.maintain_test_schema! rescue ActiveRecord::PendingMigrationError => e - abort e.to_s.strip + puts e.to_s.strip + exit 1 end RSpec.configure do |config| # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures - config.fixture_paths = [ - Rails.root.join('spec/fixtures') - ] + config.fixture_paths = ["#{::Rails.root}/spec/fixtures"] # If you're not using ActiveRecord, or you'd prefer not to run each of your # examples within a transaction, remove the following line or assign false # instead of true. - config.use_transactional_fixtures = true + config.use_transactional_fixtures = false # You can uncomment this line to turn off ActiveRecord support entirely. # config.use_active_record = false - # RSpec Rails uses metadata to mix in different behaviours to your tests, - # for example enabling you to call `get` and `post` in request specs. e.g.: + # RSpec Rails can automatically mix in different behaviours to your tests + # based on their file location, for example enabling you to call `get` and + # `post` in specs under `spec/controllers`. # - # RSpec.describe UsersController, type: :request do + # You can disable this behaviour by removing the line below, and instead + # explicitly tag your specs with their type, e.g.: + # + # RSpec.describe UsersController, type: :controller do # # ... # end # # The different available types are documented in the features, such as in - # https://rspec.info/features/7-1/rspec-rails - # - # You can also this infer these behaviours automatically by location, e.g. - # /spec/models would pull in the same behaviour as `type: :model` but this - # behaviour is considered legacy and will be removed in a future version. - # - # To enable this behaviour uncomment the line below. + # https://relishapp.com/rspec/rspec-rails/docs config.infer_spec_type_from_file_location! # Filter lines from Rails gems in backtraces. diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index ae75aac..6a9a6c5 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -12,7 +12,7 @@ # the additional setup, and require it from the spec files that actually need # it. # -# See https://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration +# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration RSpec.configure do |config| # TODO Remove when Devise fixes https://github.com/heartcombo/devise/issues/5705 config.before(:each, type: :controller) do @@ -66,7 +66,9 @@ RSpec.configure do |config| # Limits the available syntax to the non-monkey patched syntax that is # recommended. For more details, see: - # https://rspec.info/features/3-12/rspec-core/configuration/zero-monkey-patching-mode/ + # - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/ + # - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/ + # - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode config.disable_monkey_patching! # Many RSpec users commonly either run the entire suite or an individual diff --git a/yarn.lock b/yarn.lock index 16c888f..e7395a2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -129,20 +129,6 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@rails/actiontext@^8.0.200": - version "8.0.200" - resolved "https://registry.yarnpkg.com/@rails/actiontext/-/actiontext-8.0.200.tgz#b0ed8ba50ec31dd8fcc7a8885403c58b2b4f378d" - integrity sha512-p9SVulDmWKMChQpNYFrRBGa2aIfMSw8vyCRW9bwHzihFB8eAZ1NE6ak88nr037gwurbCBv4UVdnwndtuh2piAA== - dependencies: - "@rails/activestorage" ">= 8.0.0-alpha" - -"@rails/activestorage@>= 8.0.0-alpha": - version "8.0.200" - resolved "https://registry.yarnpkg.com/@rails/activestorage/-/activestorage-8.0.200.tgz#147c088e2b4167d6d49292431bdbdf10b118d5bd" - integrity sha512-V7GnZXsAMPDWVOBv4/XpHwj5sOw5bWjidWCuUbK3Zx1xt2pOfFaeJDUG7fEWb1MwP4aW1oVVlGkJBdXVyvru0A== - dependencies: - spark-md5 "^3.0.1" - "@tailwindcss/forms@^0.5.3": version "0.5.3" resolved "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.3.tgz" @@ -150,11 +136,6 @@ dependencies: mini-svg-data-uri "^1.2.3" -"@types/trusted-types@^2.0.7": - version "2.0.7" - resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.7.tgz#baccb07a970b91707df3a3e8ba6896c57ead2d11" - integrity sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw== - acorn-node@^1.8.2: version "1.8.2" resolved "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz" @@ -304,13 +285,6 @@ dlv@^1.1.3: resolved "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz" integrity sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA== -dompurify@^3.2.5: - version "3.2.6" - resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.2.6.tgz#ca040a6ad2b88e2a92dc45f38c79f84a714a1cad" - integrity sha512-/2GogDQlohXPZe6D6NOgQvXLPSYBqIWMnZ8zzOhn09REE4eyAzb+Hed3jhoM9OkuaJ8P6ZGTTVWQKAi8ieIzfQ== - optionalDependencies: - "@types/trusted-types" "^2.0.7" - electron-to-chromium@^1.4.251: version "1.4.284" resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz" @@ -873,11 +847,6 @@ source-map-js@^1.0.2: resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== -spark-md5@^3.0.1: - version "3.0.2" - resolved "https://registry.yarnpkg.com/spark-md5/-/spark-md5-3.0.2.tgz#7952c4a30784347abcee73268e473b9c0167e3fc" - integrity sha512-wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw== - supports-preserve-symlinks-flag@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz" @@ -919,13 +888,6 @@ to-regex-range@^5.0.1: dependencies: is-number "^7.0.0" -trix@^2.1.15: - version "2.1.15" - resolved "https://registry.yarnpkg.com/trix/-/trix-2.1.15.tgz#fabad796ea779a8ae96522402fbc214cbfc4015f" - integrity sha512-LoaXWczdTUV8+3Box92B9b1iaDVbxD14dYemZRxi3PwY+AuDm97BUJV2aHLBUFPuDABhxp0wzcbf0CxHCVmXiw== - dependencies: - dompurify "^3.2.5" - update-browserslist-db@^1.0.9: version "1.0.10" resolved "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz" From c7a21c7a69cf916fc4b16a4132e89676ef98c3b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Wed, 28 May 2025 18:37:59 +0400 Subject: [PATCH 04/17] Add top margin to h3 within content --- app/assets/stylesheets/components/base.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/stylesheets/components/base.css b/app/assets/stylesheets/components/base.css index 6824786..a9e082e 100644 --- a/app/assets/stylesheets/components/base.css +++ b/app/assets/stylesheets/components/base.css @@ -32,6 +32,10 @@ @apply pt-8 sm:pt-12; } + main section h3:not(:first-child) { + @apply mt-8; + } + main section:first-of-type { @apply pt-0; } From 5c8ffc2630e0cf56da2ede963ff8daf84291271f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Wed, 28 May 2025 18:39:25 +0400 Subject: [PATCH 05/17] Add editable contents table --- app/models/editable_content.rb | 4 ++++ .../20250528092931_create_editable_contents.rb | 13 +++++++++++++ db/schema.rb | 12 +++++++++++- 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 app/models/editable_content.rb create mode 100644 db/migrate/20250528092931_create_editable_contents.rb diff --git a/app/models/editable_content.rb b/app/models/editable_content.rb new file mode 100644 index 0000000..2bd5560 --- /dev/null +++ b/app/models/editable_content.rb @@ -0,0 +1,4 @@ +class EditableContent < ApplicationRecord + validates :key, presence: true, + uniqueness: { scope: :path } +end diff --git a/db/migrate/20250528092931_create_editable_contents.rb b/db/migrate/20250528092931_create_editable_contents.rb new file mode 100644 index 0000000..0fac11e --- /dev/null +++ b/db/migrate/20250528092931_create_editable_contents.rb @@ -0,0 +1,13 @@ +class CreateEditableContents < ActiveRecord::Migration[8.0] + def change + create_table :editable_contents do |t| + t.string :path + t.string :key + t.string :lang, default: "en" + t.text :content + t.boolean :rich_text, default: false + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index b7746ac..b9dd900 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[8.0].define(version: 2025_05_27_113805) do +ActiveRecord::Schema[8.0].define(version: 2025_05_28_092931) do create_table "active_storage_attachments", force: :cascade do |t| t.string "name", null: false t.string "record_type", null: false @@ -64,6 +64,16 @@ ActiveRecord::Schema[8.0].define(version: 2025_05_27_113805) do t.index ["user_id"], name: "index_donations_on_user_id" end + create_table "editable_contents", force: :cascade do |t| + t.string "path" + t.string "key" + t.string "lang", default: "en" + t.text "content" + t.boolean "rich_text", default: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + create_table "flipper_features", force: :cascade do |t| t.string "key", null: false t.datetime "created_at", null: false From 55c63be9e243f4005468c6c1b3e1e0eb4c36e666 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Wed, 28 May 2025 18:39:48 +0400 Subject: [PATCH 06/17] Memoize instance variable --- app/models/user.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 4479800..ea05989 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -131,11 +131,11 @@ class User < ApplicationRecord end def is_admin? - admin ||= if admin = Devise::LDAP::Adapter.get_ldap_param(self.cn, :admin) - !!admin.first - else - false - end + @admin ||= if admin = Devise::LDAP::Adapter.get_ldap_param(self.cn, :admin) + !!admin.first + else + false + end end def address From 2f86b3c16f2af407aae98968f2d86c1ac16f3cc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Wed, 28 May 2025 18:40:54 +0400 Subject: [PATCH 07/17] Add admin/editable_contents controller --- .../admin/editable_contents_controller.rb | 39 +++++++++++++++++++ config/routes.rb | 6 +-- 2 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 app/controllers/admin/editable_contents_controller.rb diff --git a/app/controllers/admin/editable_contents_controller.rb b/app/controllers/admin/editable_contents_controller.rb new file mode 100644 index 0000000..10140a0 --- /dev/null +++ b/app/controllers/admin/editable_contents_controller.rb @@ -0,0 +1,39 @@ +class Admin::EditableContentsController < Admin::BaseController + before_action :set_content, only: [:show, :edit, :update] + before_action :set_current_section, only: [:index, :show, :edit] + + def index + @path = params[:path].presence + scope = EditableContent.order(path: :asc) + scope = scope.where(path: @path) if @path + @pagy, @contents = pagy(scope) + end + + def show + end + + def edit + end + + def update + if @editable_content.update(content_params) + render json: { status: "success", message: "Content updated" }, status: :ok + else + render :edit, status: :unprocessable_entity + end + end + + private + + def set_content + @editable_content = EditableContent.find(params[:id]) + end + + def content_params + params.require(:editable_content).permit(:path, :key, :lang, :content, :rich_text) + end + + def set_current_section + @current_section = :content + end +end diff --git a/config/routes.rb b/config/routes.rb index 115fadd..094bf62 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -95,12 +95,10 @@ Rails.application.routes.draw do end end - # post 'users/:username/invitations', to: 'users#create_invitations' + resources :donations + resources :editable_contents, except: ['destroy'] get 'invitations', to: 'invitations#index' - - resources :donations - get 'lightning', to: 'lightning#index' namespace :app_catalog do From 315cf4dd9ff5c2f6ac07d265c83b1c5ecae10a2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Wed, 28 May 2025 18:41:53 +0400 Subject: [PATCH 08/17] Add editable content helpers --- Gemfile | 1 + Gemfile.lock | 1 + app/helpers/editable_content_helper.rb | 10 ++++++++++ 3 files changed, 12 insertions(+) create mode 100644 app/helpers/editable_content_helper.rb diff --git a/Gemfile b/Gemfile index 20d1473..5debb5f 100644 --- a/Gemfile +++ b/Gemfile @@ -42,6 +42,7 @@ gem 'flipper-active_record' gem 'flipper-ui' gem 'gpgme', '~> 2.0.24' gem 'zbase32', '~> 0.1.1' +gem 'kramdown' # HTTP requests gem 'faraday' diff --git a/Gemfile.lock b/Gemfile.lock index c96c0c3..7111c12 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -549,6 +549,7 @@ DEPENDENCIES image_processing (~> 1.12.2) importmap-rails jbuilder (~> 2.7) + kramdown letter_opener letter_opener_web listen (~> 3.2) diff --git a/app/helpers/editable_content_helper.rb b/app/helpers/editable_content_helper.rb new file mode 100644 index 0000000..b3d98b5 --- /dev/null +++ b/app/helpers/editable_content_helper.rb @@ -0,0 +1,10 @@ +module EditableContentHelper + def editable_content_for(path, key, default: nil, create_rich: false) + @content = EditableContent.find_by(path: "contributions/other", key: key) + @content.content.present? ? @content.content : default + end + + def markdown_to_html(string) + raw Kramdown::Document.new(string, { input: "GFM" }).to_html + end +end From 6713665a615b4f0ef5917e5d8e4127182fe24e85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Wed, 28 May 2025 18:42:10 +0400 Subject: [PATCH 09/17] WIP Rename "projects" page, make content editable --- .../contributions/other_controller.rb | 22 +++++++++ .../contributions/projects_controller.rb | 8 --- app/views/contributions/other/index.html.erb | 42 ++++++++++++++++ .../contributions/projects/index.html.erb | 49 ------------------- .../shared/_tabnav_contributions.html.erb | 8 +-- config/routes.rb | 2 +- 6 files changed, 70 insertions(+), 61 deletions(-) create mode 100644 app/controllers/contributions/other_controller.rb delete mode 100644 app/controllers/contributions/projects_controller.rb create mode 100644 app/views/contributions/other/index.html.erb delete mode 100644 app/views/contributions/projects/index.html.erb diff --git a/app/controllers/contributions/other_controller.rb b/app/controllers/contributions/other_controller.rb new file mode 100644 index 0000000..e4bafff --- /dev/null +++ b/app/controllers/contributions/other_controller.rb @@ -0,0 +1,22 @@ +class Contributions::OtherController < ApplicationController + before_action :authenticate_user! + before_action :set_content_editing + + # GET /contributions/other + def index + @content_title = EditableContent.find_or_create_by( + path: "contributions/other", key: "title" + ) + @content_body = EditableContent.find_or_create_by( + path: "contributions/other", key: "body", rich_text: true + ) + @current_section = :contributions + end + + private + + def set_content_editing + return unless params[:edit] && current_user.is_admin? + @edit_content = true + end +end diff --git a/app/controllers/contributions/projects_controller.rb b/app/controllers/contributions/projects_controller.rb deleted file mode 100644 index 7989fef..0000000 --- a/app/controllers/contributions/projects_controller.rb +++ /dev/null @@ -1,8 +0,0 @@ -class Contributions::ProjectsController < ApplicationController - before_action :authenticate_user! - - # GET /contributions - def index - @current_section = :contributions - end -end diff --git a/app/views/contributions/other/index.html.erb b/app/views/contributions/other/index.html.erb new file mode 100644 index 0000000..271eca2 --- /dev/null +++ b/app/views/contributions/other/index.html.erb @@ -0,0 +1,42 @@ +<%= render HeaderComponent.new(title: "Contributions") %> + +<%= render MainWithTabnavComponent.new(tabnav_partial: "shared/tabnav_contributions") do %> + <% if @edit_content %> +
+ <%= form_with model: [:admin, @content_title] do |form| %> +

+ <%= form.label :content, @content_title.key.capitalize, class: 'font-bold' %> +

+

+ <%= form.text_field :content %> + <%# <%= form.submit "Save", class: "btn-md btn-blue" %> + <%= button_tag type: 'submit', name: nil, title: "Save", class: 'btn-md btn-icon btn-outline' do %> + <%= render partial: "icons/save", locals: { custom_class: "text-blue-600 h-4 w-4 inline" } %> + <% end %> +

+ <% end %> +
+
+ <%= form_with model: [:admin, @content_body] do |form| %> +

+ <%= form.label :content, @content_body.key.capitalize, class: 'font-bold' %> +

+

+ <%= form.textarea :content, class: "w-full h-96" %> +

+

+ <%= link_to 'Cancel', request.path, class: 'btn-md btn-gray' %> + <%= form.submit "Save", class: "ml-2 btn-md btn-blue" %> +

+ <% end %> +
+ <% else %> +
+ <% if @content_body.content.present? %> + <%= markdown_to_html @content_body.content %> + <% else %> + No content yet + <% end %> +
+ <% end %> +<% end %> diff --git a/app/views/contributions/projects/index.html.erb b/app/views/contributions/projects/index.html.erb deleted file mode 100644 index 253b860..0000000 --- a/app/views/contributions/projects/index.html.erb +++ /dev/null @@ -1,49 +0,0 @@ -<%= render HeaderComponent.new(title: "Contributions") %> - -<%= render MainWithTabnavComponent.new(tabnav_partial: "shared/tabnav_contributions") do %> -
-

- Project contributions are how we develop and run all Kosmos software and - services. Everything we create and provide is free and open-source - software, even the page you're looking at right now! -

-

Start contributing

-

- Check out our - projects page - for some (but not all) potential places that can use your help. -

-

- There's something to do for everyone, especially non-programmers! For - example, we need more help with graphics, UI/UX design, and - content/copywriting. Also, testing any of our software and reporting - issues you encounter along the way is very valuable. -

-

- A good way to get started is to join one of our - chat rooms - and introduce yourself. Alternatively, you can also ping us on any other - medium, or even just grab an open issue on our - Gitea - or on - GitHub - and dive right in. -

-

- Last but not least, if you want to help by proposing new features or - services, or by giving feedback on existing ones, head over to the - community forums, - where you can do just that. -

-

Open Source Grants

-

- Money coming in from financial contributions is first used to pay for our - bills. Additional funds are being paid out directly to our contributors, - including you, according to their rough share of contributions. -

-

- We have run two 6-month trials so far, with the next trial period - starting sometime soon. Watch your email for notifications about it! -

-
-<% end %> diff --git a/app/views/shared/_tabnav_contributions.html.erb b/app/views/shared/_tabnav_contributions.html.erb index 96db0db..2cc243b 100644 --- a/app/views/shared/_tabnav_contributions.html.erb +++ b/app/views/shared/_tabnav_contributions.html.erb @@ -1,12 +1,14 @@
diff --git a/config/routes.rb b/config/routes.rb index 094bf62..f55f778 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -25,7 +25,7 @@ Rails.application.routes.draw do get 'confirm_btcpay' end end - get 'projects', to: 'projects#index' + get 'other', to: 'other#index' end resources :invitations, only: ['index', 'show', 'create', 'destroy'] From 6014134396d498548b2804ba09bbcd57be3f2279 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Thu, 29 May 2025 14:18:14 +0400 Subject: [PATCH 10/17] Finish MVP for content editing --- .../edit_content_button_component.html.erb | 30 +++++++++++ .../edit_content_button_component.rb | 6 +++ .../editable_content_component.html.erb | 9 ++++ app/components/editable_content_component.rb | 6 +++ .../admin/editable_contents_controller.rb | 8 ++- .../contributions/other_controller.rb | 6 --- app/helpers/application_helper.rb | 4 ++ app/helpers/editable_content_helper.rb | 10 ---- app/models/editable_content.rb | 10 +++- app/views/contributions/other/index.html.erb | 54 ++++++------------- .../shared/_tabnav_contributions.html.erb | 4 +- ...20250528092931_create_editable_contents.rb | 2 +- db/schema.rb | 2 +- 13 files changed, 92 insertions(+), 59 deletions(-) create mode 100644 app/components/edit_content_button_component.html.erb create mode 100644 app/components/edit_content_button_component.rb create mode 100644 app/components/editable_content_component.html.erb create mode 100644 app/components/editable_content_component.rb delete mode 100644 app/helpers/editable_content_helper.rb diff --git a/app/components/edit_content_button_component.html.erb b/app/components/edit_content_button_component.html.erb new file mode 100644 index 0000000..129d44e --- /dev/null +++ b/app/components/edit_content_button_component.html.erb @@ -0,0 +1,30 @@ +
+ + + <%= render ModalComponent.new(show_close_button: false) do %> + <%= form_with model: [:admin, @editable_content], + html: { autocomplete: "off" } do |form| %> + <%= form.hidden_field :redirect_to, value: @redirect_to %> +

+ <%= form.label :content, @editable_content.key.capitalize, class: 'font-bold' %> +

+ <% if @editable_content.rich_text %> +

+ <%= form.textarea :content, class: "md:w-[56rem] md:h-[28rem]" %> +

+

+ <%= form.submit "Save", class: "ml-2 btn-md btn-blue" %> +

+ <% else %> +

+ <%= form.text_field :content, class: "w-80" %> +

+

+ <%= form.submit "Save", class: "btn-md btn-blue w-full" %> +

+ <% end %> + <% end %> + <% end %> +
diff --git a/app/components/edit_content_button_component.rb b/app/components/edit_content_button_component.rb new file mode 100644 index 0000000..b0a463e --- /dev/null +++ b/app/components/edit_content_button_component.rb @@ -0,0 +1,6 @@ +class EditContentButtonComponent < ViewComponent::Base + def initialize(context:, key:, rich_text: false, redirect_to: nil) + @editable_content = EditableContent.find_or_create_by(context:, key:, rich_text:) + @redirect_to = redirect_to + end +end diff --git a/app/components/editable_content_component.html.erb b/app/components/editable_content_component.html.erb new file mode 100644 index 0000000..a685f08 --- /dev/null +++ b/app/components/editable_content_component.html.erb @@ -0,0 +1,9 @@ +<% if @editable_content.has_content? %> + <% if @editable_content.rich_text %> + <%= helpers.markdown_to_html @editable_content.content %> + <% else %> + <%= @editable_content.content %> + <% end %> +<% else %> + <%= @default %> +<% end %> diff --git a/app/components/editable_content_component.rb b/app/components/editable_content_component.rb new file mode 100644 index 0000000..545d79b --- /dev/null +++ b/app/components/editable_content_component.rb @@ -0,0 +1,6 @@ +class EditableContentComponent < ViewComponent::Base + def initialize(context:, key:, rich_text: false, default: nil) + @editable_content = EditableContent.find_or_create_by(context:, key:, rich_text:) + @default = default + end +end diff --git a/app/controllers/admin/editable_contents_controller.rb b/app/controllers/admin/editable_contents_controller.rb index 10140a0..d8782cc 100644 --- a/app/controllers/admin/editable_contents_controller.rb +++ b/app/controllers/admin/editable_contents_controller.rb @@ -16,8 +16,14 @@ class Admin::EditableContentsController < Admin::BaseController end def update + return_to = params[:editable_content][:redirect_to].presence + if @editable_content.update(content_params) - render json: { status: "success", message: "Content updated" }, status: :ok + if return_to + redirect_to return_to + else + render status: :ok + end else render :edit, status: :unprocessable_entity end diff --git a/app/controllers/contributions/other_controller.rb b/app/controllers/contributions/other_controller.rb index e4bafff..d4e6a6b 100644 --- a/app/controllers/contributions/other_controller.rb +++ b/app/controllers/contributions/other_controller.rb @@ -4,12 +4,6 @@ class Contributions::OtherController < ApplicationController # GET /contributions/other def index - @content_title = EditableContent.find_or_create_by( - path: "contributions/other", key: "title" - ) - @content_body = EditableContent.find_or_create_by( - path: "contributions/other", key: "body", rich_text: true - ) @current_section = :contributions end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index c166e06..47bf005 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -15,6 +15,10 @@ module ApplicationHelper tag.span text, class: "inline-flex items-center rounded-full bg-#{color}-100 px-2.5 py-0.5 text-xs font-medium text-#{color}-800" end + def markdown_to_html(string) + raw Kramdown::Document.new(string, { input: "GFM" }).to_html + end + def image_url_for(attachment) return s3_image_url(attachment) if Setting.s3_enabled? diff --git a/app/helpers/editable_content_helper.rb b/app/helpers/editable_content_helper.rb deleted file mode 100644 index b3d98b5..0000000 --- a/app/helpers/editable_content_helper.rb +++ /dev/null @@ -1,10 +0,0 @@ -module EditableContentHelper - def editable_content_for(path, key, default: nil, create_rich: false) - @content = EditableContent.find_by(path: "contributions/other", key: key) - @content.content.present? ? @content.content : default - end - - def markdown_to_html(string) - raw Kramdown::Document.new(string, { input: "GFM" }).to_html - end -end diff --git a/app/models/editable_content.rb b/app/models/editable_content.rb index 2bd5560..d051aa1 100644 --- a/app/models/editable_content.rb +++ b/app/models/editable_content.rb @@ -1,4 +1,12 @@ class EditableContent < ApplicationRecord validates :key, presence: true, - uniqueness: { scope: :path } + uniqueness: { scope: :context } + + def has_content? + content.present? + end + + def is_empty? + content.blank? + end end diff --git a/app/views/contributions/other/index.html.erb b/app/views/contributions/other/index.html.erb index 271eca2..f032e6d 100644 --- a/app/views/contributions/other/index.html.erb +++ b/app/views/contributions/other/index.html.erb @@ -1,42 +1,20 @@ <%= render HeaderComponent.new(title: "Contributions") %> <%= render MainWithTabnavComponent.new(tabnav_partial: "shared/tabnav_contributions") do %> - <% if @edit_content %> -
- <%= form_with model: [:admin, @content_title] do |form| %> -

- <%= form.label :content, @content_title.key.capitalize, class: 'font-bold' %> -

-

- <%= form.text_field :content %> - <%# <%= form.submit "Save", class: "btn-md btn-blue" %> - <%= button_tag type: 'submit', name: nil, title: "Save", class: 'btn-md btn-icon btn-outline' do %> - <%= render partial: "icons/save", locals: { custom_class: "text-blue-600 h-4 w-4 inline" } %> - <% end %> -

- <% end %> -
-
- <%= form_with model: [:admin, @content_body] do |form| %> -

- <%= form.label :content, @content_body.key.capitalize, class: 'font-bold' %> -

-

- <%= form.textarea :content, class: "w-full h-96" %> -

-

- <%= link_to 'Cancel', request.path, class: 'btn-md btn-gray' %> - <%= form.submit "Save", class: "ml-2 btn-md btn-blue" %> -

- <% end %> -
- <% else %> -
- <% if @content_body.content.present? %> - <%= markdown_to_html @content_body.content %> - <% else %> - No content yet - <% end %> -
- <% end %> +
+ <%= render EditableContentComponent.new( + context: "contributions/other", key: "body", rich_text: true, + default: "No content yet") %> + + <% if current_user.is_admin? %> +
+ <%= render EditContentButtonComponent.new( + context: "contributions/other", key: "title", + redirect_to: request.path) do %>Edit title<% end %> + <%= render EditContentButtonComponent.new( + context: "contributions/other", key: "body", rich_text: true, + redirect_to: request.path) do %>Edit content<% end %> +
+ <% end %> +
<% end %> diff --git a/app/views/shared/_tabnav_contributions.html.erb b/app/views/shared/_tabnav_contributions.html.erb index 2cc243b..1671502 100644 --- a/app/views/shared/_tabnav_contributions.html.erb +++ b/app/views/shared/_tabnav_contributions.html.erb @@ -6,7 +6,9 @@ active: current_page?(contributions_donations_path) ) %> <%= render TabnavLinkComponent.new( - name: editable_content_for("contributions/other", "title", default: "Other"), + name: render(EditableContentComponent.new( + context: "contributions/other", key: "title", default: "Other" + )), path: contributions_other_path, active: current_page?(contributions_other_path) ) %> diff --git a/db/migrate/20250528092931_create_editable_contents.rb b/db/migrate/20250528092931_create_editable_contents.rb index 0fac11e..85e54ab 100644 --- a/db/migrate/20250528092931_create_editable_contents.rb +++ b/db/migrate/20250528092931_create_editable_contents.rb @@ -1,7 +1,7 @@ class CreateEditableContents < ActiveRecord::Migration[8.0] def change create_table :editable_contents do |t| - t.string :path + t.string :context t.string :key t.string :lang, default: "en" t.text :content diff --git a/db/schema.rb b/db/schema.rb index b9dd900..087e218 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -65,7 +65,7 @@ ActiveRecord::Schema[8.0].define(version: 2025_05_28_092931) do end create_table "editable_contents", force: :cascade do |t| - t.string "path" + t.string "context" t.string "key" t.string "lang", default: "en" t.text "content" From ab1490f472676961b5998b687593a26920284fce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Thu, 29 May 2025 14:24:43 +0400 Subject: [PATCH 11/17] Remove Kosmos name from wording refs #222 --- app/views/contributions/donations/index.html.erb | 2 +- app/views/dashboard/index.html.erb | 2 +- app/views/invitations/index.html.erb | 2 +- .../notification_mailer/new_invitations_available.text.erb | 2 +- .../notification_mailer/remotestorage_auth_created.text.erb | 2 +- app/views/services/lightning/index.html.erb | 4 ++-- app/views/services/mastodon/show.html.erb | 2 +- app/views/signup/index.html.erb | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/views/contributions/donations/index.html.erb b/app/views/contributions/donations/index.html.erb index 2e9d33c..df8f9c9 100644 --- a/app/views/contributions/donations/index.html.erb +++ b/app/views/contributions/donations/index.html.erb @@ -3,7 +3,7 @@ <%= render MainWithTabnavComponent.new(tabnav_partial: "shared/tabnav_contributions") do %>

- Your financial contributions to the development and upkeep of Kosmos + Your financial contributions to the development and upkeep of our software and services.

diff --git a/app/views/dashboard/index.html.erb b/app/views/dashboard/index.html.erb index 1bd8c27..576606b 100644 --- a/app/views/dashboard/index.html.erb +++ b/app/views/dashboard/index.html.erb @@ -115,7 +115,7 @@ class: "block h-full px-6 py-6 rounded-md" do %>

Wiki

- Kosmos documentation and knowledge base + Documentation and knowledge base

<% end %> diff --git a/app/views/invitations/index.html.erb b/app/views/invitations/index.html.erb index 73d15aa..498da46 100644 --- a/app/views/invitations/index.html.erb +++ b/app/views/invitations/index.html.erb @@ -4,7 +4,7 @@
<% if @invitations_unused.any? %>

- Invite your friends to a Kosmos account by sharing an invitation URL with them: + Invite your friends to register an account by sharing an invitation URL with them:

    <% @invitations_unused.each do |invitation| %> diff --git a/app/views/notification_mailer/new_invitations_available.text.erb b/app/views/notification_mailer/new_invitations_available.text.erb index 9cf8adc..121ba50 100644 --- a/app/views/notification_mailer/new_invitations_available.text.erb +++ b/app/views/notification_mailer/new_invitations_available.text.erb @@ -1,6 +1,6 @@ Hi <%= @user.display_name.presence || @user.cn %>, -New invitations have just been added to your Kosmos account, so you can invite more people to our cooperative services: +New invitations have just been added to your account, so you can invite more people to our cooperative services: <%= invitations_url %> diff --git a/app/views/notification_mailer/remotestorage_auth_created.text.erb b/app/views/notification_mailer/remotestorage_auth_created.text.erb index 61338f3..4f04ee5 100644 --- a/app/views/notification_mailer/remotestorage_auth_created.text.erb +++ b/app/views/notification_mailer/remotestorage_auth_created.text.erb @@ -1,6 +1,6 @@ Hi <%= @user.display_name.presence || @user.cn %>, -You have just granted '<%= @auth.client_id %>' access to your Kosmos Storage, with the following permissions: +You have just granted '<%= @auth.client_id %>' access to your remote storage, with the following permissions: <% @permissions.each do |p| %> * <%= p %> diff --git a/app/views/services/lightning/index.html.erb b/app/views/services/lightning/index.html.erb index 8b0d39c..614f00e 100644 --- a/app/views/services/lightning/index.html.erb +++ b/app/views/services/lightning/index.html.erb @@ -8,7 +8,7 @@

    Lightning Address

    - Your Kosmos user address is also a + Your user address is also a Lightning Address! The easiest way to receive sats is by just giving out your address:

    @@ -32,7 +32,7 @@

    Wallet Apps

    - You can connect various wallet apps to your Kosmos account. This allows + You can connect various wallet apps to your account. This allows you to both receive and send sats. Any wallet that supports LNDHub accounts should be able to add/import your account using our setup diff --git a/app/views/services/mastodon/show.html.erb b/app/views/services/mastodon/show.html.erb index 0e10c98..b8c7cd3 100644 --- a/app/views/services/mastodon/show.html.erb +++ b/app/views/services/mastodon/show.html.erb @@ -3,7 +3,7 @@ <%= render MainSimpleComponent.new do %>

    - Follow and interact with anyone on the open social web, from your Kosmos Mastodon account. + Follow and interact with anyone on the open social web from your Mastodon account.

    diff --git a/app/views/signup/index.html.erb b/app/views/signup/index.html.erb index 0d4c759..7b9b57e 100644 --- a/app/views/signup/index.html.erb +++ b/app/views/signup/index.html.erb @@ -2,7 +2,7 @@ <%= render MainCompactComponent.new do %>

    - Hey there! You were invited to sign up for a Kosmos account by + Hey there! You were invited to sign up for an account by <%= @invited_by_name %>.

    From f1d9cf1e3daeb998b8f87a715c95d097ca6c90a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Thu, 29 May 2025 15:43:28 +0400 Subject: [PATCH 12/17] Remove special link class This cleans up the code quite a bit, but also allows links in editable content to be rendered with the default style. --- .../stylesheets/application.tailwind.css | 1 - app/assets/stylesheets/components/base.css | 10 ++++++++++ app/assets/stylesheets/components/buttons.css | 19 +++++++++++++++--- app/assets/stylesheets/components/links.css | 8 -------- .../stylesheets/components/pagination.css | 2 +- .../admin/app_catalog/web_apps/index.html.erb | 3 +-- app/views/admin/donations/_list.html.erb | 2 +- app/views/admin/donations/show.html.erb | 2 +- app/views/admin/invitations/index.html.erb | 4 ++-- app/views/admin/lightning/index.html.erb | 2 +- app/views/admin/users/index.html.erb | 2 +- app/views/admin/users/show.html.erb | 10 +++++----- app/views/dashboard/index.html.erb | 20 ++++++++++--------- app/views/rs/oauth/new.html.erb | 2 +- app/views/services/email/show.html.erb | 2 +- app/views/services/lightning/index.html.erb | 10 +++++----- app/views/services/mastodon/show.html.erb | 2 +- .../services/remotestorage/show.html.erb | 4 ++-- 18 files changed, 60 insertions(+), 45 deletions(-) delete mode 100644 app/assets/stylesheets/components/links.css diff --git a/app/assets/stylesheets/application.tailwind.css b/app/assets/stylesheets/application.tailwind.css index e679da8..bba2f9b 100644 --- a/app/assets/stylesheets/application.tailwind.css +++ b/app/assets/stylesheets/application.tailwind.css @@ -7,7 +7,6 @@ @import "components/buttons"; @import "components/dashboard_services"; @import "components/forms"; -@import "components/links"; @import "components/notifications"; @import "components/pagination"; @import "components/tables"; diff --git a/app/assets/stylesheets/components/base.css b/app/assets/stylesheets/components/base.css index a9e082e..991a296 100644 --- a/app/assets/stylesheets/components/base.css +++ b/app/assets/stylesheets/components/base.css @@ -6,6 +6,7 @@ body { @apply leading-none bg-cover bg-fixed; background-image: linear-gradient(35deg, rgba(255,0,255,0.2) 0, rgba(13,79,153,0.8) 100%), url('/img/bg-1.jpg'); + color: black; } body#admin { @@ -59,4 +60,13 @@ main ul li { @apply leading-6; } + + main a:not(nav > *), + main a:not([data-tabs-target="tab"] { + @apply text-blue-600; + &:hover { @apply underline; } + &:visited { @apply text-indigo-600; } + &:active { @apply text-red-600; } + } + } diff --git a/app/assets/stylesheets/components/buttons.css b/app/assets/stylesheets/components/buttons.css index 34fb68c..5bb4198 100644 --- a/app/assets/stylesheets/components/buttons.css +++ b/app/assets/stylesheets/components/buttons.css @@ -1,5 +1,15 @@ @layer components { + .btn-text-dark { @apply text-black; } + .btn-text-dark:hover { @apply text-black no-underline; } + .btn-text-dark:visited { @apply text-black; } + .btn-text-dark:active { @apply text-black; } + .btn-text-light { @apply text-white; } + .btn-text-light:hover { @apply text-white no-underline; } + .btn-text-light:visited { @apply text-white; } + .btn-text-light:active { @apply text-white; } + .btn { + @apply btn-text-dark; @apply inline-block font-semibold rounded-md leading-none cursor-pointer text-center transition-colors duration-75 focus:outline-none focus:ring-4; } @@ -28,17 +38,20 @@ } .btn-blue { - @apply bg-blue-500 hover:bg-blue-600 text-white + @apply btn-text-light; + @apply bg-blue-500 hover:bg-blue-600 focus:ring-blue-400 focus:ring-opacity-75; } .btn-emerald { - @apply bg-emerald-500 hover:bg-emerald-600 text-white + @apply btn-text-light; + @apply bg-emerald-500 hover:bg-emerald-600 focus:ring-emerald-400 focus:ring-opacity-75; } .btn-red { - @apply bg-red-600 hover:bg-red-700 text-white + @apply btn-text-light; + @apply bg-red-600 hover:bg-red-700 focus:ring-red-500 focus:ring-opacity-75; } diff --git a/app/assets/stylesheets/components/links.css b/app/assets/stylesheets/components/links.css deleted file mode 100644 index 92c9c75..0000000 --- a/app/assets/stylesheets/components/links.css +++ /dev/null @@ -1,8 +0,0 @@ -@layer components { - .ks-text-link { - @apply text-blue-600; - &:hover { @apply underline; } - &:visited { @apply text-indigo-600; } - &:active { @apply text-red-600; } - } -} diff --git a/app/assets/stylesheets/components/pagination.css b/app/assets/stylesheets/components/pagination.css index f6ab6c6..38fffbf 100644 --- a/app/assets/stylesheets/components/pagination.css +++ b/app/assets/stylesheets/components/pagination.css @@ -34,7 +34,7 @@ .pagy-nav .page a, .page.gap { @apply bg-white border-gray-300 text-gray-500 hover:bg-gray-100 relative inline-flex items-center border px-4 py-2 text-sm font-medium - focus:z-20; + no-underline focus:z-20; } .pagy-nav .page.active { diff --git a/app/views/admin/app_catalog/web_apps/index.html.erb b/app/views/admin/app_catalog/web_apps/index.html.erb index ebfa289..d904b0d 100644 --- a/app/views/admin/app_catalog/web_apps/index.html.erb +++ b/app/views/admin/app_catalog/web_apps/index.html.erb @@ -38,8 +38,7 @@ <%= web_app.name %> <%= link_to web_app.url, web_app.url, - target: "_blank", rel: "nofollow noopener", - class: "ks-text-link" %> + target: "_blank", rel: "nofollow noopener" %> <%= web_app.remote_storage_authorizations.count %> diff --git a/app/views/admin/donations/_list.html.erb b/app/views/admin/donations/_list.html.erb index aa405ec..b9009d7 100644 --- a/app/views/admin/donations/_list.html.erb +++ b/app/views/admin/donations/_list.html.erb @@ -12,7 +12,7 @@ <% donations.each do |donation| %> - <%= link_to donation.user.cn, admin_user_path(donation.user.cn), class: 'ks-text-link' %> + <%= link_to donation.user.cn, admin_user_path(donation.user.cn) %> <% if donation.amount_sats.present? %><%= number_with_delimiter donation.amount_sats %><% end %> <% if donation.fiat_amount.present? %><%= number_to_currency donation.fiat_amount.to_f / 100, unit: "" %> <%= donation.fiat_currency %><% end %> <%= donation.public_name %> diff --git a/app/views/admin/donations/show.html.erb b/app/views/admin/donations/show.html.erb index 3e3ad65..089b855 100644 --- a/app/views/admin/donations/show.html.erb +++ b/app/views/admin/donations/show.html.erb @@ -6,7 +6,7 @@ User - <%= link_to @donation.user.cn, admin_user_path(@donation.user.cn), class: 'ks-text-link' %> + <%= link_to @donation.user.cn, admin_user_path(@donation.user.cn) %> Donation Method diff --git a/app/views/admin/invitations/index.html.erb b/app/views/admin/invitations/index.html.erb index acc5606..c984f6d 100644 --- a/app/views/admin/invitations/index.html.erb +++ b/app/views/admin/invitations/index.html.erb @@ -44,8 +44,8 @@ <%= invitation.token %> <%= invitation.used_at.strftime("%Y-%m-%d (%H:%M UTC)") %> - <%= link_to invitation.user.cn, admin_user_path(invitation.user.cn), class: "ks-text-link" %> - <%= link_to invitation.invitee.cn, admin_user_path(invitation.invitee.cn), class: "ks-text-link" %> + <%= link_to invitation.user.cn, admin_user_path(invitation.user.cn) %> + <%= link_to invitation.invitee.cn, admin_user_path(invitation.invitee.cn) %> <% end %> diff --git a/app/views/admin/lightning/index.html.erb b/app/views/admin/lightning/index.html.erb index 9240148..cfea8e6 100644 --- a/app/views/admin/lightning/index.html.erb +++ b/app/views/admin/lightning/index.html.erb @@ -36,7 +36,7 @@ <% if user = @users.find{ |u| u[2] == account.login } %> - <%= link_to user[0], admin_user_path(user[0]), class: "ks-text-link" %> + <%= link_to user[0], admin_user_path(user[0]) %> <% end %> <%= number_with_delimiter account.balance.to_i.to_s %> diff --git a/app/views/admin/users/index.html.erb b/app/views/admin/users/index.html.erb index 66bf6f6..413ec2b 100644 --- a/app/views/admin/users/index.html.erb +++ b/app/views/admin/users/index.html.erb @@ -42,7 +42,7 @@ <% @users.each do |user| %> - <%= link_to(user.cn, admin_user_path(user.cn), class: 'ks-text-link') %> + <%= link_to(user.cn, admin_user_path(user.cn)) %> <%= user.confirmed_at.nil? ? badge("pending", :yellow) : "" %> <% if @show_contributors %><%= @contributors.include?(user.cn) ? badge("contributor", :green) : "" %><% end %> diff --git a/app/views/admin/users/show.html.erb b/app/views/admin/users/show.html.erb index 94c21dd..01aaf12 100644 --- a/app/views/admin/users/show.html.erb +++ b/app/views/admin/users/show.html.erb @@ -47,7 +47,7 @@ Donations <% if @user.donations.any? %> - <%= link_to admin_donations_path(username: @user.cn), class: "ks-text-link" do %> + <%= link_to admin_donations_path(username: @user.cn) do %> <%= @user.donations.completed.count %> for <%= number_with_delimiter @user.donations.completed.sum("amount_sats") %> sats <% end %> @@ -60,7 +60,7 @@ Invited by <% if @user.inviter %> - <%= link_to @user.inviter.cn, admin_user_path(@user.inviter.cn), class: 'ks-text-link' %> + <%= link_to @user.inviter.cn, admin_user_path(@user.inviter.cn) %> <% else %>—<% end %> @@ -102,10 +102,10 @@ <% if @invitees.any? %>

      <% @recent_invitees.each do |invitee| %> -
    • <%= link_to invitee.cn, admin_user_path(invitee.cn), class: "ks-text-link" %>
      • +
    • <%= link_to invitee.cn, admin_user_path(invitee.cn) %>
      • <% end %> <% if @more_invitees > 0 %> -
    • and <%= link_to "#{@more_invitees} more", admin_invitations_path(username: @user.cn), class: "ks-text-link" %>
      • +
    • and <%= link_to "#{@more_invitees} more", admin_invitations_path(username: @user.cn) %>
      • <% end %>
    <% else %>—<% end %> @@ -168,7 +168,7 @@ <% if @user.pgp_pubkey_contains_user_address? %> <%= link_to wkd_key_url(hashed_username: @user.wkd_hash, l: @user.cn, format: :txt), - class: "ks-text-link", target: "_blank" do %> + target: "_blank" do %> <%= "#{@user.pgp_fpr[0, 8]}…#{@user.pgp_fpr[-8..-1]}" %> <% end %> <% else %> diff --git a/app/views/dashboard/index.html.erb b/app/views/dashboard/index.html.erb index 576606b..fc44512 100644 --- a/app/views/dashboard/index.html.erb +++ b/app/views/dashboard/index.html.erb @@ -8,7 +8,7 @@ bg-[length:86%] bg-[center_top_-40px] bg-no-repeat bg-[url(/img/logos/icon_xmpp.svg)]"> <%= link_to services_chat_path, - class: "block h-full px-6 py-6 rounded-md" do %> + class: "block h-full px-6 py-6 rounded-md btn-text-dark" do %>

    Chat

    Federated chat rooms and instant messaging @@ -20,7 +20,8 @@

    - <%= link_to services_mastodon_path, class: "block h-full px-6 py-6 rounded-md" do %> + <%= link_to services_mastodon_path, + class: "block h-full px-6 py-6 rounded-md btn-text-dark" do %>

    Mastodon

    Your account on the Open Social Web @@ -33,7 +34,8 @@

    - <%= link_to services_email_path, class: "block h-full px-6 py-6 rounded-md" do %> + <%= link_to services_email_path, + class: "block h-full px-6 py-6 rounded-md btn-text-dark" do %>

    E-Mail

    A no-bullshit email account @@ -47,7 +49,7 @@ bg-[length:80%] bg-[center_top_-156px] bg-no-repeat bg-[url(/img/logos/icon_remotestorage.svg)]"> <%= link_to services_storage_path, - class: "block h-full px-6 py-6 rounded-md" do %> + class: "block h-full px-6 py-6 rounded-md btn-text-dark" do %>

    Storage

    Sync your data between apps and devices @@ -60,7 +62,7 @@ bg-cover bg-center sm:bg-[center_top_-140px] bg-no-repeat bg-[url(/img/logos/icon_lightning.svg)]"> <%= link_to services_lightning_index_path, - class: "block h-full px-6 py-6 rounded-md" do %> + class: "block h-full px-6 py-6 rounded-md btn-text-dark" do %>

    Lightning Network

    Send and receive sats over the Bitcoin Lightning Network @@ -73,7 +75,7 @@ bg-[length:80%] bg-center bg-no-repeat bg-[url(/img/logos/icon_discourse.svg)]"> <%= link_to "#{Setting.discourse_public_url}/session/sso?return_path=/", - class: "block h-full px-6 py-6 rounded-md" do %> + class: "block h-full px-6 py-6 rounded-md btn-text-dark" do %>

    Discourse

    Community forums and support/help site @@ -86,7 +88,7 @@ bg-[length:92%] bg-center bg-no-repeat bg-[url(/img/logos/icon_gitea.png)]"> <%= link_to Setting.gitea_public_url, - class: "block h-full px-6 py-6 rounded-md" do %> + class: "block h-full px-6 py-6 rounded-md btn-text-dark" do %>

    Gitea

    Code hosting and collaboration for software projects @@ -99,7 +101,7 @@ bg-[length:86%] bg-[center_top_-60px] bg-no-repeat bg-[url(/img/logos/icon_droneci.svg)]"> <%= link_to Setting.droneci_public_url, - class: "block h-full px-6 py-6 rounded-md" do %> + class: "block h-full px-6 py-6 rounded-md btn-text-dark" do %>

    Drone CI

    Continuous integration for software projects on Gitea @@ -112,7 +114,7 @@ bg-cover bg-[center_top_-20px] bg-no-repeat bg-[url(/img/logos/icon_mediawiki.svg)]"> <%= link_to Setting.mediawiki_public_url, - class: "block h-full px-6 py-6 rounded-md" do %> + class: "block h-full px-6 py-6 rounded-md btn-text-dark" do %>

    Wiki

    Documentation and knowledge base diff --git a/app/views/rs/oauth/new.html.erb b/app/views/rs/oauth/new.html.erb index 3d63f81..8cb9498 100644 --- a/app/views/rs/oauth/new.html.erb +++ b/app/views/rs/oauth/new.html.erb @@ -4,7 +4,7 @@

    The app on - <%= link_to @client_id, "https://#{@client_id}", class: "ks-text-link" %> + <%= link_to @client_id, "https://#{@client_id}" %> is asking for access to these folders:

    diff --git a/app/views/services/email/show.html.erb b/app/views/services/email/show.html.erb index 39379e6..2b297fe 100644 --- a/app/views/services/email/show.html.erb +++ b/app/views/services/email/show.html.erb @@ -34,7 +34,7 @@

    Your email password is different from your main account password. You can reset your email password in the - <%= link_to "email settings", setting_path(:email), class: "ks-text-link" %>. + <%= link_to "email settings", setting_path(:email) %>.

    diff --git a/app/views/services/lightning/index.html.erb b/app/views/services/lightning/index.html.erb index 614f00e..a72572d 100644 --- a/app/views/services/lightning/index.html.erb +++ b/app/views/services/lightning/index.html.erb @@ -9,7 +9,7 @@

    Lightning Address

    Your user address is also a - Lightning Address! + Lightning Address! The easiest way to receive sats is by just giving out your address:

    @@ -34,7 +34,7 @@

    You can connect various wallet apps to your account. This allows you to both receive and send sats. Any wallet that supports - LNDHub + LNDHub accounts should be able to add/import your account using our setup code/URL:

    @@ -57,7 +57,7 @@

    - <%= image_tag("/img/logos/alby.svg", class: 'h-16') %> @@ -70,7 +70,7 @@ URL in the "LNDHub Export URI" field.

    - <%= image_tag("/img/logos/bluewallet.svg", class: 'h-16') %> @@ -83,7 +83,7 @@ then scan the setup QR code.

    - <%= image_tag("/img/logos/zeus.svg", class: 'h-16') %> diff --git a/app/views/services/mastodon/show.html.erb b/app/views/services/mastodon/show.html.erb index b8c7cd3..cefa1d7 100644 --- a/app/views/services/mastodon/show.html.erb +++ b/app/views/services/mastodon/show.html.erb @@ -37,7 +37,7 @@

    Use your Mastodon account with many different apps, and on any devices you wish! When adding your account to an app, you will log in via - kosmos.social. + kosmos.social.

    diff --git a/app/views/services/remotestorage/show.html.erb b/app/views/services/remotestorage/show.html.erb index e4146e9..fbd7ac2 100644 --- a/app/views/services/remotestorage/show.html.erb +++ b/app/views/services/remotestorage/show.html.erb @@ -46,8 +46,8 @@

    If you want your favorite apps to support syncing data with your own Storage account, let the developers know! All relevant information is - available on the remoteStorage website. + available on the + remoteStorage website.

    From 67c450860a0252dda9b519ff6b0d7787833a821f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Thu, 29 May 2025 16:24:20 +0400 Subject: [PATCH 13/17] Fix tab links --- app/assets/stylesheets/components/base.css | 4 +--- app/views/services/chat/show.html.erb | 15 +++++---------- app/views/services/email/show.html.erb | 8 ++++---- app/views/services/mastodon/show.html.erb | 12 ++++++------ app/views/services/remotestorage/show.html.erb | 10 +++++----- 5 files changed, 21 insertions(+), 28 deletions(-) diff --git a/app/assets/stylesheets/components/base.css b/app/assets/stylesheets/components/base.css index 991a296..5f207af 100644 --- a/app/assets/stylesheets/components/base.css +++ b/app/assets/stylesheets/components/base.css @@ -61,12 +61,10 @@ @apply leading-6; } - main a:not(nav > *), - main a:not([data-tabs-target="tab"] { + main a:not(nav > *) { @apply text-blue-600; &:hover { @apply underline; } &:visited { @apply text-indigo-600; } &:active { @apply text-red-600; } } - } diff --git a/app/views/services/chat/show.html.erb b/app/views/services/chat/show.html.erb index 7e749b1..f048913 100644 --- a/app/views/services/chat/show.html.erb +++ b/app/views/services/chat/show.html.erb @@ -62,35 +62,30 @@ From f2e8ca790c289084c3fafc61f9079bea277b5135 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Fri, 30 May 2025 13:18:38 +0400 Subject: [PATCH 15/17] Add Privacy and ToS pages, footer menu --- app/components/main_compact_component.html.erb | 2 +- app/components/main_simple_component.html.erb | 2 +- .../main_with_sidenav_component.html.erb | 2 +- .../main_with_tabnav_component.html.erb | 2 +- app/controllers/pages_controller.rb | 9 +++++++++ app/views/layouts/application.html.erb | 15 +++++++++++++-- app/views/pages/privacy.html.erb | 17 +++++++++++++++++ app/views/pages/tos.html.erb | 17 +++++++++++++++++ app/views/settings/_profile.html.erb | 2 +- config/routes.rb | 2 ++ 10 files changed, 63 insertions(+), 7 deletions(-) create mode 100644 app/controllers/pages_controller.rb create mode 100644 app/views/pages/privacy.html.erb create mode 100644 app/views/pages/tos.html.erb diff --git a/app/components/main_compact_component.html.erb b/app/components/main_compact_component.html.erb index 80161b6..67c9770 100644 --- a/app/components/main_compact_component.html.erb +++ b/app/components/main_compact_component.html.erb @@ -1,4 +1,4 @@ -
    +
    <%= content %>
    diff --git a/app/components/main_simple_component.html.erb b/app/components/main_simple_component.html.erb index beacf7b..3a5651a 100644 --- a/app/components/main_simple_component.html.erb +++ b/app/components/main_simple_component.html.erb @@ -1,4 +1,4 @@ -
    +
    <%= content %>
    diff --git a/app/components/main_with_sidenav_component.html.erb b/app/components/main_with_sidenav_component.html.erb index 86225ff..9e5baf2 100644 --- a/app/components/main_with_sidenav_component.html.erb +++ b/app/components/main_with_sidenav_component.html.erb @@ -1,4 +1,4 @@ -
    +