Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
les
gancio
Commits
61dbaa14
Commit
61dbaa14
authored
Oct 02, 2019
by
les
Browse files
minor
parent
ee1b86e3
Changes
4
Hide whitespace changes
Inline
Side-by-side
server/api/controller/user.js
View file @
61dbaa14
...
...
@@ -184,7 +184,7 @@ const userController = {
if
(
!
recover_code
)
{
return
res
.
sendStatus
(
400
)
}
const
user
=
await
User
.
findOne
({
where
:
{
recover_code
:
{
[
Op
.
eq
]:
recover_code
}
}
})
if
(
!
user
)
{
return
res
.
sendStatus
(
400
)
}
res
.
sendStatus
(
200
)
res
.
sendStatus
(
200
)
},
async
updatePasswordWithRecoverCode
(
req
,
res
)
{
...
...
@@ -204,7 +204,7 @@ const userController = {
async
current
(
req
,
res
)
{
if
(
!
req
.
user
)
return
res
.
status
(
400
).
send
(
'
Not logged
'
)
const
user
=
await
User
.
findByPk
(
req
.
user
.
id
,
{
include
:
{
model
:
FedUsers
,
as
:
'
followers
'
}
})
res
.
json
(
user
)
res
.
json
(
user
)
},
async
getAll
(
req
,
res
)
{
...
...
server/emails/event/html.pug
View file @
61dbaa14
extends ../layout.pug
block content
h3 #{event.title}
p Dove: #{event.place.name} - #{event.place.address}
p Quando: #{datetime(event.start_datetime)}
p
📍
Dove: #{event.place.name} - #{event.place.address}
p
⏰
Quando: #{datetime(event.start_datetime)}
br
if event.image_path
<center>
...
...
@@ -16,6 +16,6 @@ block content
<a href="#{config.baseurl}/event/#{event.id}">#{config.baseurl}/event/#{event.id}</a>
hr
if to_confirm
p Puoi confermare questo evento <a href="#{config.baseurl}/
admin/confirm
/#{event.id}">qu
i
</a>
p Puoi confermare questo evento
premendo il tasto conferma a
<a href="#{config.baseurl}/
event
/#{event.id}">qu
esta pagina
</a>
else
p Puoi eliminare queste notifiche <a href="#{config.baseurl}/del_notification/#{notification.remove_code}">qui</a>
server/emails/layout.pug
View file @
61dbaa14
...
...
@@ -8,6 +8,4 @@ html(lang="en")
body
block content
hr
small #{config.title} / #{config.description}
br
<a
href=
'#{config.baseurl}'
>
#{config.baseurl}
</a>
\ No newline at end of file
small
<a
href=
"#{config.baseurl}"
>
#{config.title}
</a>
/ #{config.description}
\ No newline at end of file
views/feed/rss.pug
View file @
61dbaa14
doctype xml
rss(version='2.0')
rss(version='2.0'
xmlns:atom="http://www.w3.org/2005/Atom"
)
channel
atom:link(href="#{config.baseurl}/feed/rss" rel="self" type="application/rss+xml")
title #{config.title}
link #{config.baseurl}
description #{config.description}
language #{config.locale}
each event in events
item
title [#{moment.unix(event.start_datetime).utc(false).format("YY-MM-DD")}] #{event.title} @#{event.place.name}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment