diff --git a/Gemfile b/Gemfile index 9aa5bca..fe749cb 100644 --- a/Gemfile +++ b/Gemfile @@ -61,7 +61,7 @@ gem "sentry-rails" # Services gem 'discourse_api' gem "lnurl" -gem 'manifique' +gem 'manifique', '~> 1.1.0' gem 'nostr', '~> 0.6.0' group :development, :test do diff --git a/Gemfile.lock b/Gemfile.lock index ead85a4..59cb7d8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -245,7 +245,7 @@ GEM net-imap net-pop net-smtp - manifique (1.0.1) + manifique (1.1.0) faraday (~> 2.9.0) faraday-follow_redirects (= 0.3.0) nokogiri (~> 1.16.0) @@ -515,7 +515,7 @@ DEPENDENCIES listen (~> 3.2) lnurl lockbox - manifique + manifique (~> 1.1.0) net-ldap nostr (~> 0.6.0) pagy (~> 6.0, >= 6.0.2) diff --git a/app/assets/stylesheets/components/dashboard_services.css b/app/assets/stylesheets/components/dashboard_services.css index f725347..e3679c8 100644 --- a/app/assets/stylesheets/components/dashboard_services.css +++ b/app/assets/stylesheets/components/dashboard_services.css @@ -1,5 +1,5 @@ @layer components { .services > div > a { - background-image: linear-gradient(110deg, rgba(255,255,255,0.99) 0, rgba(255,255,255,0.88) 100%); + background-image: linear-gradient(110deg, rgba(255,255,255,0.99) 20%, rgba(255,255,255,0.88) 100%); } } diff --git a/app/controllers/services/remotestorage_controller.rb b/app/controllers/services/remotestorage_controller.rb index 15726d4..4a7801e 100644 --- a/app/controllers/services/remotestorage_controller.rb +++ b/app/controllers/services/remotestorage_controller.rb @@ -8,8 +8,7 @@ class Services::RemotestorageController < Services::BaseController # unless current_user.service_enabled?(:remotestorage) # redirect_to service_remotestorage_info_path # end - @rs_auths = current_user.remote_storage_authorizations - # TODO sort by app name + # @rs_apps_connected = current_user.remote_storage_authorizations.any? end private diff --git a/app/controllers/services/rs_auths_controller.rb b/app/controllers/services/rs_auths_controller.rb index e31f046..2cbcb6c 100644 --- a/app/controllers/services/rs_auths_controller.rb +++ b/app/controllers/services/rs_auths_controller.rb @@ -3,7 +3,12 @@ class Services::RsAuthsController < Services::BaseController before_action :require_feature_enabled before_action :require_service_available # before_action :require_service_enabled - before_action :find_rs_auth + before_action :find_rs_auth, only: [:destroy, :launch_app] + + def index + @rs_auths = current_user.remote_storage_authorizations + # TODO sort by app name? + end def destroy @auth.destroy! diff --git a/app/controllers/well_known_controller.rb b/app/controllers/well_known_controller.rb index b028562..72443be 100644 --- a/app/controllers/well_known_controller.rb +++ b/app/controllers/well_known_controller.rb @@ -4,7 +4,7 @@ class WellKnownController < ApplicationController def nostr http_status :unprocessable_entity and return if params[:name].blank? domain = request.headers["X-Forwarded-Host"].presence || Setting.primary_domain - relay_url = Setting.nostr_relay_url + relay_url = Setting.nostr_relay_url.presence if params[:name] == "_" # pubkey for the primary domain without a username (e.g. kosmos.org) diff --git a/app/views/contributions/projects/index.html.erb b/app/views/contributions/projects/index.html.erb index 3a299e1..253b860 100644 --- a/app/views/contributions/projects/index.html.erb +++ b/app/views/contributions/projects/index.html.erb @@ -43,7 +43,7 @@

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

<% end %> diff --git a/app/views/dashboard/index.html.erb b/app/views/dashboard/index.html.erb index 5d38b7c..1bd8c27 100644 --- a/app/views/dashboard/index.html.erb +++ b/app/views/dashboard/index.html.erb @@ -5,7 +5,7 @@
<% if Setting.ejabberd_enabled? %>
<%= link_to services_chat_path, class: "block h-full px-6 py-6 rounded-md" do %> @@ -18,7 +18,7 @@ <% end %> <% if Setting.mastodon_enabled? %>
<%= link_to services_mastodon_path, class: "block h-full px-6 py-6 rounded-md" do %>

Mastodon

@@ -30,7 +30,9 @@ <% end %> <% if Setting.email_enabled? && Flipper.enabled?(:email, current_user) %> -
+
<%= link_to services_email_path, class: "block h-full px-6 py-6 rounded-md" do %>

E-Mail

@@ -39,15 +41,16 @@ <% end %>

<% end %> - <% if Setting.discourse_enabled? %> + <% if Setting.remotestorage_enabled? && + Flipper.enabled?(:remotestorage, current_user) %>
- <%= link_to "#{Setting.discourse_public_url}/session/sso?return_path=/", + 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 %> -

Discourse

+

Storage

- Kosmos community forums and user support/help site + Sync your data between apps and devices

<% end %>
@@ -65,21 +68,22 @@ <% end %>
<% end %> - <% if Setting.remotestorage_enabled? && - Flipper.enabled?(:remotestorage, current_user) %> -
- <%= link_to services_storage_path, + <% if Setting.discourse_enabled? %> +
+ <%= link_to "#{Setting.discourse_public_url}/session/sso?return_path=/", class: "block h-full px-6 py-6 rounded-md" do %> -

Storage

+

Discourse

- Sync your data between apps and devices + Community forums and support/help site

<% end %>
<% end %> <% if Setting.gitea_enabled? %>
<%= link_to Setting.gitea_public_url, class: "block h-full px-6 py-6 rounded-md" do %> @@ -92,7 +96,7 @@ <% end %> <% if Setting.droneci_enabled? %>
<%= link_to Setting.droneci_public_url, class: "block h-full px-6 py-6 rounded-md" do %> diff --git a/app/views/services/email/show.html.erb b/app/views/services/email/show.html.erb index ada7bba..39379e6 100644 --- a/app/views/services/email/show.html.erb +++ b/app/views/services/email/show.html.erb @@ -100,6 +100,14 @@ ["Website", "https://www.thunderbird.net"] ] ) %> + <%= render AppInfoComponent.new( + name: "Geary", + description: "Built around conversations, for the GNOME desktop", + icon_path: "/img/logos/icon_geary.png", + links: [ + ["Website", "https://wiki.gnome.org/Apps/Geary"] + ] + ) %>