Merge branch 'dev'
This commit is contained in:
commit
d836598395
36 changed files with 167 additions and 165 deletions
|
@ -52,7 +52,7 @@ export default {
|
|||
},
|
||||
link () {
|
||||
if (this.event.recurrent) {
|
||||
return `${this.event.id}_${this.event.start_datetime/1000}`
|
||||
return `${this.event.id}_${this.event.start_datetime}`
|
||||
}
|
||||
return this.event.id
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<template lang="pug">
|
||||
div#list
|
||||
el-divider {{title}}
|
||||
el-divider(v-if='title') {{title}}
|
||||
el-timeline
|
||||
el-timeline-item(
|
||||
v-for='event in events'
|
||||
|
@ -26,7 +26,7 @@ export default {
|
|||
methods: {
|
||||
link (event) {
|
||||
if (event.recurrent) {
|
||||
return `${event.id}_${event.start_datetime/1000}`
|
||||
return `${event.id}_${event.start_datetime}`
|
||||
}
|
||||
return event.id
|
||||
}
|
||||
|
|
|
@ -95,7 +95,7 @@
|
|||
|
||||
<li class="navigation-list-item">
|
||||
|
||||
<a href="https://gancio.org/setup" class="navigation-list-link">Setup</a>
|
||||
<a href="https://gancio.org/install" class="navigation-list-link">Install</a>
|
||||
|
||||
|
||||
<ul class="navigation-list-child-list ">
|
||||
|
@ -105,7 +105,7 @@
|
|||
|
||||
<li class="navigation-list-item ">
|
||||
|
||||
<a href="https://gancio.org/setup/classic" class="navigation-list-link">Classic</a>
|
||||
<a href="https://gancio.org/install/classic" class="navigation-list-link">Classic</a>
|
||||
|
||||
</li>
|
||||
|
||||
|
@ -113,7 +113,7 @@
|
|||
|
||||
<li class="navigation-list-item ">
|
||||
|
||||
<a href="https://gancio.org/setup/docker" class="navigation-list-link">Docker</a>
|
||||
<a href="https://gancio.org/install/docker" class="navigation-list-link">Docker</a>
|
||||
|
||||
</li>
|
||||
|
||||
|
@ -123,7 +123,7 @@
|
|||
|
||||
<li class="navigation-list-item ">
|
||||
|
||||
<a href="https://gancio.org/setup/nginx" class="navigation-list-link">Nginx</a>
|
||||
<a href="https://gancio.org/install/nginx" class="navigation-list-link">Nginx</a>
|
||||
|
||||
</li>
|
||||
|
||||
|
|
|
@ -95,7 +95,7 @@
|
|||
|
||||
<li class="navigation-list-item">
|
||||
|
||||
<a href="https://gancio.org/setup" class="navigation-list-link">Setup</a>
|
||||
<a href="https://gancio.org/install" class="navigation-list-link">Install</a>
|
||||
|
||||
|
||||
<ul class="navigation-list-child-list ">
|
||||
|
@ -105,7 +105,7 @@
|
|||
|
||||
<li class="navigation-list-item ">
|
||||
|
||||
<a href="https://gancio.org/setup/classic" class="navigation-list-link">Classic</a>
|
||||
<a href="https://gancio.org/install/classic" class="navigation-list-link">Classic</a>
|
||||
|
||||
</li>
|
||||
|
||||
|
@ -113,7 +113,7 @@
|
|||
|
||||
<li class="navigation-list-item ">
|
||||
|
||||
<a href="https://gancio.org/setup/docker" class="navigation-list-link">Docker</a>
|
||||
<a href="https://gancio.org/install/docker" class="navigation-list-link">Docker</a>
|
||||
|
||||
</li>
|
||||
|
||||
|
@ -123,7 +123,7 @@
|
|||
|
||||
<li class="navigation-list-item ">
|
||||
|
||||
<a href="https://gancio.org/setup/nginx" class="navigation-list-link">Nginx</a>
|
||||
<a href="https://gancio.org/install/nginx" class="navigation-list-link">Nginx</a>
|
||||
|
||||
</li>
|
||||
|
||||
|
|
BIN
docs/_site/assets/home1.png
Normal file
BIN
docs/_site/assets/home1.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 255 KiB |
|
@ -16,9 +16,9 @@
|
|||
"2": {
|
||||
"id": "2",
|
||||
"title": "Classic",
|
||||
"content": "Classic setup Install Node.js and postgreSQL curl -sL https://deb.nodesource.com/setup_12.x | bash - apt-get install -y nodejs postgresql source Install Gancio npm install --global gancio Create a database (optional as you can use sqlite, but recommended) sudo -u postgres psql postgres=# create database gancio; postgres=# create user gancio with encrypted password 'gancio'; postgres=# grant all privileges on database gancio to gancio; Create a user to run gancio from adduser gancio su gancio Test & launch interactive setup gancio --help gancio setup --config config.json Start gancio --help gancio start --config config.json Point your web browser to http://localhost:13120 or where you selected during setup. Setup nginx as a proxy Deploy in production If you don’t use the docker way, in production you should use something like pm2: sudo npm install --global pm2 pm2 gancio start --config config.json",
|
||||
"url": "https://gancio.org/setup/classic",
|
||||
"relUrl": "/setup/classic"
|
||||
"content": "Install Install Node.js and postgreSQL curl -sL https://deb.nodesource.com/setup_12.x | bash - apt-get install -y nodejs postgresql source Install Gancio npm install --global gancio Create a database (optional as you can use sqlite, but recommended) sudo -u postgres psql postgres=# create database gancio; postgres=# create user gancio with encrypted password 'gancio'; postgres=# grant all privileges on database gancio to gancio; Create a user to run gancio from adduser gancio su gancio Test & launch interactive setup gancio --help gancio setup --config config.json Start gancio --help gancio start --config config.json Point your web browser to http://localhost:13120 or where you selected during setup. Setup nginx as a proxy Deploy in production If you don’t use the docker way, in production you should use something like pm2: sudo npm install --global pm2 pm2 gancio start --config config.json",
|
||||
"url": "https://gancio.org/install/classic",
|
||||
"relUrl": "/install/classic"
|
||||
},
|
||||
"3": {
|
||||
"id": "3",
|
||||
|
@ -45,8 +45,8 @@
|
|||
"id": "6",
|
||||
"title": "Docker",
|
||||
"content": "Install with docker You do not need to clone the full repo as we distribute gancio via npm. Dockerfile and docker-compose.yml are the only needed files. Create a directory where everything related to gancio is stored (db, images, config) mkdir /opt/gancio cd /opt/gancio :information_source: you can choose a different directory of course Download docker-compose.yml and Dockerfile wget https://git.lattuga.net/cisti/gancio/raw/docker/docker/Dockerfile wget https://git.lattuga.net/cisti/gancio/raw/docker/docker/docker-compose.yml Create an empty configuration file touch config.json After first setup, you can modify this file and restart the container on your needs. Build docker image and launch interactive setup in one step docker-compose run --rm gancio gancio setup Run your container docker-compose up -d Setup nginx as a proxy Point your web browser to http://localhost:13120 or where you specified during setup and enjoy :tada:",
|
||||
"url": "https://gancio.org/setup/docker",
|
||||
"relUrl": "/setup/docker"
|
||||
"url": "https://gancio.org/install/docker",
|
||||
"relUrl": "/install/docker"
|
||||
},
|
||||
"7": {
|
||||
"id": "7",
|
||||
|
@ -57,31 +57,31 @@
|
|||
},
|
||||
"8": {
|
||||
"id": "8",
|
||||
"title": "Install",
|
||||
"content": "Install Classic install Using docker Nginx as a proxy Hacking & contribute",
|
||||
"url": "https://gancio.org/install",
|
||||
"relUrl": "/install"
|
||||
},
|
||||
"9": {
|
||||
"id": "9",
|
||||
"title": "Instances",
|
||||
"content": "Instances gancio.cisti.org (Torino, Italy) lapunta.org (Firenze, Italy)",
|
||||
"url": "https://gancio.org/instances",
|
||||
"relUrl": "/instances"
|
||||
},
|
||||
"9": {
|
||||
"id": "9",
|
||||
"10": {
|
||||
"id": "10",
|
||||
"title": "Migration",
|
||||
"content": "Migration If you need to modify the db’s structure while hacking, it’s super easy, just change server/api/models/. If you then decide that your changes are good for production, a sequelize migration is needed: Create a migration: ./node_modules/.bin/sequelize migration:generate --name your_migration",
|
||||
"url": "https://gancio.org/dev/migration",
|
||||
"relUrl": "/dev/migration"
|
||||
},
|
||||
"10": {
|
||||
"id": "10",
|
||||
"title": "Nginx",
|
||||
"content": "Nginx proxy configuration This is the default nginx configuration for gancio, please modify at least the server_name and ssl_certificate’s path server { listen 80; listen [::]:80; server_name gancio.cisti.org; root /var/www/letsencrypt; location /.well-known/acme-challenge/ { allow all; } location / { return 301 https://$host$request_uri; } } server { listen 443 ssl http2; listen [::]:443 ssl http2; server_name gancio.cisti.org; ssl_protocols TLSv1.2; ssl_ciphers HIGH:!MEDIUM:!LOW:!aNULL:!NULL:!SHA; ssl_prefer_server_ciphers on; ssl_session_cache shared:SSL:10m; # Uncomment these lines once you acquire a certificate: # ssl_certificate /etc/letsencrypt/live/gancio.cisti.org/fullchain.pem; # ssl_certificate_key /etc/letsencrypt/live/gancio.cisti.org/privkey.pem; keepalive_timeout 70; sendfile on; client_max_body_size 80m; gzip on; gzip_disable "msie6"; gzip_vary on; gzip_proxied any; gzip_comp_level 6; gzip_buffers 16 8k; gzip_http_version 1.1; gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript; add_header Strict-Transport-Security "max-age=31536000"; location / { try_files $uri @proxy; } location @proxy { proxy_set_header Host $host; proxy_set_header X-Forwarded-Proto https; proxy_set_header Proxy ""; proxy_pass_header Server; proxy_pass http://127.0.0.1:13120; proxy_buffering on; proxy_redirect off; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection $connection_upgrade; tcp_nodelay on; } }",
|
||||
"url": "https://gancio.org/setup/nginx",
|
||||
"relUrl": "/setup/nginx"
|
||||
},
|
||||
"11": {
|
||||
"id": "11",
|
||||
"title": "Setup",
|
||||
"content": "Setup Setup with docker Classic setup Nginx as a proxy Hacking & contribute",
|
||||
"url": "https://gancio.org/setup",
|
||||
"relUrl": "/setup"
|
||||
"title": "Nginx",
|
||||
"content": "Nginx proxy configuration This is the default nginx configuration for gancio, please modify at least the server_name and ssl_certificate’s path. Note that this does not include a cache configuration and that gancio does not use a cache control at all, if you can help with this task you’re welcome. server { listen 80; listen [::]:80; server_name gancio.cisti.org; root /var/www/letsencrypt; location /.well-known/acme-challenge/ { allow all; } location / { return 301 https://$host$request_uri; } } server { listen 443 ssl http2; listen [::]:443 ssl http2; server_name gancio.cisti.org; ssl_protocols TLSv1.2; ssl_ciphers HIGH:!MEDIUM:!LOW:!aNULL:!NULL:!SHA; ssl_prefer_server_ciphers on; ssl_session_cache shared:SSL:10m; # Uncomment these lines once you acquire a certificate: # ssl_certificate /etc/letsencrypt/live/gancio.cisti.org/fullchain.pem; # ssl_certificate_key /etc/letsencrypt/live/gancio.cisti.org/privkey.pem; keepalive_timeout 70; sendfile on; client_max_body_size 80m; gzip on; gzip_disable "msie6"; gzip_vary on; gzip_proxied any; gzip_comp_level 6; gzip_buffers 16 8k; gzip_http_version 1.1; gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript; add_header Strict-Transport-Security "max-age=31536000"; location / { try_files $uri @proxy; } location @proxy { proxy_set_header Host $host; proxy_set_header X-Forwarded-Proto https; proxy_set_header Proxy ""; proxy_pass_header Server; proxy_pass http://127.0.0.1:13120; proxy_buffering on; proxy_redirect off; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection $connection_upgrade; tcp_nodelay on; } }",
|
||||
"url": "https://gancio.org/install/nginx",
|
||||
"relUrl": "/install/nginx"
|
||||
},
|
||||
"12": {
|
||||
"id": "12",
|
||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 1.7 KiB |
|
@ -95,7 +95,7 @@
|
|||
|
||||
<li class="navigation-list-item">
|
||||
|
||||
<a href="https://gancio.org/setup" class="navigation-list-link">Setup</a>
|
||||
<a href="https://gancio.org/install" class="navigation-list-link">Install</a>
|
||||
|
||||
|
||||
<ul class="navigation-list-child-list ">
|
||||
|
@ -105,7 +105,7 @@
|
|||
|
||||
<li class="navigation-list-item ">
|
||||
|
||||
<a href="https://gancio.org/setup/classic" class="navigation-list-link">Classic</a>
|
||||
<a href="https://gancio.org/install/classic" class="navigation-list-link">Classic</a>
|
||||
|
||||
</li>
|
||||
|
||||
|
@ -113,7 +113,7 @@
|
|||
|
||||
<li class="navigation-list-item ">
|
||||
|
||||
<a href="https://gancio.org/setup/docker" class="navigation-list-link">Docker</a>
|
||||
<a href="https://gancio.org/install/docker" class="navigation-list-link">Docker</a>
|
||||
|
||||
</li>
|
||||
|
||||
|
@ -123,7 +123,7 @@
|
|||
|
||||
<li class="navigation-list-item ">
|
||||
|
||||
<a href="https://gancio.org/setup/nginx" class="navigation-list-link">Nginx</a>
|
||||
<a href="https://gancio.org/install/nginx" class="navigation-list-link">Nginx</a>
|
||||
|
||||
</li>
|
||||
|
||||
|
|
|
@ -95,7 +95,7 @@
|
|||
|
||||
<li class="navigation-list-item">
|
||||
|
||||
<a href="https://gancio.org/setup" class="navigation-list-link">Setup</a>
|
||||
<a href="https://gancio.org/install" class="navigation-list-link">Install</a>
|
||||
|
||||
|
||||
<ul class="navigation-list-child-list ">
|
||||
|
@ -105,7 +105,7 @@
|
|||
|
||||
<li class="navigation-list-item ">
|
||||
|
||||
<a href="https://gancio.org/setup/classic" class="navigation-list-link">Classic</a>
|
||||
<a href="https://gancio.org/install/classic" class="navigation-list-link">Classic</a>
|
||||
|
||||
</li>
|
||||
|
||||
|
@ -113,7 +113,7 @@
|
|||
|
||||
<li class="navigation-list-item ">
|
||||
|
||||
<a href="https://gancio.org/setup/docker" class="navigation-list-link">Docker</a>
|
||||
<a href="https://gancio.org/install/docker" class="navigation-list-link">Docker</a>
|
||||
|
||||
</li>
|
||||
|
||||
|
@ -123,7 +123,7 @@
|
|||
|
||||
<li class="navigation-list-item ">
|
||||
|
||||
<a href="https://gancio.org/setup/nginx" class="navigation-list-link">Nginx</a>
|
||||
<a href="https://gancio.org/install/nginx" class="navigation-list-link">Nginx</a>
|
||||
|
||||
</li>
|
||||
|
||||
|
|
|
@ -95,7 +95,7 @@
|
|||
|
||||
<li class="navigation-list-item">
|
||||
|
||||
<a href="https://gancio.org/setup" class="navigation-list-link">Setup</a>
|
||||
<a href="https://gancio.org/install" class="navigation-list-link">Install</a>
|
||||
|
||||
|
||||
<ul class="navigation-list-child-list ">
|
||||
|
@ -105,7 +105,7 @@
|
|||
|
||||
<li class="navigation-list-item ">
|
||||
|
||||
<a href="https://gancio.org/setup/classic" class="navigation-list-link">Classic</a>
|
||||
<a href="https://gancio.org/install/classic" class="navigation-list-link">Classic</a>
|
||||
|
||||
</li>
|
||||
|
||||
|
@ -113,7 +113,7 @@
|
|||
|
||||
<li class="navigation-list-item ">
|
||||
|
||||
<a href="https://gancio.org/setup/docker" class="navigation-list-link">Docker</a>
|
||||
<a href="https://gancio.org/install/docker" class="navigation-list-link">Docker</a>
|
||||
|
||||
</li>
|
||||
|
||||
|
@ -123,7 +123,7 @@
|
|||
|
||||
<li class="navigation-list-item ">
|
||||
|
||||
<a href="https://gancio.org/setup/nginx" class="navigation-list-link">Nginx</a>
|
||||
<a href="https://gancio.org/install/nginx" class="navigation-list-link">Nginx</a>
|
||||
|
||||
</li>
|
||||
|
||||
|
|
|
@ -95,7 +95,7 @@
|
|||
|
||||
<li class="navigation-list-item">
|
||||
|
||||
<a href="https://gancio.org/setup" class="navigation-list-link">Setup</a>
|
||||
<a href="https://gancio.org/install" class="navigation-list-link">Install</a>
|
||||
|
||||
|
||||
<ul class="navigation-list-child-list ">
|
||||
|
@ -105,7 +105,7 @@
|
|||
|
||||
<li class="navigation-list-item ">
|
||||
|
||||
<a href="https://gancio.org/setup/classic" class="navigation-list-link">Classic</a>
|
||||
<a href="https://gancio.org/install/classic" class="navigation-list-link">Classic</a>
|
||||
|
||||
</li>
|
||||
|
||||
|
@ -113,7 +113,7 @@
|
|||
|
||||
<li class="navigation-list-item ">
|
||||
|
||||
<a href="https://gancio.org/setup/docker" class="navigation-list-link">Docker</a>
|
||||
<a href="https://gancio.org/install/docker" class="navigation-list-link">Docker</a>
|
||||
|
||||
</li>
|
||||
|
||||
|
@ -123,7 +123,7 @@
|
|||
|
||||
<li class="navigation-list-item ">
|
||||
|
||||
<a href="https://gancio.org/setup/nginx" class="navigation-list-link">Nginx</a>
|
||||
<a href="https://gancio.org/install/nginx" class="navigation-list-link">Nginx</a>
|
||||
|
||||
</li>
|
||||
|
||||
|
|
|
@ -95,7 +95,7 @@
|
|||
|
||||
<li class="navigation-list-item">
|
||||
|
||||
<a href="https://gancio.org/setup" class="navigation-list-link">Setup</a>
|
||||
<a href="https://gancio.org/install" class="navigation-list-link">Install</a>
|
||||
|
||||
|
||||
<ul class="navigation-list-child-list ">
|
||||
|
@ -105,7 +105,7 @@
|
|||
|
||||
<li class="navigation-list-item ">
|
||||
|
||||
<a href="https://gancio.org/setup/classic" class="navigation-list-link">Classic</a>
|
||||
<a href="https://gancio.org/install/classic" class="navigation-list-link">Classic</a>
|
||||
|
||||
</li>
|
||||
|
||||
|
@ -113,7 +113,7 @@
|
|||
|
||||
<li class="navigation-list-item ">
|
||||
|
||||
<a href="https://gancio.org/setup/docker" class="navigation-list-link">Docker</a>
|
||||
<a href="https://gancio.org/install/docker" class="navigation-list-link">Docker</a>
|
||||
|
||||
</li>
|
||||
|
||||
|
@ -123,7 +123,7 @@
|
|||
|
||||
<li class="navigation-list-item ">
|
||||
|
||||
<a href="https://gancio.org/setup/nginx" class="navigation-list-link">Nginx</a>
|
||||
<a href="https://gancio.org/install/nginx" class="navigation-list-link">Nginx</a>
|
||||
|
||||
</li>
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
<?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom" ><generator uri="https://jekyllrb.com/" version="3.8.6">Jekyll</generator><link href="https://gancio.org/feed.xml" rel="self" type="application/atom+xml" /><link href="https://gancio.org/" rel="alternate" type="text/html" /><updated>2019-07-27T01:25:04+02:00</updated><id>https://gancio.org/feed.xml</id><title type="html">Gancio</title><subtitle>A shared agenda for local communities</subtitle></feed>
|
||||
<?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom" ><generator uri="https://jekyllrb.com/" version="3.8.6">Jekyll</generator><link href="https://gancio.org/feed.xml" rel="self" type="application/atom+xml" /><link href="https://gancio.org/" rel="alternate" type="text/html" /><updated>2019-07-27T13:03:35+02:00</updated><id>https://gancio.org/feed.xml</id><title type="html">Gancio</title><subtitle>A shared agenda for local communities</subtitle></feed>
|
||||
|
|
|
@ -97,7 +97,7 @@
|
|||
|
||||
<li class="navigation-list-item">
|
||||
|
||||
<a href="https://gancio.org/setup" class="navigation-list-link">Setup</a>
|
||||
<a href="https://gancio.org/install" class="navigation-list-link">Install</a>
|
||||
|
||||
|
||||
<ul class="navigation-list-child-list ">
|
||||
|
@ -107,7 +107,7 @@
|
|||
|
||||
<li class="navigation-list-item ">
|
||||
|
||||
<a href="https://gancio.org/setup/classic" class="navigation-list-link">Classic</a>
|
||||
<a href="https://gancio.org/install/classic" class="navigation-list-link">Classic</a>
|
||||
|
||||
</li>
|
||||
|
||||
|
@ -115,7 +115,7 @@
|
|||
|
||||
<li class="navigation-list-item ">
|
||||
|
||||
<a href="https://gancio.org/setup/docker" class="navigation-list-link">Docker</a>
|
||||
<a href="https://gancio.org/install/docker" class="navigation-list-link">Docker</a>
|
||||
|
||||
</li>
|
||||
|
||||
|
@ -125,7 +125,7 @@
|
|||
|
||||
<li class="navigation-list-item ">
|
||||
|
||||
<a href="https://gancio.org/setup/nginx" class="navigation-list-link">Nginx</a>
|
||||
<a href="https://gancio.org/install/nginx" class="navigation-list-link">Nginx</a>
|
||||
|
||||
</li>
|
||||
|
||||
|
@ -297,10 +297,10 @@
|
|||
|
||||
<p class="fs-6">A shared agenda for local communities.</p>
|
||||
|
||||
<p><a href="setup" class="btn btn-primary fs-5 mb-4 mb-md-0 mr-2">Get started now</a> <a href="https://demo.gancio.org" class="btn btn-green fs-5 mb-4 mb-md-0">Demo</a>
|
||||
<p><a href="install" class="btn btn-primary fs-5 mb-4 mb-md-0 mr-2">Get started now</a> <a href="https://demo.gancio.org" class="btn btn-green fs-5 mb-4 mb-md-0">Demo</a>
|
||||
<a href="https://git.lattuga.net/cisti/gancio" class="btn fs-5">Source</a></p>
|
||||
|
||||
<iframe width="800" height="500" sandbox="allow-same-origin allow-scripts" src="https://spacepub.space/videos/embed/9745bffc-e1e8-416d-9b08-fbc5e4c803b3?muted=1&title=0" frameborder="0" allowfullscreen=""></iframe>
|
||||
<p><img src="assets/home1.png" alt="screenshoot"></p>
|
||||
|
||||
<h3 id="about-the-project">About the project</h3>
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
<meta http-equiv="X-UA-Compatible" content="IE=Edge">
|
||||
|
||||
|
||||
<title>Setup - Gancio</title>
|
||||
<title>Install - Gancio</title>
|
||||
|
||||
|
||||
|
||||
|
@ -25,17 +25,17 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
|
||||
<!-- Begin Jekyll SEO tag v2.6.1 -->
|
||||
<title>Setup | Gancio</title>
|
||||
<title>Install | Gancio</title>
|
||||
<meta name="generator" content="Jekyll v3.8.6" />
|
||||
<meta property="og:title" content="Setup" />
|
||||
<meta property="og:title" content="Install" />
|
||||
<meta property="og:locale" content="en_US" />
|
||||
<meta name="description" content="A shared agenda for local communities" />
|
||||
<meta property="og:description" content="A shared agenda for local communities" />
|
||||
<link rel="canonical" href="https://gancio.org/setup" />
|
||||
<meta property="og:url" content="https://gancio.org/setup" />
|
||||
<link rel="canonical" href="https://gancio.org/install" />
|
||||
<meta property="og:url" content="https://gancio.org/install" />
|
||||
<meta property="og:site_name" content="Gancio" />
|
||||
<script type="application/ld+json">
|
||||
{"@type":"WebPage","url":"https://gancio.org/setup","headline":"Setup","description":"A shared agenda for local communities","@context":"https://schema.org"}</script>
|
||||
{"@type":"WebPage","url":"https://gancio.org/install","headline":"Install","description":"A shared agenda for local communities","@context":"https://schema.org"}</script>
|
||||
<!-- End Jekyll SEO tag -->
|
||||
|
||||
</head>
|
||||
|
@ -95,7 +95,7 @@
|
|||
|
||||
<li class="navigation-list-item active">
|
||||
|
||||
<a href="https://gancio.org/setup" class="navigation-list-link active">Setup</a>
|
||||
<a href="https://gancio.org/install" class="navigation-list-link active">Install</a>
|
||||
|
||||
|
||||
<ul class="navigation-list-child-list ">
|
||||
|
@ -105,7 +105,7 @@
|
|||
|
||||
<li class="navigation-list-item ">
|
||||
|
||||
<a href="https://gancio.org/setup/classic" class="navigation-list-link">Classic</a>
|
||||
<a href="https://gancio.org/install/classic" class="navigation-list-link">Classic</a>
|
||||
|
||||
</li>
|
||||
|
||||
|
@ -113,7 +113,7 @@
|
|||
|
||||
<li class="navigation-list-item ">
|
||||
|
||||
<a href="https://gancio.org/setup/docker" class="navigation-list-link">Docker</a>
|
||||
<a href="https://gancio.org/install/docker" class="navigation-list-link">Docker</a>
|
||||
|
||||
</li>
|
||||
|
||||
|
@ -123,7 +123,7 @@
|
|||
|
||||
<li class="navigation-list-item ">
|
||||
|
||||
<a href="https://gancio.org/setup/nginx" class="navigation-list-link">Nginx</a>
|
||||
<a href="https://gancio.org/install/nginx" class="navigation-list-link">Nginx</a>
|
||||
|
||||
</li>
|
||||
|
||||
|
@ -291,11 +291,11 @@
|
|||
|
||||
|
||||
<div id="main-content" class="page-content" role="main">
|
||||
<h1 id="setup">Setup</h1>
|
||||
<h1 id="install">Install</h1>
|
||||
|
||||
<ul>
|
||||
<li><a href="docker">Setup with docker</a></li>
|
||||
<li><a href="classic">Classic setup</a></li>
|
||||
<li><a href="classic">Classic install</a></li>
|
||||
<li><a href="docker">Using docker</a></li>
|
||||
<li><a href="nginx">Nginx as a proxy</a></li>
|
||||
<li><a href="../dev">Hacking & contribute</a></li>
|
||||
</ul>
|
|
@ -31,11 +31,11 @@
|
|||
<meta property="og:locale" content="en_US" />
|
||||
<meta name="description" content="A shared agenda for local communities" />
|
||||
<meta property="og:description" content="A shared agenda for local communities" />
|
||||
<link rel="canonical" href="https://gancio.org/setup/classic" />
|
||||
<meta property="og:url" content="https://gancio.org/setup/classic" />
|
||||
<link rel="canonical" href="https://gancio.org/install/classic" />
|
||||
<meta property="og:url" content="https://gancio.org/install/classic" />
|
||||
<meta property="og:site_name" content="Gancio" />
|
||||
<script type="application/ld+json">
|
||||
{"@type":"WebPage","url":"https://gancio.org/setup/classic","headline":"Classic","description":"A shared agenda for local communities","@context":"https://schema.org"}</script>
|
||||
{"@type":"WebPage","url":"https://gancio.org/install/classic","headline":"Classic","description":"A shared agenda for local communities","@context":"https://schema.org"}</script>
|
||||
<!-- End Jekyll SEO tag -->
|
||||
|
||||
</head>
|
||||
|
@ -95,7 +95,7 @@
|
|||
|
||||
<li class="navigation-list-item active">
|
||||
|
||||
<a href="https://gancio.org/setup" class="navigation-list-link">Setup</a>
|
||||
<a href="https://gancio.org/install" class="navigation-list-link">Install</a>
|
||||
|
||||
|
||||
<ul class="navigation-list-child-list ">
|
||||
|
@ -105,7 +105,7 @@
|
|||
|
||||
<li class="navigation-list-item active">
|
||||
|
||||
<a href="https://gancio.org/setup/classic" class="navigation-list-link active">Classic</a>
|
||||
<a href="https://gancio.org/install/classic" class="navigation-list-link active">Classic</a>
|
||||
|
||||
</li>
|
||||
|
||||
|
@ -113,7 +113,7 @@
|
|||
|
||||
<li class="navigation-list-item ">
|
||||
|
||||
<a href="https://gancio.org/setup/docker" class="navigation-list-link">Docker</a>
|
||||
<a href="https://gancio.org/install/docker" class="navigation-list-link">Docker</a>
|
||||
|
||||
</li>
|
||||
|
||||
|
@ -123,7 +123,7 @@
|
|||
|
||||
<li class="navigation-list-item ">
|
||||
|
||||
<a href="https://gancio.org/setup/nginx" class="navigation-list-link">Nginx</a>
|
||||
<a href="https://gancio.org/install/nginx" class="navigation-list-link">Nginx</a>
|
||||
|
||||
</li>
|
||||
|
||||
|
@ -292,7 +292,7 @@
|
|||
<nav class="breadcrumb-nav">
|
||||
<ol class="breadcrumb-nav-list">
|
||||
|
||||
<li class="breadcrumb-nav-list-item"><a href="https://gancio.org/setup">Setup</a></li>
|
||||
<li class="breadcrumb-nav-list-item"><a href="https://gancio.org/install">Install</a></li>
|
||||
|
||||
<li class="breadcrumb-nav-list-item"><span>Classic</span></li>
|
||||
</ol>
|
||||
|
@ -300,7 +300,7 @@
|
|||
|
||||
|
||||
<div id="main-content" class="page-content" role="main">
|
||||
<h2 id="classic-setup">Classic setup</h2>
|
||||
<h2 id="install">Install</h2>
|
||||
|
||||
<ol>
|
||||
<li>Install Node.js and postgreSQL
|
|
@ -31,11 +31,11 @@
|
|||
<meta property="og:locale" content="en_US" />
|
||||
<meta name="description" content="A shared agenda for local communities" />
|
||||
<meta property="og:description" content="A shared agenda for local communities" />
|
||||
<link rel="canonical" href="https://gancio.org/setup/docker" />
|
||||
<meta property="og:url" content="https://gancio.org/setup/docker" />
|
||||
<link rel="canonical" href="https://gancio.org/install/docker" />
|
||||
<meta property="og:url" content="https://gancio.org/install/docker" />
|
||||
<meta property="og:site_name" content="Gancio" />
|
||||
<script type="application/ld+json">
|
||||
{"@type":"WebPage","url":"https://gancio.org/setup/docker","headline":"Docker","description":"A shared agenda for local communities","@context":"https://schema.org"}</script>
|
||||
{"@type":"WebPage","url":"https://gancio.org/install/docker","headline":"Docker","description":"A shared agenda for local communities","@context":"https://schema.org"}</script>
|
||||
<!-- End Jekyll SEO tag -->
|
||||
|
||||
</head>
|
||||
|
@ -95,7 +95,7 @@
|
|||
|
||||
<li class="navigation-list-item active">
|
||||
|
||||
<a href="https://gancio.org/setup" class="navigation-list-link">Setup</a>
|
||||
<a href="https://gancio.org/install" class="navigation-list-link">Install</a>
|
||||
|
||||
|
||||
<ul class="navigation-list-child-list ">
|
||||
|
@ -105,7 +105,7 @@
|
|||
|
||||
<li class="navigation-list-item ">
|
||||
|
||||
<a href="https://gancio.org/setup/classic" class="navigation-list-link">Classic</a>
|
||||
<a href="https://gancio.org/install/classic" class="navigation-list-link">Classic</a>
|
||||
|
||||
</li>
|
||||
|
||||
|
@ -113,7 +113,7 @@
|
|||
|
||||
<li class="navigation-list-item active">
|
||||
|
||||
<a href="https://gancio.org/setup/docker" class="navigation-list-link active">Docker</a>
|
||||
<a href="https://gancio.org/install/docker" class="navigation-list-link active">Docker</a>
|
||||
|
||||
</li>
|
||||
|
||||
|
@ -123,7 +123,7 @@
|
|||
|
||||
<li class="navigation-list-item ">
|
||||
|
||||
<a href="https://gancio.org/setup/nginx" class="navigation-list-link">Nginx</a>
|
||||
<a href="https://gancio.org/install/nginx" class="navigation-list-link">Nginx</a>
|
||||
|
||||
</li>
|
||||
|
||||
|
@ -293,7 +293,7 @@
|
|||
<nav class="breadcrumb-nav">
|
||||
<ol class="breadcrumb-nav-list">
|
||||
|
||||
<li class="breadcrumb-nav-list-item"><a href="https://gancio.org/setup">Setup</a></li>
|
||||
<li class="breadcrumb-nav-list-item"><a href="https://gancio.org/install">Install</a></li>
|
||||
|
||||
<li class="breadcrumb-nav-list-item"><span>Docker</span></li>
|
||||
</ol>
|
|
@ -31,11 +31,11 @@
|
|||
<meta property="og:locale" content="en_US" />
|
||||
<meta name="description" content="A shared agenda for local communities" />
|
||||
<meta property="og:description" content="A shared agenda for local communities" />
|
||||
<link rel="canonical" href="https://gancio.org/setup/nginx" />
|
||||
<meta property="og:url" content="https://gancio.org/setup/nginx" />
|
||||
<link rel="canonical" href="https://gancio.org/install/nginx" />
|
||||
<meta property="og:url" content="https://gancio.org/install/nginx" />
|
||||
<meta property="og:site_name" content="Gancio" />
|
||||
<script type="application/ld+json">
|
||||
{"@type":"WebPage","url":"https://gancio.org/setup/nginx","headline":"Nginx","description":"A shared agenda for local communities","@context":"https://schema.org"}</script>
|
||||
{"@type":"WebPage","url":"https://gancio.org/install/nginx","headline":"Nginx","description":"A shared agenda for local communities","@context":"https://schema.org"}</script>
|
||||
<!-- End Jekyll SEO tag -->
|
||||
|
||||
</head>
|
||||
|
@ -95,7 +95,7 @@
|
|||
|
||||
<li class="navigation-list-item active">
|
||||
|
||||
<a href="https://gancio.org/setup" class="navigation-list-link">Setup</a>
|
||||
<a href="https://gancio.org/install" class="navigation-list-link">Install</a>
|
||||
|
||||
|
||||
<ul class="navigation-list-child-list ">
|
||||
|
@ -105,7 +105,7 @@
|
|||
|
||||
<li class="navigation-list-item ">
|
||||
|
||||
<a href="https://gancio.org/setup/classic" class="navigation-list-link">Classic</a>
|
||||
<a href="https://gancio.org/install/classic" class="navigation-list-link">Classic</a>
|
||||
|
||||
</li>
|
||||
|
||||
|
@ -113,7 +113,7 @@
|
|||
|
||||
<li class="navigation-list-item ">
|
||||
|
||||
<a href="https://gancio.org/setup/docker" class="navigation-list-link">Docker</a>
|
||||
<a href="https://gancio.org/install/docker" class="navigation-list-link">Docker</a>
|
||||
|
||||
</li>
|
||||
|
||||
|
@ -123,7 +123,7 @@
|
|||
|
||||
<li class="navigation-list-item active">
|
||||
|
||||
<a href="https://gancio.org/setup/nginx" class="navigation-list-link active">Nginx</a>
|
||||
<a href="https://gancio.org/install/nginx" class="navigation-list-link active">Nginx</a>
|
||||
|
||||
</li>
|
||||
|
||||
|
@ -292,7 +292,7 @@
|
|||
<nav class="breadcrumb-nav">
|
||||
<ol class="breadcrumb-nav-list">
|
||||
|
||||
<li class="breadcrumb-nav-list-item"><a href="https://gancio.org/setup">Setup</a></li>
|
||||
<li class="breadcrumb-nav-list-item"><a href="https://gancio.org/install">Install</a></li>
|
||||
|
||||
<li class="breadcrumb-nav-list-item"><span>Nginx</span></li>
|
||||
</ol>
|
||||
|
@ -301,7 +301,10 @@
|
|||
|
||||
<div id="main-content" class="page-content" role="main">
|
||||
<h2 id="nginx-proxy-configuration">Nginx proxy configuration</h2>
|
||||
<p>This is the default nginx configuration for gancio, please modify at least the <strong>server_name</strong> and <strong>ssl_certificate</strong>’s path</p>
|
||||
<p>This is the default nginx configuration for gancio, please modify at least the <strong>server_name</strong> and <strong>ssl_certificate</strong>’s path.<br />
|
||||
Note that this does not include a cache configuration and that gancio does
|
||||
not use a cache control at all, if you can help with this task you’re
|
||||
welcome.</p>
|
||||
|
||||
<div class="language-nginx highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="k">server</span> <span class="p">{</span>
|
||||
<span class="kn">listen</span> <span class="mi">80</span><span class="p">;</span>
|
|
@ -95,7 +95,7 @@
|
|||
|
||||
<li class="navigation-list-item">
|
||||
|
||||
<a href="https://gancio.org/setup" class="navigation-list-link">Setup</a>
|
||||
<a href="https://gancio.org/install" class="navigation-list-link">Install</a>
|
||||
|
||||
|
||||
<ul class="navigation-list-child-list ">
|
||||
|
@ -105,7 +105,7 @@
|
|||
|
||||
<li class="navigation-list-item ">
|
||||
|
||||
<a href="https://gancio.org/setup/classic" class="navigation-list-link">Classic</a>
|
||||
<a href="https://gancio.org/install/classic" class="navigation-list-link">Classic</a>
|
||||
|
||||
</li>
|
||||
|
||||
|
@ -113,7 +113,7 @@
|
|||
|
||||
<li class="navigation-list-item ">
|
||||
|
||||
<a href="https://gancio.org/setup/docker" class="navigation-list-link">Docker</a>
|
||||
<a href="https://gancio.org/install/docker" class="navigation-list-link">Docker</a>
|
||||
|
||||
</li>
|
||||
|
||||
|
@ -123,7 +123,7 @@
|
|||
|
||||
<li class="navigation-list-item ">
|
||||
|
||||
<a href="https://gancio.org/setup/nginx" class="navigation-list-link">Nginx</a>
|
||||
<a href="https://gancio.org/install/nginx" class="navigation-list-link">Nginx</a>
|
||||
|
||||
</li>
|
||||
|
||||
|
|
|
@ -95,7 +95,7 @@
|
|||
|
||||
<li class="navigation-list-item">
|
||||
|
||||
<a href="https://gancio.org/setup" class="navigation-list-link">Setup</a>
|
||||
<a href="https://gancio.org/install" class="navigation-list-link">Install</a>
|
||||
|
||||
|
||||
<ul class="navigation-list-child-list ">
|
||||
|
@ -105,7 +105,7 @@
|
|||
|
||||
<li class="navigation-list-item ">
|
||||
|
||||
<a href="https://gancio.org/setup/classic" class="navigation-list-link">Classic</a>
|
||||
<a href="https://gancio.org/install/classic" class="navigation-list-link">Classic</a>
|
||||
|
||||
</li>
|
||||
|
||||
|
@ -113,7 +113,7 @@
|
|||
|
||||
<li class="navigation-list-item ">
|
||||
|
||||
<a href="https://gancio.org/setup/docker" class="navigation-list-link">Docker</a>
|
||||
<a href="https://gancio.org/install/docker" class="navigation-list-link">Docker</a>
|
||||
|
||||
</li>
|
||||
|
||||
|
@ -123,7 +123,7 @@
|
|||
|
||||
<li class="navigation-list-item ">
|
||||
|
||||
<a href="https://gancio.org/setup/nginx" class="navigation-list-link">Nginx</a>
|
||||
<a href="https://gancio.org/install/nginx" class="navigation-list-link">Nginx</a>
|
||||
|
||||
</li>
|
||||
|
||||
|
|
BIN
docs/assets/home1.png
Normal file
BIN
docs/assets/home1.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 255 KiB |
Binary file not shown.
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 1.7 KiB |
|
@ -12,10 +12,11 @@ permalink: /
|
|||
A shared agenda for local communities.
|
||||
{: .fs-6 }
|
||||
|
||||
[Get started now](setup){: .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 }
|
||||
[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 }
|
||||
[Source](https://git.lattuga.net/cisti/gancio){: .btn .fs-5 }
|
||||
|
||||
<iframe width="800" height="500" sandbox="allow-same-origin allow-scripts" src="https://spacepub.space/videos/embed/9745bffc-e1e8-416d-9b08-fbc5e4c803b3?muted=1&title=0" frameborder="0" allowfullscreen></iframe>
|
||||
![screenshoot](assets/home1.png)
|
||||
|
||||
|
||||
### About the project
|
||||
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
---
|
||||
layout: default
|
||||
title: Classic
|
||||
permalink: /setup/classic
|
||||
parent: Setup
|
||||
permalink: /install/classic
|
||||
parent: Install
|
||||
---
|
||||
|
||||
## Classic setup
|
||||
## Install
|
||||
|
||||
1. Install Node.js and postgreSQL
|
||||
```bash
|
|
@ -1,8 +1,8 @@
|
|||
---
|
||||
layout: default
|
||||
title: Docker
|
||||
permalink: /setup/docker
|
||||
parent: Setup
|
||||
permalink: /install/docker
|
||||
parent: Install
|
||||
---
|
||||
|
||||
## Install with docker
|
||||
|
@ -41,4 +41,4 @@ docker-compose up -d
|
|||
|
||||
1. [Setup nginx as a proxy](/setup/nginx)
|
||||
|
||||
1. Point your web browser to [http://localhost:13120](http://localhost:13120) or where you specified during setup and enjoy :tada:
|
||||
1. Point your web browser to [http://localhost:13120](http://localhost:13120) or where you specified during setup and enjoy :tada:
|
|
@ -1,16 +1,16 @@
|
|||
---
|
||||
layout: default
|
||||
title: Setup
|
||||
permalink: /setup
|
||||
title: Install
|
||||
permalink: /install
|
||||
has_children: true
|
||||
nav_order: 2
|
||||
has_toc: false
|
||||
---
|
||||
|
||||
# Setup
|
||||
# Install
|
||||
|
||||
|
||||
- [Setup with docker](docker)
|
||||
- [Classic setup](classic)
|
||||
- [Classic install](classic)
|
||||
- [Using docker](docker)
|
||||
- [Nginx as a proxy](nginx)
|
||||
- [Hacking & contribute](../dev)
|
|
@ -1,12 +1,17 @@
|
|||
---
|
||||
layout: default
|
||||
title: Nginx
|
||||
permalink: /setup/nginx
|
||||
parent: Setup
|
||||
permalink: /install/nginx
|
||||
parent: Install
|
||||
---
|
||||
|
||||
|
||||
|
||||
## Nginx proxy configuration
|
||||
This is the default nginx configuration for gancio, please modify at least the **server_name** and **ssl_certificate**'s path
|
||||
This is the default nginx configuration for gancio, please modify at least the **server_name** and **ssl_certificate**'s path.
|
||||
Note that this does not include a cache configuration and that gancio does
|
||||
not use a cache control at all, if you can help with this task you're
|
||||
welcome.
|
||||
|
||||
```nginx
|
||||
server {
|
||||
|
@ -68,4 +73,4 @@ server {
|
|||
}
|
||||
}
|
||||
|
||||
```
|
||||
```
|
|
@ -66,12 +66,11 @@ export default {
|
|||
},
|
||||
|
||||
export: {
|
||||
intro: `Contrariamente alle piattaforme del capitalismo, che fanno di tutto per tenere
|
||||
i dati e gli utenti al loro interno, crediamo che le informazioni, come le persone,
|
||||
debbano essere libere. Per questo puoi rimanere aggiornata sugli eventi che vuoi, come meglio credi, senza necessariamente passare da questo sito.`,
|
||||
email_description: `Puoi ricevere via mail gli eventi che ti interessano.`,
|
||||
insert_your_address: 'Indirizzo email',
|
||||
feed_description: `Per seguire gli aggiornamenti da computer o smartphone senza la necessità di aprire periodicamente il sito, il metodo consigliato è quello dei Feed RSS.</p>
|
||||
intro: ``,
|
||||
email_description: ``,
|
||||
insert_your_address: 'Insert your email address.',
|
||||
feed_description: `
|
||||
Per seguire gli aggiornamenti da computer o smartphone senza la necessità di aprire periodicamente il sito, il metodo consigliato è quello dei Feed RSS.</p>
|
||||
|
||||
<p>Con i feed rss utilizzi un'apposita applicazione per ricevere aggiornamenti dai siti che più ti interessano. È un buon metodo per seguire anche molti siti in modo molto rapido, senza necessità di creare un account o altre complicazioni.</p>
|
||||
|
||||
|
@ -97,19 +96,17 @@ export default {
|
|||
},
|
||||
|
||||
event: {
|
||||
anon: 'Anonimo',
|
||||
anon: 'Anon',
|
||||
anon_description: `Puoi inserire un evento senza registrarti o fare il login,
|
||||
ma in questo caso dovrai aspettare che qualcuno lo legga confermando che si
|
||||
tratta di un evento adatto a questo spazio, delegando questa scelta. Inoltre non sarà possibile modificarlo.<br/><br/>
|
||||
Puoi invece fare il <a href='/login'>login</a> o <a href='/registrarti'>registrarti</a>,
|
||||
altrimenti vai avanti e riceverai una risposta il prima possibile. `,
|
||||
same_day: 'Stesso giorno',
|
||||
what_description: 'Nome evento',
|
||||
description_description: 'Descrizione, dajene di copia/incolla',
|
||||
same_day: 'Same day',
|
||||
what_description: 'Event\' name',
|
||||
description_description: 'Description',
|
||||
tag_description: 'Tag...',
|
||||
media_description: 'Puoi aggiungere un volantino',
|
||||
time_start_description: 'Comincia alle',
|
||||
time_end_description: 'Se vuoi puoi specificare un orario di fine.',
|
||||
added: 'Evento aggiunto',
|
||||
added_anon: 'Evento aggiunto, verrà confermato quanto prima.',
|
||||
where_description: `Dov'è il gancio? Se il posto non è presente, scrivilo e <b>premi invio</b>. `,
|
||||
|
@ -207,6 +204,5 @@ export default {
|
|||
<a href='https://git.lattuga.net/cisti/gancio'>qui</a>. Aiuti e suggerimenti sono sempre benvenuti, puoi scriverci
|
||||
su underscore chicciola autistici.org</p>
|
||||
`
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -107,9 +107,7 @@ export default {
|
|||
what_description: 'Nome evento',
|
||||
description_description: 'Descrizione, dajene di copia/incolla',
|
||||
tag_description: 'Tag...',
|
||||
media_description: 'Puoi aggiungere un volantino',
|
||||
time_start_description: 'Comincia alle',
|
||||
time_end_description: 'Se vuoi puoi specificare un orario di fine.',
|
||||
media_description: 'Puoi aggiungere un volantino (opzionale)',
|
||||
added: 'Evento aggiunto',
|
||||
added_anon: 'Evento aggiunto, verrà confermato quanto prima.',
|
||||
where_description: `Dov'è il gancio? Se il posto non è presente, scrivilo e <b>premi invio</b>. `,
|
||||
|
|
|
@ -93,9 +93,9 @@ module.exports = {
|
|||
// }
|
||||
// },
|
||||
transpile: [/^element-ui/, /^vue-awesome/],
|
||||
// splitChunks: {
|
||||
// layouts: true
|
||||
// },
|
||||
splitChunks: {
|
||||
layouts: true
|
||||
},
|
||||
cache: true,
|
||||
}
|
||||
}
|
||||
|
|
|
@ -10,10 +10,15 @@ import get from 'lodash/get'
|
|||
export default {
|
||||
layout: 'iframe',
|
||||
components: { List },
|
||||
async asyncData ({ $axios, req, res }) {
|
||||
const title = get(req, 'query.title')
|
||||
const tags = req && req.query && req.query.tags
|
||||
const places = req && req.query && req.query.places
|
||||
data () {
|
||||
return {
|
||||
title : ''
|
||||
}
|
||||
},
|
||||
async asyncData ({ query, $axios }) {
|
||||
const title = query.title
|
||||
const tags = query.tags
|
||||
const places = query.places
|
||||
const now = new Date()
|
||||
|
||||
let params = []
|
||||
|
|
|
@ -102,9 +102,8 @@ export default {
|
|||
try {
|
||||
const [ id, start_datetime ] = params.id.split('_')
|
||||
const event = await $axios.$get(`/event/${id}`)
|
||||
event.start_datetime = start_datetime ? start_datetime*1000 : event.start_datetime*1000
|
||||
event.end_datetime = event.end_datetime*1000
|
||||
// event.start_datetime = start_datetime ? start_datetime*1000 : event.start
|
||||
event.start_datetime = start_datetime ? start_datetime : event.start_datetime
|
||||
event.end_datetime = event.end_datetime
|
||||
return { event, id }
|
||||
} catch(e) {
|
||||
error({ statusCode: 404, message: 'Event not found'})
|
||||
|
@ -121,7 +120,7 @@ export default {
|
|||
})
|
||||
if (!event) return false
|
||||
if (event.recurrent) {
|
||||
return `${event.id}_${event.start_datetime/1000}`
|
||||
return `${event.id}_${event.start_datetime}`
|
||||
}
|
||||
return event.id
|
||||
},
|
||||
|
@ -133,7 +132,7 @@ export default {
|
|||
})
|
||||
if (!event) return false
|
||||
if (event.recurrent) {
|
||||
return `${event.id}_${event.start_datetime/1000}`
|
||||
return `${event.id}_${event.start_datetime}`
|
||||
}
|
||||
return event.id
|
||||
},
|
||||
|
|
|
@ -21,8 +21,8 @@ export default ({ app, store }) => {
|
|||
moment.locale(store.state.locale)
|
||||
|
||||
//{start,end}_datetime are unix timestamp
|
||||
const start = moment(event.start_datetime)
|
||||
const end = moment(event.end_datetime)
|
||||
const start = moment.unix(event.start_datetime)
|
||||
const end = moment.unix(event.end_datetime)
|
||||
|
||||
const normal = `${start.format('dddd, D MMMM (HH:mm-')}${end.format('HH:mm)')}`
|
||||
|
||||
|
|
|
@ -100,9 +100,6 @@ const eventController = {
|
|||
order: [ [Comment, 'id', 'DESC'] ]
|
||||
})
|
||||
|
||||
// event.start_datetime = event.start_datetime*1000
|
||||
// event.end_datetime = event.end_datetime*1000
|
||||
|
||||
if (event && (event.is_visible || is_admin)) {
|
||||
res.json(event)
|
||||
} else {
|
||||
|
@ -217,8 +214,6 @@ const eventController = {
|
|||
})
|
||||
|
||||
events = events.map(e => e.get()).map(e => {
|
||||
e.start_datetime = e.start_datetime*1000
|
||||
e.end_datetime = e.end_datetime*1000
|
||||
e.tags = e.tags.map(t => t.tag)
|
||||
return e
|
||||
})
|
||||
|
@ -230,8 +225,8 @@ const eventController = {
|
|||
if (!recurrent.frequency) return false
|
||||
|
||||
let cursor = moment(start).startOf('week')
|
||||
const start_date = moment(e.start_datetime)
|
||||
const duration = moment(e.end_datetime).diff(start_date, 's')
|
||||
const start_date = moment.unix(e.start_datetime)
|
||||
const duration = moment.unix(e.end_datetime).diff(start_date, 's')
|
||||
const frequency = recurrent.frequency
|
||||
const days = recurrent.days
|
||||
const type = recurrent.type
|
||||
|
@ -274,8 +269,8 @@ const eventController = {
|
|||
cursor.day(d-1)
|
||||
}
|
||||
if (cursor.isAfter(dueTo) || cursor.isBefore(start)) return
|
||||
e.start_datetime = cursor.unix()*1000
|
||||
e.end_datetime = e.start_datetime+(duration*1000)// cursor.clone().hour(end_datetime.hour()).minute(end_datetime.minute()).unix()*1000
|
||||
e.start_datetime = cursor.unix()
|
||||
e.end_datetime = e.start_datetime+duration
|
||||
events.push( Object.assign({}, e) )
|
||||
})
|
||||
if (cursor.isAfter(dueTo)) break
|
||||
|
|
|
@ -50,8 +50,8 @@ const exportController = {
|
|||
|
||||
ics(res, events) {
|
||||
const eventsMap = events.map(e => {
|
||||
const tmpStart = moment(e.start_datetime)
|
||||
const tmpEnd = moment(e.end_datetime)
|
||||
const tmpStart = moment.unix(e.start_datetime)
|
||||
const tmpEnd = moment.unix(e.end_datetime)
|
||||
const start = [tmpStart.year(), tmpStart.month() + 1, tmpStart.date(), tmpStart.hour(), tmpStart.minute()]
|
||||
const end = [tmpEnd.year(), tmpEnd.month() + 1, tmpEnd.date(), tmpEnd.hour(), tmpEnd.minute()]
|
||||
return {
|
||||
|
|
|
@ -86,12 +86,12 @@ export const mutations = {
|
|||
setEvents(state, events) {
|
||||
// set`past` and `newDay` flags to event
|
||||
let lastDay = null
|
||||
state.events = events.map((e) => {
|
||||
const currentDay = moment(e.start_datetime).date()
|
||||
state.events = events.map(e => {
|
||||
const currentDay = moment.unix(e.start_datetime).date()
|
||||
e.newDay = (!lastDay || lastDay !== currentDay) && currentDay
|
||||
lastDay = currentDay
|
||||
const end_datetime = e.end_datetime || e.start_datetime+3600000*2
|
||||
const past = ((moment().unix()*1000) - end_datetime) > 0
|
||||
const end_datetime = e.end_datetime || e.start_datetime+3600*2
|
||||
const past = ((moment().unix()) - end_datetime) > 0
|
||||
e.past = !!past
|
||||
return e
|
||||
})
|
||||
|
|
Loading…
Reference in a new issue