Feature/timer

app/config.py.example

@@ -18,6 +18,7 @@ class Settings(BaseSettings):
 # GENERAL
 DOMAIN = 'Our-Domain'
 
+
 # DATABASE
 DEVELOPMENT_DATABASE_STRING = "sqlite:///./dev.db"
 # Set the following True if working on PSQL environment or set False otherwise

app/internal/timer.py

@@ -0,0 +1,23 @@
+from typing import Dict, Optional
+
+from app.routers.event import sort_by_date
+from app.routers.user import get_all_user_events
+from sqlalchemy.orm import Session
+from app.database.models import Event
+
+
+def get_next_user_event(session: Session, user_id: int) -> Optional[Event]:
+    events = list(sort_by_date(get_all_user_events(session, user_id)))
+    if events:
+        return events[0]
+
+
+def get_next_user_event_start_time(
+    session: Session,
+    user_id: int
+) -> Dict[str, Optional[str]]:
+    next_event = get_next_user_event(session, user_id)
+    timer_to_next_event = None
+    if next_event is not None:
+        timer_to_next_event = next_event.start.strftime("%Y-%m-%d %H:%M")
+    return {"timer": timer_to_next_event}

app/main.py

@@ -43,7 +43,7 @@ def create_tables(engine, psql_environment):
     about_us, agenda, calendar, categories, celebrity, credits,
     currency, dayview, email, event, export, four_o_four, friendview,
     google_connect, invitation, login, logout, profile,
-    register, search, telegram, user, weekview, whatsapp,
+    register, search, telegram, timer, user, weekview, whatsapp,
 )
 
 json_data_loader.load_to_database(next(get_db()))
@@ -89,6 +89,7 @@ async def swagger_ui_redirect():
     salary.router,
     search.router,
     telegram.router,
+    timer.router,
     user.router,
     whatsapp.router,
 ]

app/routers/timer.py

@@ -0,0 +1,13 @@
+from fastapi import APIRouter, Depends, Request
+from app.internal.timer import get_next_user_event_start_time
+from app.database.models import User
+from app.dependencies import get_db
+
+
+router = APIRouter()
+
+
+@router.get("/timer")
+def timer(request: Request, session=Depends(get_db)):
+    user = session.query(User).filter_by(id=1).first()
+    return get_next_user_event_start_time(session, user.id)

app/static/timer.js

@@ -0,0 +1,29 @@
+//credit for the countdowntimer: https://gist.github.com/Mak-Pro/0e1194d0f8696489a5c8bac72c8fa300
+function countdownTimer() {
+  fetch('/timer')
+    .then(response => response.json())
+    .then(data => {
+
+  let countDownDate = new Date(data.timer).getTime();
+
+  // Update the countdown every 1 second
+  const timerInterval = setInterval(function() {
+    const now = new Date().getTime();
+    const distance = countDownDate - now;
+    const days = Math.floor(distance / (1000 * 60 * 60 * 24));
+    let hours = Math.floor((distance % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60));
+    let minutes = Math.floor((distance % (1000 * 60 * 60)) / (1000 * 60));
+    let seconds = Math.floor((distance % (1000 * 60)) / 1000);
+  // Output the result to base.html in an element with id="eventtimer"
+    document.getElementById("eventtimer").innerHTML = "Upcoming event in: " + days + "d " + hours + "h "
+    + minutes + "m " + seconds + "s ";
+  // Countdown had finished
+    if (distance < 0) {
+      clearInterval(timerInterval);
+      document.getElementById("eventtimer").innerHTML = "Your Event Starts NOW:)";
+    }
+  }, 1000);
+  } );
+}
+
+document.addEventListener("DOMContentLoaded", countdownTimer);

app/templates/base.html

@@ -75,6 +75,7 @@
     <!-- This bootstrap version is needed here because of the toggler bug in the beta version-->
     <script src="https://stackpath.bootstrapcdn.com/bootstrap/5.0.0-alpha2/js/bootstrap.bundle.min.js" integrity="sha384-BOsAfwzjNJHrJ8cZidOg56tcQWfp6y72vEJ8xQ9w6Quywb24iOsW913URv1IS4GD" crossorigin="anonymous"></script>
     <script src="{{ url_for('static', path='/horoscope.js') }}"></script>
+    <script src="{{ url_for('static', path='/timer.js') }}"></script>
 </body>
 
 </html>

app/templates/profile.html

@@ -258,15 +258,44 @@ <h6 class="card-title text-center mb-1">{{ user.full_name }}</h6>
                 <!-- End Features card -->
 
               </div>
-
-              <!-- Center -->
-              <div class="col-5">
-                <div class="container" id="daily_horoscope">
+                            <!-- Center -->
+                            <div class="col-5">
+                                <div class="container" id="daily_horoscope">
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                 </div>
-              </div>
             </div>
-          </div>
 
+            <!-- Features card -->
+            <div class="card card-profile">
+                <div class="card-body">
+                    <p class="card-title">
+                        Explore more features
+                    </p>
+                    <ul class="list-group">
+                        {% if not user.telegram_id %}
+                        <li class="list-group-item list-group-item-action no-border">
+                            <a class="text-decoration-none text-success" href="https://t.me/pylander_bot" target="_blank">
+                                <strong>Try PyLander bot</strong>
+                            </a>
+                        </li>
+                        {% endif %}
+                        <li class="list-group-item list-group-item-action no-border">
+                            <a class="text-decoration-none text-secondary" href="#">Export my calendar</a>
+                        </li>
+                        <li class="list-group-item list-group-item-action no-border">
+                            <a class="text-decoration-none text-secondary" href="#">Your feature</a>
+                        </li>
+                    </ul>
+                    <div>
+                        <p id="eventtimer"></p>
+                    </div>
+                </div>
+            </div>
+            <!-- End Features card -->
+        </div>
           <!-- Center -->
           <div class="col-5">
 

tests/test_profile.py

@@ -36,6 +36,7 @@ def test_profile_page(profile_test_client):
     assert b'FakeName' in data
     assert b'Happy new user!' in data
     assert b'On This Day' in data
+    assert b'Event' in data
 
 
 def test_update_user_fullname(profile_test_client):

tests/test_timer.py

@@ -0,0 +1,18 @@
+from app.internal.timer import get_next_user_event
+from app.internal.timer import get_next_user_event_start_time
+
+
+def test_get_last_event_success(event, session):
+    next_event = get_next_user_event(
+        session=session,
+        user_id=event.owner_id,
+    )
+    assert next_event == event
+
+
+def test_time_left(event, session):
+    time_left = get_next_user_event_start_time(
+        session=session,
+        user_id=event.owner_id,
+    )
+    assert type(time_left["timer"]) is str