Merge branch 'dashboard_changes' of github.com:stopstalk/stopstalk-deployment

Author: raj454raj

controllers/default.py

@@ -144,6 +144,51 @@ def _get_failure_message(ticket):
 
     return dict(error_message=error_message, similar_users=similar_users)
 
+# ----------------------------------------------------------------------------
+@auth.requires_login()
+def get_card_html():
+    init_arguments = request.vars["init_arguments[]"]
+
+    if not isinstance(init_arguments, list):
+        init_arguments = [init_arguments]
+
+    if int(init_arguments[0]) != session.user_id:
+        return ""
+
+    import dashboard_cards
+    card_class = getattr(dashboard_cards,
+                         request.vars["class_name"])(*init_arguments)
+
+    return card_class.get_html() if card_class.should_show() else ""
+
+# ----------------------------------------------------------------------------
+@auth.requires_login()
+def dashboard():
+    session.welcome_shown = True
+    ratable = db.recent_announcements
+    rarecord = db(ratable.user_id == session.user_id).select().first()
+    if rarecord is None:
+        ratable.insert(user_id=session.user_id)
+        rarecord = db(ratable.user_id == session.user_id).select().first()
+
+    user = session.auth.user
+    db.sessions_today.insert(message="%s %s %d %s" % (user.first_name,
+                                                      user.last_name,
+                                                      user.id,
+                                                      datetime.datetime.now()))
+
+    return dict(recent_announcements=json.loads(rarecord.data))
+
+# ----------------------------------------------------------------------------
+@auth.requires_login()
+def cta_handler():
+    problem_id = utilities.pick_a_problem(
+                    session.user_id,
+                    False,
+                    **request.vars
+                )
+    redirect(URL("problems", "index", vars=dict(problem_id=problem_id)))
+
 # ----------------------------------------------------------------------------
 def user_editorials():
 
@@ -282,7 +327,7 @@ def index():
             session.flash = T("Welcome StopStalker!!")
         elif response.flash is not None:
             session.flash = response.flash
-        redirect(URL("default", "submissions", args=[1]))
+        redirect(URL("default", "dashboard"))
 
     return dict()
 
