Commit Graph

73 Commits

Author SHA1 Message Date
b46ed21684 Merge pull request 'Merge 3-sample_controls' (#8) from 3-sample_controls into dev
Reviewed-on: #8
2024-06-07 17:27:54 -04:00
736dbe24fa Propogation and pitching are working
closes #3
2024-06-07 17:26:33 -04:00
51f37642eb Needed to fix more reference to batch.
Everything seems to work now.
2024-06-07 13:51:15 -04:00
94810ebf8b Activate virtual environment 2024-06-07 13:41:28 -04:00
fbbe4acc1f Didn't do migration first. 2024-06-07 13:35:10 -04:00
8c5896b6b1 Merge branch '3-sample_controls' into dev 2024-06-07 11:41:06 -04:00
3468c38008 Rename yeast batch to propogation.
Refrences to yeast `batches` are now `propogations`.

Hopefully less confusing now...
Closes #6
2024-06-07 11:27:41 -04:00
651cfe9162 Merge branch 'dev' into 3-sample_controls 2024-06-07 11:05:54 -04:00
f396dacee5 Fix display of batch parents.
Fixes #5.
2024-06-07 11:04:02 -04:00
74e8a3135a Modify admin page a bit. 2024-06-07 08:53:43 -04:00
a6c244756e Merge branch 'dev' into 3-sample_controls 2024-06-07 08:47:04 -04:00
0bfcdcb409 Fix renamed property. 2024-06-07 08:46:11 -04:00
c3634141a3 Basic outline of yeast sample page.
None of the controls do anything yet.
2024-06-07 07:54:23 -04:00
e91a01f0bf Merge branch 'dev' 2024-06-06 14:21:11 -04:00
2a4ef930b7 Change batch display behavior to onchange.
Click event acts wierd on mobile.
2024-06-06 14:13:52 -04:00
14b12a6598 Finally got the login menu in the right place.
<div class="dropdown ms-auto">
2024-06-06 14:10:54 -04:00
940796d38e Nav Stuff
Updated for bootstrap 5.
2024-06-06 13:40:43 -04:00
e226f6e406 Got the right Bootstrap stuff.
bootstrap.bundle.min.js includes Popper already and including popper again
was causing dropdowns to not work.
2024-06-06 13:40:17 -04:00
303797d800 Changes for bootstrap 5 navbar.
Hopefully if collapses on mobile now.
2024-06-06 12:25:50 -04:00
a503db7a92 Pull from the current branch. 2024-06-06 11:48:02 -04:00
Chris GIACOFEI
6e16a0bede Bootstrap 5.3 switch. 2024-06-06 11:42:28 -04:00
e265dea35f Now the footer is gone. 2024-06-06 11:17:39 -04:00
e40d83e7a2 Get rid of footer.
Need to figure out how to stop it overlapping content on mobile.
2024-06-06 11:15:36 -04:00
Chris GIACOFEI
ff717d917d Add beer homepage to get rid of server error. 2024-06-06 10:48:39 -04:00
Chris GIACOFEI
082633ad47 Point home link to root page. 2024-06-06 10:40:03 -04:00
Chris GIACOFEI
0981ad63bc Implement a homepage for yeast.
Dynamic batch info display.
2024-06-06 10:13:16 -04:00
Chris GIACOFEI
3b9bf53da9 Add some useful properties. 2024-06-06 10:11:28 -04:00
Chris GIACOFEI
0d0f5e2373 Documentation things. 2024-06-05 14:14:39 -04:00
Chris GIACOFEI
3717c2b844 Make start command work every time. 2024-06-05 11:57:41 -04:00
Chris GIACOFEI
218f9ea595 Run collectstatic before restart. 2024-06-05 11:54:44 -04:00
Chris GIACOFEI
54a4d11788 Gunicorn restart depends on file changes. 2024-06-05 11:39:23 -04:00
16e7531ac5 Migration dependant on model files. 2024-06-05 11:26:30 -04:00
f76f5cec75 Fancier makefile. 2024-06-05 11:16:52 -04:00
Chris GIACOFEI
26a58ff6c8 Only restart gunircorn if templates/packages changed. 2024-06-05 11:02:24 -04:00
Chris GIACOFEI
f1f03ee3b6 Add backup/restore to makefile. 2024-06-05 10:54:33 -04:00
Chris GIACOFEI
12763925ed Update makefile 2024-06-05 10:39:51 -04:00
Chris GIACOFEI
90b613c433 Add links to parents in batch page. 2024-06-05 10:31:53 -04:00
Chris GIACOFEI
c70b326c37 Get rid of unneeded logging. 2024-06-05 10:30:08 -04:00
Chris GIACOFEI
be3eb2fefe Add missing url patterns. 2024-06-05 10:27:13 -04:00
Chris GIACOFEI
4c6fe9824d Clean up admin modules with mixins. 2024-06-05 10:07:39 -04:00
Chris GIACOFEI
bcbdc5586e Reset migrations. 2024-06-05 08:33:03 -04:00
Chris GIACOFEI
8413a63480 Get rid of the wiki stuff. 2024-06-05 08:32:09 -04:00
Chris GIACOFEI
249b87009a Rename kegs to equipment. 2024-06-05 08:30:35 -04:00
Chris GIACOFEI
f293e4ec7b Add Brewfather links to yeast pages if available. 2024-06-03 15:39:54 -04:00
Chris GIACOFEI
17d8eab873 Add properties to get Brewfather links data. 2024-06-03 15:38:38 -04:00
Chris GIACOFEI
4aa7608734 Activating venv is not necessary. 2024-06-03 14:57:04 -04:00
Chris GIACOFEI
e61424586e Update makefile. 2024-06-03 14:52:11 -04:00
Chris GIACOFEI
ea9fd028f4 Much nicer user menu. 2024-06-03 14:33:09 -04:00
acb4217a75 Find all the files 2024-06-03 13:55:47 -04:00
Chris GIACOFEI
0d75452531 Fix jumbotron. 2024-06-03 13:47:23 -04:00