WIP Rename "projects" page, make content editable
Some checks failed
continuous-integration/drone/push Build is failing
Some checks failed
continuous-integration/drone/push Build is failing
This commit is contained in:
parent
315cf4dd9f
commit
6713665a61
22
app/controllers/contributions/other_controller.rb
Normal file
22
app/controllers/contributions/other_controller.rb
Normal file
@ -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
|
@ -1,8 +0,0 @@
|
|||||||
class Contributions::ProjectsController < ApplicationController
|
|
||||||
before_action :authenticate_user!
|
|
||||||
|
|
||||||
# GET /contributions
|
|
||||||
def index
|
|
||||||
@current_section = :contributions
|
|
||||||
end
|
|
||||||
end
|
|
42
app/views/contributions/other/index.html.erb
Normal file
42
app/views/contributions/other/index.html.erb
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
<%= render HeaderComponent.new(title: "Contributions") %>
|
||||||
|
|
||||||
|
<%= render MainWithTabnavComponent.new(tabnav_partial: "shared/tabnav_contributions") do %>
|
||||||
|
<% if @edit_content %>
|
||||||
|
<section>
|
||||||
|
<%= form_with model: [:admin, @content_title] do |form| %>
|
||||||
|
<p class="mb-2">
|
||||||
|
<%= form.label :content, @content_title.key.capitalize, class: 'font-bold' %>
|
||||||
|
</p>
|
||||||
|
<p class="flex gap-1">
|
||||||
|
<%= 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 %>
|
||||||
|
</p>
|
||||||
|
<% end %>
|
||||||
|
</section>
|
||||||
|
<section>
|
||||||
|
<%= form_with model: [:admin, @content_body] do |form| %>
|
||||||
|
<p class="mb-2">
|
||||||
|
<%= form.label :content, @content_body.key.capitalize, class: 'font-bold' %>
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
<%= form.textarea :content, class: "w-full h-96" %>
|
||||||
|
</p>
|
||||||
|
<p class="text-right">
|
||||||
|
<%= link_to 'Cancel', request.path, class: 'btn-md btn-gray' %>
|
||||||
|
<%= form.submit "Save", class: "ml-2 btn-md btn-blue" %>
|
||||||
|
</p>
|
||||||
|
<% end %>
|
||||||
|
</section>
|
||||||
|
<% else %>
|
||||||
|
<section>
|
||||||
|
<% if @content_body.content.present? %>
|
||||||
|
<%= markdown_to_html @content_body.content %>
|
||||||
|
<% else %>
|
||||||
|
No content yet
|
||||||
|
<% end %>
|
||||||
|
</section>
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
@ -1,49 +0,0 @@
|
|||||||
<%= render HeaderComponent.new(title: "Contributions") %>
|
|
||||||
|
|
||||||
<%= render MainWithTabnavComponent.new(tabnav_partial: "shared/tabnav_contributions") do %>
|
|
||||||
<section>
|
|
||||||
<p class="mb-8">
|
|
||||||
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!
|
|
||||||
</p>
|
|
||||||
<h3>Start contributing</h3>
|
|
||||||
<p>
|
|
||||||
Check out our
|
|
||||||
<a href="https://kosmos.org/projects/" target="_blank" class="ks-text-link">projects page</a>
|
|
||||||
for some (but not all) potential places that can use your help.
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
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.
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
A good way to get started is to join one of our
|
|
||||||
<a href="https://wiki.kosmos.org/Main_Page#Chat" target="_blank" class="ks-text-link">chat rooms</a>
|
|
||||||
and introduce yourself. Alternatively, you can also ping us on any other
|
|
||||||
medium, or even just grab an open issue on our
|
|
||||||
<a href="https://gitea.kosmos.org/kosmos/" target="_blank" class="ks-text-link">Gitea</a>
|
|
||||||
or on
|
|
||||||
<a href="https://github.com/67P/" target="_blank" class="ks-text-link">GitHub</a>
|
|
||||||
and dive right in.
|
|
||||||
</p>
|
|
||||||
<p class="mb-8">
|
|
||||||
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
|
|
||||||
<a href="https://community.kosmos.org/" target="_blank" class="ks-text-link">community forums</a>,
|
|
||||||
where you can do just that.
|
|
||||||
</p>
|
|
||||||
<h3>Open Source Grants</h3>
|
|
||||||
<p>
|
|
||||||
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.
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
We have run two 6-month trials so far, with the next trial period
|
|
||||||
starting sometime soon. Watch your email for notifications about it!
|
|
||||||
</p>
|
|
||||||
</section>
|
|
||||||
<% end %>
|
|
@ -1,12 +1,14 @@
|
|||||||
<div class="border-b border-gray-200">
|
<div class="border-b border-gray-200">
|
||||||
<nav class="-mb-px flex" aria-label="Tabs">
|
<nav class="-mb-px flex" aria-label="Tabs">
|
||||||
<%= render TabnavLinkComponent.new(
|
<%= render TabnavLinkComponent.new(
|
||||||
name: "Donations", path: contributions_donations_path,
|
name: "Donations",
|
||||||
|
path: contributions_donations_path,
|
||||||
active: current_page?(contributions_donations_path)
|
active: current_page?(contributions_donations_path)
|
||||||
) %>
|
) %>
|
||||||
<%= render TabnavLinkComponent.new(
|
<%= render TabnavLinkComponent.new(
|
||||||
name: "Projects", path: contributions_projects_path,
|
name: editable_content_for("contributions/other", "title", default: "Other"),
|
||||||
active: current_page?(contributions_projects_path)
|
path: contributions_other_path,
|
||||||
|
active: current_page?(contributions_other_path)
|
||||||
) %>
|
) %>
|
||||||
</nav>
|
</nav>
|
||||||
</div>
|
</div>
|
||||||
|
@ -25,7 +25,7 @@ Rails.application.routes.draw do
|
|||||||
get 'confirm_btcpay'
|
get 'confirm_btcpay'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
get 'projects', to: 'projects#index'
|
get 'other', to: 'other#index'
|
||||||
end
|
end
|
||||||
|
|
||||||
resources :invitations, only: ['index', 'show', 'create', 'destroy']
|
resources :invitations, only: ['index', 'show', 'create', 'destroy']
|
||||||
|
Loading…
x
Reference in New Issue
Block a user