slococo-uni
/
bsition
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reformat files and run lint 

Co-authored-by: Ezequiel Bellver <ebellver@itba.edu.ar>
Co-authored-by: Juan Barmasch <jbarmasch@itba.edu.ar>
This commit is contained in:
Santiago Lo Coco 2022-12-20 08:35:02 -03:00
parent afa3dd8ed8
commit 2c0c5b49bf
41 changed files with 6463 additions and 857 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -80,7 +80,7 @@ sh run.sh -a
Por último, debe levantar el frontend (usará el puerto 3000) mediante:
```
h run.sh -f
sh run.sh -f
```
## Documentación de la API

18
bsition/api/endpoints/documents.py
View File

@ -3,7 +3,7 @@ import json
from fastapi import APIRouter, Depends
from fastapi.responses import JSONResponse
from bsition.api.models.document import Document, DocumentUpdate, Access
from bsition.api.models.document import Access, Document, DocumentUpdate
from bsition.api.utils.security import get_current_user
from bsition.backend.elastic import search as elastic
from bsition.backend.mongo import documents as mongo
@ -14,13 +14,17 @@ router = APIRouter()
@router.post("")
def create(aux: Document, user: tuple = Depends(get_current_user)):
doc_id = mongo.create_document({
doc_id = mongo.create_document(
{
"name": aux.name,
"owner": user[0],
"data": aux.data if aux.data is not None else ""
})
"data": aux.data if aux.data is not None else "",
}
)
postgres.give_access_doc(user[0], doc_id, 1)
return JSONResponse(content={"detail": "Document created", "id": doc_id}, status_code=201)
return JSONResponse(
content={"detail": "Document created", "id": doc_id}, status_code=201
)
@router.get("")
@ -63,7 +67,9 @@ def give_access(id: str, access_type: Access, user: tuple = Depends(get_current_
@router.put("/{id}/access")
def update_access(id: str, access_type: Access, user: tuple = Depends(get_current_user)):
def update_access(
id: str, access_type: Access, user: tuple = Depends(get_current_user)
):
postgres.give_access_doc(user[0], id, access_type.access_type)
return JSONResponse(content={"detail": "Access updated"}, status_code=202)

6
bsition/api/endpoints/tables.py
View File

@ -5,8 +5,8 @@ from bsition.api.models.document import Access
from bsition.api.models.table import Filter, Sort, Table
from bsition.api.utils.security import get_current_user
from bsition.backend.mongo import tables as mongo
from bsition.backend.postgres import tables as postgres_t
from bsition.backend.postgres import relations as postgres_r
from bsition.backend.postgres import tables as postgres_t
router = APIRouter()
@ -74,7 +74,9 @@ def give_access(id: str, access_type: Access, user: tuple = Depends(get_current_
@router.put("/{id}/access")
def update_access(id: str, access_type: Access, user: tuple = Depends(get_current_user)):
def update_access(
id: str, access_type: Access, user: tuple = Depends(get_current_user)
):
postgres_r.give_access_table(user[0], id, access_type.access_type)
return JSONResponse(content={"detail": "Access updated"}, status_code=202)

6
bsition/api/endpoints/token.py
View File

@ -7,7 +7,7 @@ from bsition.api.utils.jwt import write_token
from bsition.api.utils.password import verify_password
from bsition.api.utils.security import get_current_user, oauth2_scheme
from bsition.backend.postgres.users import get_user_by_username
from bsition.backend.redis.tokens import add_token, remove_token, clean_tokens
from bsition.backend.redis.tokens import add_token, clean_tokens, remove_token
router = APIRouter()
@ -34,6 +34,8 @@ def login(form: OAuth2PasswordRequestForm = Depends()):
@router.delete("/token")
def logout(token: str = Depends(oauth2_scheme), user: tuple = Depends(get_current_user)):
def logout(
token: str = Depends(oauth2_scheme), user: tuple = Depends(get_current_user)
):
remove_token(user[1], token)
return JSONResponse(content={"detail": "Token deleted."}, status_code=202)

12
bsition/backend/elastic/search.py
View File

@ -15,9 +15,7 @@ def search(index, query, user_id):
"must": [
{"query_string": {"query": query, "default_field": "data"}},
],
"filter": [
{"terms": {"_id": acc_doc}}
]
"filter": [{"terms": {"_id": acc_doc}}],
}
},
highlight={"fields": {"data": {}}},
@ -29,11 +27,11 @@ def search(index, query, user_id):
# str(hit["highlight"]) + " ---- " + "%(name)s: %(data)s" % hit["_source"]
# str(hit["highlight"]) + " ---- " + "%(name)s: %(data)s" % hit["_source"]
{
"id": hit['_id'],
"name": hit['_source']["name"],
"highlight": str(hit["highlight"]["data"])
"id": hit["_id"],
"name": hit["_source"]["name"],
"highlight": str(hit["highlight"]["data"]),
}
)
print(hit['_id'], hit['_source'])
print(hit["_id"], hit["_source"])
return hits

4
bsition/backend/mongo/documents.py
View File

@ -1,8 +1,8 @@
from bson import ObjectId
from bsition.backend.elastic import utils as elastic
from bsition.backend.postgres import relations as postgres
from bsition.backend.mongo.utils import get_database
from bsition.backend.postgres import relations as postgres
def get_documents(user_id):
@ -22,7 +22,7 @@ def get_documents(user_id):
"access": 1,
"owner": 1,
}
}
},
]
return list(docs_coll.aggregate(pipeline))

