Commit Graph
100 Commits
Author SHA1 Message Date
G.AmbatteandTrevor Buckner 3787cdf11c Update server/app.js
Co-authored-by: Trevor Buckner <calculuschild@gmail.com>
2022-04-13 14:39:27 +12:00
G.AmbatteandTrevor Buckner 84bc3d0be2 Update server/app.js
Co-authored-by: Trevor Buckner <calculuschild@gmail.com>
2022-04-13 14:37:11 +12:00
G.AmbatteandTrevor Buckner 6fdd415fcb Update server/app.js
Co-authored-by: Trevor Buckner <calculuschild@gmail.com>
2022-04-13 14:37:06 +12:00
G.AmbatteandTrevor Buckner 0999125678 Update client/homebrew/navbar/account.navitem.jsx
Co-authored-by: Trevor Buckner <calculuschild@gmail.com>
2022-04-13 14:30:49 +12:00
G.Ambatte ad8d5bd8a0 Merge branch 'master' into addLocalLogin-#269 2022-04-13 14:30:02 +12:00
G.AmbatteandTrevor Buckner 5d3fe719b3 Remove errant semicolon
Co-authored-by: Trevor Buckner <calculuschild@gmail.com>
2022-04-13 14:26:25 +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 0023e87d54 Whitespace fix 2022-04-13 12:37:50 +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
G.AmbatteandTrevor Buckner f3ee95f9db Update client/template.js
Co-authored-by: Trevor Buckner <calculuschild@gmail.com>
2022-04-13 08:24:33 +12:00
G.AmbatteandTrevor Buckner af950159e0 Update client/template.js
Co-authored-by: Trevor Buckner <calculuschild@gmail.com>
2022-04-13 08:24:25 +12:00
G.AmbatteandTrevor Buckner 46eaad1226 Update client/template.js
Co-authored-by: Trevor Buckner <calculuschild@gmail.com>
2022-04-13 08:24:19 +12:00
G.Ambatte c0b2fb8ed9 Merge branch 'master' into addLocalLogin-#269 2022-03-27 17:15:41 +13:00
G.Ambatte c8f6dea1e1 Conflict fix for homebrew.jsx 2022-03-27 17:12:15 +13:00
G.Ambatte a0a02f5375 Merge branch 'master' into addLocalLogin-#269 2022-03-27 17:09:13 +13:00
G.Ambatte b6933406ed Remove test timeout increase 2022-03-26 21:27:48 +13:00
G.Ambatte 57d0e8eea3 Test standard Docker MongoDB image 2022-03-26 21:13:06 +13:00
G.Ambatte 7403ef60c1 Increase test timeout via Jest config 2022-03-26 20:56:04 +13:00
G.Ambatte 42ee461f56 Remove commented out delay 2022-03-26 20:55:50 +13:00
G.Ambatte 47a4c8829c Move publicUrl to local.conf from default.conf 2022-03-25 17:40:53 +13:00
G.Ambatte 4b6fb9f595 Add publicUrl as configuration item 2022-03-25 17:05:35 +13:00
G.Ambatte 77e8952e8a Shift componentWillMount call to getInitialState 2022-03-25 16:40:41 +13:00
G.Ambatte 2be365c839 Shift global declarations to componentDidMount 2022-03-25 16:12:33 +13:00
G.Ambatte c0c08b3354 Fix new Node image location 2022-03-25 15:08:37 +13:00
G.Ambatte b0d8462a60 Remove MongoDB from testing, update Node image 2022-03-25 15:06:26 +13:00
G.Ambatte f246c96b28 Remove 10s delay for diagnostics 2022-03-25 15:00:33 +13:00
G.Ambatte aa7b3d985f Move test setup to BEFORE delay 2022-03-25 14:50:30 +13:00
G.Ambatte 5ed6e9842c Add 10s delay to route test start 2022-03-25 14:39:14 +13:00
G.Ambatte eaf8b02aa9 Update circleCi config to use new tests 2022-03-25 14:38:50 +13:00
G.Ambatte 7aa0aed7c9 Add individual tests to package.json 2022-03-25 14:38:19 +13:00
G.Ambatte 17dd738ac1 Shift to history.replaceState 2022-03-25 12:23:01 +13:00
G.Ambatte 32a5e71015 Change verbiage of filter placeholder text 2022-03-25 11:28:30 +13:00
G.Ambatte 1c641e3aff Initial pass at UserPage filtering to/from URL 2022-03-25 11:20:16 +13:00
G.Ambatte 9535fea964 Revert change to verbose 2022-03-22 12:03:26 +13:00
G.Ambatte 4134e43f6e Change test to verbose mode 2022-03-22 11:58:19 +13:00
G.Ambatte 274b3bcb7e Add parallelism parameter 2022-03-22 11:34:32 +13:00
G.Ambatte 8800397ba4 Working directory changes 2022-03-22 11:31:26 +13:00
G.Ambatte 0a90218d2a Fix for missing package.json 2022-03-22 11:27:08 +13:00
G.Ambatte 06598e0665 Fix typo 2022-03-22 11:21:51 +13:00
G.Ambatte 03e5d86b73 Add NPM settings 2022-03-22 11:20:49 +13:00
G.Ambatte 8533240407 Add executor to config 2022-03-22 11:18:59 +13:00
G.Ambatte 2753005386 Add orb to CircleCI config 2022-03-22 11:16:16 +13:00
G.Ambatte 9178d061ff Fix config 2022-03-22 11:14:41 +13:00
G.Ambatte 934c77cee9 Test CircleCI config changes 2022-03-22 11:12:52 +13:00
G.Ambatte 0d8ad50e2a Increase home page test timeout (5s -> 30s) 2022-03-22 10:53:33 +13:00
G.Ambatte 2ec2239124 Merge branch 'master' into addDividerResetOnWindowResize-#2053 2022-03-22 10:31:03 +13:00
G.Ambatte 257262e3cc Allow divider to grow back to original position 2022-03-22 10:26:29 +13:00
G.Ambatte 57c5f28938 Merge branch 'master' into addLocalLogin-#269 2022-03-22 09:39:41 +13:00
G.Ambatte a11e93ef54 Initial pass at social metadata tags 2022-03-15 18:47:46 +13:00
G.Ambatte e44bbae07a Use percentage based positioning, not reset 2022-03-09 17:55:24 +13:00
G.Ambatte f8abca6053 Formatting change - space out functions correctly 2022-03-09 16:45:21 +13:00
G.Ambatte 156e697042 Initial pass: reset divider position on log out 2022-03-09 14:17:12 +13:00
G.Ambatte 39d338e5bf Reset position in local storage on divider reset 2022-03-09 13:19:07 +13:00
G.Ambatte 8fb25646bd Initial pass: reset pane width on browser resize 2022-03-09 13:13:03 +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
G.Ambatte a1876f16da Change icon for Brews page 2022-02-08 18:19:17 +13:00
G.Ambatte c4b0dd5aa6 Initial pass of Account dropdown + LogOut 2022-02-08 18:05:02 +13:00
G.Ambatte 0b7fee0cc5 Add displayName properties 2022-02-05 19:10:18 +13:00
G.Ambatte 402301f201 Restore BrewItem action classNames 2022-02-05 19:04:53 +13:00
G.Ambatte c41141fe10 Add missing Help navItem file 2022-02-05 17:32:34 +13:00
G.Ambatte eccf5e15b1 Change ReportIssue navItem to Help navItem 2022-02-05 17:29:41 +13:00
G.Ambatte 6299e87569 Filtering now functional on ListPage 2022-02-05 17:14:41 +13:00
G.Ambatte 0611db1bdf Move Nav items to UserPage 2022-02-05 17:01:52 +13:00
G.Ambatte 660004e348 Remove UserPage BrewItem files 2022-02-05 15:19:12 +13:00
G.Ambatte e48e8cd05b Increase pageSize to 1000 2022-01-05 13:17:56 +13:00
G.Ambatte 605ea2aa62 Revert New & EditPage to master status 2021-12-31 13:42:24 +13:00
G.Ambatte 896d9ae2c7 Lint fixes 2021-12-31 13:35:50 +13:00
G.Ambatte 0beabc6c0c Fix New & EditPage issues after rebase 2021-12-31 13:30:07 +13:00
G.Ambatte 834a4c13a7 Merge branch 'createBasePages' of https://github.com/G-Ambatte/homebrewery into createBasePages
# Conflicts:
#	client/homebrew/pages/userPage/userPage.jsx
2021-12-31 13:11:50 +13:00
G.Ambatte eca12aae82 Rebase on master 2021-12-31 13:06:21 +13:00
G.Ambatte 00158c1894 Rebase on new master 2021-12-31 13:01:29 +13:00
G.Ambatte 77f5e3e835 Remove unnecessary userPage.less 2021-12-31 13:00:59 +13:00
G.Ambatte 48a5c12ab7 Rebase on new master 2021-12-31 12:59:48 +13:00
G.Ambatte db5987a466 Shift install instruction READMEs into install directory 2021-12-19 19:26:12 +13:00
G.Ambatte b5d5cb085b Merge branch 'addInstallDocs-#1896' of https://github.com/G-Ambatte/homebrewery into addInstallDocs-#1896 2021-12-19 19:22:55 +13:00
G.Ambatte dcf17e3b72 Add README.UBUNTU.md 2021-12-19 19:22:33 +13:00
G.Ambatte 5b746c0d9c Merge branch 'naturalcrit:master' into addInstallDocs-#1896 2021-12-19 18:51:59 +13:00
G.Ambatte 41bc6ca444 Add HB service file
Update install.sh to create service and set to start automatically
2021-12-19 18:50:35 +13:00
Sean Robertson aa4de67e90 Ensure curl is installed
Fix mongodb package name
Use apt satisfy instead of apt install
2021-12-17 16:06:34 +13:00
Sean Robertson b1a9fbe3ca Update location of FreeBSD install instructions 2021-12-17 15:21:52 +13:00
G.Ambatte 806a60e356 Add classes to User Page sort options + brew links 2021-11-30 21:57:42 +13:00
G.Ambatte f422b22af1 Revert "Initial pass at editorPage.jsx."
This reverts commit 6cd56dfd62.
2021-11-04 14:07:11 +13:00
G.Ambatte 6cd56dfd62 Initial pass at editorPage.jsx. 2021-11-04 14:03:57 +13:00
G.Ambatte fe708e0a0b Remove line rather than comment it out 2021-11-04 11:44:41 +13:00
G.Ambatte 4fc0bbc9d7 Remove unnecessary userPage.less 2021-11-04 11:44:05 +13:00
G.Ambatte fd0eb4ca7d Add & implement ListPage 2021-11-04 10:42:27 +13:00
G.Ambatte 2948a9ffc3 Update listGoogleBrews to ensure pageCount and views are integers 2021-11-03 21:39:20 +13:00
G.Ambatte 5bc3de1e0a Added Prod check to template function for meta URL 2021-10-31 00:21:42 +13:00
G.Ambatte bd5f3c74e7 Add public URL in template.js 2021-10-31 00:07:25 +13:00
G.Ambatte 68341bf6a5 Use PUBLIC_ENV variable and localhost thumbnail 2021-10-30 19:00:44 +13:00
G.Ambatte 95f1561f0d Change to locally hosted thumbnail image 2021-10-30 18:57:53 +13:00
G.Ambatte 056024372b Fix button arrow size. 2021-10-30 18:25:51 +13:00
G.Ambatte cd8962f68b Nudge Metadata Editor elements 2021-10-30 18:14:46 +13:00
G.Ambatte bade8ad32f Remove showThumbnail from MetadataEditor props 2021-10-30 18:14:21 +13:00
G.Ambatte 4714074b12 Remove unnecessary thumbnail default prop 2021-10-30 18:13:04 +13:00