diff --git a/app/cmd/routes.go b/app/cmd/routes.go
index 87da777f7..8790da472 100644
--- a/app/cmd/routes.go
+++ b/app/cmd/routes.go
@@ -73,7 +73,7 @@ func routes(r *web.Engine) *web.Engine {
r.Get("/oauth/:provider", handlers.SignInByOAuth())
r.Get("/oauth/:provider/callback", handlers.OAuthCallback())
- //Starting from this step, a Tenant is required
+ // Starting from this step, a Tenant is required
r.Use(middlewares.RequireTenant())
r.Get("/sitemap.xml", handlers.Sitemap())
@@ -98,7 +98,7 @@ func routes(r *web.Engine) *web.Engine {
r.Get("/oauth/:provider/token", handlers.OAuthToken())
r.Get("/oauth/:provider/echo", handlers.OAuthEcho())
- //If tenant is pending, block it from using any other route
+ // If tenant is pending, block it from using any other route
r.Use(middlewares.BlockPendingTenants())
r.Get("/signin", handlers.SignInPage())
@@ -108,7 +108,7 @@ func routes(r *web.Engine) *web.Engine {
r.Post("/_api/signin/complete", handlers.CompleteSignInProfile())
r.Post("/_api/signin", handlers.SignInByEmail())
- //Block if it's private tenant with unauthenticated user
+ // Block if it's private tenant with unauthenticated user
r.Use(middlewares.CheckTenantPrivacy())
r.Get("/", handlers.Index())
@@ -117,12 +117,13 @@ func routes(r *web.Engine) *web.Engine {
ui := r.Group()
{
- //From this step, a User is required
+ // From this step, a User is required
ui.Use(middlewares.IsAuthenticated())
ui.Get("/settings", handlers.UserSettings())
ui.Get("/notifications", handlers.Notifications())
ui.Get("/notifications/:id", handlers.ReadNotification())
+ ui.Get("/_api/notifications/unread", handlers.GetAllNotifications())
ui.Get("/change-email/verify", handlers.VerifyChangeEmailKey())
ui.Delete("/_api/user", handlers.DeleteUser())
@@ -148,7 +149,7 @@ func routes(r *web.Engine) *web.Engine {
ui.Get("/admin/authentication", handlers.ManageAuthentication())
ui.Get("/_api/admin/oauth/:provider", handlers.GetOAuthConfig())
- //From this step, only Administrators are allowed
+ // From this step, only Administrators are allowed
ui.Use(middlewares.IsAuthorized(enum.RoleAdministrator))
ui.Get("/admin/export", handlers.Page("Export · Site Settings", "", "Administration/pages/Export.page"))
diff --git a/app/handlers/notification.go b/app/handlers/notification.go
index f39221785..e00af53ed 100644
--- a/app/handlers/notification.go
+++ b/app/handlers/notification.go
@@ -9,6 +9,18 @@ import (
"github.com/getfider/fider/app/pkg/web"
)
+// GetAllNotifications will get all the notifications for the new modal
+func GetAllNotifications() web.HandlerFunc {
+ return func(c *web.Context) error {
+ q := &query.GetActiveNotifications{}
+ if err := bus.Dispatch(c, q); err != nil {
+ return c.Failure(err)
+ }
+
+ return c.Ok(q.Result)
+ }
+}
+
// TotalUnreadNotifications returns the total number of unread notifications
func TotalUnreadNotifications() web.HandlerFunc {
return func(c *web.Context) error {
@@ -65,7 +77,6 @@ func ReadNotification() web.HandlerFunc {
// ReadAllNotifications marks all unread notifications as read
func ReadAllNotifications() web.HandlerFunc {
return func(c *web.Context) error {
-
if err := bus.Dispatch(c, &cmd.MarkAllNotificationsAsRead{}); err != nil {
return c.Failure(err)
}
diff --git a/app/models/entity/notification.go b/app/models/entity/notification.go
index 385876920..28dc81275 100644
--- a/app/models/entity/notification.go
+++ b/app/models/entity/notification.go
@@ -1,12 +1,21 @@
package entity
-import "time"
+import (
+ "time"
+
+ "github.com/getfider/fider/app/models/enum"
+)
// Notification is the system generated notification entity
type Notification struct {
- ID int `json:"id" db:"id"`
- Title string `json:"title" db:"title"`
- Link string `json:"link" db:"link"`
- Read bool `json:"read" db:"read"`
- CreatedAt time.Time `json:"createdAt" db:"created_at"`
+ ID int `json:"id" db:"id"`
+ Title string `json:"title" db:"title"`
+ Link string `json:"link" db:"link"`
+ Read bool `json:"read" db:"read"`
+ CreatedAt time.Time `json:"createdAt" db:"created_at"`
+ AuthorName string `json:"authorName" db:"name"`
+ AuthorID int `json:"-" db:"author_id"`
+ AvatarBlobKey string `json:"-" db:"avatar_bkey"`
+ AvatarType enum.AvatarType `json:"-" db:"avatar_type"`
+ AvatarURL string `json:"avatarURL,omitempty"`
}
diff --git a/app/pkg/web/testdata/basic.html b/app/pkg/web/testdata/basic.html
index 98ae6191e..d5fa504ff 100755
--- a/app/pkg/web/testdata/basic.html
+++ b/app/pkg/web/testdata/basic.html
@@ -6,6 +6,9 @@
+
+
+
diff --git a/app/pkg/web/testdata/canonical.html b/app/pkg/web/testdata/canonical.html
index 5d52faee9..81b1e2040 100755
--- a/app/pkg/web/testdata/canonical.html
+++ b/app/pkg/web/testdata/canonical.html
@@ -6,6 +6,9 @@
+
+
+
diff --git a/app/pkg/web/testdata/chunk.html b/app/pkg/web/testdata/chunk.html
index bf893eaf1..ab125af24 100644
--- a/app/pkg/web/testdata/chunk.html
+++ b/app/pkg/web/testdata/chunk.html
@@ -6,6 +6,9 @@
+
+
+
diff --git a/app/pkg/web/testdata/home.html b/app/pkg/web/testdata/home.html
index 8cdc49f56..3fe3afec8 100755
--- a/app/pkg/web/testdata/home.html
+++ b/app/pkg/web/testdata/home.html
@@ -6,6 +6,9 @@
+
+
+
diff --git a/app/pkg/web/testdata/home_ssr.html b/app/pkg/web/testdata/home_ssr.html
index 1a16c2a68..52729866a 100755
--- a/app/pkg/web/testdata/home_ssr.html
+++ b/app/pkg/web/testdata/home_ssr.html
@@ -6,6 +6,9 @@
+
+
+
diff --git a/app/pkg/web/testdata/oauth.html b/app/pkg/web/testdata/oauth.html
index 7d9713aeb..fab7303d8 100755
--- a/app/pkg/web/testdata/oauth.html
+++ b/app/pkg/web/testdata/oauth.html
@@ -6,6 +6,9 @@
+
+
+
diff --git a/app/pkg/web/testdata/tenant.html b/app/pkg/web/testdata/tenant.html
index 9c87fac08..8503fd045 100755
--- a/app/pkg/web/testdata/tenant.html
+++ b/app/pkg/web/testdata/tenant.html
@@ -6,6 +6,9 @@
+
+
+
diff --git a/app/pkg/web/testdata/user.html b/app/pkg/web/testdata/user.html
index 99b571dd9..b98c6fa06 100755
--- a/app/pkg/web/testdata/user.html
+++ b/app/pkg/web/testdata/user.html
@@ -6,6 +6,9 @@
+
+
+
diff --git a/app/services/sqlstore/postgres/notification.go b/app/services/sqlstore/postgres/notification.go
index 2e7d0fc50..f5f724b10 100644
--- a/app/services/sqlstore/postgres/notification.go
+++ b/app/services/sqlstore/postgres/notification.go
@@ -102,16 +102,23 @@ func getNotificationByID(ctx context.Context, q *query.GetNotificationByID) erro
func getActiveNotifications(ctx context.Context, q *query.GetActiveNotifications) error {
return using(ctx, func(trx *dbx.Trx, tenant *entity.Tenant, user *entity.User) error {
- q.Result = []*entity.Notification{}
err := trx.Select(&q.Result, `
- SELECT id, title, link, read, created_at
- FROM notifications
- WHERE tenant_id = $1 AND user_id = $2
- AND (read = false OR updated_at > CURRENT_DATE - INTERVAL '30 days')
+ SELECT n.id, n.title, n.link, n.read, n.created_at, n.author_id, u.avatar_type, u.avatar_bkey, u.name
+ FROM notifications n
+ LEFT JOIN users u ON u.id = n.author_id
+ WHERE n.tenant_id = $1 AND n.user_id = $2
+ AND (n.read = false OR n.updated_at > CURRENT_DATE - INTERVAL '30 days')
+ ORDER BY n.updated_at DESC
`, tenant.ID, user.ID)
if err != nil {
return errors.Wrap(err, "failed to get active notifications")
}
+
+ // Iterate over notifications and build avatar URL
+ for i := range q.Result {
+ q.Result[i].AvatarURL = buildAvatarURL(ctx, q.Result[i].AvatarType, int(q.Result[i].AuthorID), q.Result[i].AuthorName, q.Result[i].AvatarBlobKey)
+ }
+
return nil
})
}
diff --git a/e2e/features/server/ssr.feature b/e2e/features/server/ssr.feature
index 3d1fc98b6..497392ee3 100644
--- a/e2e/features/server/ssr.feature
+++ b/e2e/features/server/ssr.feature
@@ -5,7 +5,7 @@ Feature: SSR
And I set the "User-Agent" header to "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36"
When I send the request
Then I should see http status 200
- And I should not see ">Powered by Fider" on the response body
+ And I should not see ">Powered by Fider ⚡" on the response body
And I should see "This website requires JavaScript, please enable and reload the page." on the response body
And I should see "/assets/js/vendor" on the response body
@@ -14,6 +14,6 @@ Feature: SSR
And I set the "User-Agent" header to "Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)"
When I send the request
Then I should see http status 200
- And I should see ">Powered by Fider" on the response body
+ And I should see ">Powered by Fider ⚡" on the response body
And I should not see "This website requires JavaScript, please enable and reload the page." on the response body
And I should not see "/assets/js/vendor" on the response body
diff --git a/locale/de/client.json b/locale/de/client.json
index f8e875e75..d7e268fcc 100644
--- a/locale/de/client.json
+++ b/locale/de/client.json
@@ -3,6 +3,7 @@
"action.change": "ändern",
"action.close": "Schließen",
"action.confirm": "Bestätigen",
+ "action.copylink": "",
"action.delete": "Löschen",
"action.edit": "Bearbeiten",
"action.markallasread": "Alle als gelesen markieren",
@@ -81,6 +82,9 @@
"modal.deleteaccount.text": "<0>Wenn Sie Ihr Konto löschen, werden wir all Ihre persönlichen Daten für immer löschen. Der von Ihnen veröffentlichte Inhalt bleibt erhalten, wird aber anonymisiert.<1>Dieser Prozess ist irreversibel. <2>Sind Sie sicher? ",
"modal.deletecomment.header": "Kommentar löschen",
"modal.deletecomment.text": "Dieser Prozess ist unumkehrbar. <0>Bist du dir sicher?",
+ "modal.notifications.nonew": "",
+ "modal.notifications.previous": "",
+ "modal.notifications.unread": "",
"modal.showvotes.message.zeromatches": "Keine Benutzer gefunden, die <0>{0} entsprechen.",
"modal.showvotes.query.placeholder": "Suche nach Benutzern nach Namen...",
"modal.signin.header": "Melde dich an, um eine neue Idee zu posten",
@@ -127,6 +131,9 @@
"page.pendingactivation.text": "Wir haben Ihnen eine Bestätigungs-E-Mail mit einem Link zur Aktivierung Ihrer Website geschickt.",
"page.pendingactivation.text2": "Bitte überprüfe deinen Posteingang, um ihn zu aktivieren.",
"page.pendingactivation.title": "Dein Account ist nicht aktiviert",
+ "showpost.comment.copylink.error": "",
+ "showpost.comment.copylink.success": "",
+ "showpost.comment.unknownhighlighted": "",
"showpost.commentinput.placeholder": "Kommentar hinzufügen",
"showpost.discussionpanel.emptymessage": "Niemand hat bisher kommentiert.",
"showpost.label.author": "Gepostet von <0/> · <1/>",
diff --git a/locale/el/client.json b/locale/el/client.json
index 371d9fb02..a9984349a 100644
--- a/locale/el/client.json
+++ b/locale/el/client.json
@@ -3,6 +3,7 @@
"action.change": "αλλαγή",
"action.close": "Κλείσιμο",
"action.confirm": "Επιβεβαίωση",
+ "action.copylink": "",
"action.delete": "Διαγραφή",
"action.edit": "Επεξεργασία",
"action.markallasread": "Σήμανση όλων ως αναγνωσμένων",
@@ -81,6 +82,9 @@
"modal.deleteaccount.text": "<0>Όταν επιλέξετε να διαγράψετε τον λογαριασμό σας, θα διαγράψουμε για πάντα όλες τις προσωπικές σας πληροφορίες. Το περιεχόμενο που δημοσιεύσατε θα παραμείνει, αλλά θα είναι ανώνυμο.<1>Αυτή η διαδικασία είναι μη αναστρέψιμη. <2>Είστε σίγουρος;",
"modal.deletecomment.header": "Διαγραφή Σχολίου",
"modal.deletecomment.text": "Αυτή η διαδικασία είναι μη αναστρέψιμη. <0>Είστε σίγουρος;",
+ "modal.notifications.nonew": "",
+ "modal.notifications.previous": "",
+ "modal.notifications.unread": "",
"modal.showvotes.message.zeromatches": "Δεν βρέθηκαν χρήστες που να ταιριάζουν <0>{0}.",
"modal.showvotes.query.placeholder": "Αναζήτηση χρηστών με όνομα...",
"modal.signin.header": "Συνδεθείτε για να συμμετάσχετε και να ψηφίσετε",
@@ -127,6 +131,9 @@
"page.pendingactivation.text": "Σας στείλαμε ένα email επιβεβαίωσης με ένα σύνδεσμο για να ενεργοποιήσετε τον ιστότοπό σας.",
"page.pendingactivation.text2": "Παρακαλώ ελέγξτε τα εισερχόμενά σας για να το ενεργοποιήσετε.",
"page.pendingactivation.title": "Ο λογαριασμός σας εκκρεμεί ενεργοποίηση",
+ "showpost.comment.copylink.error": "",
+ "showpost.comment.copylink.success": "",
+ "showpost.comment.unknownhighlighted": "",
"showpost.commentinput.placeholder": "Αφήστε ένα σχόλιο",
"showpost.discussionpanel.emptymessage": "Κανείς δεν έχει σχολιάσει ακόμα.",
"showpost.label.author": "Δημοσιεύτηκε από <0/> · <1/>",
diff --git a/locale/en/client.json b/locale/en/client.json
index 21112eff3..4fd1b1ec6 100644
--- a/locale/en/client.json
+++ b/locale/en/client.json
@@ -82,6 +82,9 @@
"modal.deleteaccount.text": "<0>When you choose to delete your account, we will erase all your personal information forever. The content you have published will remain, but it will be anonymised.<1>This process is irreversible. <2>Are you sure?",
"modal.deletecomment.header": "Delete Comment",
"modal.deletecomment.text": "This process is irreversible. <0>Are you sure?",
+ "modal.notifications.nonew": "No new notifications",
+ "modal.notifications.previous": "Previous notifications",
+ "modal.notifications.unread": "Unread notifications",
"modal.showvotes.message.zeromatches": "No users found matching <0>{0}.",
"modal.showvotes.query.placeholder": "Search for users by name...",
"modal.signin.header": "Sign in to participate and vote",
diff --git a/locale/es-ES/client.json b/locale/es-ES/client.json
index 9fa7d186a..a3d595c88 100644
--- a/locale/es-ES/client.json
+++ b/locale/es-ES/client.json
@@ -3,6 +3,7 @@
"action.change": "cambiar",
"action.close": "Cerrar",
"action.confirm": "Confirmar",
+ "action.copylink": "",
"action.delete": "Eliminar",
"action.edit": "Editar",
"action.markallasread": "Marcar Todo como Leído",
@@ -81,6 +82,9 @@
"modal.deleteaccount.text": "<0>Cuando decides eliminar tu cuenta, borraremos toda tu información personal para siempre. El contenido que has publicado permanecerá, pero será anónimo.<1>Este proceso es irreversible. <2>¿Estás seguro?",
"modal.deletecomment.header": "Eliminar Comentario",
"modal.deletecomment.text": "Este proceso es irreversible. <0>¿Estás seguro?",
+ "modal.notifications.nonew": "",
+ "modal.notifications.previous": "",
+ "modal.notifications.unread": "",
"modal.showvotes.message.zeromatches": "No se encontraron usuarios que coincidan con <0>{0}.",
"modal.showvotes.query.placeholder": "Buscar usuarios por nombre...",
"modal.signin.header": "Inicia sesión para publicar y votar",
@@ -127,6 +131,9 @@
"page.pendingactivation.text": "Te hemos enviado un correo electrónico de confirmación con un enlace para activar tu sitio.",
"page.pendingactivation.text2": "Por favor, revisa tu bandeja de entrada para activarla.",
"page.pendingactivation.title": "Tu cuenta está pendiente de activación",
+ "showpost.comment.copylink.error": "",
+ "showpost.comment.copylink.success": "",
+ "showpost.comment.unknownhighlighted": "",
"showpost.commentinput.placeholder": "Publica un comentario",
"showpost.discussionpanel.emptymessage": "Nadie ha comentado todavía.",
"showpost.label.author": "Publicado por <0/> · <1/>",
diff --git a/locale/fr/client.json b/locale/fr/client.json
index 58293a999..af64d6359 100644
--- a/locale/fr/client.json
+++ b/locale/fr/client.json
@@ -3,6 +3,7 @@
"action.change": "changer",
"action.close": "Fermer",
"action.confirm": "Confirmer",
+ "action.copylink": "",
"action.delete": "Supprimer",
"action.edit": "Modifier",
"action.markallasread": "Tout marquer comme lu",
@@ -81,6 +82,9 @@
"modal.deleteaccount.text": "<0>Lorsque vous choisissez de supprimer votre compte, nous effacerons définitivement toutes vos informations personnelles. Le contenu que vous avez publié restera, mais il sera anonyme.<1>Ce processus est irréversible. <2>Êtes-vous sûr ?",
"modal.deletecomment.header": "Supprimer le commentaire",
"modal.deletecomment.text": "Ce processus est irréversible. <0>Êtes-vous sûr ?",
+ "modal.notifications.nonew": "",
+ "modal.notifications.previous": "",
+ "modal.notifications.unread": "",
"modal.showvotes.message.zeromatches": "Aucun utilisateur correspondant à <0>{0}.",
"modal.showvotes.query.placeholder": "Rechercher des utilisateurs par nom...",
"modal.signin.header": "Connectez-vous pour poster et voter",
@@ -127,6 +131,9 @@
"page.pendingactivation.text": "Nous vous avons envoyé un e-mail de confirmation avec un lien pour activer votre site.",
"page.pendingactivation.text2": "Veuillez vérifier votre boîte de réception pour l'activer.",
"page.pendingactivation.title": "Votre compte n'est pas activé",
+ "showpost.comment.copylink.error": "",
+ "showpost.comment.copylink.success": "",
+ "showpost.comment.unknownhighlighted": "",
"showpost.commentinput.placeholder": "Rédiger un commentaire",
"showpost.discussionpanel.emptymessage": "Personne n'a encore commenté.",
"showpost.label.author": "Posté par <0/> · <1/>",
diff --git a/locale/nl/client.json b/locale/nl/client.json
index 1f1233c91..e881681b1 100644
--- a/locale/nl/client.json
+++ b/locale/nl/client.json
@@ -3,6 +3,7 @@
"action.change": "aanpassen",
"action.close": "Sluiten",
"action.confirm": "Bevestigen",
+ "action.copylink": "",
"action.delete": "Verwijderen",
"action.edit": "Bewerken",
"action.markallasread": "Markeer alles als gelezen",
@@ -81,6 +82,9 @@
"modal.deleteaccount.text": "<0>Als je ervoor kiest om je account te verwijderen, verwijderen we al je persoonlijke gegevens voor altijd. De inhoud die je hebt geplaatst blijft bestaan, maar zal geanonimiseerd worden.<1>Dit proces is onomkeerbaar. <2>Weet je het zeker?",
"modal.deletecomment.header": "Reactie verwijderen",
"modal.deletecomment.text": "Dit proces is onomkeerbaar. <0>Weet je het zeker?",
+ "modal.notifications.nonew": "",
+ "modal.notifications.previous": "",
+ "modal.notifications.unread": "",
"modal.showvotes.message.zeromatches": "Geen gebruikers gevonden voor <0>{0}.",
"modal.showvotes.query.placeholder": "Zoek gebruikers op naam...",
"modal.signin.header": "Log in om een bericht achter te laten en om te stemmen",
@@ -127,6 +131,9 @@
"page.pendingactivation.text": "We hebben je een bevestigingsmail gestuurd met een link om jouw site te activeren.",
"page.pendingactivation.text2": "Controleer je inbox om het te activeren.",
"page.pendingactivation.title": "Je account is nog niet geactiveerd",
+ "showpost.comment.copylink.error": "",
+ "showpost.comment.copylink.success": "",
+ "showpost.comment.unknownhighlighted": "",
"showpost.commentinput.placeholder": "Laat een reactie achter",
"showpost.discussionpanel.emptymessage": "Nog niemand heeft gereageerd.",
"showpost.label.author": "Geplaatst door <0/> · <1/>",
diff --git a/locale/pl/client.json b/locale/pl/client.json
index ee8409f03..5c5bc1c90 100644
--- a/locale/pl/client.json
+++ b/locale/pl/client.json
@@ -3,6 +3,7 @@
"action.change": "zmień",
"action.close": "Zamknij",
"action.confirm": "Potwierdź",
+ "action.copylink": "",
"action.delete": "Usuń",
"action.edit": "Edytuj",
"action.markallasread": "Oznacz wszystkie jako przeczytane",
@@ -81,6 +82,9 @@
"modal.deleteaccount.text": "<0>Jeśli zdecydujesz na usunięcie swojego konta, na zawsze usuniemy wszystkie Twoje dane osobowe. Opublikowana zawartość pozostanie na stronie, ale zostanie anonimowa.<1>Ten proces jest nieodwracalny. <2>Czy jesteś pewien?",
"modal.deletecomment.header": "Usuń komentarz",
"modal.deletecomment.text": "Ten proces jest nieodwracalny. <0>Czy jesteś pewien?",
+ "modal.notifications.nonew": "",
+ "modal.notifications.previous": "",
+ "modal.notifications.unread": "",
"modal.showvotes.message.zeromatches": "Nie znaleziono użytkowników pasujących do <0>{0}.",
"modal.showvotes.query.placeholder": "Wyszukaj użytkowników według nazwy...",
"modal.signin.header": "Zaloguj się aby pisać i głosować",
@@ -127,6 +131,9 @@
"page.pendingactivation.text": "Wysłaliśmy do Ciebie maila z linkiem do aktywowania Twojej strony.",
"page.pendingactivation.text2": "Sprawdź swoją skrzynkę odbiorczą, aby ją aktywować.",
"page.pendingactivation.title": "Twoje konto oczekuje na aktywację",
+ "showpost.comment.copylink.error": "",
+ "showpost.comment.copylink.success": "",
+ "showpost.comment.unknownhighlighted": "",
"showpost.commentinput.placeholder": "Skomentuj",
"showpost.discussionpanel.emptymessage": "Wygląda na to, że nikt jeszcze nie skomentował.",
"showpost.label.author": "Wysłane przez <0/> · <1/>",
diff --git a/locale/pt-BR/client.json b/locale/pt-BR/client.json
index 96e0c68d5..a7439d8cf 100644
--- a/locale/pt-BR/client.json
+++ b/locale/pt-BR/client.json
@@ -3,6 +3,7 @@
"action.change": "alterar",
"action.close": "Fechar",
"action.confirm": "Confirmar",
+ "action.copylink": "",
"action.delete": "Deletar",
"action.edit": "Editar",
"action.markallasread": "Marcar todas como lidas",
@@ -81,6 +82,9 @@
"modal.deleteaccount.text": "<0>Quando você optar por excluir sua conta, todas as suas informações pessoais serão removidas para sempre. O conteúdo que você publicou permanecerá, mas será anonimizado.<1>Esse processo é irreversível. <2>Você tem certeza?",
"modal.deletecomment.header": "Excluir comentário",
"modal.deletecomment.text": "Este processo é irreversível. <0>Tem certeza?",
+ "modal.notifications.nonew": "",
+ "modal.notifications.previous": "",
+ "modal.notifications.unread": "",
"modal.showvotes.message.zeromatches": "Nenhum usuário encontrado para <0>{0}.",
"modal.showvotes.query.placeholder": "Procurar usuários por nome...",
"modal.signin.header": "Faça login para participar e votar",
@@ -127,6 +131,9 @@
"page.pendingactivation.text": "Enviamos a você um e-mail de confirmação com um link para ativar o seu site.",
"page.pendingactivation.text2": "Verifique sua caixa de entrada para ativá-la.",
"page.pendingactivation.title": "Sua conta está com ativação pendente",
+ "showpost.comment.copylink.error": "",
+ "showpost.comment.copylink.success": "",
+ "showpost.comment.unknownhighlighted": "",
"showpost.commentinput.placeholder": "Deixe um comentário",
"showpost.discussionpanel.emptymessage": "Ninguém comentou ainda.",
"showpost.label.author": "Publicado por <0/> · <1/>",
diff --git a/locale/ru/client.json b/locale/ru/client.json
index 7cafb1ada..a1cf12c62 100644
--- a/locale/ru/client.json
+++ b/locale/ru/client.json
@@ -3,6 +3,7 @@
"action.change": "изменить",
"action.close": "Закрыть",
"action.confirm": "Подтвердить",
+ "action.copylink": "",
"action.delete": "Удалить",
"action.edit": "Изменить",
"action.markallasread": "Отметить всё как прочитанное",
@@ -81,6 +82,9 @@
"modal.deleteaccount.text": "<0>Если нужно, мы удалим всю информацию о вашем аккаунте навсегда. Всё, что вы публиковали, останется, но будет анонимизировано.<1>Это действие необратимо. <2>Вы уверены?",
"modal.deletecomment.header": "Удалить комментарий",
"modal.deletecomment.text": "Это действие необратимо. <0>Вы уверены?",
+ "modal.notifications.nonew": "",
+ "modal.notifications.previous": "",
+ "modal.notifications.unread": "",
"modal.showvotes.message.zeromatches": "Не удалось найти пользователей с <0>{0}.",
"modal.showvotes.query.placeholder": "Найдите пользователей по их имени...",
"modal.signin.header": "Войдите, чтобы создавать посты и голосовать",
@@ -127,6 +131,9 @@
"page.pendingactivation.text": "Мы отправили вам письмо со ссылкой для активации этого сайта.",
"page.pendingactivation.text2": "Проверьте свою почту, чтобы продолжить.",
"page.pendingactivation.title": "Ваш аккаунт ожидает подтверждения",
+ "showpost.comment.copylink.error": "",
+ "showpost.comment.copylink.success": "",
+ "showpost.comment.unknownhighlighted": "",
"showpost.commentinput.placeholder": "Оставить комментарий",
"showpost.discussionpanel.emptymessage": "Комментариев нет.",
"showpost.label.author": "Создал <0/> · <1/>",
diff --git a/locale/sk/client.json b/locale/sk/client.json
index a034368de..d60077174 100644
--- a/locale/sk/client.json
+++ b/locale/sk/client.json
@@ -3,6 +3,7 @@
"action.change": "zmeniť",
"action.close": "Zavrieť",
"action.confirm": "Potvrdiť",
+ "action.copylink": "",
"action.delete": "Vymazať",
"action.edit": "Upraviť",
"action.markallasread": "Označiť všetko ako prečítané",
@@ -81,6 +82,9 @@
"modal.deleteaccount.text": "<0>Keď sa rozhodnete odstrániť svoj účet, všetky vaše osobné informácie navždy vymažeme. Obsah, ktorý ste zverejnili, zostane, ale bude anonymizovaný. <1> Tento proces je nevratný.<2>Ste si istí?",
"modal.deletecomment.header": "Odstrániť komentár",
"modal.deletecomment.text": "Tento proces je nevratný. <0>Ste si istí?",
+ "modal.notifications.nonew": "",
+ "modal.notifications.previous": "",
+ "modal.notifications.unread": "",
"modal.showvotes.message.zeromatches": "Nenašli sa žiadni používatelia <0>{0}.",
"modal.showvotes.query.placeholder": "Vyhľadajte používateľov podľa mena...",
"modal.signin.header": "Prihláste sa, aby ste mohli pridávať príspevky a hlasovať",
@@ -127,6 +131,9 @@
"page.pendingactivation.text": "Poslali sme vám potvrdzovací email s odkazom na aktiváciu vašich stránok.",
"page.pendingactivation.text2": "Aktivujte prosím svoju doručenú poštu.",
"page.pendingactivation.title": "Váš účet čaká na aktiváciu",
+ "showpost.comment.copylink.error": "",
+ "showpost.comment.copylink.success": "",
+ "showpost.comment.unknownhighlighted": "",
"showpost.commentinput.placeholder": "Zanechať komentár",
"showpost.discussionpanel.emptymessage": "Zatiaľ sa nikto nevyjadril.",
"showpost.label.author": "Pridané <0/> · <1/>",
diff --git a/locale/sv-SE/client.json b/locale/sv-SE/client.json
index 2096a2fea..56ee466a3 100644
--- a/locale/sv-SE/client.json
+++ b/locale/sv-SE/client.json
@@ -3,6 +3,7 @@
"action.change": "ändra",
"action.close": "Stäng",
"action.confirm": "Bekräfta",
+ "action.copylink": "",
"action.delete": "Radera",
"action.edit": "Ändra",
"action.markallasread": "Markera alla som lästa",
@@ -81,6 +82,9 @@
"modal.deleteaccount.text": "<0>När du väljer att radera ditt konto kommer vi att radera all din personliga information för evigt. Innehållet du har publicerat kommer att finnas kvar, men det kommer att vara anonymiserat.<1>Denna process är oåterkallelig. <2>Är du säker?",
"modal.deletecomment.header": "Radera kommentar",
"modal.deletecomment.text": "Denna process är oåterkallelig. <0>Är du säker?",
+ "modal.notifications.nonew": "",
+ "modal.notifications.previous": "",
+ "modal.notifications.unread": "",
"modal.showvotes.message.zeromatches": "Inga användare hittades som matchar <0>{0}.",
"modal.showvotes.query.placeholder": "Sök efter användare med namn...",
"modal.signin.header": "Logga in för att skriva inlägg och rösta",
@@ -127,6 +131,9 @@
"page.pendingactivation.text": "Vi har skickat ett bekräftelsemail med en länk för att aktivera din webbplats.",
"page.pendingactivation.text2": "Kontrollera din inkorg för att aktivera den.",
"page.pendingactivation.title": "Ditt konto väntar på aktivering",
+ "showpost.comment.copylink.error": "",
+ "showpost.comment.copylink.success": "",
+ "showpost.comment.unknownhighlighted": "",
"showpost.commentinput.placeholder": "Skriv en kommentar",
"showpost.discussionpanel.emptymessage": "Ingen har kommenterat ännu.",
"showpost.label.author": "Skriven av <0/> · <1/>",
diff --git a/locale/tr/client.json b/locale/tr/client.json
index 00529164e..3d0083f41 100644
--- a/locale/tr/client.json
+++ b/locale/tr/client.json
@@ -3,6 +3,7 @@
"action.change": "değiştir",
"action.close": "Kapat",
"action.confirm": "Onayla",
+ "action.copylink": "",
"action.delete": "Sil",
"action.edit": "Düzenle",
"action.markallasread": "Tümünü Okundu olarak işaretle",
@@ -81,6 +82,9 @@
"modal.deleteaccount.text": "<0>Hesabınızı kaldırdığınız zaman size ait bütün kişisel bilgileri kalıcı olarak sileceğiz. Yayınladığınız öneriler sitede anonim olarak kalmaya devam edecek.<1>Bu geri alınamaz bir işlemdir. <2>Devam etmek istiyor musunuz?",
"modal.deletecomment.header": "Yorumu Sil",
"modal.deletecomment.text": "Bu geri alınamaz bir işlemdir. <0>Emin misiniz?",
+ "modal.notifications.nonew": "",
+ "modal.notifications.previous": "",
+ "modal.notifications.unread": "",
"modal.showvotes.message.zeromatches": "Eşleşen kullanıcı bulunamadı <0>{0}.",
"modal.showvotes.query.placeholder": "Kullanıcıları ismiyle arayın...",
"modal.signin.header": "Öneride bulunmak ve oy vermek için giriş yapın",
@@ -127,6 +131,9 @@
"page.pendingactivation.text": "Size, sayfanız için aktivasyon bağlantısı barındıran bir onay e-postası gönderdik.",
"page.pendingactivation.text2": "Aktivasyon için lütfen gelen kutunuzu kontrol edin.",
"page.pendingactivation.title": "Hesabınız aktivasyon beklemektedir",
+ "showpost.comment.copylink.error": "",
+ "showpost.comment.copylink.success": "",
+ "showpost.comment.unknownhighlighted": "",
"showpost.commentinput.placeholder": "Yorum yazın",
"showpost.discussionpanel.emptymessage": "Henüz hiç kimse yorum yapmadı.",
"showpost.label.author": "<0/> · <1/> tarafından gönderildi",
diff --git a/public/assets/styles/reset.scss b/public/assets/styles/reset.scss
index 45670f2e7..9d3b9cb2e 100644
--- a/public/assets/styles/reset.scss
+++ b/public/assets/styles/reset.scss
@@ -16,7 +16,7 @@ body {
overflow-x: hidden;
min-width: 320px;
color: get("colors.gray.900");
- background-color: get("colors.white");
+ background-color: get("colors.gray.100");
font-size: get("font.size.base");
font-family: $font-base;
}
diff --git a/public/assets/styles/utility/display.scss b/public/assets/styles/utility/display.scss
index 814c5db7e..30ca95ec8 100644
--- a/public/assets/styles/utility/display.scss
+++ b/public/assets/styles/utility/display.scss
@@ -63,6 +63,13 @@
}
}
+.box {
+ border-radius: get("border.radius.large");
+ background-color: get("colors.white");
+ border: 1px solid get("colors.gray.200");
+ padding: spacing(4);
+}
+
.flex {
display: flex;
}
@@ -176,6 +183,10 @@
visibility: hidden;
}
+.bt {
+ border-top: 1px solid;
+}
+
.overflow-scroll {
overflow: scroll;
}
@@ -196,3 +207,9 @@
cursor: pointer;
pointer-events: inherit;
}
+
+.hover {
+ &:hover {
+ background-color: get("colors.gray.100");
+ }
+}
diff --git a/public/assets/styles/utility/page.scss b/public/assets/styles/utility/page.scss
index d8c8b9fb8..b6b31e8cb 100644
--- a/public/assets/styles/utility/page.scss
+++ b/public/assets/styles/utility/page.scss
@@ -5,7 +5,7 @@
}
.page {
- padding-top: spacing(4);
+ padding-top: spacing(5);
padding-bottom: spacing(4);
}
diff --git a/public/assets/styles/utility/text.scss b/public/assets/styles/utility/text.scss
index bbafbc6f6..9cc2fc946 100644
--- a/public/assets/styles/utility/text.scss
+++ b/public/assets/styles/utility/text.scss
@@ -10,8 +10,8 @@ pre:last-child {
}
.text-display2 {
- font-size: get("font.size.2xl");
- font-weight: get("font.weight.bold");
+ font-size: get("font.size.xl");
+ font-weight: get("font.weight.medium");
letter-spacing: -1px;
}
@@ -20,11 +20,21 @@ pre:last-child {
font-weight: get("font.weight.semibold");
}
+.text-header {
+ font-size: get("font.size.xl");
+ font-weight: get("font.weight.medium");
+}
+
.text-title {
font-size: get("font.size.lg");
font-weight: get("font.weight.medium");
}
+.text-subtitle {
+ font-size: get("font.size.base");
+ font-weight: get("font.weight.medium");
+}
+
.text-body {
font-size: get("font.size.base");
}
@@ -49,6 +59,12 @@ pre:last-child {
color: get("colors.blue.600");
}
+.nowrap {
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+
.text-link:hover {
color: get("colors.blue.800");
text-decoration: underline;
diff --git a/public/assets/styles/variables/_text.scss b/public/assets/styles/variables/_text.scss
index f24cf6bd9..8d8ca00ef 100644
--- a/public/assets/styles/variables/_text.scss
+++ b/public/assets/styles/variables/_text.scss
@@ -1,4 +1,4 @@
-$font-base: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif,
+$font-base: 'Inter', ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", "Helvetica Neue", Arial, "Noto Sans", sans-serif,
"Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
$font-code: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
diff --git a/public/components/Header.tsx b/public/components/Header.tsx
index b4c754677..65a240f37 100644
--- a/public/components/Header.tsx
+++ b/public/components/Header.tsx
@@ -16,14 +16,14 @@ export const Header = () => {
const hideModal = () => setIsSignInModalOpen(false)
return (
-