Features Icons in features panel

app/database/models.py

@@ -107,6 +107,9 @@ class Feature(Base):
     route = Column(String, nullable=False)
     creator = Column(String, nullable=True)
     description = Column(String, nullable=False)
+    icon = Column(String, nullable=False)
+    followers = Column(Integer, default=0)
+    template = Column(String, nullable=True)
 
     users = relationship("User", secondary=UserFeature.__tablename__)
 

app/internal/features.py

@@ -8,7 +8,7 @@
 
 from app.database.models import Feature, UserFeature
 from app.dependencies import SessionLocal, get_db
-from app.internal.features_index import features
+from app.internal.features_index import features, icons
 from app.internal.security.dependencies import current_user
 from app.internal.security.ouath2 import get_authorization_cookie
 from app.internal.utils import create_model
@@ -46,7 +46,9 @@ async def wrapper(*args, **kwargs):
 def create_features_at_startup(session: Session) -> bool:
     for feat in features:
         if not is_feature_exists(feature=feat, session=session):
-            create_feature(**feat, db=session)
+            icon = icons.get(feat["name"])
+            create_feature(**feat, icon=icon, db=session)
+
     return True
 
 
@@ -90,6 +92,14 @@ def update_feature(
     feature.route = feature_dict["route"]
     feature.description = feature_dict["description"]
     feature.creator = feature_dict["creator"]
+    feature.template = feature_dict["template"]
+
+    icon = icons.get(feature.name)
+    if icon is None:
+        icon = "extension-puzzle"
+
+    feature.icon = icon
+
     session.commit()
     return feature
 
@@ -116,7 +126,7 @@ async def is_access_allowd(request: Request, route: str) -> bool:
             & (UserFeature.user_id == user.user_id),
         ),
     ).scalar()
-
+    print(user_feature)
     return user_feature
 
 
@@ -126,15 +136,24 @@ def create_feature(
     route: str,
     description: str,
     creator: str = None,
+    icon: str = None,
+    template: str = None,
 ) -> Feature:
     """Creates a feature."""
+    db = SessionLocal()
+
+    if icon is None:
+        icon = "extension-puzzle"
+
     return create_model(
         db,
         Feature,
         name=name,
         route=route,
         creator=creator,
         description=description,
+        icon=icon,
+        template=template,
     )
 
 
@@ -145,6 +164,7 @@ def create_user_feature_association(
     is_enable: bool,
 ) -> UserFeature:
     """Creates an association."""
+    add_follower(feature_id=feature_id, session=db)
     return create_model(
         db,
         UserFeature,
@@ -181,3 +201,17 @@ def get_user_uninstalled_features(
         )
         .all()
     )
+
+
+def remove_follower(feature_id: int, session: SessionLocal) -> None:
+    feat = session.query(Feature).filter_by(id=feature_id).first()
+    feat.followers -= 1
+    if feat.followers < 0:
+        feat.followers = 0
+    session.commit()
+
+
+def add_follower(feature_id: int, session: SessionLocal) -> None:
+    feat = session.query(Feature).filter_by(id=feature_id).first()
+    feat.followers += 1
+    session.commit()

app/internal/features_index.py

@@ -1,4 +1,4 @@
-'''
+"""
     This file purpose is for developers to add their features to the database
     in one convenient place, every time the system loads up it's adding and
     updating the features in the features table in the database.
@@ -12,20 +12,54 @@
     *   Please see the example below.                                         *
 
     Enjoy and good luck :)
-'''
+"""
 
-'''
+"""
+All icons come from https://ionicons.com/.
+
+If you want your feature to have an icon Go To: https://ionicons.com/
+and follow the next steps:
+
+1. pick an icon and press on it, copy the name.
+2. create dict in the icons list below.
+3. copy and paste your feature name and your
+    icon name you copied earlier (follow the example).
+
+4. And You Are Done. the icon will show automaticly.
+
+If you dont pick an icon your feature will have a default icon.
+
+Example to feature icon stracture:
+
+{
+    .
+    .
+    .
+    "<feature name>": "<icon name>",
+    .
+    .
+    .
+}
+"""
+
+# Add to last!
+icons = {"feature-panel": "albums-outline", "Google Sync": "sync-outline"}
+
+
+"""
 Example to feature stracture:
 
 {
     "name": "<feature name - str>",
     "route": "/<the route like: /features - str>",
     "description": "<description - str>",
-    "creator": "<creator name or nickname - str>"
+    "creator": "<creator name or nickname - str>",
+    "template": "<settings template - str (it's optional,
+                  the system will show a correct message)>"
 }
