Squashed commit of the following:
commit 5c0d380740c24e0467cef916fd0560cb26409f9f Author: lesion <lesion@autistici.org> Date: Sun Mar 19 23:22:25 2023 +0100 update yarn.lock commit 909ee71ecb8f27e4fba72430aecc92bf527e6cd4 Author: lesion <lesion@autistici.org> Date: Sun Mar 19 23:22:09 2023 +0100 Squashed commit of the following: commitfc8a9f4506Author: lesion <lesion@autistici.org> Date: Tue Mar 14 16:42:24 2023 +0100 address some issues with recurrent events, fix #247 commitf7357666caAuthor: lesion <lesion@autistici.org> Date: Tue Mar 14 16:16:52 2023 +0100 fix event import from URL commite1bca6f46aAuthor: lesion <lesion@autistici.org> Date: Tue Mar 14 16:15:42 2023 +0100 add Duch (nl) locale (thanks @jeoenepraat) commit5f8afdbc12Merge:57a052a92ca5abAuthor: lesion <lesion@autistici.org> Date: Tue Mar 14 11:39:50 2023 +0100 Merge remote-tracking branch 'weblate/master' commit57a052a7faMerge:63d1d2e55137d2Author: lesion <lesion@autistici.org> Date: Tue Mar 14 11:39:33 2023 +0100 Merge commit '55137d2ac23549e633f36ad10139fd4168c2645f' commit92ca5abf5eAuthor: joenepraat <joenepraat@posteo.org> Date: Fri Mar 10 23:16:32 2023 +0000 Translated using Weblate (Dutch) Currently translated at 68.3% (214 of 313 strings) Translation: Gancio/Web Translate-URL: https://hosted.weblate.org/projects/gancio/web/nl/ commit63d1d2ee53Author: lesion <lesion@autistici.org> Date: Thu Mar 9 21:41:06 2023 +0100 minor commitd2759a55a5Author: lesion <lesion@autistici.org> Date: Thu Mar 9 21:38:39 2023 +0100 wrong user / admin merge dark theme settings - fix #244 commitb401d829dbAuthor: lesion <lesion@autistici.org> Date: Thu Mar 9 21:24:45 2023 +0100 remove a small warning commitccffe5f7b0Author: lesion <lesion@autistici.org> Date: Fri Feb 24 11:40:36 2023 +0100 push tags on release commit55137d2ac2Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu Feb 23 23:56:16 2023 +0000 Bump sequelize from 6.28.0 to 6.29.0 Bumps [sequelize](https://github.com/sequelize/sequelize) from 6.28.0 to 6.29.0. - [Release notes](https://github.com/sequelize/sequelize/releases) - [Commits](https://github.com/sequelize/sequelize/compare/v6.28.0...v6.29.0) --- updated-dependencies: - dependency-name: sequelize dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> commitb654f29d8bAuthor: lesion <lesion@autistici.org> Date: Wed Feb 22 13:21:17 2023 +0100 update changelog commit0cd1ee9d89Author: lesion <lesion@autistici.org> Date: Wed Feb 22 13:17:29 2023 +0100 increase rate limit max requests per minutes commitb6dafc082eAuthor: lesion <lesion@autistici.org> Date: Wed Feb 22 08:45:39 2023 +0100 minor commit0fa7769844Author: lesion <lesion@autistici.org> Date: Wed Feb 22 08:45:18 2023 +0100 location saving is not working when geocoding is disabled, fix #238 commit07f9e2d9eeAuthor: lesion <lesion@autistici.org> Date: Wed Feb 22 08:33:40 2023 +0100 really fix #232 commitbae930799eAuthor: lesion <lesion@autistici.org> Date: Wed Feb 22 08:33:09 2023 +0100 downgrade mariadb (sequelize is not ready) commitd733d7fef1Author: lesion <lesion@autistici.org> Date: Wed Feb 22 00:16:28 2023 +0100 aargh commit98b22aad70Author: lesion <lesion@autistici.org> Date: Tue Feb 21 00:56:06 2023 +0100 minor commitfc098b603dAuthor: lesion <lesion@autistici.org> Date: Tue Feb 21 00:55:44 2023 +0100 missing i18n in setup, fix #239 commit3eaf72af19Merge:bba196bd6c6034Author: lesion <lesion@autistici.org> Date: Mon Feb 20 21:17:37 2023 +0100 Merge remote-tracking branch 'weblate/master' commitbba196b068Author: lesion <lesion@autistici.org> Date: Sat Feb 18 00:05:52 2023 +0100 update changelog, v1.6.3 commitbb9f7cca47Author: lesion <lesion@autistici.org> Date: Sat Feb 18 00:04:28 2023 +0100 minor commit80d2dbd06bAuthor: lesion <lesion@autistici.org> Date: Fri Feb 17 23:40:28 2023 +0100 minor commitd6c6034630Author: fadelkon <fadelkon@posteo.net> Date: Thu Feb 16 22:09:23 2023 +0000 Translated using Weblate (Catalan) Currently translated at 100.0% (313 of 313 strings) Translation: Gancio/Web Translate-URL: https://hosted.weblate.org/projects/gancio/web/ca/ commitd125cf1506Author: lesion <lesion@autistici.org> Date: Fri Feb 17 21:56:31 2023 +0100 set a default user_locale path commit4367960a62Merge:c8cc5c687dd179Author: lesion <lesion@autistici.org> Date: Tue Feb 7 17:46:58 2023 +0100 Merge branch 'master' into gh commitc8cc5c6c97Merge:88e0c90550e221Author: lesion <lesion@autistici.org> Date: Mon Jan 9 17:15:21 2023 +0100 Merge branch 'master' into gh commit88e0c90a66Merge:421aa12f212ac1Author: lesion <lesion@autistici.org> Date: Thu Dec 15 09:54:41 2022 +0100 Merge branch 'master' into gh commit421aa12781Merge:5f6cc46b3488e7Author: lesion <lesion@autistici.org> Date: Wed Sep 28 12:26:08 2022 +0200 Merge branch 'master' into gh commit5f6cc46cdcMerge:b66feb9171d968Author: lesion <lesion@autistici.org> Date: Mon Aug 8 00:08:12 2022 +0200 Merge branch 'master' into gh commitb66feb92e2Merge:80c55d505d068fAuthor: lesion <lesion@autistici.org> Date: Tue Jun 21 23:48:40 2022 +0200 Merge branch 'master' into gh commit80c55d5601Merge:814090ea154fdfAuthor: lesion <lesion@autistici.org> Date: Mon Jun 6 17:27:00 2022 +0200 Merge branch 'master' into gh commit814090e9b6Merge:616c5422e3aba9Author: lesion <lesion@autistici.org> Date: Mon Jun 6 17:19:31 2022 +0200 Merge branch 'master' into gh commit616c54229aMerge:e4cb22e82dcaf9Author: lesion <lesion@autistici.org> Date: Mon Jun 6 16:57:05 2022 +0200 Merge branch 'master' into gh commite4cb22ee33Merge:5dddfbd8657937Author: lesion <lesion@autistici.org> Date: Fri Mar 11 23:41:22 2022 +0100 Merge branch 'master' into gh commit5dddfbd29eMerge:60e9d9510c6b0dAuthor: lesion <lesion@autistici.org> Date: Fri Mar 11 23:22:12 2022 +0100 Merge branch 'master' into gh commit60e9d95ba8Merge:79445caad93f83Author: lesion <lesion@autistici.org> Date: Tue Dec 7 01:35:18 2021 +0100 Merge branch 'master' into gh commit79445ca8a7Merge:9472d8dcd313efAuthor: les <lesion@autistici.org> Date: Thu Jun 24 21:52:25 2021 +0200 Merge branch 'master' into gh commit9472d8d919Merge:f9601499e9643eAuthor: les <lesion@autistici.org> Date: Fri Mar 26 22:27:41 2021 +0100 Merge branch 'dev' into gh commitf9601492dcAuthor: les <lesion@autistici.org> Date: Fri Dec 6 11:30:41 2019 +0100 update dependencies commitf8c7fa2b45Author: les <lesion@autistici.org> Date: Fri Dec 6 11:41:13 2019 +0100 minor commit33ca266535Author: les <lesion@autistici.org> Date: Fri Dec 6 11:38:15 2019 +0100 prepare gh as a mirror commit 5c8875411631048210eb50030e83cb272a40d54a Author: lesion <lesion@autistici.org> Date: Sun Mar 19 23:18:40 2023 +0100 update deps commit 7eac4fce324a6e75cdda296d672317cf2497c005 Author: lesion <lesion@autistici.org> Date: Sun Mar 19 23:18:25 2023 +0100 refactoring event detail page commit dc9ca88bc62708b869be3f3efe51d9155fe17830 Author: lesion <lesion@autistici.org> Date: Sun Mar 19 23:17:35 2023 +0100 show hide boosts/bookmarks, fix #241 commit d4a25b1dd0b9404e0de7ca5cf546f0d29bc8943e Author: lesion <lesion@autistici.org> Date: Sun Mar 19 23:13:58 2023 +0100 minor with unixFormat commit 239d6bcab19ef3cf53d1b2544a5c9a36ba8dd25b Author: lesion <lesion@autistici.org> Date: Sun Mar 19 23:12:25 2023 +0100 minor commit b149f980db8245c12a6940997be6d5657bddf829 Author: lesion <lesion@autistici.org> Date: Sun Mar 19 23:12:05 2023 +0100 minor commit 6f2955c584ec9da2c10991fb09ab57735a31385d Author: lesion <lesion@autistici.org> Date: Sun Mar 19 23:11:49 2023 +0100 minor commit dd586c38c9ef2f0b408ef90eb27dffe53355305a Author: lesion <lesion@autistici.org> Date: Sun Mar 19 23:11:31 2023 +0100 minor on style commit 544823717b9801e63bef15394b25bfbcd842c10f Author: lesion <lesion@autistici.org> Date: Sun Mar 19 23:11:15 2023 +0100 fix multidate issue, go to event on save commit 9ef0c75d03ee2d69f89034b28d6991f85ffefb06 Author: lesion <lesion@autistici.org> Date: Sun Mar 19 23:09:47 2023 +0100 use v-lazy, improve search, full tag/place events commit ac91072b79960815e0535e63ac45e0b5c6100764 Author: lesion <lesion@autistici.org> Date: Sun Mar 19 22:47:51 2023 +0100 increase DDOS limiter to 250 req/min commit d0ca92efb4afe48d2fd236083d9e290ab8d49704 Author: lesion <lesion@autistici.org> Date: Sun Mar 19 22:47:14 2023 +0100 update changelog commit 2d54f19225acc4118d60ef8c9d12f9495e6776ca Author: lesion <lesion@autistici.org> Date: Sun Mar 19 22:46:51 2023 +0100 use luxon instead of dayjs, new $time plugin
This commit is contained in:
@@ -1,51 +0,0 @@
|
||||
import dayjs from 'dayjs'
|
||||
|
||||
export function attributesFromEvents(_events) {
|
||||
// merge events with same date
|
||||
let attributes = []
|
||||
const now = dayjs().unix()
|
||||
for (let e of _events) {
|
||||
const key = dayjs.unix(e.start_datetime).tz().format('MMDD') // Math.floor(e.start_datetime/(3600*24)) // dayjs.unix(e.start_datetime).tz().format('YYYYMMDD')
|
||||
const c = (e.end_datetime || e.start_datetime) < now ? 'vc-past' : ''
|
||||
|
||||
if (e.multidate === true) {
|
||||
attributes.push({
|
||||
dates: { start: new Date(e.start_datetime * 1000), end: new Date(e.end_datetime * 1000) },
|
||||
highlight: {
|
||||
start: { fillMode: 'outline' },
|
||||
base: { fillMode: 'light' },
|
||||
end: { fillMode: 'outline' },
|
||||
}
|
||||
})
|
||||
continue
|
||||
}
|
||||
|
||||
const i = attributes.find(a => a.day === key)
|
||||
if (!i) {
|
||||
attributes.push({
|
||||
day: key, key: e.id, n: 1, dates: new Date(e.start_datetime * 1000),
|
||||
dot: { color: 'teal', class: c }
|
||||
})
|
||||
continue
|
||||
}
|
||||
|
||||
i.n++
|
||||
if (i.n >= 20) {
|
||||
i.dot = { color: 'purple', class: c }
|
||||
} else if (i.n >= 10) {
|
||||
i.dot = { color: 'red', class: c }
|
||||
} else if (i.n >= 5) {
|
||||
i.dot = { color: 'orange', class: c }
|
||||
} else if (i.n >= 3) {
|
||||
i.dot = { color: 'yellow', class: c }
|
||||
} else {
|
||||
i.dot = { color: 'teal', class: c }
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// add a bar to highlight today
|
||||
attributes.push({ key: 'today', dates: new Date(), highlight: { color: 'green', fillMode: 'outline' } })
|
||||
|
||||
return attributes
|
||||
}
|
||||
@@ -108,7 +108,11 @@ li {
|
||||
/* margin-top: 16px;
|
||||
margin-right: 16px; */
|
||||
transition: all .5s;
|
||||
min-height: 288px;
|
||||
overflow: hidden;
|
||||
box-shadow: 0px 3px 1px -2px rgba(0, 0, 0, 0.2), 0px 2px 2px 0px rgba(0, 0, 0, 0.14), 0px 1px 5px 0px rgba(0, 0, 0, 0.12);
|
||||
border-radius: 4px;
|
||||
|
||||
}
|
||||
|
||||
.event .title {
|
||||
@@ -127,11 +131,10 @@ li {
|
||||
flex: 1 1 auto;
|
||||
}
|
||||
|
||||
.event .place span {
|
||||
white-space: nowrap;
|
||||
/* .event .place span {
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
} */
|
||||
|
||||
.event a {
|
||||
text-decoration: none;
|
||||
@@ -148,6 +151,7 @@ li {
|
||||
|
||||
#event {
|
||||
max-width: 1200px;
|
||||
overflow-wrap: break-word;
|
||||
}
|
||||
|
||||
/* .tags .v-chip .v-chip__content {
|
||||
|
||||
Reference in New Issue
Block a user