shibao/memEx
1
1
Fork 0
Code Issues 5 Pull Requests Projects Releases 16 Wiki Activity

Compare commits

base: shibao:41b9d87278898429250a92f4c52331f08ee275d4
Branches Tags
shibao:dev
shibao:stable
shibao:0.1.15
shibao:0.1.14
shibao:0.1.13
shibao:0.1.12
shibao:0.1.11
shibao:0.1.10
shibao:0.1.9
shibao:0.1.8
shibao:0.1.7
shibao:0.1.6
shibao:0.1.5
shibao:0.1.4
shibao:0.1.3
shibao:0.1.2
shibao:0.1.1
shibao:0.1.0
..
compare: shibao:fe91d8de6d46e8f21fd91c0538f17b4834cce801
Branches Tags
shibao:dev
shibao:stable
shibao:0.1.15
shibao:0.1.14
shibao:0.1.13
shibao:0.1.12
shibao:0.1.11
shibao:0.1.10
shibao:0.1.9
shibao:0.1.8
shibao:0.1.7
shibao:0.1.6
shibao:0.1.5
shibao:0.1.4
shibao:0.1.3
shibao:0.1.2
shibao:0.1.1
shibao:0.1.0

4 Commits
41b9d87278 ... fe91d8de6d

Author SHA1 Message Date
shibao
fe91d8de6d add german
All checks were successful
continuous-integration/drone/push Build is passing
Details
2022-11-27 13:02:32 -05:00
shibao
7fe636a99e restyle emails
All checks were successful
continuous-integration/drone/push Build is passing
Details
2022-11-27 12:59:16 -05:00
shibao
a94407a216 fix bug with email
All checks were successful
continuous-integration/drone/push Build is passing
Details
2022-11-27 12:06:26 -05:00
shibao
70de3f42a4 attempt to fix libcrypto error
Some checks are pending
continuous-integration/drone/push Build is running
Details
2022-11-27 11:49:17 -05:00
6 changed files with 21 additions and 21 deletions
Show Stats Expand all files Collapse all files

4
Dockerfile
View File

@ -1,4 +1,4 @@
FROM elixir:1.14-alpine AS build FROM elixir:1.14.1-alpine AS build
# install build dependencies # install build dependencies
RUN apk add --no-cache build-base npm git python3 RUN apk add --no-cache build-base npm git python3
@ -37,7 +37,7 @@ RUN mix do compile, release
FROM alpine:latest AS app FROM alpine:latest AS app
RUN apk upgrade --no-cache && \ RUN apk upgrade --no-cache && \
apk add --no-cache bash openssl libgcc libstdc++ ncurses-libs apk add --no-cache bash openssl libssl1.1 libcrypto1.1 libgcc libstdc++ ncurses-libs
WORKDIR /app WORKDIR /app

4
config/runtime.exs
View File

@ -62,7 +62,7 @@ if config_env() == :prod do
System.get_env("SECRET_KEY_BASE") || System.get_env("SECRET_KEY_BASE") ||
raise """ raise """
environment variable SECRET_KEY_BASE is missing. environment variable SECRET_KEY_BASE is missing.
You can generate one by calling: mix phx.gen.secret You can generate one by running: mix phx.gen.secret
""" """
config :memex, MemexWeb.Endpoint, secret_key_base: secret_key_base config :memex, MemexWeb.Endpoint, secret_key_base: secret_key_base
@ -79,7 +79,7 @@ if config_env() == :prod do
password: System.get_env("SMTP_PASSWORD") || raise("No SMTP_PASSWORD set!"), password: System.get_env("SMTP_PASSWORD") || raise("No SMTP_PASSWORD set!"),
ssl: System.get_env("SMTP_SSL") == "true", ssl: System.get_env("SMTP_SSL") == "true",
email_from: System.get_env("EMAIL_FROM") || "no-reply@#{System.get_env("HOST")}", email_from: System.get_env("EMAIL_FROM") || "no-reply@#{System.get_env("HOST")}",
email_name: System.get_env("EMAIL_NAME") || "Memex" email_name: System.get_env("EMAIL_NAME") || "memEx"
# ## Using releases # ## Using releases
# #