-'''
+"""
 
-'''
+"""
 *   IMPORTANT   *
 
 Example to decorator placement:
@@ -39,13 +73,20 @@ def my_cool_feature_route():
         ..
         .
 
-'''
+"""
 
 features = [
     {
         "name": "Google Sync",
         "route": "/google/sync",
         "description": "Sync Google Calendar events with Pylender",
-        "creator": "Liran Caduri"
+        "creator": "Liran Caduri",
+        "template": "example_panel",
+    },
+    {
+        "name": "example",
+        "route": "/example",
+        "description": "example",
+        "creator": "example",
     },
 ]

app/main.py

@@ -123,6 +123,7 @@ async def swagger_ui_redirect():
     dayview.router,
     email.router,
     event.router,
+    features.router,
     export.router,
     features.router,
     four_o_four.router,

app/routers/features.py

@@ -1,15 +1,18 @@
 from typing import List
 
 from fastapi import APIRouter, Depends, Request
+from fastapi.responses import HTMLResponse
 from sqlalchemy.sql import exists
+from starlette.responses import PlainTextResponse
 
 from app.database.models import Feature, User, UserFeature
-from app.dependencies import SessionLocal, get_db
+from app.dependencies import SessionLocal, get_db, templates
 from app.internal.features import (
     create_user_feature_association,
     get_user_installed_features,
     get_user_uninstalled_features,
     is_user_has_feature,
+    remove_follower,
 )
 from app.internal.security.dependencies import current_user
 
@@ -24,9 +27,23 @@
 async def index(
     request: Request,
     session: SessionLocal = Depends(get_db),
-) -> List[Feature]:
-    features = session.query(Feature).all()
-    return features
+    user: User = Depends(current_user),
+) -> templates:
+    features = {
+        "installed": get_user_installed_features(
+            session=session,
+            user_id=user.user_id,
+        ),
+        "uninstalled": get_user_uninstalled_features(
+            session=session,
+            user_id=user.user_id,
+        ),
+    }
+
+    return templates.TemplateResponse(
+        "features.html",
+        {"request": request, "features": features},
+    )
 
 
 @router.post("/add")
@@ -84,6 +101,8 @@ async def delete_user_feature_association(
     if not is_exist:
         return False
 
+    remove_follower(feature_id=feature_id, session=session)
+
     session.query(UserFeature).filter_by(
         feature_id=feature_id,
         user_id=user.user_id,
@@ -93,19 +112,26 @@ async def delete_user_feature_association(
     return True
 
 
-@router.get("/deactive")
-def deactive(
+@router.get("/installed")
+async def get_user_feature(
     request: Request,
     session: SessionLocal = Depends(get_db),
     user: User = Depends(current_user),
-):
-    return get_user_uninstalled_features(user_id=user.user_id, session=session)
+) -> List[Feature]:
+    return get_user_installed_features(user_id=user.user_id, session=session)
 
 
-@router.get("/active")
-def active(
+@router.post("/settings/{template}")
+async def render_settings(
     request: Request,
-    session: SessionLocal = Depends(get_db),
-    user: User = Depends(current_user),
-):
-    return get_user_installed_features(user_id=user.user_id, session=session)
+    template: str,
+) -> HTMLResponse:
+    if template == 'null':
+        return PlainTextResponse(
+            content='No additional settings for this one :)')
+
+    template = templates.get_template(
+        "partials/features_panels/" + template + '.html'
+    )
+    content = template.render()
+    return HTMLResponse(content=content)

app/static/features.css

@@ -0,0 +1,81 @@
+.search-box {
+    width: 98%;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    font-size: var(--text_s);
+    border: 2px solid var(--secondary);
+    border-radius: 0.25rem;
+    padding: 0.25rem;
+    background-color: white;
+  }
+
+.search-box * {
+  margin: 0 0.25rem;
+}
+
+.search-input[type=text],
+.search-input:focus {
+  width: 100%;
+  outline: none;
+  border:none;
+}
+
+/* Feature Panel */
+#features {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  grid-auto-rows: 3rem;
+  grid-column-gap: var(--space_l);
+  margin: var(--space_s);
+  align-items: start;
+  width: 100%;
+
+  overflow-y: scroll;
+  -ms-overflow-style: none; /* IE and Edge */
+  scrollbar-width: none; /* Firefox */
+}
+
+.invisible {
+  display: none;
+  position: absolute;
+  top:0;
+}
+
+.feature-row {
+  display: grid;
+  box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+
+  grid-template-columns: 6% 30% auto auto 15%;
+  background-color: var(--surface);
+  margin: var(--space_s) 0;
+  padding: var(--space_s);
+  border-radius: 0.25rem;
+  border: 2px solid transparent;
+}
+
+.feature-row:hover {
+  border: 2px solid var(--primary);
+}
+
+.feature-row div {
+  justify-self: start;
+  width: 100%;
+}
+
+.feature-icon {
+  font-size: var(--text_m);
+  vertical-align: middle;
+}
+
+.information {
+  display: none;
+  grid-column: 2/6;
+  width: 30rem;
+}
+
+.info-box {
+  display: block !important;
+}