Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Activate new admin and superadmin accounts by mail #41

Merged
merged 54 commits into from
Dec 24, 2023
Merged
Changes from 1 commit
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
e2f15ef
Merge pull request #31 from Kosjenka-Reading-App/dev
vvihorev Nov 26, 2023
2028ab8
Update prod.yml
vvihorev Nov 26, 2023
92c2dcf
HTML template added
tim14996 Dec 7, 2023
db6f276
Added Env Vars
tim14996 Dec 7, 2023
0870ced
Create send acc activte mail function
tim14996 Dec 7, 2023
b184518
add schema for accountIn
tim14996 Dec 7, 2023
587fff3
added acount activate func
tim14996 Dec 7, 2023
6144867
Add env to workflows
tim14996 Dec 7, 2023
e620efe
adjusted test
tim14996 Dec 8, 2023
c1d6b41
add activate test
tim14996 Dec 8, 2023
fa4806e
Added JWT_VALID_TIME_ACTIVATE_ACCOUNT to ENV and pipline
tim14996 Dec 8, 2023
64802a7
Updated schemas and revert changes in crud
tim14996 Dec 8, 2023
ff89e2c
Added account activate to andres request
tim14996 Dec 8, 2023
13c1518
Fixed test for account activation
tim14996 Dec 8, 2023
98e4f6e
formatted with black .
tim14996 Dec 8, 2023
71c063e
fixed error with double endpoint
tim14996 Dec 8, 2023
72a5a17
fixed bug
tim14996 Dec 8, 2023
64b2411
Merge pull request #42 from Kosjenka-Reading-App/dev
vvihorev Dec 10, 2023
b0e0bec
check completion exercise not started
Ambre16 Dec 12, 2023
8b2bdf1
fix patch category
vvihorev Dec 12, 2023
e054fe9
enable superadmin deletion
vvihorev Dec 12, 2023
7896acf
add assert
Ambre16 Dec 12, 2023
7f5c179
order before filter
Ambre16 Dec 12, 2023
1a9b3e9
join isouter
Ambre16 Dec 12, 2023
88c5d45
exercises not started should not be in response
Ambre16 Dec 12, 2023
e6e6d36
black .
Ambre16 Dec 12, 2023
94ded44
remove assertions
Ambre16 Dec 21, 2023
fb6a8ef
black .
Ambre16 Dec 21, 2023
3e25e8c
remove useless import
Ambre16 Dec 21, 2023
a60c761
Merge pull request #44 from Kosjenka-Reading-App/fix/sort-by-completion
Ambre16 Dec 21, 2023
bef365c
Update frontend routes
DoStini Dec 23, 2023
8f126ef
HTML template added
tim14996 Dec 7, 2023
63fe7b1
Added Env Vars
tim14996 Dec 7, 2023
b154197
Create send acc activte mail function
tim14996 Dec 7, 2023
53ca3d5
add schema for accountIn
tim14996 Dec 7, 2023
a47598e
added acount activate func
tim14996 Dec 7, 2023
b3c64b7
Add env to workflows
tim14996 Dec 7, 2023
f57c3e7
adjusted test
tim14996 Dec 8, 2023
de68f8b
add activate test
tim14996 Dec 8, 2023
d5c73a6
Added JWT_VALID_TIME_ACTIVATE_ACCOUNT to ENV and pipline
tim14996 Dec 8, 2023
5f251cd
Updated schemas and revert changes in crud
tim14996 Dec 8, 2023
a4a3d2b
Added account activate to andres request
tim14996 Dec 8, 2023
7c2fc8b
Fixed test for account activation
tim14996 Dec 8, 2023
79f2706
formatted with black .
tim14996 Dec 8, 2023
f0815c8
fixed error with double endpoint
tim14996 Dec 8, 2023
157f6ff
fixed bug
tim14996 Dec 8, 2023
2b87c78
Update frontend routes
DoStini Dec 23, 2023
20bc48f
Merge branch 'admin-acc-mail' of https://github.com/Kosjenka-Reading-…
tim14996 Dec 23, 2023
4a8cf1a
fixed teses
tim14996 Dec 23, 2023
5717e57
formatted with black
tim14996 Dec 23, 2023
95d4634
valid time changed to 10h in env
tim14996 Dec 23, 2023
40f551d
valid time in pipline change to 10h
tim14996 Dec 23, 2023
b73a724
Change activte mail template from minutes to hours
tim14996 Dec 23, 2023
66564c5
change logic also to hours
tim14996 Dec 23, 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
Prev Previous commit
Next Next commit
Change activte mail template from minutes to hours
tim14996 committed Dec 23, 2023
commit b73a7240b6d458ba6623140d313eac11919a8833
2 changes: 1 addition & 1 deletion html_templates/activate_account_email.html
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ <h2 style="color: #27a9e1;"> Hey!</h2>
<p style="font-size:18px;color: #030303;">It seems a account for you was created!</p>
<p style="font-size:18px;color: #030303;">Follow this link to finish the registration and set a password for your account:</p>
<p><a style="font-size:18px;display: inline-block; padding: 10px 20px; background-color: #27a9e1; color: #ffffff; text-decoration: none; border-radius: 5px;" href="{{url}}">Set password</a></p>
<b style="font-size:18px;color: #ff9999;">Note: This link will expire in {{expire_in_minutes}} minutes.</b>
<b style="font-size:18px;color: #ff9999;">Note: This link will expire in {{expire_in_hours}} hours.</b>
<br>
<hr style="border: 1px solid #CCCCCC;">
<p style="font-size:14px;color: #888888;">If you've received this mail without filling a reqeust, it's likely that a user entered your email address by mistake. In that case, just ignore it.</p>