display archived

This commit is contained in:
Romulus21 committed 2022-01-23 00:23:29 +01:00
1 parent 62cb27c85e
commit 0b95d65898
5 files changed
+43 -9

No files matched your search

+1 -1
View File
@@ -1 +1 @@
[{"timestamp":1642529294712,"files":[{"filename":"bundle.*****.esm.js","previous":10271,"size":10316,"diff":45},{"filename":"polyfills.*****.esm.js","previous":2191,"size":2191,"diff":0},{"filename":"route-Home.chunk.*****.esm.js","previous":5604,"size":5607,"diff":3},{"filename":"route-Plant.chunk.*****.esm.js","previous":6752,"size":6797,"diff":45},{"filename":"route-Profile.chunk.*****.esm.js","previous":922,"size":953,"diff":31},{"filename":"sw-esm.js","previous":10763,"size":10768,"diff":5},{"filename":"sw.js","previous":10769,"size":10778,"diff":9},{"filename":"index.html","previous":1749,"size":1804,"diff":55},{"filename":"200.html","previous":906,"size":907,"diff":1},{"filename":"polyfills.0ba84.js","previous":2290,"size":2290,"diff":0},{"filename":"route-Profile.chunk.3423a.js","previous":1394,"size":0,"diff":-1394},{"filename":"bundle.fdcd5.css","previous":2890,"size":0,"diff":-2890},{"filename":"route-Home~route-Plant.chunk.7dea9.js","previous":5510,"size":5510,"diff":0},{"filename":"bundle.af5c1.js","previous":10940,"size":0,"diff":-10940},{"filename":"route-Home.chunk.1a164.js","previous":1508,"size":0,"diff":-1508},{"filename":"route-Plant.chunk.d2bd9.js","previous":3152,"size":0,"diff":-3152},{"filename":"bundle.9771c.css","previous":0,"size":2897,"diff":2897},{"filename":"bundle.6998f.js","previous":0,"size":10990,"diff":10990},{"filename":"route-Home.chunk.e5b2b.js","previous":0,"size":1512,"diff":1512},{"filename":"route-Plant.chunk.f00ee.js","previous":0,"size":3203,"diff":3203},{"filename":"route-Profile.chunk.68572.js","previous":0,"size":1424,"diff":1424}]},{"timestamp":1642514633677,"files":[{"filename":"bundle.*****.esm.js","previous":10269,"size":10271,"diff":2},{"filename":"polyfills.*****.esm.js","previous":2191,"size":2191,"diff":0},{"filename":"route-Home.chunk.*****.esm.js","previous":5318,"size":5604,"diff":286},{"filename":"route-Plant.chunk.*****.esm.js","previous":6423,"size":6752,"diff":329},{"filename":"route-Profile.chunk.*****.esm.js","previous":922,"size":922,"diff":0},{"filename":"sw-esm.js","previous":10764,"size":10763,"diff":-1},{"filename":"sw.js","previous":10774,"size":10769,"diff":-5},{"filename":"index.html","previous":1750,"size":1749,"diff":-1},{"filename":"200.html","previous":907,"size":906,"diff":-1},{"filename":"bundle.6e91b.css","previous":2808,"size":0,"diff":-2808},{"filename":"route-Home~route-Plant.chunk.f4501.js","previous":5268,"size":0,"diff":-5268},{"filename":"bundle.bf6f7.js","previous":10941,"size":0,"diff":-10941},{"filename":"polyfills.0ba84.js","previous":2290,"size":2290,"diff":0},{"filename":"route-Home.chunk.04c91.js","previous":1432,"size":0,"diff":-1432},{"filename":"route-Plant.chunk.445a5.js","previous":3029,"size":0,"diff":-3029},{"filename":"route-Profile.chunk.3423a.js","previous":1394,"size":1394,"diff":0},{"filename":"bundle.fdcd5.css","previous":0,"size":2890,"diff":2890},{"filename":"route-Home~route-Plant.chunk.7dea9.js","previous":0,"size":5510,"diff":5510},{"filename":"bundle.af5c1.js","previous":0,"size":10940,"diff":10940},{"filename":"route-Home.chunk.1a164.js","previous":0,"size":1508,"diff":1508},{"filename":"route-Plant.chunk.d2bd9.js","previous":0,"size":3152,"diff":3152}]},{"timestamp":1642349922889,"files":[{"filename":"bundle.e3489.css","previous":2808,"size":0,"diff":-2808},{"filename":"bundle.*****.esm.js","previous":10272,"size":10269,"diff":-3},{"filename":"polyfills.*****.esm.js","previous":2191,"size":2191,"diff":0},{"filename":"route-Home.chunk.*****.esm.js","previous":5325,"size":5318,"diff":-7},{"filename":"route-Plant.chunk.*****.esm.js","previous":6411,"size":6423,"diff":12},{"filename":"route-Profile.chunk.*****.esm.js","previous":922,"size":922,"diff":0},{"filename":"sw-esm.js","previous":10767,"size":10764,"diff":-3},{"filename":"sw.js","previous":10760,"size":10774,"diff":14},{"filename":"bundle.e98ad.js","previous":10911,"size":0,"diff":-10911},{"filename":"polyfills.03377.js","previous":2291,"size":0,"diff":-2291},{"filename":"route-Home.chunk.58d66.js","previous":5871,"size":0,"diff":-5871},{"filename":"route-Plant.chunk.b4421.js","previous":7001,"size":0,"diff":-7001},{"filename":"route-Profile.chunk.5b010.js","previous":1393,"size":0,"diff":-1393},{"filename":"index.html","previous":1751,"size":1750,"diff":-1},{"filename":"200.html","previous":908,"size":907,"diff":-1},{"filename":"bundle.6e91b.css","previous":0,"size":2808,"diff":2808},{"filename":"route-Home~route-Plant.chunk.f4501.js","previous":0,"size":5268,"diff":5268},{"filename":"bundle.bf6f7.js","previous":0,"size":10941,"diff":10941},{"filename":"polyfills.0ba84.js","previous":0,"size":2290,"diff":2290},{"filename":"route-Home.chunk.04c91.js","previous":0,"size":1432,"diff":1432},{"filename":"route-Plant.chunk.445a5.js","previous":0,"size":3029,"diff":3029},{"filename":"route-Profile.chunk.3423a.js","previous":0,"size":1394,"diff":1394}]},{"timestamp":1642348996263,"files":[{"filename":"ssr-build/ssr-bundle.f564d.css","previous":564Line truncated [{"timestamp":1642889032469,"files":[{"filename":"bundle.*****.esm.js","previous":10316,"size":11254,"diff":938},{"filename":"polyfills.*****.esm.js","previous":2191,"size":2191,"diff":0},{"filename":"route-Home.chunk.*****.esm.js","previous":5607,"size":5820,"diff":213},{"filename":"route-Plant.chunk.*****.esm.js","previous":6797,"size":6964,"diff":167},{"filename":"route-Profile.chunk.*****.esm.js","previous":953,"size":1512,"diff":559},{"filename":"sw-esm.js","previous":10768,"size":10772,"diff":4},{"filename":"sw.js","previous":10778,"size":10785,"diff":7},{"filename":"index.html","previous":1804,"size":1827,"diff":23},{"filename":"200.html","previous":907,"size":943,"diff":36},{"filename":"polyfills.0ba84.js","previous":2290,"size":2290,"diff":0},{"filename":"route-Home~route-Plant.chunk.7dea9.js","previous":5510,"size":0,"diff":-5510},{"filename":"bundle.9771c.css","previous":2897,"size":0,"diff":-2897},{"filename":"bundle.6998f.js","previous":10990,"size":0,"diff":-10990},{"filename":"route-Home.chunk.e5b2b.js","previous":1512,"size":0,"diff":-1512},{"filename":"route-Plant.chunk.f00ee.js","previous":3203,"size":0,"diff":-3203},{"filename":"route-Profile.chunk.68572.js","previous":1424,"size":0,"diff":-1424},{"filename":"bundle.48c06.css","previous":0,"size":3189,"diff":3189},{"filename":"route-Style.chunk.*****.esm.js","previous":0,"size":1212,"diff":1212},{"filename":"route-Home~route-Plant.chunk.96a33.js","previous":0,"size":5641,"diff":5641},{"filename":"bundle.423bb.js","previous":0,"size":11957,"diff":11957},{"filename":"route-Home.chunk.f74e9.js","previous":0,"size":1604,"diff":1604},{"filename":"route-Plant.chunk.3016e.js","previous":0,"size":3249,"diff":3249},{"filename":"route-Profile.chunk.4193f.js","previous":0,"size":2150,"diff":2150},{"filename":"route-Style.chunk.97e5a.js","previous":0,"size":1220,"diff":1220}]},{"timestamp":1642529294712,"files":[{"filename":"bundle.*****.esm.js","previous":10271,"size":10316,"diff":45},{"filename":"polyfills.*****.esm.js","previous":2191,"size":2191,"diff":0},{"filename":"route-Home.chunk.*****.esm.js","previous":5604,"size":5607,"diff":3},{"filename":"route-Plant.chunk.*****.esm.js","previous":6752,"size":6797,"diff":45},{"filename":"route-Profile.chunk.*****.esm.js","previous":922,"size":953,"diff":31},{"filename":"sw-esm.js","previous":10763,"size":10768,"diff":5},{"filename":"sw.js","previous":10769,"size":10778,"diff":9},{"filename":"index.html","previous":1749,"size":1804,"diff":55},{"filename":"200.html","previous":906,"size":907,"diff":1},{"filename":"polyfills.0ba84.js","previous":2290,"size":2290,"diff":0},{"filename":"route-Profile.chunk.3423a.js","previous":1394,"size":0,"diff":-1394},{"filename":"bundle.fdcd5.css","previous":2890,"size":0,"diff":-2890},{"filename":"route-Home~route-Plant.chunk.7dea9.js","previous":5510,"size":5510,"diff":0},{"filename":"bundle.af5c1.js","previous":10940,"size":0,"diff":-10940},{"filename":"route-Home.chunk.1a164.js","previous":1508,"size":0,"diff":-1508},{"filename":"route-Plant.chunk.d2bd9.js","previous":3152,"size":0,"diff":-3152},{"filename":"bundle.9771c.css","previous":0,"size":2897,"diff":2897},{"filename":"bundle.6998f.js","previous":0,"size":10990,"diff":10990},{"filename":"route-Home.chunk.e5b2b.js","previous":0,"size":1512,"diff":1512},{"filename":"route-Plant.chunk.f00ee.js","previous":0,"size":3203,"diff":3203},{"filename":"route-Profile.chunk.68572.js","previous":0,"size":1424,"diff":1424}]},{"timestamp":1642514633677,"files":[{"filename":"bundle.*****.esm.js","previous":10269,"size":10271,"diff":2},{"filename":"polyfills.*****.esm.js","previous":2191,"size":2191,"diff":0},{"filename":"route-Home.chunk.*****.esm.js","previous":5318,"size":5604,"diff":286},{"filename":"route-Plant.chunk.*****.esm.js","previous":6423,"size":6752,"diff":329},{"filename":"route-Profile.chunk.*****.esm.js","previous":922,"size":922,"diff":0},{"filename":"sw-esm.js","previous":10764,"size":10763,"diff":-1},{"filename":"sw.js","previous":10774,"size":10769,"diff":-5},{"filename":"index.html","previous":1750,"size":1749,"diff":-1},{"filename":"200.html","previous":907,"size":906,"diff":-1},{"filename":"bundle.6e91b.css","previous":2808,"size":0,"diff":-2808},{"filename":"route-Home~route-Plant.chunk.f4501.js","previous":5268,"size":0,"diff":-5268},{"filename":"bundle.bf6f7.js","previous":10941,"size":0,"diff":-10941},{"filename":"polyfills.0ba84.js","previous":2290,"size":2290,"diff":0},{"filename":"route-Home.chunk.04c91.js","previous":1432,"size":0,"diff":-1432},{"filename":"route-Plant.chunk.445a5.js","previous":3029,"size":0,"diff":-3029},{"filename":"route-Profile.chunk.3423a.js","previous":1394,"size":1394,"diff":0},{"filename":"bundle.fdcd5.css","previous":0,"size":2890,"diff":2890},{"filename":"route-Home~route-Plant.chunk.7dea9.js","previous":0,"size":5510,"diff":5510},{"filename":"bundle.af5c1.js","previous":0,"size":10940,"diff":10940},{"filename":"route-Home.chunk.1a164.js","previous":0,"size":1508,"difLine truncated
+6
View File
@@ -21,3 +21,9 @@ export const EditSVG = (props) => SVGSkeleton({
paths: <path d="M402.3 344.9l32-32c5-5 13.7-1.5 13.7 5.7V464c0 26.5-21.5 48-48 48H48c-26.5 0-48-21.5-48-48V112c0-26.5 21.5-48 48-48h273.5c7.1 0 10.7 8.6 5.7 13.7l-32 32c-1.5 1.5-3.5 2.3-5.7 2.3H48v352h352V350.5c0-2.1.8-4.1 2.3-5.6zm156.6-201.8L296.3 405.7l-90.4 10c-26.2 2.9-48.5-19.2-45.6-45.6l10-90.4L432.9 17.1c22.9-22.9 59.9-22.9 82.7 0l43.2 43.2c22.9 22.9 22.9 60 .1 82.8zM460.1 174L402 115.9 216.2 301.8l-7.3 65.3 65.3-7.3L460.1 174zm64.8-79.7l-43.2-43.2c-4.1-4.1-10.8-4.1-14.8 0L436 82l58.1 58.1 30.9-30.9c4-4.2 4-10.8-.1-14.9z" />, paths: <path d="M402.3 344.9l32-32c5-5 13.7-1.5 13.7 5.7V464c0 26.5-21.5 48-48 48H48c-26.5 0-48-21.5-48-48V112c0-26.5 21.5-48 48-48h273.5c7.1 0 10.7 8.6 5.7 13.7l-32 32c-1.5 1.5-3.5 2.3-5.7 2.3H48v352h352V350.5c0-2.1.8-4.1 2.3-5.6zm156.6-201.8L296.3 405.7l-90.4 10c-26.2 2.9-48.5-19.2-45.6-45.6l10-90.4L432.9 17.1c22.9-22.9 59.9-22.9 82.7 0l43.2 43.2c22.9 22.9 22.9 60 .1 82.8zM460.1 174L402 115.9 216.2 301.8l-7.3 65.3 65.3-7.3L460.1 174zm64.8-79.7l-43.2-43.2c-4.1-4.1-10.8-4.1-14.8 0L436 82l58.1 58.1 30.9-30.9c4-4.2 4-10.8-.1-14.9z" />,
...props ...props
}) })
export const TriangleSVG = (props) => SVGSkeleton({
viewBox: "0 0 320 512",
paths: <path d="M288.662 352H31.338c-17.818 0-26.741-21.543-14.142-34.142l128.662-128.662c7.81-7.81 20.474-7.81 28.284 0l128.662 128.662c12.6 12.599 3.676 34.142-14.142 34.142z" />,
...props
})
+7 -5
View File
@@ -32,12 +32,14 @@ export const Text = ({text, count = null}) => {
export const TranslateProvider = ({children}) => { export const TranslateProvider = ({children}) => {
const userLang = navigator.language || navigator.userLanguage
let translate = null let translate = null
if (userLang === "en") { if (typeof navigator !== "undefined") {
translate = en const userLang = navigator.language || navigator.userLanguage
} else if (userLang === "fr") { if (userLang === "en") {
translate = fr translate = en
} else if (userLang === "fr") {
translate = fr
}
} }
return <TranslateContext.Provider value={translate}> return <TranslateContext.Provider value={translate}>
+12
View File
@@ -30,4 +30,16 @@ Array.prototype.where = function(field, search) {
return this.filter(item => item[field] === search) return this.filter(item => item[field] === search)
} }
/**
* Sort Array of Objects by a specific field
* @param {string} field to sort
* @param {boolean} desc way to sort
* @returns {Array}
*/
Array.prototype.sortObjectsBy = function (field, desc = false) {
return desc
? this.sort((a, b) => a[field] < b[field])
: this.sort((a, b) => a[field] > b[field])
}
export default App; export default App;
+17 -3
View File
@@ -6,11 +6,11 @@ import { PageLayout } from "../components/PageLayout"
import { PlantsContext } from "../Contexts" import { PlantsContext } from "../Contexts"
import {InputField, SelectField} from "../components/Form" import {InputField, SelectField} from "../components/Form"
import {getPicture, storePicture} from "../utilities/pictures" import {getPicture, storePicture} from "../utilities/pictures"
import {EditSVG, PlusSVG} from "../components/SVG" import {EditSVG, PlusSVG, TriangleSVG} from "../components/SVG"
import {classNames} from "../utilities/classNames" import {classNames} from "../utilities/classNames"
import {PlantForm} from "../components/Plants" import {PlantForm} from "../components/Plants"
import {ACTION_TYPES, actionId} from "../utilities/actions" import {ACTION_TYPES, actionId} from "../utilities/actions"
import {Text} from "../components/Translation"; import {Text} from "../components/Translation"
const Plant = ({id}) => { const Plant = ({id}) => {
@@ -109,7 +109,7 @@ const Plant = ({id}) => {
? <span><Text text="when you want" /></span> ? <span><Text text="when you want" /></span>
: <span><Text text="every {{count}} days" count={action.frequency} /></span>} : <span><Text text="every {{count}} days" count={action.frequency} /></span>}
<span className="text-gray-500"><Text text="last task" /> {lastTask ? lastTask.toFrDate() : <Text text="never" />}</span> <span className="text-gray-500"><Text text="last task" /> {lastTask ? lastTask.toFrDate() : <Text text="never" />}</span>
{/*<span>{ archived.where('action', actionId(action.action_type)).length }</span>*/} <ArchivedAction archived={archived.where('action', actionId(action.action_type))} />
</div> </div>
})} })}
</div> </div>
@@ -169,3 +169,17 @@ const Plant = ({id}) => {
} }
export default Plant export default Plant
const ArchivedAction = ({archived = []}) => {
console.log(archived)
const [isOpen, setIsOpen] = useState(false)
return <>
{archived.length > 0 && <span className="relative" onClick={() => setIsOpen(!isOpen)}>
{ archived.length } <TriangleSVG className={classNames("w-6 inline transform transition-all duration-300", isOpen ? 'rotate-180' : '')} />
{archived.length > 0 && isOpen && <ul className="absolute z-10 bg-white dark:bg-gray-800 border border-primary p-2 rounded">
{archived.sortObjectsBy('time', true).map(archive => <li>{(new Date(archive.time)).toFrDate()}</li>)}
</ul>}
</span>}
</>
}