Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add forms for managing tags #809

Merged
merged 29 commits into from
May 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
bff359b
Add user forms for tags
MisterPhilip Apr 20, 2024
ba452c2
Merge branch 'master' into 460_manage_tags_form
MisterPhilip Apr 20, 2024
7b140ee
Fix admin tag form
MisterPhilip Apr 21, 2024
1f00733
Add items tagged count for tag list
MisterPhilip Apr 21, 2024
e8808e6
Update breadcrumb copy & URL
MisterPhilip Apr 21, 2024
537847a
Center color & tagged item count cols
MisterPhilip Apr 21, 2024
9a9a348
Add warning copy to tag delete form
MisterPhilip Apr 21, 2024
fb487b4
Add tests for tag forms
MisterPhilip Apr 21, 2024
4508203
Add tag detail page (WIP)
MisterPhilip Apr 21, 2024
bced665
Finalize tag crud views
MisterPhilip Apr 23, 2024
8b1272f
Lint fontello
MisterPhilip Apr 25, 2024
4dc86a2
Fix layout of form buttons on mobile
josevh May 3, 2024
6ae01d6
Lock django-import-export to v3
cdubz May 3, 2024
61252f4
Change sleep pattern report to show awake times
simwir Apr 22, 2024
ba46c49
Use pill for diaper change colors
cdubz May 3, 2024
5145171
Add user forms for tags
MisterPhilip Apr 20, 2024
39eec75
Fix admin tag form
MisterPhilip Apr 21, 2024
0fb1e46
Add items tagged count for tag list
MisterPhilip Apr 21, 2024
b362ecb
Update breadcrumb copy & URL
MisterPhilip Apr 21, 2024
70b61be
Center color & tagged item count cols
MisterPhilip Apr 21, 2024
f761e49
Add warning copy to tag delete form
MisterPhilip Apr 21, 2024
880ccf5
Add tests for tag forms
MisterPhilip Apr 21, 2024
c3d18c0
Add tag detail page (WIP)
MisterPhilip Apr 21, 2024
714b5fe
Finalize tag crud views
MisterPhilip Apr 23, 2024
c7dd3b7
Lint fontello
MisterPhilip Apr 25, 2024
66939de
Use slugs in tag tests
MisterPhilip May 3, 2024
071c4d2
Add tag filtering & proper sorting in tag lists
MisterPhilip May 3, 2024
713865b
Merge branch '460_manage_tags_form' of github.com:MisterPhilip/babybu…
MisterPhilip May 3, 2024
63dd463
Add translated strings
MisterPhilip May 3, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ django = "~=5.0"
django-axes = "*"
django-filter = "*"
django-imagekit = "*"
django-import-export = "*"
django-storages = "*"
django-widget-tweaks = "*"
djangorestframework = "*"
Expand All @@ -26,6 +25,7 @@ whitenoise = "*"
django-taggit = "*"
django-qr-code = "*"
django-dbsettings = "*"
django-import-export = "~=3.0"

