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.

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

Merge develop to main to prep for release #76

Merged
merged 160 commits into from
Oct 29, 2024
Merged

Merge develop to main to prep for release #76

merged 160 commits into from
Oct 29, 2024

Conversation

anilnatha
Copy link
Collaborator

🗒️ Summary

This PR addresses the need to merge our develop branch main to prepare for a release.

⚙️ Test Data and/or Report

Changes have been tested against the develop branch

eddiesarevalo and others added 30 commits June 18, 2024 13:02
-Fixed styles being overwritten className prop in Typgraphy.
-Removed anchor typography components. Used link in title.
-Updated titlebar link styles to be bold.
-Use wds icons.
-Title is now required as a prop for header.
-Added resize on breakpoints.
-Added menus for small screen size.
-Replaced icons with wds icons.
-Title link is a prop.
-Added the title with a red forward arrow icons to each menu item.
-Added forward and foward up icons.
-Fixed reverse arrow circle in small navbar menu.
-Removed unused code.
-Removed the explore pds link.
-Changed design to one menu in titlebar when in md or smaller instead of 2 menus.
-Header now takes subtitle and subtitle link as a prop.
-Removed arrow circle forward icon and used a box instead.
-Fixed several styles to match designs.
…, we don't have linking issues. This change means that the portal prototype, wds-react, and wds should all be using the same version of node.
Integrated generic Loader component with default material ui styling.
-Removed the first submenu item in navbar with the red icon.
-Fixed styles for popper in titlebar to not float under the menu.
-Updated styles for navbar submenu to have a smaller margin.
-Edited search text box style to be on the left not center.
…ve issue with npm install complaining that the package.json and package-lock.json files are out of sync.
-Small menu parent items are now semibold font size 18.
-Changed right margin for search bar.
-Added highlight for selected submenu item.
Improve documentation captured in README
Bumps the npm_and_yarn group with 6 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) | `7.22.8` | `7.25.3` |
| [braces](https://github.com/micromatch/braces) | `3.0.2` | `3.0.3` |
| [ejs](https://github.com/mde/ejs) | `3.1.9` | `3.1.10` |
| [express](https://github.com/expressjs/express) | `4.18.2` | `4.19.2` |
| [ws](https://github.com/websockets/ws) | `8.13.0` | `8.18.0` |
| [ws](https://github.com/websockets/ws) | `6.2.2` | `8.18.0` |
| [webpack-dev-middleware](https://github.com/webpack/webpack-dev-middleware) | `6.1.1` | `6.1.3` |



Updates `@babel/traverse` from 7.22.8 to 7.25.3
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.25.3/packages/babel-traverse)

Updates `braces` from 3.0.2 to 3.0.3
- [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md)
- [Commits](micromatch/braces@3.0.2...3.0.3)

Updates `ejs` from 3.1.9 to 3.1.10
- [Release notes](https://github.com/mde/ejs/releases)
- [Commits](mde/ejs@v3.1.9...v3.1.10)

Updates `express` from 4.18.2 to 4.19.2
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](expressjs/express@4.18.2...4.19.2)

Updates `ws` from 8.13.0 to 8.18.0
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](websockets/ws@8.13.0...8.18.0)

Updates `ws` from 6.2.2 to 8.18.0
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](websockets/ws@8.13.0...8.18.0)

Updates `webpack-dev-middleware` from 6.1.1 to 6.1.3
- [Release notes](https://github.com/webpack/webpack-dev-middleware/releases)
- [Changelog](https://github.com/webpack/webpack-dev-middleware/blob/v6.1.3/CHANGELOG.md)
- [Commits](webpack/webpack-dev-middleware@v6.1.1...v6.1.3)

---
updated-dependencies:
- dependency-name: "@babel/traverse"
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: braces
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: ejs
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: express
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: ws
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: ws
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: webpack-dev-middleware
  dependency-type: indirect
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <[email protected]>
anilnatha and others added 27 commits September 30, 2024 13:17
-Added facility, telescope and instrument host to search result types.
-Updated the featured link details to the types that the designs show.
…-facility

Add More Search Result Types To Featured Link Details
-Added link statement back to where it was deleted in the previous commit.
…1T00:00:00.000Z" and instead should be output as "ongoing".
…tails

Update Featured Link Details Content
…e is added after the comma to improve readability.
-Added another possible string for ongoing date in the featured link details component.
-Updated offical in the footer.
-Make buttons non capitalized.
…or-collections

Features/featured link updates for collections
Merge changes on main to develop
…ated functionality for use within wds-react and by consumers of it.
…rting

Added a new collection utility file to better organize collection rel…
Updated GITHUB_TOKEN reference
Updated GITHUB_TOKEN reference.
@eddiesarevalo eddiesarevalo self-requested a review October 29, 2024 16:53
Copy link
Member

@eddiesarevalo eddiesarevalo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ready for 0.1.0! Icon and library build tested. Package.json file looks good!

@anilnatha anilnatha merged commit 3613a05 into main Oct 29, 2024
6 of 8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants