From 65c75faa94b4fbe5538fd5b3aa2db7b6a8262714 Mon Sep 17 00:00:00 2001 From: Sumukh Date: Sat, 21 Sep 2024 00:58:50 -0700 Subject: [PATCH] more fixes --- appname/assets.py | 8 +- appname/templates/dashboard/home.html | 2703 ++++++++--------- appname/templates/dashboard/team.html | 2 +- appname/templates/settings/account.html | 26 +- appname/templates/tabler/_footer.html | 40 +- appname/templates/tabler/_navbar_overlap.html | 71 + appname/templates/tabler/_overlap_header.html | 0 appname/templates/tabler/dashboard_base.html | 8 +- 8 files changed, 1382 insertions(+), 1476 deletions(-) create mode 100644 appname/templates/tabler/_navbar_overlap.html create mode 100644 appname/templates/tabler/_overlap_header.html diff --git a/appname/assets.py b/appname/assets.py index bab331cd..e8e578c6 100755 --- a/appname/assets.py +++ b/appname/assets.py @@ -1,7 +1,7 @@ from flask_assets import Bundle common_css = Bundle( - 'https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css', + 'https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css', 'css/vendor/helper.css', 'css/main.css', 'css/overrides.css', @@ -11,7 +11,7 @@ common_js = Bundle( 'https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.6/dist/umd/popper.min.js', - 'https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js', + 'https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js', Bundle( 'js/main.js', filters='jsmin' @@ -33,14 +33,14 @@ tabler_css = Bundle( 'https://cdn.jsdelivr.net/npm/@tabler/core@latest/dist/css/tabler.min.css', - 'https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta17/dist/css/tabler-vendors.min.css', + 'https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta21/dist/css/tabler-vendors.min.css', 'css/overrides.css', filters='cssmin', output='public/css/tabler.css' ) tabler_js = Bundle( - 'https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta17/dist/js/tabler.min.js', + 'https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta21/dist/js/tabler.min.js', output='public/js/tabler.js' ) diff --git a/appname/templates/dashboard/home.html b/appname/templates/dashboard/home.html index 903f24a8..df187e4c 100644 --- a/appname/templates/dashboard/home.html +++ b/appname/templates/dashboard/home.html @@ -12,1551 +12,1364 @@ {% endblock %} {% block body %} -
-
-
-

- {{team.name}} Dashboard -

+
+
+
+
+ +
+ Overview
-
-
-
-
-
- 6% - -
-
43
-
New Tickets
-
+

+ {{team.name}} +

+
+ +
+
+ + + New view + + + + + Create new report + + + +
-
-
-
-
-
- -3% - +
+
+
+
+ + +
+
+
+
+
+
+
+
Sales
+
+
+ +
+ Last 7 days + Last 30 days + Last 3 months
-
17
-
Closed Today
-
+
-
-
-
-
-
- 9% - -
-
7
-
New Replies
+
+
75%
+
+
Conversion rate
+
+ + 7% + +
+
+
+
+
+
-
-
-
-
- 3% - +
+
+
+
+
+
+
Revenue
+
+
+ +
+ Last 7 days + Last 30 days + Last 3 months
-
27.3K
-
Followers
+
+
+
+
$4,300
+
+ + 8% + + +
+
-
-
-
-
- -2% - -
-
$95
-
Daily Earnings
-
-
+
-
-
-
-
- -1% - +
+
+
+
+
+
+
New clients
+
+
+ +
+ Last 7 days + Last 30 days + Last 3 months
-
621
-
Products
-
+
-
-
-
-
-

Development Activity

-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
UserCommitDate
Ronald BradleyInitial commitMay 6, 2018
BMRussell GibsonMain structureApril 22, 2018
Beverly ArmstrongLeft sidebar adjustmentsApril 15, 2018
Bobby KnightTopbar dropdown styleApril 8, 2018
Sharon WellsFixes #625April 9, 2018
+
+
+
6,782
+
+ + 0% + +
-
-
-
Need Help? Read our documentation with code samples.
-
-
-
-
-

Chart title

-
-
-
-
-
- -
-
-
-
-

Chart title

-
-
-
-
-
- -
-
-
-
-
New feedback
-
62
-
-
-
-
-
-
-
-
-
-
Today profit
-
$652
-
-
-
-
+
+
+
+
+
+
+
Active users
+
+
+ +
+ Last 7 days + Last 30 days + Last 3 months
+
+
+
+
2,986
+
+ + 4% + +
+
+
+
+
+
-
-
- - - -
-

132 Sales

- 12 waiting payments +
+
+
+
+ + +
+
+
+ 132 Sales +
+
+ 12 waiting payments +
+
+
-
+
-
-
- - - -
-

78 Orders

- 32 shipped +
+
+
+
+ + +
+
+
+ 78 Orders +
+
+ 32 shipped +
+
+
-
+
-
-
- - - -
-

1,352 Members

- 163 registered today +
+
+
+
+ + +
+
+
+ 623 Shares +
+
+ 16 today +
+
+
-
+
-
-
- - - -
-

132 Comments

- 16 waiting +
+
+
+
+ + +
+
+
+ 132 Likes +
+
+ 21 today +
+
+
-
+
+
+
+
+
+
+

Traffic summary

-
-
-
- -
-

And this isn't my nose. This is a false one.

-
Look, my liege! The Knights Who Say Ni demand a sacrifice! …Are you suggesting that coconuts migr...
-
-
-
- Rose Bradley - 3 days ago +
+
+
+
+
+

Locations

+
+
+
+
+
+
+
+
+
+
+
+
+
+

Using Storage 6854.45 MB of 8 GB

+
+
+
+
+
+
+
+ + Regular + 915MB
-
- +
+ + System + 415MB
+
+ + Shared + 201MB
+
+ + Free + 612MB +
+
-
+
-
-
- -
-

Well, I didn't vote for you.

-
Well, we did do the nose. Why? Shut up! Will you shut up?! You don't frighten us, English pig-dog...
-
-
+
+
+
+
- Peter Richards - 3 days ago +
+
+ JL +
+
+
+ Jeffie Lewzey commented on your "I'm not a witch." post. +
+
yesterday
+
+
+
+
+
-
- +
+
+
+ +
+
+
+ It's Mallory Hulme's birthday. Wish him well! +
+
2 days ago
+
+
+
+
+
+
+
+
+ +
+
+
+ Dunn Slane posted "Well, what do you want?". +
+
today
+
+
+
+
+
-
-
-
-
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
UserUsagePaymentActivitySatisfaction
-
- -
- 		-
Elizabeth Martin
-
- Registered: Mar 19, 2018 -
- 		-
-
- 42% -
-
- Jun 11, 2015 - Jul 10, 2015 -
-
-
-
-
- 		- - -
Last login
-
4 minutes ago
- 		-
-
42%
-
- 		-
- -
- Action - Another action - Something else here -
- Separated link -
-
-
-
- -
- 		-
Michelle Schultz
-
- Registered: Mar 2, 2018 -
- 		-
-
- 0% -
-
- Jun 11, 2015 - Jul 10, 2015 -
-
-
-
-
- 		- - -
Last login
-
5 minutes ago
- 		-
-
0%
-
- 		-
- -
- Action - Another action - Something else here -
- Separated link -
-
-
-
- -
- 		-
Crystal Austin
-
- Registered: Apr 7, 2018 -
- 		-
-
- 96% -
-
- Jun 11, 2015 - Jul 10, 2015 -
-
-
-
-
- 		- - -
Last login
-
a minute ago
- 		-
-
96%
-
- 		-
- -
- Action - Another action - Something else here -
- Separated link -
-
-
-
- -
- 		-
Douglas Ray
-
- Registered: Jan 15, 2018 -
- 		-
-
- 6% -
-
- Jun 11, 2015 - Jul 10, 2015 -
-
-
-
-
- 		- - -
Last login
-
a minute ago
- 		-
-
6%
-
- 		-
- -
- Action - Another action - Something else here -
- Separated link -
-
-
-
- -
- 		-
Teresa Reyes
-
- Registered: Mar 4, 2018 -
- 		-
-
- 36% -
-
- Jun 11, 2015 - Jul 10, 2015 -
-
-
-
-
- 		- - -
Last login
-
2 minutes ago
- 		-
-
36%
-
- 		-
- -
- Action - Another action - Something else here -
- Separated link -
-
-
-
- -
- 		-
Emma Wade
-
- Registered: Mar 20, 2018 -
- 		-
-
- 7% -
-
- Jun 11, 2015 - Jul 10, 2015 -
-
-
-
-
- 		- - -
Last login
-
a minute ago
- 		-
-
7%
-
- 		-
- -
- Action - Another action - Something else here -
- Separated link -
-
-
-
- -
- 		-
Carol Henderson
-
- Registered: Feb 22, 2018 -
- 		-
-
- 80% -
-
- Jun 11, 2015 - Jul 10, 2015 -
-
-
-
-
- 		- - -
Last login
-
9 minutes ago
- 		-
-
80%
-
- 		-
- -
- Action - Another action - Something else here -
- Separated link -
-
-
-
- -
- 		-
Christopher Harvey
-
- Registered: Jan 22, 2018 -
- 		-
-
- 83% -
-
- Jun 11, 2015 - Jul 10, 2015 -
-
-
-
-
- 		- - -
Last login
-
8 minutes ago
- 		-
-
83%
-
- 		-
- -
- Action - Another action - Something else here -
- Separated link -
-
-
-
-
-
-
-
-
-

Browser Stats

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Google Chrome23%
Mozila Firefox15%
Apple Safari7%
Internet Explorer9%
Opera mini23%
Microsoft edge9%
-
-
-
-
-
-

Projects

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
Admin Template - 65% -
Landing Page - Finished -
Backend UI - Rejected -
Personal Blog - 40% -
E-mail Templates - 13% -
Corporate Website - Pending -
-
-
-
-
-
-

Members

-
-
-
+
+
- + EP
- - test +
+ Egan Poetz registered new client as Trilia. +
+
yesterday
+
+
+
+
-
- -
- Action - Another action - Something else here -
- Separated link -
-
+
+
+
+ Kellie Skingley closed a new deal on project Pen Pineapple Apple Pen. +
+
2 days ago
- -
  • -
    +
    +
    • +
    +
    - +
    - - admin +
    + Christabel Charlwood created a new project for Wikibox. +
    +
    4 days ago
    +
    +
    +
    +
    -
    - -
    - Action - Another action - Something else here -
    - Separated link -
    -
    + HS
    +
    +
    + Haskel Shelper change status of Tabler Icons from open to closed. +
    +
    today
    - -
  • -
    +
    +
    • +
    +
    - +
    - - test +
    + Lorry Mion liked Tabler UI Kit. +
    +
    yesterday
    +
    +
    +
    +
    -
    - -
    - Action - Another action - Something else here -
    - Separated link -
    -
    +
    +
    +
    + Leesa Beaty posted new video. +
    +
    2 days ago
    - -
  • -
    +
    +
    • +
    +
    - +
    - - test +
    + Perren Keemar and 3 others followed you. +
    +
    2 days ago
    +
    +
    +
    +
    -
    - -
    - Action - Another action - Something else here -
    - Separated link -
    -
    + SA
    +
    +
    + Sunny Airey upload 3 new photos to category Inspirations. +
    +
    2 days ago
    - - -
    -
    -
    -
    -
    -
    -
    -
    -
    +5%
    -

    423

    -
    Users online
    +
    -
    -
    +
    +
    +
    + +
    +
    +
    + Geoffry Flaunders made a $10 donation. +
    +
    2 days ago
    +
    +
    +
    +
    +
    + +
    +
    +
    + Thatcher Keel created a profile. +
    +
    3 days ago
    +
    +
    - -
    -
    -
    -
    -
    -3%
    -

    423

    -
    Users online
    +
    +
    +
    + +
    +
    +
    + Dyann Escala hosted the event Tabler UI Birthday. +
    +
    4 days ago
    +
    +
    -
    -
    +
    +
    +
    + +
    +
    +
    + Avivah Mugleston mentioned you on Best of 2020. +
    +
    2 days ago
    +
    +
    +
    +
    +
    + AA +
    +
    +
    + Arlie Armstead sent a Review Request to Amanda Blake. +
    +
    2 days ago
    +
    +
    - +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    Development activity
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    UserCommitDate
    + + +
    + Fix dart Sass compatibility (#29755) +
    +     		28 Nov 2019
    + JL + +
    + Change deprecated html tags to text decoration classes (#29604) +
    +     		27 Nov 2019
    + + +
    + justify-content:between ⇒ justify-content:space-between (#29734) +
    +     		26 Nov 2019
    + + +
    + Update change-version.js (#29736) +
    +     		26 Nov 2019
    + + +
    + Regenerate package-lock.json (#29730) +
    +     		25 Nov 2019
    +
    +
    +
    +
    +
    +
    +
    + + + +
    +
    +
    +
    +
    +

    Tabler Icons

    +
    + All icons come from the Tabler Icons set and are MIT-licensed. Visit + tabler-icons.io, + download any of the 5628 icons in SVG, PNG or React and use them in your favourite design tools. +
    +
    + + + + Download icons + +
    -
    -
    -
    -
    -3%
    -

    423

    -
    Users online
    +
    +
    +
    +
    +
    +
    +
    +

    Most Visited Pages

    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Page nameVisitorsUniqueBounce rate
    + / + + + + 4,8963,65482.54% +
    +
    + /form-elements.html + + + + 3,6523,21576.29% +
    +
    + /index.html + + + + 3,2562,86572.65% +
    +
    + /icons.html + + + + 98686544.89% +
    +
    + /docs/ + + + + 91282241.12% +
    +
    + /accordion.html + + + + 85579832.65% +
    +
    +
    +
    +
    +
    +
    +
    +

    Social Media Traffic

    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    NetworkVisitors
    Instagram3,550 +
    +
    -
    -
    +
    Twitter1,798 +
    +
    +
    Facebook1,245 +
    +
    - - -
    -
    -
    -
    9%
    -

    423

    -
    Users online
    +
    TikTok986 +
    +
    -
    -
    +
    Pinterest854 +
    +
    +
    VK650 +
    +
    - - - +
    Pinterest420 +
    +
    +
    +
    +
    +
    +
    +
    +
    +

    Tasks

    -
    -
    -
    -

    Invoices

    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    No.Invoice SubjectClientVAT No.CreatedStatusPrice
    001401Design Works - Carlson Limited - - 87956621 - - 15 Dec 2017 - - Paid - $887 - Manage -
    - -
    -     		- - - -
    001402UX Wireframes - Adobe - - 87956421 - - 12 Apr 2017 - - Pending - $1200 - Manage -
    - -
    -     		- - - -
    001403New Dashboard - Bluewolf - - 87952621 - - 23 Oct 2017 - - Pending - $534 - Manage -
    - -
    -     		- - - -
    001404Landing Page - Salesforce - - 87953421 - - 2 Sep 2017 - - Due in 2 Weeks - $1500 - Manage -
    - -
    -     		- - - -
    001405Marketing Templates - Printic - - 87956621 - - 29 Jan 2018 - - Paid Today - $648 - Manage -
    - -
    -     		- - - -
    001406Sales Presentation - Tabdaq - - 87956621 - - 4 Feb 2018 - - Due in 3 Weeks - $300 - Manage -
    - -
    -     		- - - -
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + Extend the data model. + + + + August 05, 2021 + + + + + 2/7 + + + + + + 3 + + +
    + + + Verify the event flow. + + + + January 01, 2019 + + + + + 3/10 + + + + + + 6 + + JL +
    + + + Database backup and maintenance + + + + December 28, 2018 + + + + + 0/6 + + + + + + 1 + + +
    + + + Identify the implementation team. + + + + November 11, 2020 + + + + + 6/10 + + + + + + 12 + + +
    + + + Define users and workflow + + + + November 14, 2021 + + + + + 3/7 + + + + + + 5 + + +
    + + + Check Pull Requests + + + + February 11, 2021 + + + + + 2/9 + + + + + + 3 + + +
    +
    +
    +
    +
    +
    +
    +

    Invoices

    +
    +
    +
    +
    + Show +
    + +
    + entries
    +
    + Search: +
    + +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    No. + + Invoice SubjectClientVAT No.CreatedStatusPrice
    001401Design Works + + Carlson Limited + + 87956621 + + 15 Dec 2017 + + Paid + $887 + + +
    + + Action + + + Another action + +
    +     +
    001402UX Wireframes + + Adobe + + 87956421 + + 12 Apr 2017 + + Pending + $1200 + + +
    + + Action + + + Another action + +
    +     +
    001403New Dashboard + + Bluewolf + + 87952621 + + 23 Oct 2017 + + Pending + $534 + + +
    + + Action + + + Another action + +
    +     +
    001404Landing Page + + Salesforce + + 87953421 + + 2 Sep 2017 + + Due in 2 Weeks + $1500 + + +
    + + Action + + + Another action + +
    +     +
    001405Marketing Templates + + Printic + + 87956621 + + 29 Jan 2018 + + Paid Today + $648 + + +
    + + Action + + + Another action + +
    +     +
    001406Sales Presentation + + Tabdaq + + 87956621 + + 4 Feb 2018 + + Due in 3 Weeks + $300 + + +
    + + Action + + + Another action + +
    +     +
    001407Logo & Print + + Apple + + 87956621 + + 22 Mar 2018 + + Paid Today + $2500 + + +
    + + Action + + + Another action + +
    +     +
    001408Icons + + Tookapic + + 87956621 + + 13 May 2018 + + Paid Today + $940 + + +
    + + Action + + + Another action + +
    +     +
    +
    +

    Showing 1 to 8 of 16 entries

    +
    +
    +
    +
    + + + {% endblock %} \ No newline at end of file diff --git a/appname/templates/dashboard/team.html b/appname/templates/dashboard/team.html index 0ecc0763..6b4c3e94 100644 --- a/appname/templates/dashboard/team.html +++ b/appname/templates/dashboard/team.html @@ -46,7 +46,7 @@

    {% if member.user != current_user %}
    - {{ simple_form.hidden_tag() }} + {{ simple_form().hidden_tag() }}
    diff --git a/appname/templates/settings/account.html b/appname/templates/settings/account.html index bdafe2e7..f601107d 100644 --- a/appname/templates/settings/account.html +++ b/appname/templates/settings/account.html @@ -4,7 +4,31 @@ {% block title %}appname account settings{% endblock %} {% block body %} - +
    +
    +
    +
    + +
    + Account +
    +

    + Your settings +

    +
    + +
    +
    + + + Get Help + + +
    +
    +
    +
    +
    diff --git a/appname/templates/tabler/_footer.html b/appname/templates/tabler/_footer.html index 19035001..d896da87 100644 --- a/appname/templates/tabler/_footer.html +++ b/appname/templates/tabler/_footer.html @@ -1,26 +1,24 @@ -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    - Copyright © 2019 + +
    -
    + \ No newline at end of file diff --git a/appname/templates/tabler/_navbar_overlap.html b/appname/templates/tabler/_navbar_overlap.html new file mode 100644 index 00000000..f63dc410 --- /dev/null +++ b/appname/templates/tabler/_navbar_overlap.html @@ -0,0 +1,71 @@ +
    +
    + +
    + + ignite logo + + +
    +
    +
    + +
    +
    + + +
    +
    {{ current_user.email }}
    + {% if team %} +
    {{ team.name }}
    + {% endif %} +
    +     +
    + Settings + Logout +
    +
    +
    + +
    +
    + + {{ render_flashes() }} \ No newline at end of file diff --git a/appname/templates/tabler/_overlap_header.html b/appname/templates/tabler/_overlap_header.html new file mode 100644 index 00000000..e69de29b diff --git a/appname/templates/tabler/dashboard_base.html b/appname/templates/tabler/dashboard_base.html index b9b58017..0a9b81e1 100644 --- a/appname/templates/tabler/dashboard_base.html +++ b/appname/templates/tabler/dashboard_base.html @@ -22,6 +22,7 @@ + @@ -38,14 +39,13 @@
    -
    - {% include 'tabler/_header.html' with context %} - {% include 'tabler/_navbar.html' with context %} + {% include 'tabler/_navbar_overlap.html' with context %} +
    {% block body %} {% endblock %} -
    + {% include 'tabler/_footer.html' with context %}