4
bsition/backend/postgres/relations.py
View File

@ -118,9 +118,7 @@ def is_public(doc_id):
conn = get_connection()
cur = conn.cursor()
cur.execute(
sql.SQL(
"SELECT doc_id FROM public_docs WHERE doc_id = {doc_id}"
).format(
sql.SQL("SELECT doc_id FROM public_docs WHERE doc_id = {doc_id}").format(
doc_id=sql.Literal(doc_id),
)
)

2
bsition/backend/redis/tokens.py
View File

@ -21,8 +21,6 @@ def remove_token(username, token):
client.zrem(username, token)
# Puede correr en un cron o, por ejemplo, cada vez que el usuario hace login (o logout)
def clean_tokens(username):
client = get_client()
client.zremrangebyscore(username, -inf, int(time.time()))

3
bsition/frontend/.eslintrc.json Normal file
View File

@ -0,0 +1,3 @@
{
"extends": "next/core-web-vitals"
}

4236
bsition/frontend/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

3
bsition/frontend/package.json
View File

@ -3,6 +3,7 @@
"version": "0.1.0",
"private": true,
"scripts": {
"lint": "next lint",
"dev": "next dev",
"build": "next build",
"start": "next start"
@ -19,6 +20,8 @@
"@types/node": "^17.0.21",
"@types/react": "^17.0.39",
"autoprefixer": "^10.4.2",
"eslint": "8.30.0",
"eslint-config-next": "13.0.7",
"postcss": "^8.4.7",
"postcss-import": "^14.0.2",
"tailwindcss": "^3.0.23",

3
bsition/frontend/src/components/Sidebar.tsx
View File

@ -90,8 +90,7 @@ const Sidebar = () => {
if (!activeMenu || !menu || menu === "undefined") {
if (!router.query || !router.query.id) {
return classNames("flex items-center cursor-pointer hover:bg-light-lighter rounded w-full overflow-hidden whitespace-nowrap");
}
else {
} else {
return classNames(
"flex items-center cursor-pointer hover:bg-light-lighter rounded w-full overflow-hidden whitespace-nowrap",
{

8
bsition/frontend/src/pages/create-document.tsx
View File

@ -39,13 +39,17 @@ export default function CreateDocument() {
return (
<Layout>
<div className="flex items-center justify-center w-full h-full">
<form onSubmit={handleSubmit} className="flex items-center justify-center align-center w-full h-full login-form" style={{flexDirection: "column"}}>
<form onSubmit={handleSubmit}
className="flex items-center justify-center align-center w-full h-full login-form"
style={{flexDirection: "column"}}>
<div>
<input type="text" id="name" name="name" required placeholder="name"
style={{border: "1px solid grey", color: "black", padding: "2px 4px"}}/>
</div>
<button type="submit" className="rounded bg-pink-600 rounded" style={{border: "1px solid grey", padding: "4px"}}>Create</button>
<button type="submit" className="rounded bg-pink-600 rounded"
style={{border: "1px solid grey", padding: "4px"}}>Create
</button>
</form>
</div>
</Layout>

22
bsition/frontend/src/pages/documents/[id].tsx
View File

@ -111,14 +111,26 @@ export default function Document() {
openDropdown.classList.remove('show');
}
}
}}}} className="dropbtn"></OptionsIcon>
}
}
}} className="dropbtn"></OptionsIcon>
<div id="myDropdown" className="dropdown-content">
<Link href={access}>
<div className="flex flex-row items-center justify-start align-center menu-opt"><ManageIcon/><span>Manage access</span></div>
<div className="flex flex-row items-center justify-start align-center menu-opt">
<ManageIcon/><span>Manage access</span></div>
</Link>
<a href="#"><div className="flex flex-row items-center justify-start align-center menu-opt"><ShareIcon/><span>Share</span></div></a>
<a href="#"><div className="flex flex-row items-center justify-start align-center menu-opt"><LockIcon/><span>Public/private</span></div></a>
<a href="#"><div className="flex flex-row items-center justify-start align-center menu-opt"><DeleteIcon/><span>Delete document</span></div></a>
<a href="#">
<div className="flex flex-row items-center justify-start align-center menu-opt"><ShareIcon/><span>Share</span>
</div>
</a>
<a href="#">
<div className="flex flex-row items-center justify-start align-center menu-opt">
<LockIcon/><span>Public/private</span></div>
</a>
<a href="#">
<div className="flex flex-row items-center justify-start align-center menu-opt">
<DeleteIcon/><span>Delete document</span></div>
</a>
</div>
</div>
</div>