[dev-packages]
coveralls = "*"
Expand Down

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions babybuddy/static_src/fontello/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,12 @@
"css": "pumping",
"code": 62631,
"src": "entypo"
},
{
"uid": "3db5347bd219f3bce6025780f5d9ef45",
"css": "tag",
"code": 59414,
"src": "fontawesome"
}
]
}
1 change: 1 addition & 0 deletions babybuddy/static_src/fontello/css/babybuddy-codes.css
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
.icon-cancel:before { content: '\e813'; } /* '' */
.icon-head-circumference:before { content: '\e814'; } /* '' */
.icon-measurements:before { content: '\e815'; } /* '' */
.icon-tag:before { content: '\e816'; } /* '' */
.icon-height:before { content: '\f044'; } /* '' */
.icon-dashboard:before { content: '\f0e4'; } /* '' */
.icon-tummytime:before { content: '\f118'; } /* '' */
Expand Down
13 changes: 7 additions & 6 deletions babybuddy/static_src/fontello/css/babybuddy-embedded.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions babybuddy/static_src/fontello/css/babybuddy-ie7-codes.css
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
.icon-cancel { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-head-circumference { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-measurements { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-tag { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-height { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-dashboard { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-tummytime { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
Expand Down
1 change: 1 addition & 0 deletions babybuddy/static_src/fontello/css/babybuddy-ie7.css
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
.icon-cancel { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-head-circumference { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-measurements { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-tag { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-height { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-dashboard { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-tummytime { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
Expand Down
15 changes: 8 additions & 7 deletions babybuddy/static_src/fontello/css/babybuddy.css
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
@font-face {
font-family: 'babybuddy';
src: url('../font/babybuddy.eot?34831680');
src: url('../font/babybuddy.eot?34831680#iefix') format('embedded-opentype'),
url('../font/babybuddy.woff2?34831680') format('woff2'),
url('../font/babybuddy.woff?34831680') format('woff'),
url('../font/babybuddy.ttf?34831680') format('truetype'),
url('../font/babybuddy.svg?34831680#babybuddy') format('svg');
src: url('../font/babybuddy.eot?34829963');
src: url('../font/babybuddy.eot?34829963#iefix') format('embedded-opentype'),
url('../font/babybuddy.woff2?34829963') format('woff2'),
url('../font/babybuddy.woff?34829963') format('woff'),
url('../font/babybuddy.ttf?34829963') format('truetype'),
url('../font/babybuddy.svg?34829963#babybuddy') format('svg');
font-weight: normal;
font-style: normal;
}
Expand All @@ -15,7 +15,7 @@
@media screen and (-webkit-min-device-pixel-ratio:0) {
@font-face {
font-family: 'babybuddy';
src: url('../font/babybuddy.svg?34831680#babybuddy') format('svg');
src: url('../font/babybuddy.svg?34829963#babybuddy') format('svg');
}
}
*/
Expand Down Expand Up @@ -76,6 +76,7 @@
.icon-cancel:before { content: '\e813'; } /* '' */
.icon-head-circumference:before { content: '\e814'; } /* '' */
.icon-measurements:before { content: '\e815'; } /* '' */
.icon-tag:before { content: '\e816'; } /* '' */
.icon-height:before { content: '\f044'; } /* '' */
.icon-dashboard:before { content: '\f0e4'; } /* '' */
.icon-tummytime:before { content: '\f118'; } /* '' */
Expand Down
33 changes: 18 additions & 15 deletions babybuddy/static_src/fontello/demo.html
Original file line number Diff line number Diff line change
Expand Up @@ -146,11 +146,11 @@
}
@font-face {
font-family: 'babybuddy';
src: url('./font/babybuddy.eot?50060209');
src: url('./font/babybuddy.eot?50060209#iefix') format('embedded-opentype'),
url('./font/babybuddy.woff?50060209') format('woff'),
url('./font/babybuddy.ttf?50060209') format('truetype'),
url('./font/babybuddy.svg?50060209#babybuddy') format('svg');
src: url('./font/babybuddy.eot?22207665');
src: url('./font/babybuddy.eot?22207665#iefix') format('embedded-opentype'),
url('./font/babybuddy.woff?22207665') format('woff'),
url('./font/babybuddy.ttf?22207665') format('truetype'),
url('./font/babybuddy.svg?22207665#babybuddy') format('svg');
font-weight: normal;
font-style: normal;
}
Expand Down Expand Up @@ -291,14 +291,17 @@ <h1>
<div class="span3" title="Code: 0xe815">
<i class="demo-icon icon-measurements">&#xe815;</i> <span class="i-name">icon-measurements</span><span class="i-code">0xe815</span>
</div>
<div class="span3" title="Code: 0xe816">
<i class="demo-icon icon-tag">&#xe816;</i> <span class="i-name">icon-tag</span><span class="i-code">0xe816</span>
</div>
<div class="span3" title="Code: 0xf044">
<i class="demo-icon icon-height">&#xf044;</i> <span class="i-name">icon-height</span><span class="i-code">0xf044</span>
</div>
</div>
<div class="row">
<div class="span3" title="Code: 0xf0e4">
<i class="demo-icon icon-dashboard">&#xf0e4;</i> <span class="i-name">icon-dashboard</span><span class="i-code">0xf0e4</span>
</div>
</div>
<div class="row">
<div class="span3" title="Code: 0xf118">
<i class="demo-icon icon-tummytime">&#xf118;</i> <span class="i-name">icon-tummytime</span><span class="i-code">0xf118</span>
</div>
Expand All @@ -308,11 +311,11 @@ <h1>
<div class="span3" title="Code: 0xf126">
<i class="demo-icon icon-source">&#xf126;</i> <span class="i-name">icon-source</span><span class="i-code">0xf126</span>
</div>
</div>
<div class="row">
<div class="span3" title="Code: 0xf137">
<i class="demo-icon icon-angle-circled-left">&#xf137;</i> <span class="i-name">icon-angle-circled-left</span><span class="i-code">0xf137</span>
</div>
</div>
<div class="row">
<div class="span3" title="Code: 0xf138">
<i class="demo-icon icon-angle-circled-right">&#xf138;</i> <span class="i-name">icon-angle-circled-right</span><span class="i-code">0xf138</span>
</div>
Expand All @@ -322,11 +325,11 @@ <h1>
<div class="span3" title="Code: 0xf1b1">
<i class="demo-icon icon-feeding">&#xf1b1;</i> <span class="i-name">icon-feeding</span><span class="i-code">0xf1b1</span>
</div>
</div>
<div class="row">
<div class="span3" title="Code: 0xf1b3">
<i class="demo-icon icon-activities">&#xf1b3;</i> <span class="i-name">icon-activities</span><span class="i-code">0xf1b3</span>
</div>
</div>
<div class="row">
<div class="span3" title="Code: 0xf1da">
<i class="demo-icon icon-timeline">&#xf1da;</i> <span class="i-name">icon-timeline</span><span class="i-code">0xf1da</span>
</div>
Expand All @@ -336,11 +339,11 @@ <h1>
<div class="span3" title="Code: 0xf236">
<i class="demo-icon icon-sleep">&#xf236;</i> <span class="i-name">icon-sleep</span><span class="i-code">0xf236</span>
</div>
</div>
<div class="row">
<div class="span3" title="Code: 0xf249">
<i class="demo-icon icon-note">&#xf249;</i> <span class="i-name">icon-note</span><span class="i-code">0xf249</span>
</div>
</div>
<div class="row">
<div class="span3" title="Code: 0xf24e">
<i class="demo-icon icon-weight">&#xf24e;</i> <span class="i-name">icon-weight</span><span class="i-code">0xf24e</span>
</div>
Expand All @@ -350,11 +353,11 @@ <h1>
<div class="span3" title="Code: 0xf295">
<i class="demo-icon icon-bmi">&#xf295;</i> <span class="i-name">icon-bmi</span><span class="i-code">0xf295</span>
</div>
</div>
<div class="row">
<div class="span3" title="Code: 0xf2c8">
<i class="demo-icon icon-temperature">&#xf2c8;</i> <span class="i-name">icon-temperature</span><span class="i-code">0xf2c8</span>
</div>
</div>
<div class="row">
<div class="span3" title="Code: 0xf4a7">
<i class="demo-icon icon-pumping">&#xf4a7;</i> <span class="i-name">icon-pumping</span><span class="i-code">0xf4a7</span>
</div>
Expand Down
Binary file modified babybuddy/static_src/fontello/font/babybuddy.eot
Binary file not shown.
4 changes: 3 additions & 1 deletion babybuddy/static_src/fontello/font/babybuddy.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified babybuddy/static_src/fontello/font/babybuddy.ttf
Binary file not shown.
Binary file modified babybuddy/static_src/fontello/font/babybuddy.woff
Binary file not shown.
Binary file modified babybuddy/static_src/fontello/font/babybuddy.woff2
Binary file not shown.