Skip to content

Commit

Permalink
Merge branch 'main' into 3952-deprecated-firestone-locator
Browse files Browse the repository at this point in the history
  • Loading branch information
rladdusaw committed Apr 5, 2024
2 parents 4783c76 + b71fa2a commit 0743199
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 7 deletions.
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,10 @@ RAILS_ENV=development bundle exec rake browse:load_all

## Local development with account/request features

You will need a working local copy of [Bibdata](https://github.com/pulibrary/marc_liberation).
Start the Bibdata server, and then set the ```bidata_base``` value in OrangeLight's `config/requests.yml` file to the local URL where Bibdata is running (e.g., `http://localhost:{port}`).
For more information, see [requests dev hints](docs/requests/dev_hints.md).

You will need a working local copy of [Bibdata](https://github.com/pulibrary/bibdata).
Start the Bibdata server, and then set the ```bidata_base``` value in OrangeLight's `config/requests.yml` file to the local URL where Bibdata is running (e.g., `http://localhost:{port}`) or use the `BIBDATA_BASE` environment variable.

## Development Mailcatcher

Expand Down
3 changes: 3 additions & 0 deletions docs/requests/dev_hints.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,13 @@
- Make sure you have the Alma keys for Bibdata set up - see [info in the Bibdata readme](https://github.com/pulibrary/bibdata#configure-alma-keys-for-development)
- Start the Bibdata support application servers `bundle exec rails servers:start`
- Start the Bibdata server on a non-standard port `bundle exec rails s -p 3001` (Question: Should this point to the Orangelight Solr? Or does it matter?)
- Make sure that there are locations displaying at http://localhost:3001/locations/holding_locations. If not, run `bundle exec rake bibdata:delete_and_repopulate_locations`.

## Start up Orangelight
- Start the Orangelight support servers `bundle exec rake servers:start`
- If you will be making a hold request in Alma, you will need a read/write alma key. To get the sandbox read/write key from the staging catalog server if you are on the VPN, you can run `export $(ssh deploy@catalog-staging2 "env | grep ALMA_READ_WRITE")`
- Start up the Orangelight server, pointing to the local Bibdata instance
```BASH
BIBDATA_BASE=http://localhost:3001 bundle exec rails s
```
- Start mailcatcher if you want to review the emails sent: `mailcatcher`
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"postcss-import": "^15.1.0",
"prettier": "^3.1.0",
"simple-git-hooks": "^2.9.0",
"vite": "^5.0.12",
"vite": "^5.0.13",
"vite-plugin-ruby": "^5.0.0"
},
"simple-git-hooks": {
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5084,10 +5084,10 @@ vite-plugin-ruby@^5.0.0:
debug "^4.3.4"
fast-glob "^3.3.2"

vite@^5.0.12:
version "5.0.12"
resolved "https://registry.yarnpkg.com/vite/-/vite-5.0.12.tgz#8a2ffd4da36c132aec4adafe05d7adde38333c47"
integrity sha512-4hsnEkG3q0N4Tzf1+t6NdN9dg/L3BM+q8SWgbSPnJvrgH2kgdyzfVJwbR1ic69/4uMJJ/3dqDZZE5/WwqW8U1w==
vite@^5.0.13:
version "5.0.13"
resolved "https://registry.yarnpkg.com/vite/-/vite-5.0.13.tgz#605865b0e482506163e3f04f91665238f3be8cf1"
integrity sha512-/9ovhv2M2dGTuA+dY93B9trfyWMDRQw2jdVBhHNP6wr0oF34wG2i/N55801iZIpgUpnHDm4F/FabGQLyc+eOgg==
dependencies:
esbuild "^0.19.3"
postcss "^8.4.32"
Expand Down

0 comments on commit 0743199

Please sign in to comment.