4
lib/memex/accounts/email.ex
View File

@ -19,8 +19,8 @@ defmodule Memex.Email do
@spec base_email(User.t(), String.t()) :: t() @spec base_email(User.t(), String.t()) :: t()
defp base_email(%User{email: email}, subject) do defp base_email(%User{email: email}, subject) do
from = Application.get_env(:Memex, Memex.Mailer)[:email_from] || "noreply@localhost" from = Application.get_env(:memex, Memex.Mailer)[:email_from] || "noreply@localhost"
name = Application.get_env(:Memex, Memex.Mailer)[:email_name] name = Application.get_env(:memex, Memex.Mailer)[:email_name]
new() |> to(email) |> from({name, from}) |> subject(subject) new() |> to(email) |> from({name, from}) |> subject(subject)
end end

8
lib/memex_web/templates/layout/email.html.heex
View File

@ -4,15 +4,15 @@
<%= @email.subject %> <%= @email.subject %>
</title> </title>
</head> </head>
<body style="padding: 2em; color: rgb(31, 31, 31); background-color: rgb(220, 220, 228); font-family: 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif; text-align: center;"> <body style="padding: 2em; color: rgb(161, 161, 170); background-color: rgb(39, 39, 42); font-family: 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif; text-align: center;">
<%= @inner_content %> <%= @inner_content %>
<hr style="margin: 2em auto; border-width: 1px; border-color: rgb(212, 212, 216); width: 100%; max-width: 42rem;" /> <hr style="margin: 2em auto; border-width: 1px; border-color: rgb(161, 161, 170); width: 100%; max-width: 42rem;" />
<a style="color: rgb(31, 31, 31);" href={Routes.live_url(Endpoint, HomeLive)}> <a style="color: rgb(161, 161, 170);" href={Routes.live_url(Endpoint, HomeLive)}>
<%= dgettext( <%= dgettext(
"emails", "emails",
"This email was sent from Memex, the self-hosted firearm tracker website." "This email was sent from memEx"
) %> ) %>
</a> </a>
</body> </body>

2
lib/memex_web/templates/layout/email.txt.eex
View File

@ -7,5 +7,5 @@
===================== =====================
<%= dgettext("emails", <%= dgettext("emails",
"This email was sent from Memex at %{url}, the self-hosted firearm tracker website.", "This email was sent from memEx at %{url}",
url: Routes.live_url(Endpoint, HomeLive)) %> url: Routes.live_url(Endpoint, HomeLive)) %>

20
priv/gettext/emails.pot
View File

@ -52,16 +52,6 @@ msgstr ""
msgid "Reset your Memex password" msgid "Reset your Memex password"
msgstr "" msgstr ""
#: lib/memex_web/templates/layout/email.txt.eex:9
#, elixir-autogen, elixir-format
msgid "This email was sent from Memex at %{url}, the self-hosted firearm tracker website."
msgstr ""
#: lib/memex_web/templates/layout/email.html.heex:13
#, elixir-autogen, elixir-format
msgid "This email was sent from Memex, the self-hosted firearm tracker website."
msgstr ""
#: lib/memex/accounts/email.ex:44 #: lib/memex/accounts/email.ex:44
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "Update your Memex email" msgid "Update your Memex email"
@ -90,3 +80,13 @@ msgstr ""
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "You can reset your password by visiting the URL below:" msgid "You can reset your password by visiting the URL below:"
msgstr "" msgstr ""
#: lib/memex_web/templates/layout/email.html.heex:13
#, elixir-autogen, elixir-format
msgid "This email was sent from memEx"
msgstr ""
#: lib/memex_web/templates/layout/email.txt.eex:9
#, elixir-autogen, elixir-format
msgid "This email was sent from memEx at %{url}"
msgstr ""