fixed login

README.md

@@ -1,12 +1,12 @@
 ---
-title: Aieye Tutorial Template
-emoji: 🌍
-colorFrom: green
-colorTo: purple
+title: Named Entity Recognition
+emoji: 🤖
+colorFrom: red
+colorTo: blue
 sdk: streamlit
 sdk_version: 1.21.0
 app_file: 0_Introduction.py
-pinned: false
+pinned: true
 license: openrail
 duplicated_from: aieye/aieye_tutorial_template
 ---

utils/levels.py

@@ -1,60 +1,36 @@
 import streamlit as st
+from utils.login import get_login
 import os
-import requests
-import os
-import json
-
-# Fetch the service account key JSON file contents
-
 
-def initialize_login():
-    if "login" not in st.session_state:
-        st.columns(3)[1].image("assets/logo.png")
-        username = st.text_input("Username")
-        password = st.text_input("Password", type="password")
-
-        if st.button("Login"):
-            authorized = authenticate(username, password)
-            if authorized["status"]:
-                st.session_state["login"] = authorized
-                os.makedirs(
-                    os.path.join(".sessions", st.session_state["login"]["username"]),
-                    exist_ok=True,
-                )
-                st.success("Login Successful!")
-                st.experimental_rerun()
+def initialize_level():
+    if 'level' not in st.session_state:
+        if get_login()["status"]:
+            if not os.path.exists(f".sessions/{get_login()['username']}/level.txt"):
+                with open(f".sessions/{get_login()['username']}/level.txt", "w") as f:
+                    f.write("0")
+                st.session_state['level'] = 0
             else:
-                st.error("Invalid username or password")
+                with open(f".sessions/{get_login()['username']}/level.txt", "r") as f:
+                    st.session_state['level'] = int(f.read())
+
+def get_level():
+    return st.session_state['level']
+
+def render_page(page, level):
+    if get_login()["status"]:
+        if st.session_state['level'] < level:
+            st.error(f"You need to complete Level {st.session_state['level']} first!")
+        else:
+            page()
     else:
-        st.sidebar.success(f'Hello, {st.session_state["login"]["Name"]}!')
-        st.sidebar.image("assets/logo.png", use_column_width=True)
-
+        st.error("You need to login first!")
 
-def authenticate(username, password):
-    FIREBASE_WEB_API_KEY = os.environ.get("FIREBASE_WEB_API_KEY")
-    payload = json.dumps(
-        {
-            "email": f"{username}@aieye.com",
-            "password": password,
-            "returnSecureToken": False,
-        }
-    )
-
-    rest_api_url = (
-        f"https://identitytoolkit.googleapis.com/v1/accounts:signInWithPassword"
-    )
-    r = requests.post(rest_api_url, params={"key": FIREBASE_WEB_API_KEY}, data=payload)
-    print(r.json())
-
-    if r.status_code == 200:
-        return {
-            "status": True,
-            "Name": " ".join(username.split("_")),
-            "username": username,
-        }
+def complete_level(level):
+    if st.session_state['level'] > level:
+        st.info(f'You have Already completed Level {level}!')
     else:
-        return {"status": False}
-
-
-def get_login():
-    return st.session_state.get("login", {"status": False})
+        st.session_state['level'] = level + 1
+        with open(f".sessions/{get_login()['username']}/level.txt", "w") as f:
+            f.write(str(st.session_state['level']))
+        st.balloons()
+        st.success(f'You have completed Level {level}! You can now move on to the next level.')

utils/login.py

@@ -1,5 +1,10 @@
 import streamlit as st
 import os
+import requests
+import os
+import json
+
+# Fetch the service account key JSON file contents
 
 
 def initialize_login():
@@ -7,9 +12,9 @@ def initialize_login():
         st.columns(3)[1].image("assets/logo.png")
         username = st.text_input("Username")
         password = st.text_input("Password", type="password")
+
         if st.button("Login"):
-            # TODO: replace with actual authorization check
-            authorized = {"status": True, "Name": "John Doe", "username": "johndoe"}
+            authorized = authenticate(username, password)
             if authorized["status"]:
                 st.session_state["login"] = authorized
                 os.makedirs(
@@ -22,6 +27,33 @@ def initialize_login():
                 st.error("Invalid username or password")
     else:
         st.sidebar.success(f'Hello, {st.session_state["login"]["Name"]}!')
+        st.sidebar.image("assets/logo.png", use_column_width=True)
+
+
+def authenticate(username, password):
+    FIREBASE_WEB_API_KEY = os.environ.get("FIREBASE_WEB_API_KEY")
+    payload = json.dumps(
+        {
+            "email": f"{username}@aieye.com",
+            "password": password,
+            "returnSecureToken": False,
+        }
+    )
+
+    rest_api_url = (
+        f"https://identitytoolkit.googleapis.com/v1/accounts:signInWithPassword"
+    )
+    r = requests.post(rest_api_url, params={"key": FIREBASE_WEB_API_KEY}, data=payload)
+    print(r.json())
+
+    if r.status_code == 200:
+        return {
+            "status": True,
+            "Name": " ".join(username.split("_")),
+            "username": username,
+        }
+    else:
+        return {"status": False}
 
 
 def get_login():