Remove key

app_run.py

@@ -5,7 +5,8 @@
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import RedirectResponse, HTMLResponse
 
-from server.models import Base
+from server.models.user import Base as UserBase
+from server.models.text import Base as TextBase
 from server.routers.database import engine, get_db
 from server.routers.download import router as download_router
 from server.routers.features import router as features_router
@@ -14,6 +15,7 @@
 from server.routers.states import router as states_router
 from server.routers.text import router as text_router
 from server.routers.texts import router as texts_router
+from server.routers.user import router as user_router
 
 
 app = FastAPI()
@@ -32,7 +34,9 @@
 )
 
 # Create tables
-Base.metadata.create_all(bind=engine)
+TextBase.metadata.create_all(bind=engine)
+UserBase.metadata.create_all(bind=engine)
+
 
 @app.get("/healthcheck")
 async def healthcheck():
@@ -46,11 +50,14 @@ async def index() -> RedirectResponse:
 
 app.include_router(download_router, prefix=f"{PROD_PREFIX}/download", tags=["download"], dependencies=[Depends(get_db)])
 app.include_router(features_router, prefix=f"{PROD_PREFIX}/features", tags=["features"], dependencies=[Depends(get_db)])
-app.include_router(frequencies_router, prefix=f"{PROD_PREFIX}/frequencies", tags=["frequencies"], dependencies=[Depends(get_db)])
+app.include_router(
+    frequencies_router, prefix=f"{PROD_PREFIX}/frequencies", tags=["frequencies"], dependencies=[Depends(get_db)]
+)
 app.include_router(lengths_router, prefix=f"{PROD_PREFIX}/lengths", tags=["lengths"], dependencies=[Depends(get_db)])
 app.include_router(states_router, prefix=f"{PROD_PREFIX}/states", tags=["states"], dependencies=[Depends(get_db)])
 app.include_router(text_router, prefix=f"{PROD_PREFIX}/text", tags=["text"], dependencies=[Depends(get_db)])
 app.include_router(texts_router, prefix=f"{PROD_PREFIX}/texts", tags=["texts"], dependencies=[Depends(get_db)])
+app.include_router(user_router, prefix=f"{PROD_PREFIX}/user", tags=["user"], dependencies=[Depends(get_db)])
 
 
 if __name__ == "__main__":

frontend/src/components/TopNav/TopNavbar.vue

@@ -31,11 +31,16 @@
         <el-menu-item index="/sv/help">
           {{ $t('topNavbar.help') }}
         </el-menu-item>
+        <el-menu-item index="/login">
+          <span>
+            Login
+          </span>
+        </el-menu-item>
       </el-menu>
       <lang-switch />
     </div>
     <div
-      v-if="$route.params.toolVersion==='en'"
+      v-else-if="$route.params.toolVersion==='en'"
       class="navbar-container english-version"
     >
       <el-menu
@@ -65,6 +70,31 @@
         <el-menu-item index="/en/help">
           {{ $t('topNavbar.help') }}
         </el-menu-item>
+        <el-menu-item index="/login">
+          <span>
+            Login
+          </span>
+        </el-menu-item>
+      </el-menu>
+      <lang-switch />
+    </div>
+    <div
+      v-else-if="$route.params.login==='login'"
+      class="navbar-container login english-version"
+    >
+      <el-menu
+        :default-active="activeLink"
+        background-color="#F2575F"
+        active-text-color="black"
+        mode="horizontal"
+        router
+      >
+        <el-menu-item index="/en">
+          {{ $t('topNavbar.home') }}
+        </el-menu-item>
+        <el-menu-item index="/register">
+          Register
+        </el-menu-item>
       </el-menu>
       <lang-switch />
     </div>

frontend/src/main.js

@@ -12,6 +12,7 @@ import MainPage from './components/MainPage.vue';
 import UploadPage from './components/Upload/UploadPage.vue';
 import HelpPage from './components/HelpPage.vue';
 import DownloadPage from './components/DownloadPage.vue';
+import LoginPage from './components/LoginPage.vue';
 import VisualizePage from './components/Visualize/VisualizePage.vue';
 import StatisticsPage from './components/Statistics/StatisticsPage.vue';
 
@@ -29,6 +30,7 @@ const router = new VueRouter({
       path: '/',
       redirect: '/en',
     },
+    { path: '/:login(login|logout)', component: LoginPage },
     {
       path: '/:toolVersion(en|sv)',
       component: MainPage,

server/lib/download.py

@@ -10,7 +10,7 @@
 from server.lib.exceptions import DownloadError
 from server.lib.fetch_features import get_features_for_items
 from server.lib.utils import get_texts
-from server.models import Text, Paragraph, Sentence
+from server.models.text import Text, Paragraph, Sentence
 from swegram_main.config import COLUMN_DELIMITER
 from swegram_main.config import METADATA_DELIMITER_LEBAL as LEBAL
 from swegram_main.config import METADATA_DELIMITER_TAG as TAG

server/lib/fetch_current_sentences.py

@@ -5,7 +5,7 @@
 from fastapi.responses import JSONResponse
 from sqlalchemy.orm import Session
 
-from server.models import Text, Sentence
+from server.models.text import Text, Sentence
 from swegram_main.config import PAGE_SIZE
 
 

server/lib/fetch_data.py

@@ -1,6 +1,6 @@
 """Fetch data"""
 from typing import Any, Dict, List, Tuple
-from server.models import Text
+from server.models.text import Text
 
 
 def _fetch_text_ids_and_filenames(texts: List[Text]) -> List[Tuple[int, str]]:

server/lib/fetch_features.py

@@ -4,7 +4,7 @@
 from pydantic import BaseModel
 from sqlalchemy.orm import Session
 
-from server.models import Text, Paragraph, Sentence
+from server.models.text import Text, Paragraph, Sentence
 from server.lib.exceptions import ServerError
 from server.lib.utils import get_texts
 from swegram_main.config import PAGE_SIZE

server/lib/utils.py

@@ -3,7 +3,7 @@
 
 from sqlalchemy.orm import Session
 
-from server.models import Text
+from server.models.text import Text
 
 
 def get_texts(db: Session, language: str, category: Optional[str] = None) -> List[Text]: