encrypt/gancio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor

Browse Source
This commit is contained in:
les
2019-10-02 21:05:15 +02:00
parent ee1b86e36c
commit 61dbaa147e
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/api/controller/user.js
View File

@@ -184,7 +184,7 @@ const userController = {
if (!recover_code) { return res.sendStatus(400) } if (!recover_code) { return res.sendStatus(400) }
const user = await User.findOne({ where: { recover_code: { [Op.eq]: recover_code } } }) const user = await User.findOne({ where: { recover_code: { [Op.eq]: recover_code } } })
if (!user) { return res.sendStatus(400) } if (!user) { return res.sendStatus(400) }
res.sendStatus(200) res.sendStatus(200)
}, },
async updatePasswordWithRecoverCode (req, res) { async updatePasswordWithRecoverCode (req, res) {
@@ -204,7 +204,7 @@ const userController = {
async current (req, res) { async current (req, res) {
if (!req.user) return res.status(400).send('Not logged') if (!req.user) return res.status(400).send('Not logged')
const user = await User.findByPk(req.user.id, { include: { model: FedUsers, as: 'followers' } }) const user = await User.findByPk(req.user.id, { include: { model: FedUsers, as: 'followers' } })
res.json(user) res.json(user)
}, },
async getAll (req, res) { async getAll (req, res) {

6
server/emails/event/html.pug
View File

@@ -1,8 +1,8 @@
extends ../layout.pug extends ../layout.pug
block content block content
h3 #{event.title} h3 #{event.title}
p Dove: #{event.place.name} - #{event.place.address} p 📍 Dove: #{event.place.name} - #{event.place.address}
p Quando: #{datetime(event.start_datetime)} p ⏰ Quando: #{datetime(event.start_datetime)}
br br
if event.image_path if event.image_path
<center> <center>
@@ -16,6 +16,6 @@ block content
<a href="#{config.baseurl}/event/#{event.id}">#{config.baseurl}/event/#{event.id}</a> <a href="#{config.baseurl}/event/#{event.id}">#{config.baseurl}/event/#{event.id}</a>
hr hr
if to_confirm if to_confirm
p Puoi confermare questo evento <a href="#{config.baseurl}/admin/confirm/#{event.id}">qui</a> p Puoi confermare questo evento premendo il tasto conferma a <a href="#{config.baseurl}/event/#{event.id}">questa pagina</a>
else else
p Puoi eliminare queste notifiche <a href="#{config.baseurl}/del_notification/#{notification.remove_code}">qui</a> p Puoi eliminare queste notifiche <a href="#{config.baseurl}/del_notification/#{notification.remove_code}">qui</a>

4
server/emails/layout.pug
View File

@@ -8,6 +8,4 @@ html(lang="en")
body body
block content block content
hr hr
small #{config.title} / #{config.description} small <a href="#{config.baseurl}">#{config.title}</a> / #{config.description}
br
<a href='#{config.baseurl}'> #{config.baseurl}</a>

4
views/feed/rss.pug
View File

@@ -1,10 +1,10 @@
doctype xml doctype xml
rss(version='2.0') rss(version='2.0' xmlns:atom="http://www.w3.org/2005/Atom")
channel channel
atom:link(href="#{config.baseurl}/feed/rss" rel="self" type="application/rss+xml")
title #{config.title} title #{config.title}
link #{config.baseurl} link #{config.baseurl}
description #{config.description} description #{config.description}
language #{config.locale}
each event in events each event in events
item item
title [#{moment.unix(event.start_datetime).utc(false).format("YY-MM-DD")}] #{event.title} @#{event.place.name} title [#{moment.unix(event.start_datetime).utc(false).format("YY-MM-DD")}] #{event.title} @#{event.place.name}