@@ -332,7 +377,7 @@ def _get_ids(ids):
                         TD(IMG(_src=get_static_url("images/" + \
                                                    utilities.urltosite(row.link) + \
                                                    "_small.png"),
-                               _style="height: 30px; weight: 30px;")),
+                               _class="parent-site-icon-small")),
                         TD(row.total_submissions),
                         TD(len(uids) + len(cuids)),
                         TD(I(_class="red-text text-accent-4 fa fa-times remove-from-todo",
@@ -449,6 +494,7 @@ def _upload_resume():
     else:
         rdtable.insert(**update_params)
         resume_data_record = db(rdtable.user_id == session.user_id).select().first()
+        current.REDIS_CLIENT.delete(CARD_CACHE_REDIS_KEYS["job_profile_prefix"] + str(session.user_id))
 
     response.flash = "Successfully saved your details!"
     return _get_response_from_record(resume_data_record)
@@ -675,30 +721,14 @@ def contests():
         Show the upcoming contests
     """
 
-    today = datetime.datetime.today()
-    today = datetime.datetime.strptime(str(today)[:-7],
-                                       "%Y-%m-%d %H:%M:%S")
+    ongoing, upcoming = utilities.get_contests()
+    if None in [ongoing, upcoming]:
+        return dict(retrieved=False)
 
-    start_date = today.date()
-    end_date = start_date + datetime.timedelta(90)
     site_mapping = {"CODECHEF": "CodeChef",
                     "CODEFORCES": "Codeforces",
                     "HACKERRANK": "HackerRank",
                     "HACKEREARTH": "HackerEarth"}
-    url = "https://contesttrackerapi.herokuapp.com/"
-
-    from urllib3 import disable_warnings
-    disable_warnings()
-
-    response = requests.get(url, verify=False)
-    if response.status_code == 200:
-        response = response.json()["result"]
-    else:
-        return dict(retrieved=False)
-
-    ongoing = response["ongoing"]
-    upcoming = response["upcoming"]
-    contests = []
     cal = pdt.Calendar()
 
     table = TABLE(_class="centered bordered", _id="contests-table")
@@ -714,7 +744,6 @@ def contests():
     button_class = "btn-floating btn-small accent-4 tooltipped"
     view_link_class = button_class + " green view-contest"
     reminder_class = button_class + " orange set-reminder"
-    icon_style = "height: 30px; width: 30px;"
     left_tooltip_attrs = {"position": "left", "delay": "50"}
 
     for i in ongoing:
@@ -743,7 +772,7 @@ def contests():
                                           str(i["Platform"]).lower() + \
                                           "_small.png"),
                       _title=site_mapping[i["Platform"]],
-                      _style=icon_style)))
+                      _class="parent-site-icon-small")))
 
         append(TD("-"))
         append(TD(str(endtime).replace("-", "/"),
@@ -1228,6 +1257,7 @@ def mark_friend():
     # Insert a tuple of users' id into the following table
     ftable.insert(user_id=friend_id, follower_id=session.user_id)
 
+    current.REDIS_CLIENT.delete(CARD_CACHE_REDIS_KEYS["add_more_friends_prefix"] + str(session.user_id))
     trtable = db.todays_requests
     query = (trtable.user_id == friend_id) & \
             (trtable.follower_id == session.user_id)
@@ -1534,6 +1564,7 @@ def _invalid_url():
             return _invalid_url()
 
         db(query).delete()
+        current.REDIS_CLIENT.delete(CARD_CACHE_REDIS_KEYS["add_more_friends_prefix"] + str(session.user_id))
 
         trtable = db.todays_requests
         query = (trtable.user_id == friend_id) & \
@@ -1569,13 +1600,11 @@ def submissions():
             # The pagination page number is not integer
             raise HTTP(404)
             return
-    session.welcome_shown = True
 
     cftable = db.custom_friend
     stable = db.submission
     atable = db.auth_user
     ptable = db.problem
-    ratable = db.recent_announcements
 
     # Get all the friends/custom friends of the logged-in user
     friends, cusfriends = utilities.get_friends(session.user_id)
@@ -1602,48 +1631,17 @@ def submissions():
         return dict(count=count,
                     total_rows=1)
 
-    rarecord = db(ratable.user_id == session.user_id).select().first()
-    if rarecord is None:
-        ratable.insert(user_id=session.user_id)
-        rarecord = db(ratable.user_id == session.user_id).select().first()
-
-    user = session.auth.user
-    db.sessions_today.insert(message="%s %s %d %s" % (user.first_name,
-                                                      user.last_name,
-                                                      user.id,
-                                                      datetime.datetime.now()))
-
     offset = PER_PAGE * (active - 1)
     # Retrieve only some number of submissions from the offset
     rows = db(query).select(orderby=~db.submission.time_stamp,
                             limitby=(offset, offset + PER_PAGE))
 
     table = utilities.render_table(rows, cusfriends, session.user_id)
 
-    country_value = session.auth.user.get("country")
-    country = country_value if country_value else "not-available"
-
-    country_form = None
-    if country == "not-available":
-        country_form = SQLFORM(db.auth_user,
-                               session.auth.user,
-                               fields=["country"],
-                               showid=False)
-        if country_form.process(onvalidation=current.sanitize_fields).accepted:
-            session.auth.user = db.auth_user(session.user_id)
-            session.flash = T("Country updated!")
-            redirect(URL("default", "submissions", args=1))
-        elif country_form.errors:
-            response.flash = T("Form has errors")
-
     return dict(table=table,
                 friends=friends,
                 cusfriends=cusfriends,
-                total_rows=len(rows),
-                country=country,
-                country_form=country_form,
-                utilities=utilities,
-                recent_announcements=json.loads(rarecord.data))
+                total_rows=len(rows))
 
 # ----------------------------------------------------------------------------
 def faq():

controllers/user.py

@@ -290,7 +290,8 @@ def update_details():
             db(submission_query).delete()
 
         session.auth.user = db.auth_user(session.user_id)
-        redirect(URL("default", "submissions", args=[1]))
+        current.REDIS_CLIENT.delete(CARD_CACHE_REDIS_KEYS["more_accounts_prefix"] + str(session.user_id))
+        redirect(URL("default", "index"))
     elif form.errors:
         response.flash = T("Form has errors")
 
@@ -693,40 +694,10 @@ def get_stopstalk_user_stats():
 
     user_id = int(user_id)
     custom = (custom == "True")
-    stopstalk_handle = utilities.get_stopstalk_handle(user_id, custom)
-    redis_cache_key = "profile_page:user_stats_" + stopstalk_handle
-
-    # Check if data is present in REDIS
-    data = current.REDIS_CLIENT.get(redis_cache_key)
-    if data:
-        result = json.loads(data)
-        if not auth.is_logged_in():
-            del result["rating_history"]
-        if "problems_authored_count" not in result:
-            result["problems_authored_count"] = 0
-        return result
-
-    stable = db.submission
-
-    query = (stable["custom_user_id" if custom else "user_id"] == user_id)
-    rows = db(query).select(stable.time_stamp,
-                            stable.problem_id,
-                            stable.status,
-                            stable.site,
-                            orderby=stable.time_stamp)
-
-    # Returns rating history, accepted & max streak (day and accepted),
-    result = utilities.get_stopstalk_user_stats(stopstalk_handle,
-                                                custom,
-                                                rows.as_list())
-
-    if auth.is_logged_in():
-        current.REDIS_CLIENT.set(redis_cache_key,
-                                 json.dumps(result, separators=JSON_DUMP_SEPARATORS),
-                                 ex=1 * 60 * 60)
-    elif "rating_history" in result:
-        del result["rating_history"]
 
+    result = utilities.get_rating_information(user_id,
+                                              custom,
+                                              auth.is_logged_in())
     return result
 
 # ------------------------------------------------------------------------------
@@ -1082,7 +1053,7 @@ def custom_friend():
     if form.accepted:
         session.flash = T("Submissions will be added in some time")
         current.create_next_retrieval_record(form.vars, custom=True)
-        redirect(URL("default", "submissions", args=[1]))
+        redirect(URL("default", "dashboard"))
 
     return dict(form=form,
                 table=table,

deploy_scripts/static_files_list.txt

@@ -9,6 +9,7 @@ js/web2py-bootstrap3.js
 js/appjs/google_analytics.js
 js/appjs/layout.js
 js/appjs/default/contests.js
+js/appjs/default/dashboard.js
 js/appjs/default/faq.js
 js/appjs/default/filters.js
 js/appjs/default/search.js

models/db.py

@@ -796,6 +796,24 @@ def _count_custom_users_lambda(row):
 }
 current.REFRESH_INTERVAL = 120 * 60
 
+# ----------------------------------------------------------------------------
+def get_static_file_version(file_path):
+    if current.environment == "production":
+        new_file_path = file_path
+        static_dir = "static/minified_files"
+        if file_path[-3:] == ".js":
+            new_file_path = file_path[:-3] + ".min.js"
+        elif file_path[-4:] == ".css":
+            new_file_path = file_path[:-4] + ".min.css"
+        else:
+            static_dir = "static"
+            new_file_path = file_path
+    else:
+        new_file_path = file_path
+        static_dir = "static"
+
+    return static_dir, new_file_path, current.REDIS_CLIENT.get(new_file_path)
+
 # ----------------------------------------------------------------------------
 def get_static_url(file_path):
     """
@@ -806,25 +824,17 @@ def get_static_url(file_path):
     """
 
     if current.environment == "production":
-        new_file_path = file_path
-        if file_path[-3:] == ".js":
-            new_file_path = file_path[:-3] + ".min.js"
-        elif file_path[-4:] == ".css":
-            new_file_path = file_path[:-4] + ".min.css"
-        else:
-            return URL("static",
-                       file_path,
-                       vars={"_rev": current.REDIS_CLIENT.get(file_path)},
-                       extension=False)
-        return URL("static/minified_files",
-                   new_file_path,
-                   vars={"_rev": current.REDIS_CLIENT.get(new_file_path)},
+        static_dir, file_path, revision = get_static_file_version(file_path)
+        return URL(static_dir,
+                   file_path,
+                   vars={"_rev": revision},
                    extension=False)
     else:
         return URL("static",
                    file_path,
                    extension=False)
 
+current.get_static_file_version = get_static_file_version
 current.get_static_url = get_static_url
 
 # =============================================================================