diff --git a/blt/settings.py b/blt/settings.py index 0e9142b1a8..968165321e 100644 --- a/blt/settings.py +++ b/blt/settings.py @@ -519,3 +519,7 @@ APP_KEY_SECRET = os.environ.get("APP_KEY_SECRET") ACCESS_TOKEN = os.environ.get("ACCESS_TOKEN") ACCESS_TOKEN_SECRET = os.environ.get("ACCESS_TOKEN_SECRET") + +# USPTO + +USPTO_API = os.environ.get("USPTO_API") diff --git a/blt/urls.py b/blt/urls.py index 1c08156eb7..5cd1912a11 100644 --- a/blt/urls.py +++ b/blt/urls.py @@ -331,15 +331,14 @@ re_path(r"^hunts/$", ListHunts.as_view(), name="hunts"), re_path(r"^invite/$", InviteCreate.as_view(template_name="invite.html"), name="invite"), re_path(r"^terms/$", TemplateView.as_view(template_name="terms.html"), name="terms"), - re_path(r"^about/$", TemplateView.as_view(template_name="about.html"), name="about"), - re_path(r"^teams/$", TemplateView.as_view(template_name="teams.html"), name="teams"), - re_path(r"^projects/$", TemplateView.as_view(template_name="projects.html"), name="projects"), - re_path(r"^apps/$", TemplateView.as_view(template_name="apps.html"), name="apps"), - re_path(r"^deletions/$", TemplateView.as_view(template_name="deletions.html"), name="deletions"), - re_path(r"^trademarks/$", TemplateView.as_view(template_name="trademarks.html"), name="trademarks"), - re_path(r"^bacon/$", TemplateView.as_view(template_name="bacon.html"), name="bacon"), - re_path(r"^bltv/$", TemplateView.as_view(template_name="bltv.html"), name="bltv"), - re_path(r"^privacypolicy/$", TemplateView.as_view(template_name="privacy.html"), name="privacy"), + re_path(r"^about/$", TemplateView.as_view(template_name="about.html")), + re_path(r"^teams/$", TemplateView.as_view(template_name="teams.html")), + re_path(r"^projects/$", TemplateView.as_view(template_name="projects.html")), + re_path(r"^apps/$", TemplateView.as_view(template_name="apps.html")), + re_path(r"^deletions/$", TemplateView.as_view(template_name="deletions.html")), + re_path(r"^bacon/$", TemplateView.as_view(template_name="bacon.html")), + re_path(r"^bltv/$", TemplateView.as_view(template_name="bltv.html")), + re_path(r"^privacypolicy/$", TemplateView.as_view(template_name="privacy.html")), re_path(r"^stats/$", StatsDetailView.as_view(), name="stats"), re_path(r"^favicon\.ico$", favicon_view), re_path( @@ -412,10 +411,13 @@ re_path(r"^ratings/", include("star_ratings.urls", namespace="ratings")), path("robots.txt", website.views.robots_txt), path("ads.txt", website.views.ads_txt), - re_path(r"^contributors/$", contributors_view, name="contributors"), - path("company/", include("company.urls")), - path("sponsor/", website.views.sponsor_view, name="sponsor"), - path("companies/", DomainListView.as_view(), name="domain_lists"), + re_path(r"^contributors/$",contributors_view,name="contributors"), + path("company/",include("company.urls")), + path("sponsor/",website.views.sponsor_view, name="sponsor"), + path("companies/", DomainListView.as_view() , name="domain_list"), + path("trademarks/" , website.views.trademark_search , name="trademark_search"), + re_path(r"^trademarks/query=(?P[\w\s]+)" , website.views.trademark_detailview , name="trademark_detailview") + ] if settings.DEBUG: diff --git a/website/static/img/TM.png b/website/static/img/TM.png new file mode 100644 index 0000000000..b5d5549729 Binary files /dev/null and b/website/static/img/TM.png differ diff --git a/website/static/img/tm-search.png b/website/static/img/tm-search.png new file mode 100644 index 0000000000..ce4835f289 Binary files /dev/null and b/website/static/img/tm-search.png differ diff --git a/website/templates/includes/footer.html b/website/templates/includes/footer.html index 4615b08c1a..0115e235b9 100644 --- a/website/templates/includes/footer.html +++ b/website/templates/includes/footer.html @@ -2,7 +2,7 @@ {% load i18n %} {% load custom_tags %} {% comment %} 'img/logo_white.png' {% endcomment %} -