Skip to content

Commit

Permalink
Merge pull request #26 from lsst-sqre/tickets/DM-31197
Browse files Browse the repository at this point in the history
DM-31197: Updating funding text
  • Loading branch information
jonathansick authored Aug 4, 2021
2 parents a07e789 + a80f977 commit a9b5ca4
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 28 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@
Change log
##########

0.3.1 (2021-08-04)
==================

- Update funding text.

- Refresh README with status badges and revise text on git hooks.

0.3.0 (2021-07-12)
==================

Expand Down
23 changes: 14 additions & 9 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
#############
rsp-squareone
#############
.. image:: https://github.com/lsst-sqre/squareone/actions/workflows/ci.yaml/badge.svg
:target: https://github.com/lsst-sqre/sqr-060/actions/
.. image:: https://img.shields.io/badge/squareone-lsst.io-brightgreen.svg
:target: https://squareone.lsst.io

#########
Squareone
#########

Squareone is the next-generation landing page for the `Rubin Observatory`_ Science Platform.
It's where you start on your journey to use the RSP's portal, notebooks, and APIs to do science with Rubin/LSST data.

Squareone is deployed with `Phalanx <https://phalanx.lsst.io>`_.

**Documentation:** https://squareone.lsst.io

Technology stack
Expand Down Expand Up @@ -35,12 +42,11 @@ Install the JavaScript packages::

npm install

Install pre-commit hooks
------------------------
Install git hooks
-----------------

You can automatically lint and format code using pre-commit_ hooks.
Squareone uses Git pre-commit hooks to automatically run eslint and prettier on staged commits.
These hooks are managed by husky, and should be installed automatically when you install Squareone locally.
Git hooks allow you to automatically lint and format code with eslint and prettier on each commit.
These hooks are managed by `husky <https://typicode.github.io/husky/#/>`_, and should be installed automatically when you install Squareone locally.
If not, you can manually install the hooks::

husky install
Expand Down Expand Up @@ -90,7 +96,6 @@ You can serve the production build locally::

.. _Next.js: https://nextjs.org
.. _Prettier: https://prettier.io/
.. _pre-commit: https://pre-commit.com/
.. _Rubin Observatory: https://www.lsst.org
.. _React: https://reactjs.org
.. _styled-components: https://styled-components.com
27 changes: 9 additions & 18 deletions components/footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,26 +54,17 @@ export default function Footer() {
</FooterNav>
<FundingNotice>
<p>
<a href="https://www.nsf.gov/">NSF</a> and{' '}
<a href="https://www.energy.gov">DOE</a> provide financial support
for Rubin Observatory in its operations phase to carry out the
Legacy Survey of Space and Time including support for scientific
research with the data. NSF funding is managed by the Association of
Universities for Research in Astronomy (
<a href="http://www.aura-astronomy.org/">AURA</a>) under a
cooperative agreement with NSF, and DOE funding is managed by SLAC
under contract by DOE. The operations phase of Rubin Observatory is
operated jointly by NSF’s{' '}
Rubin Observatory is a joint initiative of the National Science
Foundation (NSF) and the Department of Energy (DOE). Its primary
mission is to carry out the Legacy Survey of Space and Time,
providing an unprecedented data set for scientific research
supported by both agencies. Rubin is operated jointly by NSF’s{' '}
<a href="https://noirlab.edu/public/">NOIRLab</a> and SLAC National
Accelerator Laboratory (
<a href="https://www6.slac.stanford.edu/">SLAC</a>).
</p>
<p>
The National Science Foundation (NSF) is an independent federal
agency created by{' '}
<a href="https://www.nsf.gov/od/ogc/leg.jsp">Congress</a> in 1950 to
promote the progress of science. NSF supports basic research and
people to create knowledge that transforms the future.
<a href="https://www6.slac.stanford.edu/">SLAC</a>). NOIRLab is
managed for NSF by the Association of Universities for Research in
Astronomy (AURA) and SLAC is operated for DOE by Stanford
University.
</p>
</FundingNotice>
<PartnerLogoContainer>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "squareone",
"version": "0.3.0",
"version": "0.3.1",
"private": true,
"scripts": {
"dev": "next dev -p 3000",
Expand Down

0 comments on commit a9b5ca4

Please sign in to comment.