-
-
Notifications
You must be signed in to change notification settings - Fork 313
Trademark Search API #1818
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Trademark Search API #1818
Changes from all commits
Commits
Show all changes
36 commits
Select commit
Hold shift + click to select a range
071d9ca
issue-1821
HanilJain f82e6d2
Merge branch 'main' of https://github.com/HanilJain/BLT
HanilJain d04211d
Merge branch 'OWASP:main' into main
HanilJain b613336
Merge branch 'OWASP:main' into main
HanilJain 064c81c
trademark search
HanilJain 73ce088
commit
HanilJain cd139f1
commit
HanilJain aeb7e52
color chnages and text
HanilJain 175b9d2
pre_commit
HanilJain 011684e
suggested changes
HanilJain 1b30a00
Update blt/settings.py
HanilJain 8e1e36d
front changes
HanilJain 43d0661
coming soon file removed
HanilJain d5c35b5
Merge branch 'OWASP:main' into main
HanilJain f6f166c
Merge branch 'main' into issue-998
HanilJain f480d23
pre-commit
HanilJain 7284376
Merge branch 'issue-998' of https://github.com/HanilJain/BLT into iss…
HanilJain d7a9244
trademark search
HanilJain c404020
commit
HanilJain e8ce1a8
commit
HanilJain f0328e2
color chnages and text
HanilJain 6609f3d
pre_commit
HanilJain e9ed569
suggested changes
HanilJain 6731b45
Update blt/settings.py
HanilJain 92e4cfd
front changes
HanilJain 389d66e
coming soon file removed
HanilJain c0ad07c
pre-commit
HanilJain 6db6f2c
Merge branch 'issue-998' of https://github.com/HanilJain/BLT into iss…
HanilJain 68b4cc3
trademark search
HanilJain 5582993
commit
HanilJain 25a2597
color chnages and text
HanilJain 06be388
pre_commit
HanilJain 5d7236c
suggested changes
HanilJain f8af261
front changes
HanilJain 8572846
pre-commit
HanilJain 8305074
Merge branch 'issue-998' of https://github.com/HanilJain/BLT into iss…
HanilJain File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,143 @@ | ||
| {% extends "base.html" %} | ||
| {% load static %} | ||
| {% block content %} | ||
| {% include "includes/sidenav.html" %} | ||
| <head> | ||
| <link rel="preconnect" href="https://fonts.googleapis.com"> | ||
| <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin> | ||
| <link href="https://fonts.googleapis.com/css2?family=Gravitas+One&display=swap" | ||
| rel="stylesheet"> | ||
| </head> | ||
| <style> | ||
| .table-auto{ | ||
| margin-right:70px ; | ||
| } | ||
| .status_label { | ||
| border-radius: 30px; | ||
| text-align: center; | ||
| color: white; | ||
| } | ||
| .type_label{ | ||
| color: blueviolet; | ||
| } | ||
| .tm-wrapper{ | ||
| position: relative; | ||
| left : 350px; | ||
| top : 80px; | ||
| height: 470px; | ||
| width: 500px; | ||
| background-color: #FFFFFF; | ||
| border-radius: 30px; | ||
| box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); | ||
| font-family: "Gravitas One", serif; | ||
| font-weight: 400; | ||
| font-style: normal; | ||
| } | ||
| #tm-logo{ | ||
| height: 175px; | ||
| width: 196px; | ||
| position: absolute; | ||
| left: 152px; | ||
| top: 71px; | ||
| } | ||
| .tm-wrapper p{ | ||
| position: absolute; | ||
| left: 154px; | ||
| top: 252px; | ||
| font-size: 30px; | ||
| } | ||
| #tm-text{ | ||
| position: absolute; | ||
| left: 28px; | ||
| top: 316px; | ||
| font-size: 20px; | ||
| opacity: 80%; | ||
| text-align: center; | ||
| } | ||
| #back-button{ | ||
| background-color: #FF9191; | ||
| height: 70px; | ||
| width: 250px; | ||
| border-radius: 0px 0px 0px 30px; | ||
| position: absolute; | ||
| left: 0px; | ||
| top: 400px; | ||
| } | ||
| #more-button{ | ||
| background-color: #D92D2D; | ||
| height: 70px; | ||
| width: 250px; | ||
| border-radius: 0px 0px 30px 0px; | ||
| position: absolute; | ||
| right: 0px; | ||
| top: 400px; | ||
| } | ||
|
|
||
| </style> | ||
| {% if available %} | ||
| <div class="tm-wrapper"> | ||
| <img id="tm-logo" | ||
| height="300" | ||
| width="400" | ||
| alt="trademark available" | ||
| src="{% static 'img/TM.png' %}"> | ||
| <p>available !</p> | ||
| <div id="tm-text">Trademark is available for Registration</div> | ||
| <button id="back-button"> | ||
| <a href="{% url 'index' %}">Back</a> | ||
| </button> | ||
| <button id="more-button"> | ||
| <a href="{% url 'trademark_search' %}">Search More</a> | ||
| </button> | ||
| </div> | ||
| {% else %} | ||
| <p class="text-gray-300 my-3 font-satoshi font-bold text-[25px]">{{ count }} results found for {{ query }}</p> | ||
| <table class="table-auto border-collapse w-full"> | ||
| <thead class="font-bold italic text-opacity-25 bg-gray-200"> | ||
| <tr> | ||
| <th class="px-4 py-2">Name</th> | ||
| <th class="px-4 py-2">Registration No</th> | ||
| <th class="px-4 py-2">Serial No</th> | ||
| <th class="px-4 py-2">Filing Date</th> | ||
| <th class="px-4 py-2">Registration Date</th> | ||
| <th class="px-4 py-2">Expiry Date</th> | ||
| <th class="px-4 py-2">Owner Label</th> | ||
| <th class="px-4 py-2">Owner Name</th> | ||
| <th class="px-4 py-2">Owner Address</th> | ||
| <th class="px-4 py-2">Labels</th> | ||
| </tr> | ||
| </thead> | ||
| <tbody> | ||
| {% for item in items %} | ||
| {% for owner in item.owners %} | ||
| <tr class="border"> | ||
| <td class="px-4 py-2 font-bold ">{{ item.keyword }}</td> | ||
| <td class="px-4 py-2">{{ item.registration_number }}</td> | ||
| <td class="px-4 py-2">{{ item.serial_number }}</td> | ||
| <td class="px-4 py-2 min-h-2">{{ item.filing_date }}</td> | ||
| <td class="px-4 py-2">{{ item.registration_date }}</td> | ||
| <td class="px-4 py-2">{{ item.expiration_date }}</td> | ||
| <td class="px-4 py-2">{{ owner.owner_label }}</td> | ||
| <td class="px-4 py-2">{{ owner.name }}</td> | ||
| <td class="px-4 py-2"> | ||
| {{ owner.address1 }} | ||
| {{ owner.address2 }}, | ||
| {{ owner.city }}, | ||
| {{ owner.state }}, | ||
| {{ owner.country }}, | ||
| {{ owner.postcode }} | ||
| </td> | ||
| <td class="px-4 py-2"> | ||
| <div class="status_label {% if item.status_label == 'Live/Pending' %} bg-yellow-600 {% elif item.status_label == 'Live/Registered' %} bg-green-600 {% elif item.status_label == 'Dead/Abandoned' %} bg-red-600 {% else %} bg-sky-600 {% endif %} "> | ||
| {{ item.status_label }} | ||
| </div> | ||
| <br> | ||
| <div class="type_label">{{ owner.legal_entity_type_label }}</div> | ||
| </td> | ||
| </tr> | ||
| {% endfor %} | ||
| {% endfor %} | ||
| </tbody> | ||
| </table> | ||
| {% endif %} | ||
| {% endblock content %} | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,167 @@ | ||
| {% extends "base.html" %} | ||
| {% block title %} | ||
| trademarks | ||
| {% endblock title %} | ||
| {% block content %} | ||
| {% include "includes/sidenav.html" %} | ||
| <head> | ||
| <link rel="preconnect" href="https://fonts.googleapis.com"> | ||
| <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin> | ||
| <link href="https://fonts.googleapis.com/css2?family=Gravitas+One&display=swap" | ||
| rel="stylesheet"> | ||
| </head> | ||
| <style> | ||
| {% include 'includes/sidenav.html' %} | ||
| <head> | ||
| <link rel="preconnect" href="https://fonts.googleapis.com"> | ||
HanilJain marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin> | ||
| <link href="https://fonts.googleapis.com/css2?family=Gravitas+One&display=swap" rel="stylesheet"> | ||
| </head> | ||
| <style> | ||
| #query{ | ||
| position: relative; | ||
| top: 40px; | ||
| left: 172px; | ||
| background-color: #E4E4E4; | ||
| top: 40px; | ||
| left: 172px; | ||
| background-color: #E4E4E4; | ||
| border-style: outset; | ||
| border-radius: 40px; | ||
| width: 659px; | ||
| height: 44px; | ||
| width: 659px; | ||
| height: 44px; | ||
| } | ||
| .search_input{ | ||
| width: 100%; | ||
| padding: 10px; | ||
| border-radius: 5px; | ||
| font-size: 16px; | ||
| } | ||
| .search_input:focus{ | ||
| outline: none; | ||
| border-color: #f2f2f2; /* Change border color on focus */ | ||
| } | ||
| #search_button{ | ||
| width: 231px; | ||
| height: 53px; | ||
| background-color: #FF4D4D; | ||
| position: relative; | ||
| border-radius: 30px; | ||
| top: 118px; | ||
| right: 260px; | ||
| border-radius: 30px; | ||
| top: 118px; | ||
| right: 260px; | ||
| font-size: medium; | ||
| font-weight: bold; | ||
| color: #f2f2f2; | ||
| } | ||
| #search_button:hover{ | ||
| outline: none; | ||
| border-color: #f2f2f2; /* Change border color on focus */ | ||
| box-shadow: 0 0 5px #e93232; /* Add a shadow on focus */ | ||
| } | ||
|
|
||
| .trademark-logo{ | ||
| position: relative; | ||
| margin-top: 100px; | ||
| left: 184px; | ||
| top: 37px; | ||
| width: 663px; | ||
| height: 185px; | ||
| } | ||
| .tm-wrapper{ | ||
| position: relative; | ||
| left: 181px; | ||
| top: 0px; | ||
| height: 446px; | ||
| width: 961px; | ||
| background-color: #FFFFFF; | ||
| border-radius: 30px; | ||
| box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); | ||
| font-family: "Gravitas One", serif; | ||
| font-weight: 200; | ||
| font-style: normal; | ||
| } | ||
| .tm-wrapper p{ | ||
| font-size: 13px; | ||
| position: absolute; | ||
| left: 207px; | ||
| top: 374px; | ||
| opacity: 60%; | ||
| margin-top: 100px; | ||
| left: 184px; | ||
| top: 37px; | ||
| width: 663px; | ||
| height: 185px; | ||
| } | ||
| .tm-wrapper{ | ||
| position: relative; | ||
| left: 181px; | ||
| top: 0px; | ||
| height: 446px; | ||
| width: 961px; | ||
| background-color: #FFFFFF; | ||
| border-radius: 30px; | ||
| box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); | ||
| font-family: "Gravitas One", serif; | ||
| font-weight: 200; | ||
| font-style: normal; | ||
| } | ||
| .tm-wrapper p{ | ||
| font-size: 13px; | ||
| position: absolute; | ||
| left: 207px; | ||
| top: 374px; | ||
| opacity: 60%; | ||
| } | ||
|
|
||
| </style> | ||
| <div class="tm-wrapper"> | ||
| <img class="trademark-logo" | ||
| height="200" | ||
| width="450" | ||
| alt="Trademark Search" | ||
| src="{% static 'img/tm-search.png' %}"> | ||
| <form method="post" class="search-container" role="search" id="form"> | ||
| {% csrf_token %} | ||
| <input class="search_input" | ||
| type="search" | ||
| id="query" | ||
| name="query" | ||
| placeholder="Search..."> | ||
| <button id="search_button" type="submit">Search</button> | ||
| </form> | ||
| <p>This data is fetched from United States Patent and Trademark Office</p> | ||
| </div> | ||
| <script> | ||
| </style> | ||
|
|
||
| <div class="tm-wrapper"> | ||
| <img class="trademark-logo" src="../static/img/tm-search.png"> | ||
| <form method="POST" class="search-container" role="search" id="form"> | ||
| {% csrf_token %} | ||
| <input class="search_input" type="search" id="query" name="query" placeholder="Search..."> | ||
| <button id="search_button" type="submit">Search</button> | ||
| </form> | ||
| <p>This data is fetched from United States Patent and Trademark Office</p> | ||
| </div> | ||
|
|
||
|
|
||
| <script> | ||
| document.addEventListener('DOMContentLoaded', function() { | ||
| var form = document.getElementById('form'); | ||
| var searchInput = document.getElementById('query'); // Corrected ID | ||
| var searchButton = document.getElementById('search_button'); | ||
|
|
||
| form.addEventListener('submit', function(event) { | ||
| if (searchInput.value.trim() === '') { | ||
| event.preventDefault(); // Prevent the form from submitting | ||
| } | ||
| }); | ||
| }); | ||
|
|
||
| </script> | ||
| {% endblock content %} | ||
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.