dnitza/adamantium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

StandardRB

Browse Source
This commit is contained in:
Daniel Nitsikopoulos
2023-12-02 20:32:57 +11:00
parent c6e0c6e832
commit 8501279eaa
15 changed files with 29 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/posts/index.rb
View File

@@ -19,7 +19,7 @@ module Adamantium
end end
expose :query do |query:| expose :query do |query:|
query == "" ? nil : query (query == "") ? nil : query
end end
expose :post_years do expose :post_years do

8
config.ru
View File

@@ -7,10 +7,10 @@ use Rack::Static, urls: ["/assets", "/media"], root: "public"
raise StandardError.new("No secret key") unless ENV["SESSION_SECRET"] raise StandardError.new("No secret key") unless ENV["SESSION_SECRET"]
use Rack::Session::Cookie, use Rack::Session::Cookie,
:domain => URI.parse(ENV["MICROPUB_SITE_URL"]).host, domain: URI.parse(ENV["MICROPUB_SITE_URL"]).host,
:path => '/', path: "/",
:expire_after => 3600*24, expire_after: 3600 * 24,
:secret => ENV["SESSION_SECRET"] secret: ENV["SESSION_SECRET"]
require "rack/rewrite" require "rack/rewrite"
use Rack::Rewrite do use Rack::Rewrite do

2
lib/adamantium/middleware/authenticate.rb
View File

@@ -8,7 +8,7 @@ module Adamantium
def call(env) def call(env)
session = env["rack.session"] session = env["rack.session"]
return [403, {'Content-Type' => 'text/html'}, ["Unauthorized | <a href=\"/admin/login\">Login</>"]] unless @auth_proc.call(session[:user_id]) return [403, {"Content-Type" => "text/html"}, ["Unauthorized | <a href=\"/admin/login\">Login</>"]] unless @auth_proc.call(session[:user_id])
@app.call(env) @app.call(env)
end end

2
slices/admin/actions/sessions/create.rb
View File

@@ -5,7 +5,7 @@ module Admin
include Deps["commands.sessions.create"] include Deps["commands.sessions.create"]
def handle(req, res) def handle(req, res)
create.(email: req.params[:email]) create.call(email: req.params[:email])
res.redirect_to "/admin" res.redirect_to "/admin"
end end

2
slices/admin/actions/sessions/validate.rb
View File

@@ -5,7 +5,7 @@ module Admin
include Deps["commands.sessions.validate"] include Deps["commands.sessions.validate"]
def handle(req, res) def handle(req, res)
user_id = validate.(token: req.params[:token]) user_id = validate.call(token: req.params[:token])
session = req.env["rack.session"] session = req.env["rack.session"]
session[:user_id] = user_id session[:user_id] = user_id

2
slices/admin/commands/sessions/create.rb
View File

@@ -37,7 +37,7 @@ module Admin
body "#{app_settings.micropub_site_url}/admin/login/#{token.token}" body "#{app_settings.micropub_site_url}/admin/login/#{token.token}"
end end
mail[:to] = email mail[:to] = user.email
mail[:from] = app_settings.from_email mail[:from] = app_settings.from_email
mail.deliver mail.deliver

6
slices/admin/commands/sessions/validate.rb
View File

@@ -12,11 +12,7 @@ module Admin
return nil return nil
end end
user_id = token.user_id token.user_id
if user_id
user_id
end
end end
end end
end end

4
slices/admin/templates/layouts/app.html.slim
View File

@@ -8,10 +8,10 @@ html
title Admin // Daniel Nitsikopoulos title Admin // Daniel Nitsikopoulos
= stylesheet_tag "app" = stylesheet_tag "admin/app"
link rel="icon" type="image/x-icon" href="/assets/favicon.ico" link rel="icon" type="image/x-icon" href="/assets/favicon.ico"
= javascript_tag "app" = javascript_tag "admin/app"
script src="https://unpkg.com/htmx.org@1.9.2/dist/htmx.min.js" integrity="sha384-L6OqL9pRWyyFU3+/bjdSri+iIphTN/bvYyM37tICVyOJkWZLpP2vGn6VUEXgzg6h" crossorigin="anonymous" script src="https://unpkg.com/htmx.org@1.9.2/dist/htmx.min.js" integrity="sha384-L6OqL9pRWyyFU3+/bjdSri+iIphTN/bvYyM37tICVyOJkWZLpP2vGn6VUEXgzg6h" crossorigin="anonymous"
script src="https://cdn.jsdelivr.net/npm/alpinejs@3.12.0/dist/cdn.min.js" defer="true" script src="https://cdn.jsdelivr.net/npm/alpinejs@3.12.0/dist/cdn.min.js" defer="true"

1
slices/micropub/templates/layouts/app.html.erb
View File

@@ -4,7 +4,6 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Adamantium - Micropub</title> <title>Adamantium - Micropub</title>
<%= favicon_tag %>
<%= stylesheet_tag "micropub/app" %> <%= stylesheet_tag "micropub/app" %>
</head> </head>
<body> <body>