4
bsition/frontend/src/pages/documents/[id]/access.tsx
View File

@ -100,7 +100,9 @@ export default function Document() {
style={{border: "1px solid grey", color: "black", padding: "2px 4px"}}/>
</div>
<button type="submit" className="rounded bg-pink-600 rounded" style={{border: "1px solid grey", padding: "4px"}}>Create</button>
<button type="submit" className="rounded bg-pink-600 rounded"
style={{border: "1px solid grey", padding: "4px"}}>Create
</button>
{/*</form>*/}
</div>
</>

8
bsition/frontend/src/pages/login.tsx
View File

@ -38,7 +38,9 @@ export default function Login() {
return (
<div className="flex items-center justify-center w-full h-full" style={{marginTop: "30%"}}>
<form onSubmit={handleSubmit} className="flex items-center justify-center align-center w-full h-full login-form" style={{flexDirection: "column"}}>
<form onSubmit={handleSubmit}
className="flex items-center justify-center align-center w-full h-full login-form"
style={{flexDirection: "column"}}>
<div>
<input type="text" id="username" name="username" required placeholder="username"
style={{border: "1px solid grey", color: "black", padding: "2px 4px"}}/>
@ -48,7 +50,9 @@ export default function Login() {
style={{border: "1px solid grey", color: "black", padding: "2px 4px"}}/>
</div>
<button type="submit" className="rounded bg-pink-600 rounded" style={{border: "1px solid grey", padding: "4px"}}>Log in</button>
<button type="submit" className="rounded bg-pink-600 rounded"
style={{border: "1px solid grey", padding: "4px"}}>Log in
</button>
</form>
</div>
);

8
bsition/frontend/src/styles/index.css
View File

@ -61,9 +61,13 @@
display: block;
}
.dropdown a:hover {background-color: #ddd;}
.dropdown a:hover {
background-color: #ddd;
}
.show {display: block;}
.show {
display: block;
}
svg {

1425
bsition/frontend/yarn.lock
View File

File diff suppressed because it is too large Load Diff

2
run.sh
View File

@ -14,7 +14,7 @@ EOF
}
RUN=
while getopts "hadic" OPTION; do
while getopts "hadicf" OPTION; do
case $OPTION in
a) RUN=api ;;
d) RUN=docker ;;