diff --git a/bsition/api/endpoints/documents.py b/bsition/api/endpoints/documents.py
index b48aef8..74cd2b9 100644
--- a/bsition/api/endpoints/documents.py
+++ b/bsition/api/endpoints/documents.py
@@ -45,11 +45,20 @@ def edit_data(aux: DocumentUpdate, id: str):
mongo.edit_data(id, aux.data)
if aux.access is not None:
mongo.edit_access(id, aux.access)
+ if aux.public is not None:
+ print("public")
+ mongo.make_public(id, aux.public)
if aux.name is not None:
mongo.edit_name(id, aux.name)
return JSONResponse(content={"detail": "Document updated."}, status_code=202)
+@router.delete("/{id}")
+def delete_doc(id: str):
+ mongo.delete_document(id)
+ return JSONResponse(content={"detail": "Document deleted."}, status_code=201)
+
+
@router.get("/{id}/access")
def get_doc_access(id: str):
return postgres.access_to_doc(id)
@@ -61,20 +70,18 @@ def get_access(id: str, user: tuple = Depends(get_current_user)):
@router.post("/{id}/access")
-def give_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 created"}, status_code=201)
-
-
-@router.put("/{id}/access")
-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)
+def add_access(id: str, aux: Access):
+ postgres.give_access_doc(aux.username, id, aux.access_type)
return JSONResponse(content={"detail": "Access updated"}, status_code=202)
-@router.delete("/{id}/access")
+@router.delete("/{id}/access/me")
def deny_access(id: str, user: tuple = Depends(get_current_user)):
postgres.deny_access_doc(user[0], id)
return JSONResponse(content={"detail": "Access deleted"}, status_code=201)
+
+
+@router.delete("/{id}/access")
+def deny_access(id: str, aux: Access):
+ postgres.deny_access_doc(aux.username, id)
+ return JSONResponse(content={"detail": "Access deleted"}, status_code=201)
diff --git a/bsition/api/endpoints/tables.py b/bsition/api/endpoints/tables.py
index 1a400ca..f608ff2 100644
--- a/bsition/api/endpoints/tables.py
+++ b/bsition/api/endpoints/tables.py
@@ -1,8 +1,10 @@
+import json
+
from fastapi import APIRouter, Depends
from fastapi.responses import JSONResponse
from bsition.api.models.document import Access
-from bsition.api.models.table import Filter, Sort, Table
+from bsition.api.models.table import Filter, Sort, Table, Column
from bsition.api.utils.security import get_current_user
from bsition.backend.mongo import tables as mongo
from bsition.backend.postgres import relations as postgres_r
@@ -13,53 +15,47 @@ router = APIRouter()
@router.post("")
def create_table(aux: Table):
- mongo.create_table(aux.name)
+ print(json.loads(json.dumps(aux.__dict__)))
+ mongo.create_table({
+ "_id": aux.id,
+ "name": aux.name,
+ "column_names": aux.column_names,
+ "types": aux.types,
+ "owner": aux.owner,
+ "data": aux.data
+ })
return JSONResponse(content={"detail": "Table created."}, status_code=201)
-@router.put("/{name}")
-def edit_table(aux: Table, name: str):
- if aux.column is not None and aux.type is not None:
- mongo.add_column(name, aux.column, aux.type)
- if aux.column_data is not None:
- mongo.insert_columns(name, aux.column_data)
- if aux.row_number is not None:
- mongo.edit_columns(name, aux.columns, aux.columns_data, aux.row_number)
+@router.put("/{id}")
+def edit_table(aux: Column, id: int):
+ if aux.data is not None:
+ mongo.edit_column(aux.row_number, aux.column, aux.data, id)
+ if aux.column is not None and aux.data is None:
+ mongo.insert_columns(id, aux.column, aux.type)
return JSONResponse(content={"detail": "Table updated."}, status_code=202)
-@router.post("/{name}/sort")
-def create_sort(name: str):
- postgres_t.create_sort()
- return JSONResponse(content={"detail": "Sort created."}, status_code=201)
-
-
-@router.put("/{name}/sort")
-def add_sort(aux: Sort, name: str):
- postgres_t.add_sort(name, aux.property, aux.order, aux.priority)
+@router.put("/{id}/sort")
+def add_sort(aux: Sort, id: str):
+ postgres_t.add_sort(id, aux.property, aux.order, aux.priority)
return JSONResponse(content={"detail": "Sort updated."}, status_code=202)
-@router.get("/{name}/sort")
-def sort(name: str):
- return mongo.sort(name)
+@router.get("/{id}/sort")
+def sort(id: str):
+ return mongo.sort(int(id))
-@router.post("/{name}/filter")
-def create_filter(name: str):
- postgres_t.create_filter()
- return JSONResponse(content={"detail": "Filter created."}, status_code=201)
-
-
-@router.put("/{name}/filter")
-def add_filter(aux: Filter, name: str):
- postgres_t.add_filter(name, aux.property, aux.value, aux.function)
+@router.put("/{id}/filter")
+def add_filter(aux: Filter, id: str):
+ postgres_t.add_filter(id, aux.property, aux.value, aux.function)
return JSONResponse(content={"detail": "Filter updated."}, status_code=202)
-@router.get("/{name}/filter")
-def filter(name: str):
- return mongo.filter(name)
+@router.get("/{id}/filter")
+def filter(id: str):
+ return mongo.filter(int(id))
@router.get("/{id}/access")
diff --git a/bsition/api/endpoints/token.py b/bsition/api/endpoints/token.py
index d4e45ef..522702c 100644
--- a/bsition/api/endpoints/token.py
+++ b/bsition/api/endpoints/token.py
@@ -2,7 +2,6 @@ from fastapi import APIRouter, Depends, HTTPException
from fastapi.responses import JSONResponse
from fastapi.security import OAuth2PasswordRequestForm
-from bsition.api.models.user import User
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
diff --git a/bsition/api/endpoints/users.py b/bsition/api/endpoints/users.py
index be05a32..315941e 100644
--- a/bsition/api/endpoints/users.py
+++ b/bsition/api/endpoints/users.py
@@ -32,7 +32,9 @@ router.dependencies = [Depends(get_current_user)]
@router.get("")
-def get_users():
+def get_users(user: str = None):
+ if user is not None:
+ return postgres.get_user_by_username(user)
return postgres.get_users()
diff --git a/bsition/api/models/document.py b/bsition/api/models/document.py
index 5c56d59..e7b9ab4 100644
--- a/bsition/api/models/document.py
+++ b/bsition/api/models/document.py
@@ -10,8 +10,10 @@ class Document(BaseModel):
class DocumentUpdate(BaseModel):
name: Optional[str]
access: Optional[list]
+ public: Optional[bool]
data: Optional[str]
class Access(BaseModel):
- access_type: int
+ username: Optional[str]
+ access_type: Optional[str]
diff --git a/bsition/api/models/table.py b/bsition/api/models/table.py
index 9fe6be3..957f4c6 100644
--- a/bsition/api/models/table.py
+++ b/bsition/api/models/table.py
@@ -3,13 +3,20 @@ from pydantic.utils import Optional
class Table(BaseModel):
+ id: Optional[int]
name: Optional[str]
+ owner: Optional[str]
+ column_names: Optional[list]
+ types: Optional[list]
+ data: Optional[list]
+
+
+class Column(BaseModel):
column: Optional[str]
type: Optional[str]
- column_data: Optional[list]
- row_number: Optional[str]
- columns: Optional[list]
- columns_data: Optional[list]
+ row_number: Optional[int]
+ column_data: Optional[str]
+ data: Optional[str]
class Sort(BaseModel):
diff --git a/bsition/backend/configure.py b/bsition/backend/configure.py
index af12a69..b7b501a 100644
--- a/bsition/backend/configure.py
+++ b/bsition/backend/configure.py
@@ -1,12 +1,13 @@
from dotenv import load_dotenv
from bsition.backend.elastic.utils import create_index
-from bsition.backend.postgres.tables import add_function
+from bsition.backend.postgres.tables import create_filter, create_sort
from bsition.backend.postgres.users import create_user_table
def configure():
load_dotenv()
- add_function()
create_user_table()
+ create_filter()
+ create_sort()
create_index("test-index")
diff --git a/bsition/backend/mongo/documents.py b/bsition/backend/mongo/documents.py
index 67f6006..458e479 100644
--- a/bsition/backend/mongo/documents.py
+++ b/bsition/backend/mongo/documents.py
@@ -67,3 +67,15 @@ def edit_name(id, name):
dbname = get_database()
docs_coll = dbname["docs"]
docs_coll.update_one({"_id": ObjectId(id)}, {"$set": {"name": name}})
+
+
+def make_public(id, public):
+ dbname = get_database()
+ docs_coll = dbname["docs"]
+ docs_coll.update_one({"_id": ObjectId(id)}, {"$set": {"public": public}})
+
+
+def delete_document(id):
+ dbname = get_database()
+ docs_coll = dbname["docs"]
+ docs_coll.delete_one({"_id": ObjectId(id)})
diff --git a/bsition/backend/mongo/tables.py b/bsition/backend/mongo/tables.py
index 3809467..d55760f 100644
--- a/bsition/backend/mongo/tables.py
+++ b/bsition/backend/mongo/tables.py
@@ -8,7 +8,7 @@ def create_table(table):
docs_coll.insert_one(table)
-def insert_columns(id, name, type, data):
+def insert_columns(id, name, type):
dbname = get_database()
docs_coll = dbname["tables"]
doc = docs_coll.find_one({"_id": id}, {"_id": 0})
diff --git a/bsition/backend/postgres/relations.py b/bsition/backend/postgres/relations.py
index 20edd0c..eec4a72 100644
--- a/bsition/backend/postgres/relations.py
+++ b/bsition/backend/postgres/relations.py
@@ -106,7 +106,7 @@ def access_to_doc(id):
cur = conn.cursor()
cur.execute(
sql.SQL(
- "SELECT user_id, username, access_type FROM doc_access JOIN users ON user_id = users.id WHERE doc_id = {id}"
+ "SELECT user_id, username, access_type FROM doc_access JOIN users ON user_id = users.id WHERE doc_id = {id} ORDER BY user_id"
).format(
id=sql.Literal(id),
)
@@ -114,6 +114,19 @@ def access_to_doc(id):
return list(cur.fetchall())
+def get_shared_documents(user_id):
+ conn = get_connection()
+ cur = conn.cursor()
+ cur.execute(
+ sql.SQL(
+ "SELECT doc_id FROM doc_access WHERE user_id = {user_id} AND access_type"
+ ).format(
+ id=sql.Literal(user_id),
+ )
+ )
+ return list(cur.fetchall())
+
+
def is_public(doc_id):
conn = get_connection()
cur = conn.cursor()
diff --git a/bsition/backend/postgres/tables.py b/bsition/backend/postgres/tables.py
index c90ada2..36371f8 100644
--- a/bsition/backend/postgres/tables.py
+++ b/bsition/backend/postgres/tables.py
@@ -35,52 +35,6 @@ def get_sort(id):
return cur.fetchall()
-# def add_function():
-# conn = get_connection()
-# cur = conn.cursor()
-# cur.execute(
-# """
-# CREATE OR REPLACE FUNCTION trigger_function()
-# RETURNS TRIGGER
-# LANGUAGE PLPGSQL
-# AS $$
-# DECLARE
-# name text := TG_ARGV[0]::text;
-# BEGIN
-# IF NEW.property NOT IN (
-# SELECT column_name
-# FROM INFORMATION_SCHEMA.COLUMNS
-# WHERE TABLE_NAME = name)
-# THEN
-# RAISE EXCEPTION 'ERROR %', NEW.property;
-#
-# END IF;
-#
-# RETURN NEW;
-# END;
-# $$;
-# """
-# )
-# conn.commit()
-#
-#
-# def add_filter_trigger(name):
-# conn = get_connection()
-# cur = conn.cursor()
-# cur.execute(
-# sql.SQL(
-# """
-# CREATE TRIGGER {filter}
-# BEFORE INSERT OR UPDATE
-# ON {filter}
-# FOR EACH ROW
-# EXECUTE PROCEDURE trigger_function({table});
-# """
-# ).format(table=sql.Identifier(name), filter=sql.Identifier(name + "_filter"))
-# )
-# conn.commit()
-
-
def create_filter():
conn = get_connection()
cur = conn.cursor()
diff --git a/bsition/backend/postgres/users.py b/bsition/backend/postgres/users.py
index de0c31f..86db04b 100644
--- a/bsition/backend/postgres/users.py
+++ b/bsition/backend/postgres/users.py
@@ -45,7 +45,7 @@ def get_user_by_username(username):
conn = get_connection()
cur = conn.cursor()
cur.execute(
- sql.SQL("SELECT * FROM users WHERE username = {username}").format(
+ sql.SQL("SELECT * FROM users WHERE LOWER(username) = LOWER({username})").format(
username=sql.Literal(username)
)
)
diff --git a/bsition/frontend/src/components/Sidebar.tsx b/bsition/frontend/src/components/Sidebar.tsx
index 390423d..6277f74 100644
--- a/bsition/frontend/src/components/Sidebar.tsx
+++ b/bsition/frontend/src/components/Sidebar.tsx
@@ -8,6 +8,8 @@ import {
LogoIcon,
LogoutIcon,
SearchIcon,
+ ShareIcon,
+ ShareDocIcon,
HomeIcon,
CreateIcon
} from "./icons";
@@ -16,9 +18,9 @@ const Sidebar = () => {
const [toggleCollapse, setToggleCollapse] = useState(false);
const [isCollapsible, setIsCollapsible] = useState(false);
const [menuItems, setMenuItems] = useState([
- {id: 1, label: "Home", icon: HomeIcon, link: "/"},
- {id: 2, label: "Search", icon: SearchIcon, link: "/search"},
- {id: 3, label: "Create document", icon: CreateIcon, link: "/create-document"}
+ {id: 1, label: "Home", icon: HomeIcon, shared: false, link: "/"},
+ {id: 2, label: "Search", icon: SearchIcon, shared: false, link: "/search"},
+ {id: 3, label: "Create document", icon: CreateIcon, shared: false, link: "/create-document"}
]);
const [token, setToken] = useState("");
@@ -37,15 +39,17 @@ const Sidebar = () => {
})
let json = await res.json();
let list = [
- {id: 1, label: "Home", icon: HomeIcon, link: "/"},
- {id: 2, label: "Search", icon: SearchIcon, link: "/search"},
- {id: 3, label: "Create document", icon: CreateIcon, link: "/create-document"}
+ {id: 1, label: "Home", icon: HomeIcon, shared: false, link: "/"},
+ {id: 2, label: "Search", icon: SearchIcon, shared: false, link: "/search"},
+ {id: 3, label: "Create document", icon: CreateIcon, shared: false, link: "/create-document"}
]
json.forEach((doc) => {
+ let shared = doc["owner"].toString() !== localStorage.getItem("user")
list.push({
id: doc["id"],
label: doc["name"],
- icon: ArticleIcon,
+ icon: shared ? ShareDocIcon : ArticleIcon,
+ shared: shared,
link: `/documents/${doc["id"]}`
})
})
diff --git a/bsition/frontend/src/components/icons/PublicIcon.jsx b/bsition/frontend/src/components/icons/PublicIcon.jsx
index 558486e..2d6ae57 100644
--- a/bsition/frontend/src/components/icons/PublicIcon.jsx
+++ b/bsition/frontend/src/components/icons/PublicIcon.jsx
@@ -6,7 +6,7 @@ function PublicIcon({fill = "#6C7281", ...rest}) {
width={24}
height={24}
fill="none"
- viewBox="0 0 24 24"
+ viewBox="23.9516 24.0793 208 207.9"
xmlns="http://www.w3.org/2000/svg"
{...rest}
>
diff --git a/bsition/frontend/src/components/icons/ShareDocIcon.jsx b/bsition/frontend/src/components/icons/ShareDocIcon.jsx
new file mode 100644
index 0000000..faea6b5
--- /dev/null
+++ b/bsition/frontend/src/components/icons/ShareDocIcon.jsx
@@ -0,0 +1,21 @@
+import * as React from "react";
+
+function ShareDocIcon({fill = "#6C7281", ...rest}) {
+ return (
+
+ );
+}
+
+export default ShareDocIcon;
diff --git a/bsition/frontend/src/components/icons/index.js b/bsition/frontend/src/components/icons/index.js
index 6cadf3d..5e6375e 100644
--- a/bsition/frontend/src/components/icons/index.js
+++ b/bsition/frontend/src/components/icons/index.js
@@ -13,4 +13,5 @@ export {default as DeleteIcon} from "./DeleteIcon";
export {default as OptionsIcon} from "./OptionsIcon";
export {default as ManageIcon} from "./ManageIcon";
export {default as CreateIcon} from "./CreateIcon";
+export {default as ShareDocIcon} from "./ShareDocIcon";
diff --git a/bsition/frontend/src/pages/documents/[id].tsx b/bsition/frontend/src/pages/documents/[id].tsx
index 4b176d5..2563386 100644
--- a/bsition/frontend/src/pages/documents/[id].tsx
+++ b/bsition/frontend/src/pages/documents/[id].tsx
@@ -1,16 +1,8 @@
import io from "socket.io-client";
-import {useState, useEffect} from "react";
+import React, {useEffect, useState} from "react";
import {useRouter} from "next/router";
import Layout from "../../components/Layout";
-import {
- OptionsIcon,
- DeleteIcon,
- LockIcon,
- PublicIcon,
- ShareIcon,
- ManageIcon
-} from "../../components/icons";
-import Link from "next/link";
+import {DeleteIcon, LockIcon, ManageIcon, OptionsIcon, ShareIcon, PublicIcon} from "../../components/icons";
let socket;
@@ -20,6 +12,8 @@ export default function Document() {
const [text, setText] = useState("");
const [token, setToken] = useState("");
const [title, setTitle] = useState("");
+ const [shared, setShared] = useState(false);
+ const [publicMode, setPublicMode] = useState(false);
useEffect(() => {
socketInitializer();
@@ -41,6 +35,8 @@ export default function Document() {
const json = await res.json();
setText(() => json["data"])
setTitle(() => json["name"])
+ setShared(() => json["owner"].toString() !== localStorage.getItem("user"))
+ setPublicMode(() => json["public"])
}
fetchData()
@@ -52,7 +48,7 @@ export default function Document() {
const interval = setInterval(() => {
fetch(`http://localhost:8000/api/documents/${router.query.id}`, {
method: 'PUT',
- body: `{"data": "${text}"}`,
+ body: `{"data": "${text.replace(/\n/g, "\\n")}"}`,
headers: {
'Content-type': 'application/json',
'Authorization': `Bearer ${token}`
@@ -89,6 +85,48 @@ export default function Document() {
};
let access = router.query.id + "/access"
+ const deleteDoc = async () => {
+ const res = await fetch(`http://localhost:8000/api/documents/${router.query.id}`, {
+ method: "DELETE",
+ headers: {
+ 'Authorization': `Bearer ${token}`
+ }
+ })
+ const json = await res.json();
+
+ if (res.status == 201) {
+ router.push("/")
+ }
+ };
+ const publicOrPrivate = async () => {
+ if (!publicMode) {
+ const res = await fetch(`http://localhost:8000/api/documents/${router.query.id}`, {
+ method: "PUT",
+ headers: {
+ 'Content-type': 'application/json',
+ 'Authorization': `Bearer ${token}`
+ },
+ body: '{"public": true}'
+ })
+
+ if (res.status == 202) {
+ setPublicMode(() => true)
+ }
+ } else {
+ const res = await fetch(`http://localhost:8000/api/documents/${router.query.id}`, {
+ method: 'PUT',
+ headers: {
+ 'Content-type': 'application/json',
+ 'Authorization': `Bearer ${token}`
+ },
+ body: '{"public": false}'
+ })
+
+ if (res.status == 202) {
+ setPublicMode(() => false)
+ }
+ }
+ };
return (
@@ -98,40 +136,45 @@ export default function Document() {
{title}
-
{
- document.getElementById("myDropdown").classList.toggle("show");
+ {!shared && (<>
+ {
+ document.getElementById("myDropdown").classList.toggle("show");
- window.onclick = function (event) {
- if (!event.target.matches('.dropbtn')) {
- var dropdowns = document.getElementsByClassName("dropdown-content");
- var i;
- for (i = 0; i < dropdowns.length; i++) {
- var openDropdown = dropdowns[i];
- if (openDropdown.classList.contains('show')) {
- openDropdown.classList.remove('show');
+ window.onclick = function (event) {
+ if (!event.target.matches('.dropbtn')) {
+ var dropdowns = document.getElementsByClassName("dropdown-content");
+ var i;
+ for (i = 0; i < dropdowns.length; i++) {
+ var openDropdown = dropdowns[i];
+ if (openDropdown.classList.contains('show')) {
+ openDropdown.classList.remove('show');
+ }
}
}
}
- }
- }} className="dropbtn">
-
+ }} className="dropbtn">
+
+ )}