Skip to content
Open

jh #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
315 commits
Select commit Hold shift + click to select a range
c5f78ca
mongoose update and routing change to post from get
Yisrael94 May 3, 2023
bff5fad
Merge pull request #27 from HereEvents/yisraelServer
Yisrael94 May 3, 2023
75ab0ca
Merge branch 'dev' of https://github.com/HereEvents/server into viewE…
naamaorlan May 3, 2023
0610738
Merge pull request #28 from HereEvents/viewEvent
naamaorlan May 3, 2023
4f06fd3
favourite
hadarna May 3, 2023
368a2c0
add favourite
hadarna May 3, 2023
6cf4023
Merge pull request #29 from HereEvents/hadar
hadarna May 3, 2023
0fe12e1
sendEventDetailsToAdvertiser
sapircafri May 3, 2023
db3033b
sendEventDetailsToAdvertiser
sapircafri May 3, 2023
5269e4e
Merge pull request #19 from HereEvents/forget_pass
sapircafri May 3, 2023
2e635d0
function findEventsNextNow add sort
yair-ken May 3, 2023
0d153b3
Merge branch 'dev' of https://github.com/HereEvents/server into yair
yair-ken May 3, 2023
7bea8ba
before big merge
kobikru May 3, 2023
4ad6863
before big merged
kobikru May 3, 2023
fbabd6e
Merge branch 'dev' of https://github.com/HereEvents/server into multer
kobikru May 3, 2023
778ffca
after big merge
kobikru May 3, 2023
71a6a82
after big merge
kobikru May 3, 2023
9ba4c62
Merge pull request #30 from HereEvents/multer
kobikru May 3, 2023
4634e1b
function findEventsNextNow add sort2
yair-ken May 3, 2023
c7e65fa
Merge branch 'dev' of https://github.com/HereEvents/server into yair
yair-ken May 3, 2023
53d77ca
added filtered events by date and sort them out by most recent
Yisrael94 May 3, 2023
abf9e70
Merge branch 'dev' of https://github.com/HereEvents/server into yisra…
Yisrael94 May 3, 2023
2177d65
Merge pull request #31 from HereEvents/yisraelServer
Yisrael94 May 3, 2023
08a7715
function findEventsNextNow add limit&skip
yair-ken May 3, 2023
7f39ea1
Merge branch 'dev' of https://github.com/HereEvents/server into yair
yair-ken May 3, 2023
1d77a38
multer without galery
kobikru May 3, 2023
27c0b5c
Merge branch 'dev' of https://github.com/HereEvents/server into multer
kobikru May 3, 2023
3954a27
Merge pull request #32 from HereEvents/multer
kobikru May 3, 2023
755b378
Merge branch 'dev' of https://github.com/HereEvents/server into yair
yair-ken May 3, 2023
70a9bbc
ab
sapircafri May 4, 2023
602d0f5
Merge branch 'dev' of https://github.com/HereEvents/server into forge…
sapircafri May 4, 2023
f6e2404
Merge pull request #33 from HereEvents/forget_pass
sapircafri May 4, 2023
984f8b6
Merge branch 'dev' of https://github.com/HereEvents/server into yair
yair-ken May 7, 2023
c090839
added filtered events by date and sort them out by most recentת start…
Yisrael94 May 7, 2023
a687e6a
Merge branch 'dev' of https://github.com/HereEvents/server into yisra…
Yisrael94 May 7, 2023
4775faa
Merge pull request #34 from HereEvents/yisraelServer
Yisrael94 May 7, 2023
ac992a5
Merge branch 'dev' of https://github.com/HereEvents/server into yair
yair-ken May 7, 2023
233e82a
page next
yair-ken May 9, 2023
252cafd
minor changes
kobikru May 9, 2023
e700089
Merge branch 'dev' of https://github.com/HereEvents/server into multer
kobikru May 9, 2023
6590f00
page next and search
yair-ken May 9, 2023
94e6ba0
Merge pull request #35 from HereEvents/Pagination
yair-ken May 9, 2023
401088c
uload to server
kobikru May 10, 2023
6e2b633
Merge branch 'dev' of https://github.com/HereEvents/server into multer
kobikru May 10, 2023
75cce6f
Merge pull request #36 from HereEvents/multer
kobikru May 10, 2023
f938d0d
added filtering to findEventById to return one most updated date.
Yisrael94 May 11, 2023
5e48a30
Merge pull request #37 from HereEvents/yisraelServer
Yisrael94 May 11, 2023
f8ee74e
add the payment to the event model
naamaorlan May 14, 2023
8dd041e
Merge pull request #38 from HereEvents/viewEvent
naamaorlan May 14, 2023
74a575f
search whith addfields
yair-ken May 14, 2023
1dd6aea
Merge branch 'dev' of https://github.com/HereEvents/server into Pagin…
yair-ken May 14, 2023
2b8a270
search whith addfields2
yair-ken May 14, 2023
540bf2f
fixed verify token from route to servicess to controller
Yisrael94 May 15, 2023
686d213
Merge pull request #39 from HereEvents/yisraelServer
Yisrael94 May 15, 2023
5fec430
deleted logs in findEventBYId and in verifyToken
Yisrael94 May 15, 2023
84644f1
Merge pull request #40 from HereEvents/yisraelServer
Yisrael94 May 15, 2023
1f24b71
Merge branch 'dev' of https://github.com/HereEvents/server into Pagin…
yair-ken May 15, 2023
f21dbd1
Merge pull request #41 from HereEvents/Pagination
yair-ken May 15, 2023
43e4554
fix currect date
yair-ken May 17, 2023
f971bf0
Merge pull request #42 from HereEvents/Pagination
yair-ken May 17, 2023
1ec4459
fix falt servis
yair-ken May 17, 2023
d686dd6
Merge pull request #43 from HereEvents/Pagination
yair-ken May 17, 2023
e45cf6f
added userType in schema
Yisrael94 May 17, 2023
fac8720
Merge branch 'dev' of https://github.com/HereEvents/server into yisra…
Yisrael94 May 17, 2023
653fdc6
Merge pull request #44 from HereEvents/yisraelServer
Yisrael94 May 17, 2023
c8e3a60
added updating function to update event status to published
Yisrael94 May 17, 2023
2134f93
Merge pull request #45 from HereEvents/yisraelServer
Yisrael94 May 17, 2023
e4e456e
before merg
matanelvatkin May 17, 2023
051dda4
sending mail to admin
kobikru May 17, 2023
23f13f1
Merge branch 'dev' of https://github.com/HereEvents/server into multer
kobikru May 17, 2023
a37f345
Merge pull request #46 from HereEvents:publish-and-send-mail
kobikru May 17, 2023
86805a4
add save in cloud
matanelvatkin May 21, 2023
31c2359
Merge branch 'dev' into matanelvatkin2
matanelvatkin May 21, 2023
9c5825f
Merge pull request #47 from HereEvents/matanelvatkin2
matanelvatkin May 21, 2023
23145ff
Update event.route.js
matanelvatkin May 21, 2023
877f281
Merge pull request #48 from HereEvents/matanelvatkin-patch-1
matanelvatkin May 21, 2023
887925c
fixforgetpassword
sapircafri May 22, 2023
3644d50
Merge pull request #49 from HereEvents/forget_pass
sapircafri May 22, 2023
b82ac6f
fix begin date 2
yair-ken May 23, 2023
916c0fe
Merge branch 'dev' of https://github.com/HereEvents/server into Pagin…
yair-ken May 23, 2023
853b6e9
fixing files
matanelvatkin May 24, 2023
8d6712e
Merge pull request #50 from HereEvents/matanelvatkin2
matanelvatkin May 24, 2023
2c91faa
add crop in cloud
matanelvatkin May 24, 2023
9a7118a
Merge pull request #51 from HereEvents/matanelvatkin2
matanelvatkin May 24, 2023
14b5063
before the real crop
kobikru May 24, 2023
a1edfc3
Merge branch 'dev' of https://github.com/HereEvents/server into publi…
kobikru May 24, 2023
986d0bf
mailToManagerAndadvister
sapircafri May 29, 2023
d4e5a61
Merge branch 'dev' of https://github.com/HereEvents/server into forge…
sapircafri May 29, 2023
f1005a1
Merge pull request #52 from HereEvents/forget_pass
sapircafri May 29, 2023
f4af454
mailToManagerAndadvister
sapircafri May 29, 2023
fdc53ca
Merge pull request #53 from HereEvents/forget_pass
sapircafri May 29, 2023
4ca3d7a
Merge branch 'dev' of https://github.com/HereEvents/server into publi…
kobikru May 29, 2023
0d4361d
search after
yair-ken Jun 4, 2023
427e83f
Merge branch 'dev' of https://github.com/HereEvents/server into Pagin…
yair-ken Jun 4, 2023
4d0cdfc
search todat tommorow and alldate
yair-ken Jun 5, 2023
c0c3393
Merge pull request #54 from HereEvents/Pagination
yair-ken Jun 5, 2023
d1bf87e
search this week
yair-ken Jun 5, 2023
aeb6de6
Merge branch 'dev' of https://github.com/HereEvents/server into advan…
yair-ken Jun 5, 2023
b2d372b
addDateOfPublished
sapircafri Jun 5, 2023
06718d4
Merge pull request #55 from HereEvents/forget_pass
sapircafri Jun 5, 2023
07db6fc
search categoris
yair-ken Jun 5, 2023
b5c15e3
Merge branch 'dev' of https://github.com/HereEvents/server into advan…
yair-ken Jun 5, 2023
cbc6d91
Merge pull request #56 from HereEvents/advanceSearch
yair-ken Jun 5, 2023
6fd659b
Accurate location
kobikru Jun 5, 2023
469e702
Merge branch 'dev' of https://github.com/HereEvents/server into publi…
kobikru Jun 5, 2023
e946b75
Merge pull request #57 from HereEvents/Accurate-location
kobikru Jun 6, 2023
ce7d3ae
added middlewere function checkUserType for admin validetion
Yisrael94 Jun 7, 2023
5d0ccdc
Merge pull request #58 from HereEvents/yisraelServer
Yisrael94 Jun 7, 2023
0fd4640
deleted logs in userRouter
Yisrael94 Jun 7, 2023
f50fe37
Merge pull request #59 from HereEvents/yisraelServer
Yisrael94 Jun 7, 2023
e493cdb
deleted logs in userRouter 2
Yisrael94 Jun 7, 2023
6f28d9e
Merge pull request #60 from HereEvents/yisraelServer
Yisrael94 Jun 7, 2023
a3e6b7e
Update event.route.js
matanelvatkin Jun 8, 2023
f911dcd
Merge pull request #61 from HereEvents/matanelvatkin-patch-2
matanelvatkin Jun 8, 2023
56e40cd
pegination to search
yair-ken Jun 8, 2023
2d7aff4
Merge branch 'dev' of https://github.com/HereEvents/server into advan…
yair-ken Jun 8, 2023
155b930
Merge pull request #62 from HereEvents/advanceSearch
yair-ken Jun 8, 2023
43f8eb7
update authorization
yair-ken Jun 11, 2023
81ffe36
update authorization try and catch
yair-ken Jun 12, 2023
e1bcca0
update log in btnDates in events.services
yair-ken Jun 12, 2023
cc0a46c
Merge pull request #63 from HereEvents/advanceSearch
yair-ken Jun 12, 2023
9a177b9
update rout get eventID
yair-ken Jun 13, 2023
3bd4ed4
Merge pull request #64 from HereEvents/advanceSearch
yair-ken Jun 13, 2023
087112c
added user validation and correct error response
Yisrael94 Jun 14, 2023
1e26234
Merge pull request #65 from HereEvents/yisraelServer
Yisrael94 Jun 14, 2023
d37da4e
update aear location
yair-ken Jun 15, 2023
922dadf
Merge branch 'dev' of https://github.com/HereEvents/server into advan…
yair-ken Jun 15, 2023
950a190
Merge pull request #66 from HereEvents/advanceSearch
yair-ken Jun 15, 2023
ead90f6
added registration validations
Yisrael94 Jun 15, 2023
192f3e8
Merge branch 'dev' of https://github.com/HereEvents/server into yisra…
Yisrael94 Jun 15, 2023
347f022
Merge pull request #67 from HereEvents/yisraelServer
Yisrael94 Jun 15, 2023
1ebc535
add trim to cloudinary
matanelvatkin Jun 21, 2023
1191340
add trim to cloudinary
matanelvatkin Jun 21, 2023
c281293
Merge pull request #68 from HereEvents/matanelvatkin
matanelvatkin Jun 21, 2023
b543399
repeat event
hadarna Jun 26, 2023
fba12f5
repeat event2
hadarna Jun 27, 2023
4621ad9
repeat event3
hadarna Jun 28, 2023
1257bda
repeat event4
hadarna Jun 28, 2023
f8ad7b6
repeat event after merge
hadarna Jun 28, 2023
50561a8
weekly event
hadarna Jul 6, 2023
4e82461
reapet event
hadarna Jul 6, 2023
11b9d91
customized event
hadarna Jul 9, 2023
7ee91bb
Merge pull request #69 from HereEvents/hadar
hadarna Jul 9, 2023
ad1695f
fix regex
yair-ken Jul 11, 2023
9cf17e5
Merge branch 'dev' of https://github.com/HereEvents/server into advan…
yair-ken Jul 11, 2023
3cc7b3a
fix mail
kobikru Jul 13, 2023
78ea4dd
Merge pull request #70 from HereEvents/fixed-mail
kobikru Jul 13, 2023
cc11870
again new mail
kobikru Jul 13, 2023
acd581f
Merge pull request #71 from HereEvents/fixed-mail
kobikru Jul 13, 2023
0be1c29
and again
kobikru Jul 13, 2023
5cd1b66
Merge pull request #72 from HereEvents/fixed-mail
kobikru Jul 13, 2023
f2bc57e
button to mail
kobikru Jul 13, 2023
ed55246
Merge branch 'dev' of https://github.com/HereEvents/server into fixed…
kobikru Jul 13, 2023
d5b6440
Merge pull request #73 from HereEvents/fixed-mail
kobikru Jul 13, 2023
3b002b7
button mail like
kobikru Jul 13, 2023
557e05c
Merge pull request #74 from HereEvents/fixed-mail
kobikru Jul 13, 2023
e5932b2
two options
kobikru Jul 13, 2023
bf553e3
final link mail
kobikru Jul 14, 2023
8effe1b
Merge pull request #75 from HereEvents/fixed-mail
kobikru Jul 14, 2023
efba266
add client domain
matanelvatkin Jul 19, 2023
ed4a1fd
Merge pull request #76 from HereEvents/matanelvatkin
binyamintech Jul 19, 2023
9c1da98
Merge branch 'dev' of https://github.com/HereEvents/server into advan…
yair-ken Jul 19, 2023
dfe0ee2
add regex
matanelvatkin Jul 19, 2023
e9126bb
Merge pull request #77 from HereEvents/matanelvatkin
matanelvatkin Jul 19, 2023
b39253c
try and catch on picture server error
kobikru Jul 20, 2023
538d9b1
Merge branch 'dev' of https://github.com/HereEvents/server into fixed…
kobikru Jul 20, 2023
beab044
Merge pull request #79 from HereEvents:fixed-mail
kobikru Jul 20, 2023
d286f62
catch error message
kobikru Jul 20, 2023
2f45c64
Merge branch 'dev' of https://github.com/HereEvents/server into fixed…
kobikru Jul 20, 2023
30003e2
Merge pull request #80 from HereEvents:fixed-mail
kobikru Jul 20, 2023
1b9d1ad
KorePo in the subject of the mail
kobikru Jul 23, 2023
5bb89c0
chang email adress
sapircafri Jul 24, 2023
88d9d7e
chang email adress
sapircafri Jul 24, 2023
2bdebe6
Merge pull request #81 from HereEvents/forget_pass
sapircafri Jul 24, 2023
b2615b1
jast merg
matanelvatkin Jul 20, 2023
ca29520
send error mail
matanelvatkin Jul 25, 2023
90a73bf
send error mail
matanelvatkin Jul 25, 2023
a0ab678
Merge pull request #83 from HereEvents/matanel
binyamintech Jul 25, 2023
903b1a5
Merge branch 'dev' of https://github.com/HereEvents/server into fixed…
kobikru Jul 25, 2023
6b901db
EROREMAIL
kobikru Jul 25, 2023
0db3b8f
typo
kobikru Jul 25, 2023
ed916c8
login after registeretion
yair-ken Jul 26, 2023
c6e5109
Merge branch 'dev' of https://github.com/HereEvents/server into advan…
yair-ken Jul 26, 2023
b592435
Merge pull request #84 from HereEvents/advanceSearch
matanelvatkin Jul 29, 2023
40d163a
add to model tag
yair-ken Jul 30, 2023
f12fd35
Merge branch 'dev' of https://github.com/HereEvents/server into advan…
yair-ken Jul 30, 2023
82c1585
Merge pull request #85 from HereEvents/advanceSearch
yair-ken Jul 30, 2023
98fd45c
Merge branch 'dev' of https://github.com/HereEvents/server into fixed…
kobikru Jul 30, 2023
4bb8ac7
add to model user tel and city and approval
yair-ken Aug 6, 2023
3e7e19a
Merge branch 'dev' of https://github.com/HereEvents/server into advan…
yair-ken Aug 6, 2023
a0ac871
Merge pull request #86 from HereEvents/advanceSearch
yair-ken Aug 6, 2023
b1c7e9c
Merge branch 'dev' of https://github.com/HereEvents/server into fixed…
kobikru Aug 9, 2023
f98c0a5
bugfix link = null
kobikru Aug 9, 2023
91dbf28
Merge pull request #87 from HereEvents:fixed-mail
kobikru Aug 9, 2023
7901e1e
Dev
kobikru Aug 9, 2023
419baf5
Merge branch 'dev' of https://github.com/kobikru/my-here-event-server…
kobikru Aug 9, 2023
e32273c
Merge pull request #88 from kobikru:dev
kobikru Aug 9, 2023
8c5d719
fix registeretion form login
yair-ken Aug 10, 2023
1deeaa7
Merge branch 'dev' of https://github.com/HereEvents/server into advan…
yair-ken Aug 10, 2023
019a6de
Merge pull request #89 from HereEvents/advanceSearch
yair-ken Aug 10, 2023
a031c5d
fix registeretion
yair-ken Aug 16, 2023
4b3399b
Merge pull request #90 from HereEvents/advanceSearch
yair-ken Aug 16, 2023
8968923
fix saerch to sort start event
yair-ken Aug 17, 2023
b6c5e9e
fix saerch to end event
yair-ken Aug 17, 2023
2fb633b
Merge branch 'dev' of https://github.com/HereEvents/server into fixSa…
yair-ken Aug 17, 2023
ef44ce1
Merge pull request #91 from HereEvents/fixSaveEventToEnd
yair-ken Aug 17, 2023
783f963
add tag and add sort to search
yair-ken Aug 22, 2023
4c852b5
Merge branch 'dev' of https://github.com/HereEvents/server into fixSa…
yair-ken Aug 22, 2023
1e86cb0
Merge pull request #92 from HereEvents/fixSaveEventToEnd
yair-ken Aug 22, 2023
b0913b5
fix noTag
yair-ken Aug 22, 2023
a6b1e61
Merge branch 'dev' of https://github.com/HereEvents/server into fixSa…
yair-ken Aug 22, 2023
d880241
Merge pull request #93 from HereEvents/fixSaveEventToEnd
yair-ken Aug 22, 2023
b3ef3cc
add google register
matanelvatkin Aug 22, 2023
b7ff00b
fix regestion
yair-ken Aug 24, 2023
c018d3a
Merge branch 'dev' of https://github.com/HereEvents/server into fixSa…
yair-ken Aug 24, 2023
5274b91
Merge pull request #94 from HereEvents/fixSaveEventToEnd
yair-ken Aug 24, 2023
ca68196
search key words
yair-ken Aug 24, 2023
cfac2c2
Merge branch 'dev' of https://github.com/HereEvents/server into fixSa…
yair-ken Aug 24, 2023
22a98b7
Merge pull request #95 from HereEvents/fixSaveEventToEnd
yair-ken Aug 24, 2023
2078f36
fix no sand mail in chage tag
yair-ken Aug 29, 2023
822ae27
Merge branch 'dev' of https://github.com/HereEvents/server into fixSa…
yair-ken Aug 29, 2023
ae4ed38
Merge pull request #96 from HereEvents/fixSaveEventToEnd
yair-ken Aug 29, 2023
4420eb1
fix registeretion
yair-ken Aug 16, 2023
c729f6d
fix saerch to sort start event
yair-ken Aug 17, 2023
68d819b
fix saerch to end event
yair-ken Aug 17, 2023
6ea7c0c
add tag and add sort to search
yair-ken Aug 22, 2023
e096cde
fix noTag
yair-ken Aug 22, 2023
0a55201
fix regestion
yair-ken Aug 24, 2023
bdeb1cc
search key words
yair-ken Aug 24, 2023
139832e
fix no sand mail in chage tag
yair-ken Aug 29, 2023
2b73529
add google
matanelvatkin Sep 6, 2023
3432337
Merge pull request #97 from HereEvents/matanel
matanelvatkin Sep 6, 2023
aec48bd
update datals user
yair-ken Sep 6, 2023
4a8e0ea
Merge branch 'dev' of https://github.com/HereEvents/server into fixSa…
yair-ken Sep 6, 2023
cd4fb27
fixing gooogle"
matanelvatkin Sep 8, 2023
11717e3
Merge pull request #98 from HereEvents/matanel
matanelvatkin Sep 8, 2023
9081437
fixing gooogle"
matanelvatkin Sep 8, 2023
cbd9fdb
Merge pull request #99 from HereEvents/matanel
matanelvatkin Sep 8, 2023
dd2a2ab
Merge branch 'dev' of https://github.com/HereEvents/server into fixSa…
yair-ken Sep 12, 2023
e1fcb7b
Merge pull request #100 from HereEvents/fixSaveEventToEnd
yair-ken Sep 12, 2023
167e821
fixing google register
matanelvatkin Sep 13, 2023
533b868
Merge pull request #101 from HereEvents/matanel
matanelvatkin Sep 13, 2023
69c0d4d
remove change pasword in creatUser
yair-ken Sep 13, 2023
6f7d4e1
Merge pull request #102 from HereEvents/fixSaveEventToEnd
yair-ken Sep 13, 2023
4c2f0e9
remove chack emailupdateDetails
yair-ken Sep 13, 2023
1947fa5
Merge branch 'dev' of https://github.com/HereEvents/server into fixSa…
yair-ken Sep 13, 2023
1344551
Merge pull request #103 from HereEvents/fixSaveEventToEnd
yair-ken Sep 13, 2023
17cf1c0
new login and remove pasword in entergoogle
yair-ken Sep 27, 2023
620bf44
Merge branch 'dev' of https://github.com/HereEvents/server into fixSa…
yair-ken Sep 27, 2023
028cdc0
Merge pull request #104 from HereEvents/fixSaveEventToEnd
yair-ken Sep 27, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
node_modules
.env
.env

./upload
upload
37 changes: 37 additions & 0 deletions BL/emailInterface.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
const nodemailer = require('nodemailer');


async function sendMail(email, subject, html) {
try {
const transporter = await nodemailer.createTransport({
service: "gmail",
auth: {
user: "korepo149@gmail.com",
pass: "avozrwilpxiljoaw"
}
});
const mailOptions = await {
from: 'קורה פה! <korepo149@gmail.com>',
to: email,
subject: subject,
html: html
};
transporter.sendMail(mailOptions, function (error, info) {
if (error) {
console.log(error);
} else {
console.log('Email sent: ' + info.response);
}
});

} catch (error) {
throw { message: "something went wrong" }

}

}

module.exports = {
sendMail
};

Loading