0
0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-05-08 16:28:41 +00:00
Commit Graph

358 Commits

Author SHA1 Message Date
G.Ambatte b059bf68b5 Revert change to select method 2022-04-29 10:53:03 +12:00
G.Ambatte c46c4a9320 Switch to use select method 2022-04-28 20:19:01 +12:00
G.Ambatte cffe08b785 Add fields to Mongoose query 2022-04-28 11:09:32 +12:00
Charlie Humphreys 2e145e7ff1 Merge branch 'master' into google-document-stubs 2022-04-15 00:23:51 -05:00
Charlie Humphreys 8a5e9aa1f6 update app to better handle google brew stubs 2022-04-15 00:22:51 -05:00
Charlie Humphreys e7fe68d20c merge master into google-document-stubs 2022-04-14 23:31:07 -05:00
G.Ambatte 0e25793f0a Add publicUrl to global.config & update template 2022-04-13 19:35:51 +12:00
G.Ambatte de977b3b94 Make local login route conditional and rename 2022-04-13 14:49:16 +12:00
G.Ambatte 3787cdf11c Update server/app.js
Co-authored-by: Trevor Buckner <calculuschild@gmail.com>
2022-04-13 14:39:27 +12:00
G.Ambatte 84bc3d0be2 Update server/app.js
Co-authored-by: Trevor Buckner <calculuschild@gmail.com>
2022-04-13 14:37:11 +12:00
G.Ambatte 6fdd415fcb Update server/app.js
Co-authored-by: Trevor Buckner <calculuschild@gmail.com>
2022-04-13 14:37:06 +12:00
G.Ambatte ad8d5bd8a0 Merge branch 'master' into addLocalLogin-#269 2022-04-13 14:30:02 +12:00
G.Ambatte 85312859d2 Change props.publicUrl fallback behavior 2022-04-13 14:15:26 +12:00
G.Ambatte f8086a098b Add publicUrl to default.json 2022-04-13 14:14:09 +12:00
G.Ambatte 811d1347ea Reduce calls to config.get 2022-04-13 12:57:04 +12:00
G.Ambatte 1bdd08f878 Shift JWT generation to app.js 2022-04-13 12:40:16 +12:00
G.Ambatte 42878ea99d Merge branch 'master' into addMetadata-#820 2022-04-13 09:13:37 +12:00
G.Ambatte 16ae32b881 Move default URL check to app.js 2022-04-13 09:12:48 +12:00
Charlie Humphreys 39d29abb19 update app to list stubbed google docs only once 2022-04-11 12:55:19 -05:00
Charlie Humphreys 4941dbb5bd add exclusions for stub props 2022-04-06 11:11:11 -05:00
Trevor Buckner ff1f70afa8 Merge branch 'master' into SwappableThemes-ReorganizeFolderStructure 2022-04-02 13:50:18 -04:00
Charlie Humphreys e5021259bb swap usage of delete on possible Mongoose object for setting the value to undefined 2022-03-30 23:34:39 -05:00
Charlie Humphreys fa8d47400f update API and frontend for google drive document stubs 2022-03-30 23:23:45 -05:00
Charlie Humphreys e9cf7be488 add asyncHandler to async methods in routes 2022-03-28 20:43:45 -05:00
G.Ambatte 4b6fb9f595 Add publicUrl as configuration item 2022-03-25 17:05:35 +13:00
Charlie Humphreys bba0208361 update based on feedback 2022-03-24 13:46:23 -05:00
Charlie Humphreys 92d8027640 update app to use a single endpoint for google and non-google stored brews 2022-03-24 08:13:34 -05:00
G.Ambatte a11e93ef54 Initial pass at social metadata tags 2022-03-15 18:47:46 +13:00
G.Ambatte 535291a91a Add local_environments to configuration files
Add `local` parameter to global `config` object to avoid repeating tests
JWT key `secret` only added to global object `config` when local installation detected
2022-03-07 14:14:32 +13:00
G.Ambatte 7c2663fa56 Add passwordless login for local installs 2022-03-07 13:26:54 +13:00
Charlie Humphreys 8ea2780a44 add log line to explain what to do when the service account cannot be found 2022-02-16 22:03:01 -06:00
Charlie Humphreys 7cc7bd4786 update readFileMetadata to be getGoogleBrew 2022-02-16 21:51:14 -06:00
Charlie Humphreys 927345b131 update app, googleActions, and homebrew api based on PR feedback 2022-02-16 16:53:34 -06:00
Charlie Humphreys 59d08a7414 update googleActions and related files to use service-level auth where viable 2022-02-14 22:21:58 -06:00
Trevor Buckner dd0112f749 Update to Master 2022-02-10 23:38:33 -05:00
Trevor Buckner d35c5c2719 Merge branch 'master' into SwappableThemes-ReorganizeFolderStructure 2022-02-10 23:36:41 -05:00
Charlie Humphreys 57d3db5322 Merge branch 'master' into migration-guide
# Conflicts:
#	server/app.js
2022-01-31 17:13:36 -06:00
Trevor Buckner ccbeca2cad Move process.chdir up so it occurs before config.js is ever called.
app.js should be required before config to make sure process.cwd is updated first
2022-01-30 00:13:35 -05:00
Trevor Buckner d7aa4afa60 process.chdir in app.js.
Everything works, no need for path.resolve. All tests pass.
2022-01-29 23:53:30 -05:00
Trevor Buckner e4c2ce6a8c Merge branch 'private/asachkov/refactor-config-initialization' of https://github.com/AlexeySachkov/homebrewery into pr/1981 2022-01-29 21:36:10 -05:00
Trevor Buckner de115c5113 Merge branch 'master' into pr/1981 2022-01-29 21:34:38 -05:00
Alexey Sachkov 4e0ab4b393 Adjust paths to config files 2022-01-28 21:40:40 +03:00
Charlie Humphreys e614fbc5a1 Update app.js from master 2022-01-26 08:46:45 -06:00
Alexey Sachkov 588bcebc87 [NFC] Outline config creation into a separate module
This is done in order to have config creation rules
unified in one place to avoid modifying them multiple times
if they change.

We already had 3 duplicated pieces of code initializing the
config and there will be more config uses in future tests.

This resolves #1960
2022-01-23 20:06:52 +03:00
Alexey Sachkov 9c57450330 [NFC] Explicitly define variables before using them
Fixed two errors which were discovered by trying to run the code in "strict" mode,
which is automatically done by Jest testing framework.
2022-01-22 00:18:13 +03:00
Alexey Sachkov 0dfe18cd18 Fix liner errors 2022-01-11 23:24:50 +03:00
Alexey Sachkov 8895b44be9 [NFC] Outline an express app into a separate module
This is done in order to be able to re-use that app in API unit tests later
2022-01-11 22:24:23 +03:00
Trevor Buckner 65335162fc Merge branch 'master' into SwappableThemes-ReorganizeFolderStructure 2022-01-10 21:58:21 -05:00
Trevor Buckner e315c29620 Merge pull request #1931 from AlexeySachkov/private/asachkov/outline-db-connection
[NFC] Outline database connection into a separate file
2022-01-10 13:55:55 -05:00
Alexey Sachkov e84cd4fe8b Apply review comments
Switched from raw promises to async/await.
Outlined error handling function to reduce amount of nested code.
Added comment about the new file intent.
2022-01-10 19:25:36 +03:00