discours.io/core
5
0
Fork 0
Code Pull Requests Actions Projects Activity

fix after merge

Browse Source
This commit is contained in:
knst-kotov
2021-07-13 10:14:48 +00:00
parent af0211721c
commit 6c9337be4c
13 changed files with 802 additions and 806 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
schema.graphql
View File

@@ -64,8 +64,6 @@ type Mutation {
requestEmailConfirmation: User! requestEmailConfirmation: User!
requestPasswordReset(email: String!): Boolean! requestPasswordReset(email: String!): Boolean!
resetPassword(password: String!, token: String!): Token! resetPassword(password: String!, token: String!): Token!
signIn(email: String!, password: String!): Token!
# signUp(email: String!, password: String!, username: String): User!
registerUser(input: registerUserInput!): User! registerUser(input: registerUserInput!): User!
# shout # shout
@@ -136,7 +134,9 @@ type Proposal {
type Subscription { type Subscription {
messageCreated: Message! messageCreated: Message!
messageUpdated: Message!
messageDeleted: Message! messageDeleted: Message!
onlineUpdated: [User!]! onlineUpdated: [User!]!
shoutUpdated: Shout! shoutUpdated: Shout!
userUpdated: User! userUpdated: User!

6
server.py
View File

@@ -2,8 +2,4 @@ import uvicorn
from settings import PORT from settings import PORT
if __name__ == '__main__': if __name__ == '__main__':
<<<<<<< HEAD uvicorn.run("main:app", host="0.0.0.0", port=PORT, ssl_keyfile="discours.key", ssl_certfile="discours.crt", reload=True)
uvicorn.run("main:app", host="0.0.0.0", port=8081, ssl_keyfile="discours.key", ssl_certfile="discours.crt", reload=True)
=======
uvicorn.run("main:app", host="0.0.0.0", port=PORT, reload=True)
>>>>>>> remotes/origin/dev

2
settings.py
View File

@@ -1,6 +1,6 @@
from pathlib import Path from pathlib import Path
PORT = 24579 PORT = 8081
SQLITE_URI = Path(__file__).parent / "database.sqlite3" SQLITE_URI = Path(__file__).parent / "database.sqlite3"
JWT_ALGORITHM = "HS256" JWT_ALGORITHM = "HS256"