diff --git a/.gitignore b/.gitignore index aa13309a..7f07453b 100644 --- a/.gitignore +++ b/.gitignore @@ -63,7 +63,7 @@ typings/ .node_repl_history # Output of 'npm pack' -*.tgz +#*.tgz # Yarn Integrity file .yarn-integrity diff --git a/CHANGELOG b/CHANGELOG index 74edce93..64611818 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,21 @@ All notable changes to this project will be documented in this file. +### Unreleased + +### 1.0 (beta) +This release is a complete rewrite of frontend UI and many internals, main changes are: + +- Switch UI framework from [element](https://element.eleme.io/) to [vuetify](https://vuetifyjs.com/) +- Distribute package directly from site instead of using npm registry +- Improve docker setup (run as user, fix some data export) +- New logging system (based on [winston](https://github.com/winstonjs/winston)) +- Slugify event URL (keeping old one valid) +- Import events from ics and external website using h-event (microformat) improving [`h-event`](https://microformats.org/wiki/h-event) export +- Hide unconfirmed tags and places +- Clean unused places and tags +- Fix tons of issues + + ### 0.24.0 - New Euskara language from Basque Country, thanks @hacklabkelo - fix feed with filters diff --git a/app/router.scrollBehavior.js b/app/router.scrollBehavior.js new file mode 100644 index 00000000..a054e10b --- /dev/null +++ b/app/router.scrollBehavior.js @@ -0,0 +1,3 @@ +export default function (to, from, savedPosition) { + return { x: 0, y: 0 } +} diff --git a/assets/event.less b/assets/event.less index 0a4c2cf4..2bf07805 100644 --- a/assets/event.less +++ b/assets/event.less @@ -1,56 +1,56 @@ -.event { - width: 320px; - max-width: 450px; - flex-grow: 1; - margin: .2em; - background-color: #202020; - overflow: hidden; +// .event { +// width: 320px; +// max-width: 450px; +// flex-grow: 1; +// margin: .2em; +// background-color: #202020; +// overflow: hidden; - a:hover { - text-decoration: none; - .title { - border-bottom: 1px solid #888; - color: white; - } - } +// a:hover { +// text-decoration: none; +// .title { +// border-bottom: 1px solid #888; +// color: white; +// } +// } - .title { - margin-left: 1rem; - margin-top: 1rem; - margin-right: 1rem; - border-bottom: 1px solid #333; - transition: border-color .5s; - font-size: 1.2em; - max-height: 3em; - overflow: hidden; - color: white; - font-weight: bold; - } +// .title { +// margin-left: 1rem; +// margin-top: 1rem; +// margin-right: 1rem; +// border-bottom: 1px solid #333; +// transition: border-color .5s; +// font-size: 1.2em; +// max-height: 3em; +// overflow: hidden; +// color: white; +// font-weight: bold; +// } - .card-footer { - max-height: 4.5em; - overflow: hidden; - padding: .25rem 0.5rem; - line-height: 1.8rem; - min-height: 2.2rem; - } +// .card-footer { +// max-height: 4.5em; +// overflow: hidden; +// padding: .25rem 0.5rem; +// line-height: 1.8rem; +// min-height: 2.2rem; +// } - .card-body { - overflow: hidden; - } +// .card-body { +// overflow: hidden; +// } - .description { - color: #999; - font-size: 0.8em; - overflow: hidden; - max-height: 100%; - } +// .description { +// color: #999; +// font-size: 0.8em; +// overflow: hidden; +// max-height: 100%; +// } - .el-image { width: 100% } - img { - width: 100%; - max-height: 250px; - object-fit: cover; - object-position: top; - } -} +// .el-image { width: 100% } +// img { +// width: 100%; +// max-height: 250px; +// object-fit: cover; +// object-position: top; +// } +// } diff --git a/assets/helper.js b/assets/helper.js new file mode 100644 index 00000000..01b9c1bc --- /dev/null +++ b/assets/helper.js @@ -0,0 +1,56 @@ +import take from 'lodash/take' +import get from 'lodash/get' +import dayjs from 'dayjs' + +export function attributesFromEvents (_events, _tags) { + const colors = ['blue', 'orange', 'yellow', 'teal', 'indigo', 'green', 'red', 'purple', 'pink', 'gray'] + const tags = take(_tags, 10).map(t => t.tag) + let attributes = [] + attributes.push({ key: 'today', dates: new Date(), bar: { color: 'green', fillMode: 'outline' } }) + const now = dayjs().unix() + + function getColor (event, where) { + const color = { class: 'vc-rounded-full', color: 'blue', fillMode: where === 'base' ? 'light' : 'solid' } + const tag = get(event, 'tags[0]') + if (event.start_datetime < now) { + if (event.multidate) { + color.fillMode = where === 'base' ? 'light' : 'outline' + if (where === 'base') { + color.class += ' vc-past' + } + } else { + color.class += ' vc-past' + } + } + if (!tag) { return color } + const idx = tags.indexOf(tag) + if (idx < 0) { return color } + color.color = colors[idx] + // if (event.start_datetime < now) { color.class += ' vc-past' } + return color + } + + attributes = attributes.concat(_events + .filter(e => !e.multidate) + .map(e => { + return { + key: e.id, + dot: getColor(e), + dates: new Date(e.start_datetime * 1000) + } + })) + + attributes = attributes.concat(_events + .filter(e => e.multidate) + .map(e => ({ + key: e.id, + highlight: { + start: getColor(e), + base: getColor(e, 'base'), + end: getColor(e) + }, + dates: { start: new Date(e.start_datetime * 1000), end: new Date(e.end_datetime * 1000) } + }))) + + return attributes +} diff --git a/assets/style.less b/assets/style.less index a0bffed8..4dc453ee 100644 --- a/assets/style.less +++ b/assets/style.less @@ -1,215 +1,119 @@ -:focus {outline:none;} -::-moz-focus-inner {border:0;} - -blockquote { - border-left: 3px solid grey; - font-style: italic; - color: #666; - padding-left: 1em; -} - -code { - font-family: sans-serif; - display: inline-block; - padding: 0 .4rem; - border-radius: 5px; - font-size: .8rem; - font-weight: 700; - background: rgba(0,0,0,.1); - color: #888; -} - html, body { + scrollbar-width: thin; + overflow: auto !important; + scrollbar-color: #FF4511 #111; font-family: sans-serif; - scroll-behavior: smooth; - text-rendering: optimizeSpeed; - background-color: #111; - overflow-y: auto; - scrollbar-width: thin; - scrollbar-color: #555 #111; - padding: 0 !important; } -#__nuxt, #__layout { - min-height: 100vh; - display: flex; - flex-direction: column; +li { + margin-left: 10px; } -#main { - min-height: 200px; - overflow: hidden; - scrollbar-width: thin; - transition: background-color .5s, opacity .5s; //, color 1s; - background-color: white; - &.dark { - background-color: #111; - } +.v-dialog .theme--dark.v-card { + background-color: #434343; } -#content { +.v-application .p-description.text-body-1 { + letter-spacing: normal !important; +} + +#home { max-width: 1400px; - flex-grow: 1; - width: 100%; + padding: 0px; + overflow: hidden; +} + +#events { margin: 0 auto; + display: flex; + flex-wrap: wrap; + justify-content: center; } -#header, #footer { - color: white; - background-color: #222; - font-size: 18px; - padding: 0 15px; +.container { + max-width: 1400px; } +.v-dialog { + width: 600px; + max-width: 800px; +} -#footer { - a { - color: orangered; - transition: color .4s; - &:hover { - text-decoration: none; - color: orange; +.theme--dark.v-list { + background-color: #333; +} + +.v-autocomplete__content.v-menu__content { + scrollbar-width: thin; + scrollbar-color: #FF4511 #111; +} + +// EVENT +.event { + display: flex; + position: relative; + flex-direction: column; + width: 330px; + max-width: 500px !important; + flex-grow: 1; + margin-top: .4em; + margin-right: .4em; + transition: all .5s; + overflow: hidden; + + .title { + transition: all .5s; + display: block; + max-height: 3em; + color: white; + overflow: hidden; + margin: 0.5rem 1rem 0.5rem 1rem; + font-size: 1.1em !important; + line-height: 1em !important; + } + + .body { + flex: 1 1 auto; + } + + .img { + width: 100%; + max-height: 250px; + min-height: 160px; + background-color: #222; + object-fit: cover; + object-position: top; + } + + .place { + max-width: 100%; + span { + display: block; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } } - - #links a { - margin-left: 15px; - } - min-height: 6em; - padding-top: 2em; - font-size: 1em; -} - -#header .el-menu--horizontal { - background-color: #222; - color: white; - .el-menu-item, .el-submenu__title { - color: white; - } - - .el-submenu .el-submenu__icon-arrow { - margin-left: 0px; - } - - .el-submenu .el-submenu__title { - padding: 0 15px; - } - - .el-menu-item:not(.is-disabled):focus, - .el-menu-item.is-active, - .el-menu-item:not(.is-disabled):hover, - .el-submenu:focus > .el-submenu__title, - .el-submenu:hover > .el-submenu__title, - .el-submenu.is-active > .el-submenu__title, - .el-submenu.is-opened { - color: white; - background-color: #111; - } -} - - -.page-enter-active { - transition: opacity .05s; -} - -.page-enter, .page-leave-active { - transition: opacity .3s; //, transform .3s; - opacity: 0; - // transform: translateX(30px); -} - -.el-card { - max-width: 700px; - margin: 0 auto; -} - -.el-menu-item { - height: 40px; - line-height: 40px; a { - color: #303133; - display: block; text-decoration: none; - text-overflow: ellipsis; - overflow: hidden; } } -.el-message-box { - max-width: 90%; +.v-list { + background-color: #333 !important; } -//TODO: refactoring -.el-button.is-plain, -.el-button.is-plain:focus, -.el-button.is-plain { - border-color: #ff450075; - background-color: transparent; - color: orangered; - - &:hover { - border-color: #ff450075; - background-color: transparent; - color: orange; - } +.vc-past { + opacity: 0.4; } -// TODO: this should be a link - -.event .p-location { - transition: color .2s; - &:hover { - cursor: pointer; - color: orangered !important; - } +#event { + max-width: 1200px; } -.el-button--text { - color: orangered !important; - &:hover { - color: orange !important; - } -} - -.el-button--success.is-plain { - color: #2c8600; - border-color: #9de27b; - background-color: #f9fff6; -} - -.el-button--mini, .el-button--mini.is-round { - padding: 6px 12px; - font-size: 0.8rem; -} - -.bg-dark { - background-color: #292929 !important; -} - -.el-dialog { - min-height: 300px; - max-width: 600px; - width: 100%; - .el-dialog__body { - word-break: normal !important; - } -} - -.el-switch__label span { - position: absolute; -} - -// .el-input { -// max-width: 350px; -// } - -// @media only screen and (max-width: 768px) { - // .el-card { - // padding: 0px !important; - // border-radius: 0px; - // } -// } - - -@import './event.less'; -@import './editor.less'; \ No newline at end of file +.tags .v-chip .v-chip__content { + max-width: 120px; + white-space: nowrap; + overflow: hidden; + display: block; +} \ No newline at end of file diff --git a/components/Announcement.vue b/components/Announcement.vue index f94673e9..1eb45080 100644 --- a/components/Announcement.vue +++ b/components/Announcement.vue @@ -1,10 +1,6 @@ - diff --git a/components/Calendar.vue b/components/Calendar.vue index 413c1924..4e49ebfa 100644 --- a/components/Calendar.vue +++ b/components/Calendar.vue @@ -1,10 +1,10 @@ diff --git a/components/List.vue b/components/List.vue index c9fc6b89..23be8723 100644 --- a/components/List.vue +++ b/components/List.vue @@ -1,18 +1,18 @@ @@ -56,23 +62,8 @@ export default { #list { max-width: 500px; margin: 0 auto; - - .el-timeline { - padding-left: 5px; - - hr { - margin-top: 4px; - margin-bottom: 4px; - } - } - - .el-timeline-item { - padding-bottom: 1px; - } - - .el-timeline-item__timestamp { - margin: 0px; - padding: 0px; + .v-list-item__title { + white-space: normal !important; } } diff --git a/components/Loading.vue b/components/Loading.vue new file mode 100644 index 00000000..a06bcf98 --- /dev/null +++ b/components/Loading.vue @@ -0,0 +1,44 @@ + + + + + diff --git a/components/Nav.vue b/components/Nav.vue index 8b2e5921..2ba83a3a 100644 --- a/components/Nav.vue +++ b/components/Nav.vue @@ -1,53 +1,61 @@ - - diff --git a/components/Search.vue b/components/Search.vue index 32b812ae..666fac58 100644 --- a/components/Search.vue +++ b/components/Search.vue @@ -1,126 +1,98 @@ - diff --git a/components/Snackbar.vue b/components/Snackbar.vue new file mode 100644 index 00000000..b0944936 --- /dev/null +++ b/components/Snackbar.vue @@ -0,0 +1,40 @@ + + + diff --git a/components/admin/Announcement.vue b/components/admin/Announcement.vue index 8b27211d..5edba461 100644 --- a/components/admin/Announcement.vue +++ b/components/admin/Announcement.vue @@ -1,30 +1,37 @@ diff --git a/components/admin/Federation.vue b/components/admin/Federation.vue index 0843d83f..507d8d73 100644 --- a/components/admin/Federation.vue +++ b/components/admin/Federation.vue @@ -1,61 +1,93 @@ - diff --git a/components/admin/Places.vue b/components/admin/Places.vue index 3506ba97..5129dca8 100644 --- a/components/admin/Places.vue +++ b/components/admin/Places.vue @@ -1,57 +1,71 @@ diff --git a/components/admin/Users.vue b/components/admin/Users.vue index 69564134..45a38950 100644 --- a/components/admin/Users.vue +++ b/components/admin/Users.vue @@ -1,87 +1,90 @@ - {% endif %} - - - - - - - - + + + + + + + + + {% seo %} - + diff --git a/docs/_sass/custom/custom.scss b/docs/_sass/custom/custom.scss new file mode 100644 index 00000000..b25ff777 --- /dev/null +++ b/docs/_sass/custom/custom.scss @@ -0,0 +1,168 @@ +$default-color: #5bc0de; +$default-light-color: #e3edf2; +$info-color: #50af51; +$info-light-color: #f3f8f3; +$warning-color: #f0ad4e; +$warning-light-color: #fcf8f2; +$error-color: #d9534f; +$error-light-color: #fdf7f7; +$content-color: rgba(0, 0, 0, 0.5); +$citation-color: #495057; +$citation-light-color: #f8f9fa; + +$svg-default-color: "5bc0de"; +$svg-info-color: "50af51"; +$svg-warning-color: "f0ad4e"; +$svg-error-color: "d9534f"; +$svg-citation-color: "495057"; + +.nav-list .nav-list-item { + font-size: 18px !important; + padding: 4px 0px 0px 0px !important; +} + +.main { + max-width: 1200px; +} + +.premonition { + display: grid; + grid-template-columns: 43px auto; + padding-top: 13px; + padding-bottom: 13px; + margin: 30px 0 30px 0; + background-color: $default-light-color; + border-left: 4px solid $default-color; + color: $default-color; + + code { + background-color: #fff; + color: $default-color; + } + + .header { + font-weight: 500; + font-size: 1.1rem; + color: $default-color; + padding-bottom: 6px; + } + + .content { + color: $content-color; + padding-left: 20px; + padding-right: 40px; + } + + p { + margin-top: 0; + margin-bottom: 0; + } + + @mixin box-type($c, $lc) { + background-color: $lc; + color: $c; + border-color: $c; + + a { + color: $c; + text-decoration: underline; + } + code { + color: $c; + } + .header { + color: $c; + } + } + + &.info { + @include box-type($info-color, $info-light-color); + } + &.warning { + @include box-type($warning-color, $warning-light-color); + } + &.error { + @include box-type($error-color, $error-light-color); + } + &.citation { + @include box-type($citation-color, $citation-light-color); + + blockquote { + border-left: 0; + } + } + + .fa, + .fas, + .far, + .fal, + .fab { + font-size: 28px; + opacity: 0.3; + padding-top: 2px; + padding-left: 20px; + } + + & > svg { + opacity: 0.6; + margin-top: 0.36rem; + margin-left: 0.7rem; + } + + @mixin pn-icon($pre, $color, $post) { + border: 0; + margin: 3px 0 0 14px; + background-repeat: no-repeat; + background-color: transparent; + background-image: url($pre + "%23" + $color + $post); + background-size: 28px 28px; + width: 28px; + height: 28px; + opacity: 0.3; + } + + /* Autogenerated code */ + &.pn-note { + @include pn-icon( + "data:image/svg+xml,%3C%3Fxml version='1.0' encoding='UTF-8'%3F%3E%3Csvg width='165px' height='165px' viewBox='0 0 165 165' version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'%3E%3Cg id='Page-1' stroke='none' stroke-width='1' fill='none' fill-rule='evenodd'%3E%3Cpath d='M40,0.5 C18.1847524,0.5 0.5,18.1847524 0.5,40 L0.5,125 C0.5,146.815248 18.1847524,164.5 40,164.5 L125,164.5 C146.815248,164.5 164.5,146.815248 164.5,125 L164.5,40 C164.5,18.1847524 146.815248,0.5 125,0.5 L40,0.5 Z M73.9421225,101.035652 C105.680247,64.0622419 122.973943,44.3076275 125.890221,41.6952841 C129.340278,37.6445263 135.770506,37.5263132 140.538208,40.8455453 C145.631474,44.3914319 146.755991,50.3287958 142.263833,56.0881327 C114.758351,89.0776641 89.30795,118.028061 81.5674939,125.633994 C76.464822,130.398827 70.5909248,130.398827 66.4355344,125.58961 C62.9024905,121.371642 58.9333122,116.710237 54.3854087,111.427565 C53.8350288,110.788264 53.2758998,110.139548 52.706934,109.480131 C49.8512069,106.170414 46.9143172,102.783286 43.1506474,98.4546038 C43.1657573,98.4719821 36.1709078,90.431646 34.3564576,88.341891 C27.8799723,80.882735 24.2336656,76.6160672 22.1013335,73.9633891 L22.095737,73.9562966 C15.4200148,65.3371074 30.5778334,52.1721209 38.5786063,60.512576 C48.9690719,71.5242952 60.7566779,85.0318321 73.9420929,101.035687 Z' id='Note' stroke='%23979797' fill='", + $svg-default-color, + "'%3E%3C/path%3E%3C/g%3E%3C/svg%3E" + ); + } + &.pn-info { + @include pn-icon( + "data:image/svg+xml,%3C%3Fxml version='1.0' encoding='UTF-8'%3F%3E%3Csvg width='165px' height='165px' viewBox='0 0 165 165' version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'%3E%3Cg id='Page-1' stroke='none' stroke-width='1' fill='none' fill-rule='evenodd'%3E%3Cpath d='M82.5,165 C36.9365081,165 0,128.063492 0,82.5 C0,36.9365081 36.9365081,0 82.5,0 C128.063492,0 165,36.9365081 165,82.5 C165,128.063492 128.063492,165 82.5,165 Z M71.3481445,44.7539062 C71.3481445,47.7402493 72.400136,50.2853899 74.5041504,52.3894043 C76.6081648,54.4934187 79.1533054,55.5454102 82.1396484,55.5454102 C85.0807439,55.5454102 87.603261,54.4934187 89.7072754,52.3894043 C91.8112898,50.2853899 92.8632812,47.7402493 92.8632812,44.7539062 C92.8632812,41.7675632 91.8112898,39.2224226 89.7072754,37.1184082 C87.603261,35.0143938 85.0807439,33.9624023 82.1396484,33.9624023 C79.1533054,33.9624023 76.6081648,35.0143938 74.5041504,37.1184082 C72.400136,39.2224226 71.3481445,41.7675632 71.3481445,44.7539062 Z M65.2397461,126.674316 L65.2397461,130 L98.3608398,130 L98.3608398,126.674316 C95.8722206,126.176593 94.1754603,125.497888 93.2705078,124.638184 C92.3655554,123.778479 91.9130859,121.83286 91.9130859,118.80127 L91.9130859,65.9975586 L65.2397461,65.9975586 L65.2397461,69.3911133 C68.0450987,69.8888371 69.9228468,70.6467234 70.8730469,71.6647949 C71.8232469,72.6828664 72.2983398,74.5945498 72.2983398,77.3999023 L72.2983398,118.258301 C72.2983398,121.425634 71.6196357,123.620111 70.262207,124.841797 C69.3572546,125.656254 67.6831177,126.267088 65.2397461,126.674316 Z' id='Info' fill='", + $svg-info-color, + "'%3E%3C/path%3E%3C/g%3E%3C/svg%3E" + ); + } + &.pn-warn { + @include pn-icon( + "data:image/svg+xml,%3C%3Fxml version='1.0' encoding='UTF-8'%3F%3E%3Csvg width='165px' height='165px' viewBox='0 0 165 165' version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'%3E%3Cg id='Page-1' stroke='none' stroke-width='1' fill='none' fill-rule='evenodd'%3E%3Cpath d='M82.5,165 C36.9365081,165 0,128.063492 0,82.5 C0,36.9365081 36.9365081,0 82.5,0 C128.063492,0 165,36.9365081 165,82.5 C165,128.063492 128.063492,165 82.5,165 Z M70.0629883,121.226562 C70.0629883,124.484391 71.2054736,127.255767 73.4904785,129.540771 C75.7754834,131.825776 78.5468587,132.968262 81.8046875,132.968262 C85.0625163,132.968262 87.8338916,131.825776 90.1188965,129.540771 C92.4039014,127.255767 93.5463867,124.484391 93.5463867,121.226562 C93.5463867,117.968734 92.4039014,115.197358 90.1188965,112.912354 C87.8338916,110.627349 85.0625163,109.484863 81.8046875,109.484863 C78.5468587,109.484863 75.7754834,110.627349 73.4904785,112.912354 C71.2054736,115.197358 70.0629883,117.968734 70.0629883,121.226562 Z M70.0629883,49.1474609 C70.0629883,50.8668706 70.4475873,53.2423351 71.2167969,56.2739258 C71.7145207,58.2195735 72.8230708,62.1108107 74.5424805,67.9477539 C75.8999091,72.5177637 76.804848,76.0696488 77.2573242,78.6035156 C77.7098004,81.1373825 78.5921158,87.7886831 79.9042969,98.5576172 L83.9086914,98.5576172 C84.8588915,90.0058166 85.5489074,84.3160135 85.9787598,81.4880371 C86.4086122,78.6600607 87.2117454,75.1194874 88.3881836,70.8662109 C90.3338313,63.8075819 91.6799279,58.7286125 92.4265137,55.6291504 C93.1730994,52.5296883 93.5463867,50.2107824 93.5463867,48.6723633 C93.5463867,43.7856201 92.3586545,40.278982 89.9831543,38.1523438 C87.6076541,36.0257055 84.8815258,34.9624023 81.8046875,34.9624023 C78.637354,34.9624023 75.8886021,36.0370172 73.5583496,38.1862793 C71.2280971,40.3355413 70.0629883,43.989232 70.0629883,49.1474609 Z' id='Warning' fill='", + $svg-warning-color, + "'%3E%3C/path%3E%3C/g%3E%3C/svg%3E" + ); + } + &.pn-error { + @include pn-icon( + "data:image/svg+xml,%3C%3Fxml version='1.0' encoding='UTF-8'%3F%3E%3Csvg width='165px' height='165px' viewBox='0 0 165 165' version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'%3E%3Cg id='Page-1' stroke='none' stroke-width='1' fill='none' fill-rule='evenodd'%3E%3Cpath d='M94.8695048,7.74207645 L163.217029,144.437125 C166.674878,151.352824 163.871738,159.762246 156.956039,163.220096 C155.012063,164.192084 152.86848,164.698115 150.695048,164.698115 L14,164.698115 C6.2680135,164.698115 -4.08562073e-14,158.430102 -4.26325641e-14,150.698115 C-4.26325641e-14,148.524684 0.506031285,146.381101 1.47801933,144.437125 L69.8255435,7.74207645 C73.283393,0.826377491 81.6928155,-1.97676336 88.6085145,1.48108612 C91.3178981,2.83577793 93.514813,5.03269282 94.8695048,7.74207645 Z M70.4105124,130.924678 C70.4105124,134.182506 71.5529978,136.953882 73.8380027,139.238887 C76.1230076,141.523892 78.8943829,142.666377 82.1522117,142.666377 C85.4100404,142.666377 88.1814157,141.523892 90.4664206,139.238887 C92.7514256,136.953882 93.8939109,134.182506 93.8939109,130.924678 C93.8939109,127.666849 92.7514256,124.895474 90.4664206,122.610469 C88.1814157,120.325464 85.4100404,119.182978 82.1522117,119.182978 C78.8943829,119.182978 76.1230076,120.325464 73.8380027,122.610469 C71.5529978,124.895474 70.4105124,127.666849 70.4105124,130.924678 Z M70.4105124,58.845576 C70.4105124,60.5649857 70.7951115,62.9404502 71.564321,65.9720409 C72.0620449,67.9176886 73.170595,71.8089258 74.8900046,77.645869 C76.2474333,82.2158788 77.1523722,85.7677639 77.6048484,88.3016307 C78.0573246,90.8354976 78.93964,97.4867982 80.251821,108.255732 L84.2562156,108.255732 C85.2064156,99.7039317 85.8964315,94.0141286 86.3262839,91.1861522 C86.7561363,88.3581758 87.5592696,84.8176025 88.7357078,80.564326 C90.6813555,73.505697 92.0274521,68.4267276 92.7740378,65.3272655 C93.5206236,62.2278034 93.8939109,59.9088975 93.8939109,58.3704784 C93.8939109,53.4837352 92.7061786,49.9770971 90.3306785,47.8504589 C87.9551783,45.7238206 85.22905,44.6605175 82.1522117,44.6605175 C78.9848781,44.6605175 76.2361263,45.7351324 73.9058738,47.8843944 C71.5756212,50.0336565 70.4105124,53.6873471 70.4105124,58.845576 Z' id='Error' fill='", + $svg-error-color, + "'%3E%3C/path%3E%3C/g%3E%3C/svg%3E" + ); + } + &.pn-quote { + @include pn-icon( + "data:image/svg+xml,%3C%3Fxml version='1.0' encoding='UTF-8'%3F%3E%3Csvg width='165px' height='165px' viewBox='0 0 165 165' version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'%3E%3Cg id='Page-1' stroke='none' stroke-width='1' fill='none' fill-rule='evenodd'%3E%3Cpath d='M104.546838,164.525333 C97.1871585,164.350607 90.6368822,160.915227 90.6512001,150.013018 C90.4479076,131.842639 90.4697154,98.303237 90.6512001,49.7828789 C91.9844555,2.36817118 138.064959,0.504907944 148.576644,0.0692731383 C152.479575,0.302510658 153.780675,2.21617827 154.578947,4.17356105 C155.831948,9.88458567 155.831948,17.6357453 154.578947,27.4270401 C153.93686,32.7057192 151.936092,35.3224781 148.576644,35.2773166 C143.472082,35.2236794 151.862467,35.2263624 140.927765,35.2773166 C128.559674,35.7091823 122.660334,39.3672244 122.615074,56.9085817 C122.635604,63.1213926 122.635604,71.5842998 122.615074,82.2973033 C138.48496,82.4101196 149.139584,82.4488979 154.578947,82.4136382 C159.435737,82.5353733 163.923774,84.3352392 164.565789,96.288498 C164.874062,119.857257 164.829662,136.387115 164.782895,150.013018 C164.664253,157.17723 161.233392,164.356416 151.753558,164.525333 C127.51005,164.615729 113.455097,164.525333 104.546838,164.525333 Z M14.0400451,164.45606 C6.68036548,164.281334 0.130089247,160.845954 0.144407166,149.943745 C-0.058885353,131.773366 -0.0370775896,98.2339638 0.144407166,49.7136058 C1.47766255,2.29889804 47.5581663,0.435634806 58.0698511,-9.9475983e-14 C61.9727821,0.233237519 63.2738816,2.14690514 64.0721544,4.10428791 C65.3251551,9.81531253 65.3251551,17.5664722 64.0721544,27.3577669 C63.4300669,32.6364461 61.4292991,35.2532049 58.0698511,35.2080434 C52.9652887,35.1544062 61.3556736,35.1570892 50.4209719,35.2080434 C38.0528815,35.6399092 32.153541,39.2979513 32.1082808,56.8393085 C32.1288111,63.0521194 32.1288111,71.5150266 32.1082808,82.2280302 C47.9781667,82.3408464 58.6327912,82.3796247 64.0721544,82.3443651 C68.9289443,82.4661002 73.4169814,84.265966 74.0589965,96.2192249 C74.367269,119.787984 74.3228688,136.317842 74.2761018,149.943745 C74.1574604,157.107957 70.7265987,164.287143 61.2467647,164.45606 C37.0032571,164.546456 22.9483044,164.45606 14.0400451,164.45606 Z' id='Quote' fill='", + $svg-citation-color, + "'%3E%3C/path%3E%3C/g%3E%3C/svg%3E" + ); + } + &.pn-square { + @include pn-icon( + "data:image/svg+xml,%3C%3Fxml version='1.0' encoding='UTF-8'%3F%3E%3Csvg width='165px' height='165px' viewBox='0 0 165 165' version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'%3E%3Cg id='Page-1' stroke='none' stroke-width='1' fill='none' fill-rule='evenodd'%3E%3Cpath d='M82.5,165 C36.9365081,165 0,128.063492 0,82.5 C0,36.9365081 36.9365081,0 82.5,0 C128.063492,0 165,36.9365081 165,82.5 C165,128.063492 128.063492,165 82.5,165 Z M115.5,99 C124.612698,99 132,91.3888407 132,82 C132,72.6111593 124.612698,65 115.5,65 C106.387302,65 99,72.6111593 99,82 C99,91.3888407 106.387302,99 115.5,99 Z M49.5,99 C58.6126984,99 66,91.3888407 66,82 C66,72.6111593 58.6126984,65 49.5,65 C40.3873016,65 33,72.6111593 33,82 C33,91.3888407 40.3873016,99 49.5,99 Z M66,114 L66,129 L99,129 L99,114 L66,114 Z' id='Default' fill='", + $svg-default-color, + "'%3E%3C/path%3E%3C/g%3E%3C/svg%3E" + ); + } + /* End of Autogenerated code */ +} diff --git a/docs/assets/add.png b/docs/assets/add.png new file mode 100644 index 00000000..138f4221 Binary files /dev/null and b/docs/assets/add.png differ diff --git a/docs/assets/admin_users.png b/docs/assets/admin_users.png deleted file mode 100644 index 28767ad6..00000000 Binary files a/docs/assets/admin_users.png and /dev/null differ diff --git a/docs/assets/css/style.css b/docs/assets/css/style.css deleted file mode 100644 index 895bcced..00000000 --- a/docs/assets/css/style.css +++ /dev/null @@ -1,12 +0,0 @@ -.navigation-list-item { - font-size: 18px !important; - padding: 4px; -} - -html, body { - font-family: sans-serif; -} - -.page-content h1:first-of-type { - font-weight: 500; -} diff --git a/docs/assets/event.png b/docs/assets/event.png new file mode 100644 index 00000000..17fdf20a Binary files /dev/null and b/docs/assets/event.png differ diff --git a/docs/assets/federation.png b/docs/assets/federation.png new file mode 100644 index 00000000..5f0c10a6 Binary files /dev/null and b/docs/assets/federation.png differ diff --git a/docs/assets/follow.png b/docs/assets/follow.png new file mode 100644 index 00000000..eaca281d Binary files /dev/null and b/docs/assets/follow.png differ diff --git a/docs/assets/home1.png b/docs/assets/home1.png deleted file mode 100644 index 6f83f00a..00000000 Binary files a/docs/assets/home1.png and /dev/null differ diff --git a/docs/assets/home_desktop.png b/docs/assets/home_desktop.png new file mode 100644 index 00000000..786b0b0c Binary files /dev/null and b/docs/assets/home_desktop.png differ diff --git a/docs/assets/js/zzzz-search-data.json b/docs/assets/js/zzzz-search-data.json new file mode 100644 index 00000000..6235244d --- /dev/null +++ b/docs/assets/js/zzzz-search-data.json @@ -0,0 +1,72 @@ +--- +permalink: /assets/js/search-data.json +--- +{ +{%- assign i = 0 -%} +{%- assign pages_array = '' | split: '' -%} +{%- assign pages_array = pages_array | push: site.html_pages -%} +{%- if site.just_the_docs.collections -%} + {%- for collection_entry in site.just_the_docs.collections -%} + {%- assign collection_key = collection_entry[0] -%} + {%- assign collection_value = collection_entry[1] -%} + {%- assign collection = site[collection_key] -%} + {%- if collection_value.search_exclude != true -%} + {%- assign pages_array = pages_array | push: collection -%} + {%- endif -%} + {%- endfor -%} +{%- endif -%} +{%- for pages in pages_array -%} + {%- for page in pages -%} + {%- if page.title and page.search_exclude != true -%} + {%- assign page_content = page.content -%} + {%- assign heading_level = site.search.heading_level | default: 2 -%} + {%- for j in (2..heading_level) -%} + {%- assign tag = '' -%} + {%- assign title = titleAndContent[0] | replace_first: '>', '

