Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Staging -> Main #94

Merged
merged 7 commits into from
Sep 5, 2023
Merged

Staging -> Main #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6ce6dce
add the rest of the sections for the USA Identifier on the footer
mark-meyer Aug 22, 2023
f5072cb
fix indeting
mark-meyer Aug 22, 2023
66cd31f
Merge pull request #87 from GSA/mmeyer/299/GSA-footer
mark-meyer Aug 23, 2023
269b4d6
Merge pull request #88 from GSA/dev
mark-meyer Aug 23, 2023
9e4ebc1
add 889.smartpay.gov to cors origins
mark-meyer Aug 24, 2023
fb8acdc
Merge pull request #89 from GSA/mmeyer/add-cors-origin
mark-meyer Aug 24, 2023
a66df72
Merge pull request #93 from GSA/dev
mark-meyer Sep 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 65 additions & 1 deletion front-end/src/components/USAIdentifier.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="usa-identifier">
<div class="usa-identifier">
<section
class="usa-identifier__section usa-identifier__section--masthead"
aria-label="Agency identifier,">
Expand All @@ -24,5 +24,69 @@
</section>
</div>
</section>
<nav
class="usa-identifier__section usa-identifier__section--required-links"
aria-label="Important links,"
>
<div class="usa-identifier__container">
<ul class="usa-identifier__required-links-list">
<li class="usa-identifier__required-links-item">
<a
href="https://www.gsa.gov/about-us"
class="usa-identifier__required-link usa-link"
>About GSA</a
>
</li>
<li class="usa-identifier__required-links-item">
<a href="https://www.gsa.gov/website-information/accessibility-aids"
class="usa-identifier__required-link usa-link"
>Accessibility support</a
>
</li>
<li class="usa-identifier__required-links-item">
<a href="https://www.gsa.gov/reference/freedom-of-information-act-foia"
class="usa-identifier__required-link usa-link"
>FOIA requests</a
>
</li>
<li class="usa-identifier__required-links-item">
<a href="https://www.gsa.gov/reference/civil-rights-programs/notification-and-federal-employee-antidiscrimination-and-retaliation-act-of-2002"
class="usa-identifier__required-link usa-link"
>No FEAR Act data</a
>
</li>
<li class="usa-identifier__required-links-item">
<a href="https://www.gsaig.gov/"
class="usa-identifier__required-link usa-link"
>Office of the Inspector General</a
>
</li>
<li class="usa-identifier__required-links-item">
<a href="https://www.gsa.gov/reference/reports/budget-performance"
class="usa-identifier__required-link usa-link"
>Performance reports</a
>
</li>
<li class="usa-identifier__required-links-item">
<a href="https://www.gsa.gov/website-information/website-policies"
class="usa-identifier__required-link usa-link"
>Privacy policy</a
>
</li>
</ul>
</div>
</nav>
<section
class="usa-identifier__section usa-identifier__section--usagov"
aria-label="U.S. government information and services,"
>
<div class="usa-identifier__container">
<div class="usa-identifier__usagov-description">
Looking for U.S. government information and services?&nbsp;
</div>

<a href="https://www.usa.gov/" class="usa-link--external">Visit USA.gov</a>
</div>
</section>
</div>
</template>
5 changes: 3 additions & 2 deletions samtools/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"http://localhost",
"http://localhost:5173",
"http://127.0.0.1:5173",
"https://889.smartpay.gsa.gov"
]


Expand All @@ -30,7 +31,7 @@ def create_app(name=__name__):
app.add_middleware(
CORSMiddleware,
allow_origins=origins,
allow_origin_regex='https://federalist.*\.sites\.pages\.cloud\.gov',
allow_origin_regex=r'https://federalist.*\.sites\.pages\.cloud\.gov',
allow_credentials=True,
allow_methods=["*"],
allow_headers=["*"],
Expand All @@ -56,7 +57,7 @@ async def search_v3(
return response
except Exception as exception:
logging.exception(exception)
raise HTTPException(status_code=400, detail="Problem connecting to SAM.gov")
raise HTTPException(status_code=400, detail="Problem connecting to SAM.gov") # noqa E501

return app

Expand Down