diff --git a/Custom_Templates/customer_templates/Mizuno/.DS_Store b/Custom_Templates/customer_templates/Mizuno/.DS_Store new file mode 100644 index 00000000..5008ddfc Binary files /dev/null and b/Custom_Templates/customer_templates/Mizuno/.DS_Store differ diff --git a/Custom_Templates/customer_templates/Mizuno/_course_details.html.liquid b/Custom_Templates/customer_templates/Mizuno/_course_details.html.liquid index 50093c68..09d86c00 100644 --- a/Custom_Templates/customer_templates/Mizuno/_course_details.html.liquid +++ b/Custom_Templates/customer_templates/Mizuno/_course_details.html.liquid @@ -4,10 +4,9 @@ {% for course_section in course.sections %} {% for course_activity in course_section.activities %} {% assign activities_count = activities_count | plus: 1 %} - {% if course_activity.type == "quiz" %} {% assign quizzes_count = quizzes_count | plus: 1 %} - {% endif %} + {% endif %} {% endfor %} {% endfor %} diff --git a/Custom_Templates/customer_templates/Mizuno/_courses_catalog.html.liquid b/Custom_Templates/customer_templates/Mizuno/_courses_catalog.html.liquid new file mode 100644 index 00000000..8d32ebc0 --- /dev/null +++ b/Custom_Templates/customer_templates/Mizuno/_courses_catalog.html.liquid @@ -0,0 +1,20 @@ +{% if courses.in_catalog.any? %} +
+ {% for course in courses.in_catalog %} + {% assign category_flag = false %} + + {% unless course.name == 'PFS Resources' %} +
+ {% include "cards_course" with course %} +
+ {% endunless %} + {% endfor %} +
+{% else %} + {% capture message %} + {% t shared.zero_state.courses.catalog, + key: current_school.course_vocabulary + %} + {% endcapture %} + {% include "courses_zero_state", message: message %} +{% endif %} \ No newline at end of file diff --git a/Custom_Templates/customer_templates/Mizuno/_courses_resources.html.liquid b/Custom_Templates/customer_templates/Mizuno/_courses_resources.html.liquid new file mode 100644 index 00000000..aa7dfd4b --- /dev/null +++ b/Custom_Templates/customer_templates/Mizuno/_courses_resources.html.liquid @@ -0,0 +1,20 @@ +{% if courses.in_catalog.any? %} +
+ {% for course in courses.in_catalog %} + {% for category in course.categories %} + {% if category.name == 'Resources' %} +
+ {% include "cards_course" with course %} +
+ {% endif %} + {% endfor %} + {% endfor %} +
+{% else %} + {% capture message %} + {% t shared.zero_state.courses.catalog, + key: current_school.course_vocabulary + %} + {% endcapture %} + {% include "courses_zero_state", message: message %} +{% endif %} diff --git a/Custom_Templates/customer_templates/Mizuno/_filter_dropdown.html.liquid b/Custom_Templates/customer_templates/Mizuno/_filter_dropdown.html.liquid new file mode 100644 index 00000000..e7a954bb --- /dev/null +++ b/Custom_Templates/customer_templates/Mizuno/_filter_dropdown.html.liquid @@ -0,0 +1,33 @@ +
+
+ + +
+
+ {% + include "filter_select", + filters: filters, + key: key, + label: label + %} + + +
+
+
+
diff --git a/Custom_Templates/customer_templates/Mizuno/_filter_select.html.liquid b/Custom_Templates/customer_templates/Mizuno/_filter_select.html.liquid new file mode 100644 index 00000000..b3d2c99f --- /dev/null +++ b/Custom_Templates/customer_templates/Mizuno/_filter_select.html.liquid @@ -0,0 +1,24 @@ +{% if params.q %} + +{% endif %} + + + + diff --git a/Custom_Templates/customer_templates/Mizuno/_footer_special.html.liquid b/Custom_Templates/customer_templates/Mizuno/_footer_special.html.liquid index b6280ea0..72182101 100644 --- a/Custom_Templates/customer_templates/Mizuno/_footer_special.html.liquid +++ b/Custom_Templates/customer_templates/Mizuno/_footer_special.html.liquid @@ -70,10 +70,14 @@ } .logo-links a{ - color: #058ccf; + color: #001588; text-decoration: none; } +.logo-links a:hover{ + color: #058ccf; +} + .np-footer-social-links { margin-top: -25px; z-index: 1; diff --git a/Custom_Templates/customer_templates/Mizuno/_header.html.liquid b/Custom_Templates/customer_templates/Mizuno/_header.html.liquid index a9418233..a4718872 100644 --- a/Custom_Templates/customer_templates/Mizuno/_header.html.liquid +++ b/Custom_Templates/customer_templates/Mizuno/_header.html.liquid @@ -1,3 +1,20 @@ +{% assign groupValidator = false %} +{% for group in current_person.groups %} + {% if group %} + {% assign groupValidator = true %} + {% endif %} +{% endfor %} + +{% if current_person.signed_in? and groupValidator == false %} + {% unless current_person.email contains '+preview-' %} + + {% endunless %} +{% endif %} +
{% if current_school.logo_url %} {% endif %} {% endfor %} +
+
+ + Resources + +
- \ No newline at end of file + + + \ No newline at end of file diff --git a/Custom_Templates/customer_templates/Mizuno/dashboard.html.liquid b/Custom_Templates/customer_templates/Mizuno/dashboard.html.liquid index 8b4833a6..a6530894 100644 --- a/Custom_Templates/customer_templates/Mizuno/dashboard.html.liquid +++ b/Custom_Templates/customer_templates/Mizuno/dashboard.html.liquid @@ -37,81 +37,30 @@ Courses
- {%- comment -%}
{%- endcomment -%} - {% if courses.enrolled.any? %} - {%- comment -%} {% if categories.enrolled.any? %} - {% assign all_categories = categories.enrolled | map: "name" %} - {% for enrolled_category in all_categories %} -
-
-
- {{ enrolled_category }} -
-
- {% - include "filter_by_progress", - label: "Filter by Progress:", - default_option: "All Courses", - topic: enrolled_category, - %} -
- {% - include "carousel_courses", - items: courses.enrolled, - topic: enrolled_category, - %} - {% endfor %} - {% else %} - {% assign enrolled_category = "Not Categorized" %} -
-
-
- Topic -
-
- {{ enrolled_category }} -
-
- {% - include "filter_by_progress", - label: "Filter by Progress:", - default_option: "All Courses", - topic: enrolled_category, - %} -
- {% - include "carousel_courses", - items: courses.enrolled, - topic: enrolled_category, + {% if courses.enrolled.any? %} + {% for course in courses.enrolled %} + {% assign course_status = "" %} + + {% if course.started? == false %} + {% assign course_status = "not-started" %} + {% elsif course.completed? %} + {% assign course_status = "completed" %} + {% elsif course.started? %} + {% assign course_status = "in-progress" %} + {% endif %} + +
{% include "cards_course" with course %}
+ {% endfor %} + {% else %} + {% capture message %} + {% t shared.zero_state.courses.index, + key: current_school.course_vocabulary %} - {% endif %} {%- endcomment -%} - {% for course in courses.enrolled %} - {% assign course_status = "" %} - - {% if course.started? == false %} - {% assign course_status = "not-started" %} - {% elsif course.completed? %} - {% assign course_status = "completed" %} - {% elsif course.started? %} - {% assign course_status = "in-progress" %} - {% endif %} - -
{% include "cards_course" with course %}
- {% endfor %} - {% else %} -
- Courses -
- {% capture message %} - {% t shared.zero_state.courses.index, - key: current_school.course_vocabulary - %} - {% endcapture %} -
- {% include "courses_zero_state", message: message %} -
- {% endif %} - {%- comment -%}
{%- endcomment -%} + {% endcapture %} +
+ {% include "courses_zero_state", message: message %} +
+ {% endif %}
. @@ -135,99 +84,3 @@ {% endcomment %} {% include "footer" %} - - diff --git a/Custom_Templates/customer_templates/Mizuno/dashboard_pixel.html.liquid b/Custom_Templates/customer_templates/Mizuno/dashboard_pixel.html.liquid deleted file mode 100644 index 6e4f377e..00000000 --- a/Custom_Templates/customer_templates/Mizuno/dashboard_pixel.html.liquid +++ /dev/null @@ -1,226 +0,0 @@ - -{% include "header" %} -{% include "course_version_outdated_alert", courses: courses.enrolled %} -{% include "sub_navigation" %} -
-
-
Hi {{current_person.first_name}}! 👋
-
This is what’s relevant to you right now in Pixel Academy.
-
-
-
- {% if features.learning_paths? %} -
- {% t shared.learning_paths %} -
- {% include "learning_paths_index", items: learning_paths.enrolled %} - {% endif %} -
-
-
Course Progress
- {% comment %} {% include "widget_course_progress" %} {% endcomment %} - -
Recent Achievements
- {% comment %} {% include "widget_achievements" %} {% endcomment %} -
-
- -
-
- {% if courses.enrolled.any? %} - {% if categories.enrolled.any? %} - {% assign all_categories = categories.enrolled | map: "name" %} - {% for enrolled_category in all_categories %} -
-
-
- Topic -
-
- {{ enrolled_category }} -
-
- {% - include "filter_by_progress", - label: "Filter by Progress:", - default_option: "All Courses", - topic: enrolled_category, - %} -
- {% - include "carousel_courses", - items: courses.enrolled, - topic: enrolled_category, - %} - {% endfor %} - {% else %} - {% assign enrolled_category = "Not Categorized" %} -
-
-
- Topic -
-
- {{ enrolled_category }} -
-
- {% - include "filter_by_progress", - label: "Filter by Progress:", - default_option: "All Courses", - topic: enrolled_category, - %} -
- {% - include "carousel_courses", - items: courses.enrolled, - topic: enrolled_category, - %} - {% endif %} - {% else %} -
- Courses -
- {% capture message %} - {% t shared.zero_state.courses.index, - key: current_school.course_vocabulary - %} - {% endcapture %} -
- {% include "courses_zero_state", message: message %} -
- {% endif %} -
-
- - - {% comment %}
-
-
- {% t .upcoming_events %} -
- {% if training_events.enrolled.any? %} - {% - include "carousel_events", - items: training_events.enrolled, - %} - {% else %} -
- {% include "training_events_zero_state" %} -
- - {% endif %} -
-
{% endcomment %} - - -
-
- {% if courses.enrolled.any? %} -
- Meet the Instructors -
- {% - include "carousel_instructors", - items: courses.enrolled, - %} - {% endif %} -
-
-
-{% include "footer" %} - diff --git a/Custom_Templates/customer_templates/Mizuno/resources.html.liquid b/Custom_Templates/customer_templates/Mizuno/resources.html.liquid new file mode 100644 index 00000000..b6aebd88 --- /dev/null +++ b/Custom_Templates/customer_templates/Mizuno/resources.html.liquid @@ -0,0 +1,23 @@ +{% include "header" %} +{% include "course_version_outdated_alert", courses: courses.in_catalog %} +{% include "sub_navigation" %} +
+
+
+
Resources
+
Placeholder Resources Subheadline
+
+ {% capture label %}{% t shared.filters.by_category %}{% endcapture %} + + {%- comment -%} {% if courses.in_catalog.any? %} + {% + include "filter_dropdown", + filters: courses.filters, + key: "category_uuid", + label: label + %} + {% endif %} {%- endcomment -%} +
+ {% include "courses_resources" %} +
+{% include "footer" %} diff --git a/Custom_Templates/customer_templates/Mizuno/sign-up-follow-up-dropdown.html.liquid b/Custom_Templates/customer_templates/Mizuno/sign-up-follow-up-dropdown.html.liquid new file mode 100644 index 00000000..54dcb0dd --- /dev/null +++ b/Custom_Templates/customer_templates/Mizuno/sign-up-follow-up-dropdown.html.liquid @@ -0,0 +1,40 @@ + diff --git a/Custom_Templates/customer_templates/Mizuno/sign-up-follow-up.html.liquid b/Custom_Templates/customer_templates/Mizuno/sign-up-follow-up.html.liquid new file mode 100644 index 00000000..6709b2b5 --- /dev/null +++ b/Custom_Templates/customer_templates/Mizuno/sign-up-follow-up.html.liquid @@ -0,0 +1,209 @@ +{% assign groupValidator = false %} +{% for group in current_person.groups %} + {% if group %} + {% assign groupValidator = true %} + {% endif %} +{% endfor %} + +{% if current_person.signed_in? %} + {% if groupValidator == true %} + + {% endif %} +{% endif %} + +
+ +
+ + + + diff --git a/Custom_Templates/customer_templates/Mizuno/styles.css.liquid b/Custom_Templates/customer_templates/Mizuno/styles.css.liquid index 98fdd09f..9c85d89c 100644 --- a/Custom_Templates/customer_templates/Mizuno/styles.css.liquid +++ b/Custom_Templates/customer_templates/Mizuno/styles.css.liquid @@ -282,7 +282,7 @@ HOMEPAGE */ justify-content: flex-end; height: 30px; color: #001588; - font-size: 16px; + font-size: 10px; font-weight: 400; } @@ -305,6 +305,24 @@ HOMEPAGE */ display: block; height: 0.2rem; } + +@media screen and (min-width: 550px){ + .np-sub-navigation-content-item-link { + font-size: 12px; + } +} + +@media screen and (min-width: 650px){ + .np-sub-navigation-content-item-link { + font-size: 14px; + } +} + +@media screen and (min-width: 850px){ + .np-sub-navigation-content-item-link { + font-size: 16px; + } +} /* END */ /* SUB NAVIGATION */ diff --git a/Custom_Templates/customer_templates/Mizuno/waiting-room.html.liquid b/Custom_Templates/customer_templates/Mizuno/waiting-room.html.liquid new file mode 100644 index 00000000..55c823be --- /dev/null +++ b/Custom_Templates/customer_templates/Mizuno/waiting-room.html.liquid @@ -0,0 +1,105 @@ +{% assign ready = false %} +{% if current_person.signed_in? %} + {% for group in current_person.groups %} + {% if group %} + {% assign ready = true %} + {% break %} + {% endif %} + {% endfor %} +{% endif %} + +{% if ready %} + +{% else %} + +{% endif %} + +
+
+ +
+ Thank you for entering your PGA ID! + Please wait while we configure the school for you. + You’ll be automatically redirected when it's ready! +
+
+
+ + \ No newline at end of file diff --git a/CustomerNotes/4Pillars.md b/CustomerNotes/4Pillars.md index b48fe2e5..234a31da 100644 --- a/CustomerNotes/4Pillars.md +++ b/CustomerNotes/4Pillars.md @@ -1,12 +1,11 @@ # 4Pillars + Code igniter information RDS on AWS SQL database Send documentation for open access and appending learner information into URL - Scrolling not working on course overview page or LX when embedded into their app Launch is still on track, translation can wait a day or two As long as embedded experience working, parameters can be passed - diff --git a/CustomerNotes/CIBC.md b/CustomerNotes/CIBC.md index 343d0c8a..230deec5 100644 --- a/CustomerNotes/CIBC.md +++ b/CustomerNotes/CIBC.md @@ -2,25 +2,24 @@ ## Categories and Flow - - Should things be put into epics? - - Examples of how something was laid out? + - Should things be put into epics? + - Examples of how something was laid out? - They want to add glossary somewhere, possibly as a page - For instance, what are preferences. What are push notifications and alerts - Lots of clients are elderly and unaware of these terms - - What are savings, checking, etc. + - What are savings, checking, etc. - [ ] - Find examples of search within the page only [ ] - Submit ticket with Figma files for design changes [ ] - Activities in a course is a step in a how-to -[ ] - See if circle button at bottom of image can be clickable -[ ] - In terms of images, what format are they using? PNG - -Iron out user experience +[ ] - See if circle button at bottom of image can be clickable +[ ] - In terms of images, what format are they using? PNG - +Iron out user experience Contact us and back to FCIB same as corporate site Create categories for the links -Add the "active state" CSS for each link -POS training falls on cash management -Elisia handles the training cash management engagement -She might need to connect with us to utilize the platform -Andre in that meeting aswell - +Add the "active state" CSS for each link +POS training falls on cash management +Elisia handles the training cash management engagement +She might need to connect with us to utilize the platform +Andre in that meeting as well diff --git a/Scripts/API_Notes/conf_functionsonly.py b/Scripts/API_Notes/conf_functionsonly.py index cdb1169d..68f8a213 100644 --- a/Scripts/API_Notes/conf_functionsonly.py +++ b/Scripts/API_Notes/conf_functionsonly.py @@ -1,9 +1,8 @@ -from datetime import date -import markdown -import re +import markdown rootdir = "/Users/normrasmussen/Documents/Northpass/Scripts/API_Notes/SampleNotes/" + def findheadings(): headingsarray = [] with open(rootdir + "Flink.md", "r") as myfile: @@ -12,43 +11,49 @@ def findheadings(): if "##" in headings: headingsarray.append(headings) print(headingsarray) - + + # From StackOverflow: -def noteSections(rootdir): - #today = date.today() - #today = today.strftime("%m/%d/%Y") - #dateregex = "^[0-9]{1,2}\\/[0-9]{1,2}\\/[0-9]{4}$" - with open(rootdir+"Flink.md", "r") as f: +def noteSections(rootdir): + # today = date.today() + # today = today.strftime("%m/%d/%Y") + # dateregex = "^[0-9]{1,2}\\/[0-9]{1,2}\\/[0-9]{4}$" + with open(rootdir + "Flink.md", "r") as f: notes_flag = False - notes = '' + notes = "" for line in f: if line.startswith("## "): notes_flag = True elif notes_flag: notes += line - if not line.strip(): break + if not line.strip(): + break print(notes) - # mdConvert(rootdir, notes) + + +# mdConvert(rootdir, notes) + def meetingSections(rootdir): dateregex = "^[0-9]{1,2}\\/[0-9]{1,2}\\/[0-9]{4}$" currentnote = rootdir + "Flink.md" with open(currentnote, "r") as f: text = f.read() - #print(text) - #m = re.search(f"##(.^[0-9]{1,2}\\/[0-9]{1,2}\\/[0-9]{4}$)\n(.*)\n\n") - #m = re.search("##"+dateregex+"(.*)"+"##"+dateregex, text) + # print(text) + # m = re.search(f"##(.^[0-9]{1,2}\\/[0-9]{1,2}\\/[0-9]{4}$)\n(.*)\n\n") + # m = re.search("##"+dateregex+"(.*)"+"##"+dateregex, text) if m: print("Found a section!") found = m.group(1) print(found) + def mdConvert(rootdir, notes): conversion = markdown.markdown(notes) print(conversion) - # Add Conversion variable to payload for hubspot. Copy functions from the other files. + # FEAT: Add Conversion variable to payload for hubspot. Copy functions from the other files. + if __name__ == "__main__": meetingSections(rootdir) - #noteSections(rootdir) - + # noteSections(rootdir) diff --git a/Timetagger/_timetagger/users/norm~bm9ybQ==.db b/Timetagger/_timetagger/users/norm~bm9ybQ==.db index e48e338b..3e97e196 100644 Binary files a/Timetagger/_timetagger/users/norm~bm9ybQ==.db and b/Timetagger/_timetagger/users/norm~bm9ybQ==.db differ