' | split: '

' -%} + {%- assign title = title[1] | strip_html -%} + {%- assign content = titleAndContent[1] -%} + {%- assign url = page.url -%} + {%- if title == page.title and parts[0] == '' -%} + {%- assign title_found = true -%} + {%- else -%} + {%- assign id = titleAndContent[0] -%} + {%- assign id = id | split: 'id="' -%} + {%- if id.size == 2 -%} + {%- assign id = id[1] -%} + {%- assign id = id | split: '"' -%} + {%- assign id = id[0] -%} + {%- capture url -%}{{ url | append: '#' | append: id }}{%- endcapture -%} + {%- endif -%} + {%- endif -%} + {%- unless i == 0 -%},{%- endunless -%} + "{{ i }}": { + "doc": {{ page.title | jsonify }}, + "title": {{ title | jsonify }}, + "content": {{ content | replace: ' info "info" -> `Content-Type` has to be `multipart/form-data` 'cause support image upload +> `Content-Type` has to be `multipart/form-data` to support image upload **Params** diff --git a/docs/dev/dev.md b/docs/dev/dev.md index 0e1f3222..3ac1beaf 100644 --- a/docs/dev/dev.md +++ b/docs/dev/dev.md @@ -15,7 +15,7 @@ has_children: true - Express - Node.js - [Sequelize](https://sequelize.org/) -- Element.ui +- [Vuetify](vuetifyjs.com/) ### Testing on your own machine @@ -42,4 +42,4 @@ yarn dev > warning "Warning" > You need to register a first user, this will be an active administrator! -Please use the [issue board](https://framagit.org/les/gancio/-/boards) and the [forum](https://framavox.org/g/hMXTDgtJ/gancio) to discuss any modification. +Please use the [issues](https://framagit.org/les/gancio/-/issues) to discuss any modification. diff --git a/docs/dev/locales.md b/docs/dev/locales.md index 2fbee27a..092772fd 100644 --- a/docs/dev/locales.md +++ b/docs/dev/locales.md @@ -8,11 +8,10 @@ nav_order: 7 ## Internationalization -We're self-hosting an instance of [weblate](https://weblate.gancio.org) you can use to help us with translations. +We're using [weblate](https://hosted.weblate.org/engage/gancio/) for localization, you can use it to help us with translations. + Currently supported languages: - - - -Stato traduzione + +Stato traduzione \ No newline at end of file diff --git a/docs/docker/Dockerfile b/docs/docker/Dockerfile index 4328e84d..c1c89a34 100644 --- a/docs/docker/Dockerfile +++ b/docs/docker/Dockerfile @@ -1,3 +1,2 @@ -FROM node:latest -WORKDIR / -RUN yarn global add gancio \ No newline at end of file +FROM node:buster +RUN yarn global add --silent https://gancio.org/latest.tgz 2> /dev/null diff --git a/docs/docker/postgres/docker-compose.yml b/docs/docker/postgres/docker-compose.yml index 664bd894..74b8476e 100644 --- a/docs/docker/postgres/docker-compose.yml +++ b/docs/docker/postgres/docker-compose.yml @@ -17,16 +17,17 @@ services: - 5432:5432 gancio: build: . - image: node:latest - environment: - - DEBUG=*,-babel,-follow-redirects,-send,-body-parser:*,-express:*,-connect:*,-sequelize:* - container_name: gancio restart: always - command: gancio start --docker --db=postgres + image: node:buster + user: node + container_name: gancio + environment: + - PATH=$PATH:/home/node/.yarn/bin + - GANCIO_DATA=/home/node/data + command: gancio start --docker volumes: - - ./config.json:/opt/gancio/config.json - - ./uploads:/opt/gancio/uploads + - ./data:/home/node/data + ports: + - "127.0.0.1:13120:13120" depends_on: - db - ports: - - 127.0.0.1:13120:13120 diff --git a/docs/docker/sqlite/docker-compose.yml b/docs/docker/sqlite/docker-compose.yml index 8e0ec36e..478aa72c 100644 --- a/docs/docker/sqlite/docker-compose.yml +++ b/docs/docker/sqlite/docker-compose.yml @@ -4,14 +4,14 @@ services: gancio: build: . restart: always - image: node:latest + image: node:buster + user: node container_name: gancio - command: gancio start --docker --db=sqlite environment: - - DEBUG=*,-babel,-follow-redirects,-send,-body-parser:*,-express:*,-connect:*,-sequelize:* + - PATH=$PATH:/home/node/.yarn/bin + - GANCIO_DATA=/home/node/data + command: gancio start --docker volumes: - - ./db.sqlite:/opt/gancio/db.sqlite - - ./config.json:/opt/gancio/config.json - - ./uploads:/opt/gancio/uploads + - ./data:/home/node/data ports: - "127.0.0.1:13120:13120" diff --git a/docs/index.md b/docs/index.md index edbec711..fcdab97e 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,5 +1,4 @@ --- -layout: default title: Home nav_order: 1 description: "Gancio is a shared agenda for local communities." @@ -12,14 +11,9 @@ permalink: / A shared agenda for local communities. {: .fs-6 } -[Get started now](install){: .btn .btn-primary .fs-5 .mb-4 .mb-md-0 .mr-2 } [Demo](https://demo.gancio.org){: .btn .btn-green .fs-5 .mb-4 .mb-md-0 } +[Install]({% link install/install.md %}){: .btn .btn-primary .fs-5 .mb-4 .mb-md-0 .mr-2 } [Demo](https://demo.gancio.org){: .btn .btn-green .fs-5 .mb-4 .mb-md-0 } [Source](https://framagit.org/les/gancio){: .btn .fs-5 } -[![assets/thumbs/home1.png](assets/thumbs/home1.png)](assets/home1.png){: data-fancybox="group" data-caption="Home of the first gancio instance"} -[![assets/thumbs/mobile1.png](assets/thumbs/mobile1.png)](assets/mobile1.png){: data-fancybox="group" data-caption="Home mobile"} -[![assets/thumbs/mobile2.png](assets/thumbs/mobile2.png)](assets/mobile2.png){: data-fancybox="group" data-caption="Home mobile"} -[![assets/thumbs/admin_users.png](assets/thumbs/admin_users.png)](assets/admin_users.png){: data-fancybox="group" data-caption="Admin interface"} - ## Some relevant key features: @@ -30,7 +24,7 @@ nowhere on gancio appears the identity of who published the event, not even unde - **Anonymous events**: optionally a visitor can create events without being registered (an administrator has to confirm them) -- **We are not interested in making hits** so we export events in many ways, via RSS feeds, via global or individual ics, incorporating lists of events or single event via iframe on other websites and via [AP](/federation) +- **We are not interested in making hits** so we export events in many ways, via RSS feeds, via global or individual ics, incorporating lists of events or single event via iframe on other websites and via [AP]({% link federation.md %}) - Very easy UI - Multidays events support (festival, conferences...) diff --git a/docs/install/backup.md b/docs/install/backup.md new file mode 100644 index 00000000..09cf4a60 --- /dev/null +++ b/docs/install/backup.md @@ -0,0 +1,23 @@ +--- +layout: default +title: Backup +permalink: /install/backup +nav_order: 5 +parent: Install +--- + +## Backup + +The following commands should be valid for every setup (docker/debian/sqlite/postgres) but check your installation directory first. +This includes database, configuration, custom user locales, logs, images and thumbnails. + +```bash +cd /opt/gancio/ # or /home/gancio or where your installation is +tar -czf gancio-$(date +%Y-%m-%d-%H%M%S)-backup.tgz \ + $(ls -d config.json uploads user_locale db.sqlite postgres data logs 2> /dev/null) +``` +> warning "Permission denied" +> `postgres` directory could have different permission or owner, in this case you need to be root or use `sudo` instead. + +> info "Automatic backup" +> To periodically backup your data you should probably use something like [restic](https://restic.net) or [borg](https://www.borgbackup.org/) \ No newline at end of file diff --git a/docs/configuration.md b/docs/install/configuration.md similarity index 85% rename from docs/configuration.md rename to docs/install/configuration.md index 4a87299f..fd242480 100644 --- a/docs/configuration.md +++ b/docs/install/configuration.md @@ -1,14 +1,14 @@ --- -layout: default title: Configuration -permalink: /config -nav_order: 3 +permalink: /install/config +nav_order: 6 +parent: Install --- ## Configuration {: .no_toc } -Main `gancio` configuration is done with a configuration file. -This shoud be a `.json` or a `.js` file and could be specified using the `--config` flag. +`gancio` configuration is done during installation process but you can change it editing the configuration file. Note that you can always re-run gancio with `--setup` flag to use the interactive setup. +The configuration file shoud be a `.json` or a `.js` file and could be specified using the `--config` flag. - eg. `gancio start --config ./config.json` - eg. `pm2 start gancio start -- --config ~/config.json` @@ -21,7 +21,7 @@ The title will be in rss feed, in html head and in emails: `"title": "Gancio"` -![title](assets/title.png) +![title](../assets/title.png) - ### Description `"description": "a shared agenda for local communities"` @@ -77,11 +77,6 @@ Email of administrator. Note that email from gancio comes from this email and th the SMTP configuration above should allow to use this address as from. -- ### Favicon -You could specify another favicon. This is also used as logo (top-left -corner): -`"favicon": "./favicon.ico"` - - ### User locale Probably you want to modify some text for your specific community, that's why we thought the `user_locale` configuration: you can specify your version of @@ -105,8 +100,6 @@ list of strings you can override. :warning: Note that a restart is needed when you change user_locale's content. -- ### Secret - ## Default settings ```json @@ -115,15 +108,14 @@ user_locale's content. "description": "A shared agenda for local communities", "baseurl": "http://localhost:13120", "server": { - "host": "0.0.0.0", + "host": "127.0.0.1", "port": 13120 }, "db": { "dialect": "sqlite", - "storage": "/tmp/db.sqlite" + "storage": "./db.sqlite" }, "upload_path": "./", - "favicon": "../dist/favicon.ico", "smtp": { "auth": { "user": "", @@ -133,6 +125,5 @@ user_locale's content. "host": "" }, "admin_email": "", - "secret": "notsosecret" } ``` diff --git a/docs/install/debian.md b/docs/install/debian.md index fde2aa40..0079f240 100644 --- a/docs/install/debian.md +++ b/docs/install/debian.md @@ -1,7 +1,7 @@ --- -layout: default title: Debian permalink: /install/debian +nav_order: 1 parent: Install --- @@ -9,7 +9,7 @@ parent: Install 1. Install Node.js & yarn (**from root**) ```bash -curl -sL https://deb.nodesource.com/setup_12.x | bash - +curl -sL https://deb.nodesource.com/setup_16.x | bash - apt-get install -y nodejs curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list @@ -19,7 +19,7 @@ apt-get update && apt-get install yarn 1. Install Gancio ```bash -yarn global add gancio --prod +yarn global add --silent {{site.url}}{% link /latest.tgz %} 2> /dev/null ``` 1. Setup with postgreSQL __(optional as you can choose sqlite)__ @@ -49,7 +49,7 @@ gancio start --config config.json ``` 1. Point your web browser to [http://localhost:13120](http://localhost:13120) or where you selected during setup. -1. [Setup nginx as a proxy](/install/nginx) +1. [Setup nginx as a proxy]({% link install/nginx.md %}) 1. To deploy gancio in production you should use something like **[pm2](http://pm2.keymetrics.io/)**: @@ -62,8 +62,8 @@ pm2 startup # read the output! sudo pm2 startup -u gancio ``` -1. Upgrade +## Upgrade ```bash -sudo yarn global add gancio +sudo yarn global add --silent {{site.url}}{% link /latest.tgz %} 2> /dev/null sudo service pm2 restart ``` diff --git a/docs/install/docker.md b/docs/install/docker.md index 85be1e7e..7e405818 100644 --- a/docs/install/docker.md +++ b/docs/install/docker.md @@ -3,39 +3,35 @@ layout: default title: Docker permalink: /install/docker parent: Install +nav_order: 2 --- -## Table of contents -{: .no_toc .text-delta } +## Docker installation +{: .no_toc } 1. TOC {:toc} ## Initial setup -**You do not need to clone the full repo as we distribute gancio via npm.** -A Dockerfile and a docker-compose.yml are the only files needed. -- __Create a directory where everything related to gancio is stored (db, images, config)__ +> info "Clone not needed" +> You do not need to clone the full repo, a `Dockerfile` and a `docker-compose.yml` are enough. + +- __Create a directory where everything related to gancio is stored__ ```bash -mkdir /opt/gancio +mkdir -p /opt/gancio/data cd /opt/gancio ``` -note that you can choose a different directory. ## Use sqlite
1. **Download docker-compose.yml and Dockerfile** ```bash -wget https://gancio.org/docker/Dockerfile -wget https://gancio.org/docker/sqlite/docker-compose.yml +wget {{site.url}}{% link /docker/Dockerfile %} +wget {{site.url}}{% link /docker/sqlite/docker-compose.yml %} ``` -1. Create an empty db and config (**this is needed**) -``` -touch config.json db.sqlite -mkdir user_locale -``` -1. Build docker image and launch interactive setup in one step +1. Build docker image and launch interactive setup ``` docker-compose build docker-compose run --rm gancio gancio setup --docker --db=sqlite @@ -47,17 +43,11 @@ docker-compose run --rm gancio gancio setup --docker --db=sqlite 1. **Download docker-compose.yml and Dockerfile** ```bash -wget https://gancio.org/docker/Dockerfile -wget https://gancio.org/docker/postgres/docker-compose.yml +wget {{site.url}}{% link /docker/Dockerfile %} +wget {{site.url}}{% link /docker/postgres/docker-compose.yml %} ``` -1. Create an empty configuration (**this is needed**) -``` -touch config.json -mkdir user_locale -``` - -1. Build docker image and launch interactive setup in one step +1. Build docker image and launch interactive setup ``` docker-compose build docker-compose run --rm gancio gancio setup --docker --db=postgres @@ -72,20 +62,37 @@ docker-compose run --rm gancio gancio setup --docker --db=postgres docker-compose up -d ``` -1. Look at logs with +1. Look at logs ```bash -docker-compose logs +tail -f data/logs/gancio.log ``` -1. [Setup nginx as a proxy](/install/nginx) +1. [Setup nginx as a proxy]({% link install/nginx.md %} 1. Point your web browser to [http://localhost:13120](http://localhost:13120) or where you specified during setup and enjoy :tada: -1. You can edit `config.json` file and restart the container on your needs, see [Configuration](/config) for more details. - +1. Edit `data/config.json` and restart the container on your needs, see [Configuration]({% link install/configuration.md %}) for more details. ## Upgrade +> warning "Backup your data" +> Backup your data is generally a good thing to do and this is especially true before upgrading. +> Don't be lazy and [backup]({% link install/backup.md %}) your data! + + +> error "Upgrade from a version < 1.0" +> Since v1.0 our docker setup is changed and a new container has to be built: +> +> 1. `cd /opt/gancio` +> 1. [Backup your data]({% link install/backup.md %}) +> 1. Download new `Dockerfile`
`wget {{site.url}}{% link /docker/Dockerfile %}` +> 1. Download new `docker-compose.yml` (substitute `sqlite` with `postgres` in case):
`wget {{site.url}}{% link /docker/sqlite/docker-compose.yml %}` +> 1. Build the new container `docker-compose build` +> 1. Extract your backup into `./data`
`mkdir data; tar xvzf gancio--backup.tgz -C data` +> 1. Stop your old container `docker-compose stop` +> 1. Start your new container `docker-compose up` + + ```bash cd /opt/gancio docker-compose up -d --no-deps --build diff --git a/docs/install/install.md b/docs/install/install.md index 55dc5b81..1d5ec5a8 100644 --- a/docs/install/install.md +++ b/docs/install/install.md @@ -3,17 +3,20 @@ layout: default title: Install permalink: /install has_children: true -nav_order: 2 +nav_order: 3 has_toc: false --- +## Install -## Install (production) +You can install gancio on a cheap VPS (500mb of ram will be enough) -- [Install on Debian](/install/debian) -- [Install using docker](/install/docker) +- [Install on Debian]({% link install/debian.md %}) +- [Install using docker]({% link install/docker.md %}) ### Post installation -- [Nginx as a proxy](/install/nginx) +- [Setup Nginx as a proxy]({% link install/nginx.md %}) +- [Configuration]({% link install/configuration.md %}) +- [Backup]({% link install/backup.md %}) -If you wanna hack or run the current develop release take a look at [Hacking & contribute](../dev) +If you wanna hack or run the current development release take a look at [Hacking & contribute]({% link dev/dev.md %}) diff --git a/docs/install/nginx.md b/docs/install/nginx.md index 9068b627..862b386d 100644 --- a/docs/install/nginx.md +++ b/docs/install/nginx.md @@ -1,6 +1,6 @@ --- layout: default -title: Nginx +title: Nginx setup permalink: /install/nginx parent: Install --- diff --git a/docs/instances.md b/docs/instances.md index 82eae14b..0de24ac8 100644 --- a/docs/instances.md +++ b/docs/instances.md @@ -1,5 +1,4 @@ --- -layout: default title: Instances permalink: /instances nav_order: 7 @@ -12,4 +11,4 @@ nav_order: 7 - [chesefa.org](https://chesefa.org) (Naples, Italy) -Do you want your instance to appear here? [Write us](/contacts). \ No newline at end of file +Do you want your instance to appear here? [Write us]({% link contact.md %}). \ No newline at end of file diff --git a/docs/screenshot.md b/docs/screenshot.md new file mode 100644 index 00000000..b5ffc5ba --- /dev/null +++ b/docs/screenshot.md @@ -0,0 +1,16 @@ +--- +title: Screenshots +nav_order: 2 +permalink: /screenshot +--- + +## Screenshots + +[![assets/thumbs/home_desktop.png](assets/thumbs/home_desktop.png)](assets/home_desktop.png){: data-fancybox="group" data-caption="Home"} +[![assets/thumbs/event.png](assets/thumbs/event.png)](assets/event.png){: data-fancybox="group" data-caption="Event"} +[![assets/thumbs/mobile.png](assets/thumbs/mobile.png)](assets/mobile.png){: data-fancybox="group" data-caption="Mobile"} +[![assets/thumbs/add.png](assets/thumbs/add.png)](assets/add.png){: data-fancybox="group" data-caption="Add event"} +[![assets/thumbs/share.png](assets/thumbs/share.png)](assets/share.png){: data-fancybox="group" data-caption="Share"} +[![assets/thumbs/options.png](assets/thumbs/options.png)](assets/options.png){: data-fancybox="group" data-caption="Admin options"} +[![assets/thumbs/federation.png](assets/thumbs/federation.png)](assets/federation.png){: data-fancybox="group" data-caption="Admin federation"} +[![assets/thumbs/follow.png](assets/thumbs/follow.png)](assets/follow.png){: data-fancybox="group" data-caption="Follow"} diff --git a/docs/usage/usage.md b/docs/usage/usage.md deleted file mode 100644 index afda198a..00000000 --- a/docs/usage/usage.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -layout: default -title: Usage -permalink: /usage -nav_order: 1 -has_children: true ---- - -# Usage - -ehmmm, help needed here :smile: feel free to send a PR => [here](https://framagit.org/les/gancio/tree/master/docs) diff --git a/layouts/default.vue b/layouts/default.vue index 0254e2f8..103829f9 100644 --- a/layouts/default.vue +++ b/layouts/default.vue @@ -1,43 +1,31 @@ - + diff --git a/layouts/error.vue b/layouts/error.vue index fe1f0afe..05b82718 100644 --- a/layouts/error.vue +++ b/layouts/error.vue @@ -1,7 +1,7 @@ @@ -9,17 +9,10 @@ import { mapState } from 'vuex' export default { - props: { error: { type: Object } }, - computed: mapState(['settings']), + props: { error: { type: Object, default: () => ({ }) } }, head () { return { title: `${this.settings.title} - Error` } - } + }, + computed: mapState(['settings']) } - diff --git a/layouts/iframe.vue b/layouts/iframe.vue index 5b7dff00..1c4a03d0 100644 --- a/layouts/iframe.vue +++ b/layouts/iframe.vue @@ -1,8 +1,9 @@ -