Skip to content

Commit

Permalink
Merge branch '1.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
imonroe committed Dec 11, 2024
2 parents 5519719 + 0b738a3 commit 074952c
Show file tree
Hide file tree
Showing 6 changed files with 1,921 additions and 1,820 deletions.
614 changes: 307 additions & 307 deletions .yarn/releases/yarn-4.5.1.cjs → .yarn/releases/yarn-4.5.3.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.5.1.cjs
yarnPath: .yarn/releases/yarn-4.5.3.cjs
52 changes: 26 additions & 26 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,58 +14,58 @@
},
"dependencies": {
"@formkit/auto-animate": "^0.8.2",
"@heroicons/react": "^2.1.5",
"@mui/base": "5.0.0-beta.60",
"@next/third-parties": "15.0.2",
"@heroicons/react": "^2.2.0",
"@mui/base": "5.0.0-beta.64",
"@next/third-parties": "15.0.4",
"@tailwindcss/container-queries": "^0.1.1",
"@tailwindcss/typography": "^0.5.15",
"@tanstack/react-query": "^5.59.16",
"@types/node": "^22.8.4",
"@types/react": "^19.0.0-rc.1",
"@tanstack/react-query": "^5.62.3",
"@types/node": "^22.10.1",
"@types/react": "^19.0.1",
"autoprefixer": "^10.4.20",
"axios": "^1.7.7",
"axios": "^1.7.9",
"critters": "^0.0.25",
"decanter": "^7.3.0",
"graphql": "^16.9.0",
"graphql-request": "^7.1.0",
"graphql-request": "^7.1.2",
"graphql-tag": "^2.12.6",
"html-entities": "^2.5.2",
"html-react-parser": "^5.1.18",
"html-react-parser": "^5.2.0",
"jsona": "^1.12.1",
"next": "15.0.2",
"next": "15.0.4",
"next-drupal": "^1.6.0",
"postcss": "^8.4.47",
"react": "19.0.0-rc-fb9a90fa48-20240614",
"react-aria": "^3.35.1",
"react-dom": "19.0.0-rc-fb9a90fa48-20240614",
"postcss": "^8.4.49",
"react": "19.0.0",
"react-aria": "^3.36.0",
"react-dom": "19.0.0",
"react-error-boundary": "^4.1.2",
"react-focus-lock": "^2.13.2",
"react-obfuscate": "^3.7.0",
"react-obfuscate-email": "^1.1.5",
"react-stately": "^3.33.0",
"react-stately": "^3.34.0",
"react-super-responsive-table": "^5.2.3",
"react-tiny-oembed": "^1.1.0",
"sharp": "^0.33.5",
"tailwind-merge": "^2.5.4",
"tailwindcss": "^3.4.14",
"typescript": "^5.6.3",
"tailwind-merge": "^2.5.5",
"tailwindcss": "^3.4.16",
"typescript": "^5.7.2",
"usehooks-ts": "^3.1.0"
},
"devDependencies": {
"@graphql-codegen/cli": "5.0.3",
"@graphql-codegen/import-types-preset": "^3.0.0",
"@graphql-codegen/typescript-graphql-request": "^6.2.0",
"@graphql-codegen/typescript-operations": "4.3.1",
"@types/qs": "^6.9.16",
"eslint": "^9.13.0",
"eslint-config-next": "15.0.2",
"@graphql-codegen/typescript-operations": "4.4.0",
"@types/qs": "^6.9.17",
"eslint": "^9.16.0",
"eslint-config-next": "15.0.4",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.2.1",
"prettier": "^3.3.3",
"prettier-plugin-tailwindcss": "^0.6.8",
"typescript-eslint": "^8.12.2"
"prettier": "^3.4.2",
"prettier-plugin-tailwindcss": "^0.6.9",
"typescript-eslint": "^8.17.0"
},
"packageManager": "[email protected].1",
"packageManager": "[email protected].3",
"resolutions": {
"@types/react": "npm:[email protected]"
}
Expand Down
12 changes: 12 additions & 0 deletions src/components/node/stanford-page/home-page/today-hours.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import SelectList from "@/components/patterns/elements/select-list"
import {buildUrl} from "@/lib/drupal/utils"
import {NodeSulLibrary} from "@/lib/gql/__generated__/drupal.d"
import Link from "next/link"
import MoonStarsIcon from "@/components/patterns/icons/MoonStarsIcon"

type HoursProps = HTMLAttributes<HTMLDivElement> & {
libraries: NodeSulLibrary[]
Expand Down Expand Up @@ -95,6 +96,17 @@ const LibrariesTodayHours = ({libraries, ...props}: {libraries: HoursProps["libr
</div>
}
/>
<div className="rs-px-1 w-full bg-cardinal-red py-9 text-16 text-white shadow-md">
<MoonStarsIcon className="mr-02em inline" />
<span className="font-bold">New!</span>{" "}
<Link
href="/extended-green-library-hours"
className="grow-0 font-normal text-white underline hocus:text-white hocus:no-underline"
>
Late night study space
</Link>{" "}
available at Green.
</div>
</div>
)
}
Expand Down
9 changes: 9 additions & 0 deletions src/components/patterns/icons/MoonStarsIcon.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import {SVGProps} from "react"

const MoonStarsIcon = (props: SVGProps<SVGSVGElement>) => (
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="#ffffff" viewBox="0 0 16 16" {...props}>
<path d="M6 .278a.77.77 0 0 1 .08.858 7.2 7.2 0 0 0-.878 3.46c0 4.021 3.278 7.277 7.318 7.277q.792-.001 1.533-.16a.79.79 0 0 1 .81.316.73.73 0 0 1-.031.893A8.35 8.35 0 0 1 8.344 16C3.734 16 0 12.286 0 7.71 0 4.266 2.114 1.312 5.124.06A.75.75 0 0 1 6 .278" />
<path d="M10.794 3.148a.217.217 0 0 1 .412 0l.387 1.162c.173.518.579.924 1.097 1.097l1.162.387a.217.217 0 0 1 0 .412l-1.162.387a1.73 1.73 0 0 0-1.097 1.097l-.387 1.162a.217.217 0 0 1-.412 0l-.387-1.162A1.73 1.73 0 0 0 9.31 6.593l-1.162-.387a.217.217 0 0 1 0-.412l1.162-.387a1.73 1.73 0 0 0 1.097-1.097zM13.863.099a.145.145 0 0 1 .274 0l.258.774c.115.346.386.617.732.732l.774.258a.145.145 0 0 1 0 .274l-.774.258a1.16 1.16 0 0 0-.732.732l-.258.774a.145.145 0 0 1-.274 0l-.258-.774a1.16 1.16 0 0 0-.732-.732l-.774-.258a.145.145 0 0 1 0-.274l.774-.258c.346-.115.617-.386.732-.732z" />
</svg>
)
export default MoonStarsIcon
Loading

0 comments on commit 074952c

Please sign in to comment.