Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
a581d50
Added files for sending invitations by email
annashtirberg Jan 19, 2021
b4f8082
Added files for sending invitations by email
annashtirberg Jan 19, 2021
afe8234
Add base html file and mount static directory.
leddcode Jan 11, 2021
34b13a0
Minor fix
leddcode Jan 11, 2021
bb9d880
Add profile page - basic layout
leddcode Jan 11, 2021
7e8f43b
Update file tree schema
leddcode Jan 11, 2021
bd1e792
Create python-app.yml
yammesicka Jan 13, 2021
2f8b1e4
Update python-app.yml
yammesicka Jan 13, 2021
ed30098
docs: add how to run in readme
ellenc345 Jan 15, 2021
c761950
docs: add info how to run
ellenc345 Jan 15, 2021
215a0cb
ci: Stop the build if there are flake8 errors
yammesicka Jan 17, 2021
bfc70db
Added files for sending invitations by email
annashtirberg Jan 19, 2021
e045af5
Added files for sending invitations by email
annashtirberg Jan 19, 2021
e4ddf13
removed file
annashtirberg Jan 19, 2021
ac618b2
Removed file
annashtirberg Jan 19, 2021
0ae7a5a
Updated requirements.txt
annashtirberg Jan 19, 2021
4d34624
Fixed line too long errors
annashtirberg Jan 19, 2021
05c4b6e
Fixed line too long errors
annashtirberg Jan 19, 2021
8a60612
Changed tests configurations
annashtirberg Jan 19, 2021
a80faf0
Removed test config file
annashtirberg Jan 19, 2021
541e4fe
fixed paths
annashtirberg Jan 19, 2021
7dfd230
fixed line too long
annashtirberg Jan 19, 2021
2d0c6f8
added fake smtp server fixure to tests
annashtirberg Jan 19, 2021
8fc77e6
Updated requirements.txt
annashtirberg Jan 19, 2021
0e167cd
changed fixture for smtpd to include configuration
annashtirberg Jan 19, 2021
8d8a864
fixed email pattern checking
annashtirberg Jan 19, 2021
d782fe5
fixed a bad practice that Yuval Cagan reviewed me
annashtirberg Jan 19, 2021
5ff27d0
Added documentation to some function
annashtirberg Jan 19, 2021
3cd740c
Fixed line to long
annashtirberg Jan 19, 2021
e1cc002
Fixed line too long
annashtirberg Jan 19, 2021
b63cd81
fix status stuff
annashtirberg Jan 20, 2021
4e40092
Merged with upstream
annashtirberg Jan 20, 2021
3234c5c
gitignore additions
annashtirberg Jan 20, 2021
aa4967f
Fixed Yam comments
annashtirberg Jan 20, 2021
dac2bd5
Fixed Yam comments on conftest
annashtirberg Jan 20, 2021
9442599
try config for all
annashtirberg Jan 20, 2021
1948832
Merge branch 'develop' into feature/send-email
annashtirberg Jan 21, 2021
faacc4f
working on merging with main mail feature
annashtirberg Jan 23, 2021
3797401
pulled from upstream
annashtirberg Jan 27, 2021
61310b2
pulled upstream
annashtirberg Jan 30, 2021
b048f0a
fixed stuff
annashtirberg Jan 30, 2021
380ec54
added internal mail sending functions
annashtirberg Jan 30, 2021
7118f7d
added internal mail sending functions
annashtirberg Jan 30, 2021
fa3e26d
moved send function to use internal internal function
annashtirberg Jan 30, 2021
a7e88b3
moved send function to use internal function
annashtirberg Jan 30, 2021
7a05faa
added send file with email function and send invitation with email fu…
annashtirberg Jan 30, 2021
a4d0d67
added tests
annashtirberg Jan 30, 2021
cadc5c4
added tests
annashtirberg Jan 30, 2021
c77b6a1
fixed flake8 error
annashtirberg Jan 30, 2021
c3c92d8
fixed flake8 error
annashtirberg Jan 30, 2021
aa62cc0
fixed flake8 error
annashtirberg Jan 30, 2021
13c4613
Fixed pull request issues
annashtirberg Jan 31, 2021
4ac8f73
Fixed pull request issues (configuration)
annashtirberg Jan 31, 2021
a9c068c
Fixed flake8 error
annashtirberg Jan 31, 2021
ca3e532
Added a test for invitation parameters
annashtirberg Feb 1, 2021
cbb4e0b
Merge branch 'develop' of https://github.com/PythonFreeCourse/calenda…
annashtirberg Feb 1, 2021
859e834
Added a tests for coverage
annashtirberg Feb 1, 2021
41ebd6a
Fixed flake8 errors
annashtirberg Feb 1, 2021
6513233
Add tests
annashtirberg Feb 1, 2021
b827bda
Fixed flake8 error
annashtirberg Feb 1, 2021
acabbd9
Add tests
annashtirberg Feb 1, 2021
1fb1c4d
Fixed flake8 error
annashtirberg Feb 1, 2021
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
fixed paths
  • Loading branch information
annashtirberg committed Jan 19, 2021
commit 541e4fec1c78a7d0a0b0b2ac5a93dbe937516d97
4 changes: 3 additions & 1 deletion app/internal/mail.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import os

from fastapi.templating import Jinja2Templates
from fastapi_mail import ConnectionConfig, FastMail, MessageSchema
from pydantic import EmailStr

from config import get_settings

templates = Jinja2Templates(directory="templates")
templates = Jinja2Templates(directory=os.path.join("app", "templates"))

# application name
CALENDAR_SITE_NAME = "Calendar"
Expand Down
6 changes: 4 additions & 2 deletions app/main.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import os

from fastapi import FastAPI, Request
from fastapi.staticfiles import StaticFiles
from fastapi.templating import Jinja2Templates
Expand All @@ -6,9 +8,9 @@

app = FastAPI()

app.mount("/static", StaticFiles(directory="static"), name="static")
app.mount("/static", StaticFiles(directory=os.path.join("app", "static")), name="static")

templates = Jinja2Templates(directory="templates")
templates = Jinja2Templates(directory=os.path.join("app", "templates"))

app.include_router(mail.router)

Expand Down