From 5a3d07336fdaca27b77d8535ca6acdf2d48400fe Mon Sep 17 00:00:00 2001 From: les Date: Wed, 7 Aug 2019 19:15:15 +0200 Subject: [PATCH] refactoring --- docs/{ => _drafts}/admin.md | 2 +- docs/{ => _drafts}/contribute.md | 0 docs/{ => _drafts}/usage.md | 0 docs/_site/404.html | 42 ---- docs/_site/admin.html | 318 ------------------------- docs/_site/assets/js/search-data.json | 57 ++--- docs/_site/config.html | 42 ---- docs/_site/contribute.html | 319 -------------------------- docs/_site/dev.html | 48 ---- docs/_site/dev/migration.html | 42 ---- docs/_site/dev/structure.html | 42 ---- docs/_site/feed.xml | 2 +- docs/_site/index.html | 42 ---- docs/_site/install.html | 42 ---- docs/_site/install/debian.html | 42 ---- docs/_site/install/docker.html | 42 ---- docs/_site/install/nginx.html | 42 ---- docs/_site/instances.html | 42 ---- docs/_site/usage.html | 309 ------------------------- locales/en.js | 90 +++----- locales/it.js | 5 +- package.json | 1 + pages/event/_id.vue | 11 +- pages/export.vue | 7 + views/feed/rss.pug | 9 +- 25 files changed, 71 insertions(+), 1527 deletions(-) rename docs/{ => _drafts}/admin.md (91%) rename docs/{ => _drafts}/contribute.md (100%) rename docs/{ => _drafts}/usage.md (100%) delete mode 100644 docs/_site/admin.html delete mode 100644 docs/_site/contribute.html delete mode 100644 docs/_site/usage.html diff --git a/docs/admin.md b/docs/_drafts/admin.md similarity index 91% rename from docs/admin.md rename to docs/_drafts/admin.md index e57b4963..1884e866 100644 --- a/docs/admin.md +++ b/docs/_drafts/admin.md @@ -16,4 +16,4 @@ nav_order: 5 ## Add user ## Enable registration ## Confirm registration -## Confirm event \ No newline at end of file +## Confirm event diff --git a/docs/contribute.md b/docs/_drafts/contribute.md similarity index 100% rename from docs/contribute.md rename to docs/_drafts/contribute.md diff --git a/docs/usage.md b/docs/_drafts/usage.md similarity index 100% rename from docs/usage.md rename to docs/_drafts/usage.md diff --git a/docs/_site/404.html b/docs/_site/404.html index 28a41640..2fcb2420 100644 --- a/docs/_site/404.html +++ b/docs/_site/404.html @@ -140,12 +140,6 @@ - - - - - - @@ -164,26 +158,6 @@ -
  • - - Usage - -
    • - - - - - -
  • - - Admin - -
    • - - - - -
  • Hacking @@ -225,12 +199,6 @@ - - - - - -
    • @@ -239,16 +207,6 @@ -
  • - - Contribute - -
    • - - - - -
  • Instances diff --git a/docs/_site/admin.html b/docs/_site/admin.html deleted file mode 100644 index f54cfe63..00000000 --- a/docs/_site/admin.html +++ /dev/null @@ -1,318 +0,0 @@ - - - - - - - - Admin - Gancio - - - - - - - - - - - - - - - - - - - -Admin | Gancio - - - - - - - - - - - - - - - -
    -
    - Gancio - -
    - - -
    -
    -

    This site uses Just the Docs, a documentation theme for Jekyll.

    -
    -
    -
    -
    -
    - -
    -
    - - Search -
    -
    -
    - - - - -
    -
    -
    - - - -
    -

    Admin

    - -
      -
    1. Basics
      2. -
    2. Add user
      3. -
    3. Enable registration
      4. -
    4. Confirm registration
      5. -
    5. Confirm event
      6. -
    - -

    Basics

    -

    Add user

    -

    Enable registration

    -

    Confirm registration

    -

    Confirm event

    - - - -
    -
    -
    -
    - - - diff --git a/docs/_site/assets/js/search-data.json b/docs/_site/assets/js/search-data.json index b889dedb..d3f49aa5 100644 --- a/docs/_site/assets/js/search-data.json +++ b/docs/_site/assets/js/search-data.json @@ -8,94 +8,73 @@ }, "1": { "id": "1", - "title": "Admin", - "content": "Admin Basics Add user Enable registration Confirm registration Confirm event Basics Add user Enable registration Confirm registration Confirm event", - "url": "https://gancio.org/admin", - "relUrl": "/admin" - }, - "2": { - "id": "2", "title": "Configuration", "content": "Configuration 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. eg. gancio start --config ./config.json eg. pm2 start gancio start -- --config ~/config.json Title Description BaseURL Server Database Upload path SMTP Admin Favicon User locale Secret Default settings Title The title will be in rss feed, in html head and in emails: "title": "Gancio" Description "description": "a shared agenda for local communities" BaseURL URL where your site will be accessible (include http or https): "baseurl": "https://gancio.cisti.org" Server This probably support unix socket too :D "server": { "host": "localhost", "port": 13120 } Database "db": { "dialect": "sqlite", "storage": "/tmp/db.sqlite" } Upload path Where to save images "upload_path": "./uploads" SMTP Admin 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 each string of gancio making a directory with your locales inside. For example, let’s say you want to modify the text inside the /about page: mkdir /opt/gancio/user_locale put something like this in /opt/gancio/user_locale/en.js to override the about in english: export default { about: 'A new about' } and then point the user_locale configuration to that directory: "user_locale": "/opt/gancio/user_locale" Watch here for a list of strings you can override. :warning: Note that a restart is needed when you change user_locale’s content. Secret Default settings { "title": "Gancio", "description": "A shared agenda for local communities", "baseurl": "http://localhost:13120", "server": { "host": "0.0.0.0", "port": 13120 }, "db": { "dialect": "sqlite", "storage": "/tmp/db.sqlite" }, "upload_path": "./", "favicon": "../dist/favicon.ico", "smtp": { "auth": { "user": "", "pass": "" }, "secure": true, "host": "" }, "admin": "", "secret": "notsosecret" }", "url": "https://gancio.org/config", "relUrl": "/config" }, - "3": { - "id": "3", - "title": "Contribute", - "content": "Contribute If you want to contribute, take a look at the issues Code Translate Design Documentation Share Code Translate Design Documentation Share", - "url": "https://gancio.org/contribute", - "relUrl": "/contribute" - }, - "4": { - "id": "4", + "2": { + "id": "2", "title": "Debian", "content": "Debian installation Install Node.js & yarn (from root) curl -sL https://deb.nodesource.com/setup_12.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 apt-get update && apt-get install yarn source Install Gancio yarn add gancio --prod Setup with postgreSQL (optional as you can choose sqlite) apt-get install postgresql # Create the database su postgres -c 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 yarn global add pm2 pm2 gancio start --config config.json", "url": "https://gancio.org/install/debian", "relUrl": "/install/debian" }, - "5": { - "id": "5", + "3": { + "id": "3", "title": "Hacking", "content": "Development Stack Gancio is built with following technologies: Nuxt.js Vue.js Express Node.js Sequelize Element.ui Testing on your own machine Download source git clone https://git.lattuga.net/cisti/gancio Install dependencies yarn Hacking yarn dev", "url": "https://gancio.org/dev", "relUrl": "/dev" }, - "6": { - "id": "6", + "4": { + "id": "4", "title": "Docker", "content": "Install with docker 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) mkdir /opt/gancio cd /opt/gancio :information_source: you can choose a different directory. Using postgreSQL Download docker-compose.yml and Dockerfile wget https://git.lattuga.net/cisti/gancio/raw/master/docker/Dockerfile wget https://git.lattuga.net/cisti/gancio/raw/master/docker/docker-compose.postgresql.yml -O docker.compose.yml Create an empty configiguration (this is needed) touch config.json Using sqlite Download docker-compose.yml and Dockerfile wget https://git.lattuga.net/cisti/gancio/raw/master/docker/Dockerfile wget https://git.lattuga.net/cisti/gancio/raw/master/docker/docker-compose.sqlite.yml -O docker-compose.yml Create an empty db and config (this is needed) touch config.json db.sqlite Finish Build docker image and launch interactive setup in one step docker-compose run --rm gancio gancio setup --docker 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: You can edit config.json file and restart the container on your needs, see Configuration for more details.", "url": "https://gancio.org/install/docker", "relUrl": "/install/docker" }, - "7": { - "id": "7", + "5": { + "id": "5", "title": "Home", "content": "Gancio A shared agenda for local communities. Get started now Demo Source About the project Gancio is made with :heart: by hacklab underscore License Gancio is distributed by an AGPL-3.0 Licence.", "url": "https://gancio.org/", "relUrl": "/" }, - "8": { - "id": "8", + "6": { + "id": "6", "title": "Install", "content": "Install (production) Install on Debian Install using docker Post installation Nginx as a proxy If you wanna hack or run the current develop release take a look at Hacking & contribute", "url": "https://gancio.org/install", "relUrl": "/install" }, - "9": { - "id": "9", + "7": { + "id": "7", "title": "Instances", "content": "Instances gancio.cisti.org (Torino, Italy) lapunta.org (Firenze, Italy)", "url": "https://gancio.org/instances", "relUrl": "/instances" }, - "10": { - "id": "10", + "8": { + "id": "8", "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" }, - "11": { - "id": "11", + "9": { + "id": "9", "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", + "10": { + "id": "10", "title": "Project Structure", "content": "Project structure API / backend Client / frontend Federation / ActivityPub API / backend Source code inside server/api/. index.js is basically a routing table pointing each PATH with specified HTTP VERB to a method of a controller. jwt is used to authenticate api request. Express.js is based on middleware, passing each request to a chain of methods. If you come from a PHP background, note that the main difference with Node.js is that the server process is always running and able to manage multiple requests and tasks together (asyncronically) while each php process is tied to a single request. Sequelize is used as ORM. Take a look in /server/api/models. Client / frontend Nuxt.js is used here! Nuxt is basically Vue plus SSR (Server Side Rendering). Client routing in nuxt is automatic (if you don’t need something special), just put your page inside pages and that’s it! Federation / ActivityPub Code inside server/federation.", "url": "https://gancio.org/dev/structure", "relUrl": "/dev/structure" - }, - "13": { - "id": "13", - "title": "Usage", - "content": "Usage Add event Normal Multidate Recurrent", - "url": "https://gancio.org/usage", - "relUrl": "/usage" } } diff --git a/docs/_site/config.html b/docs/_site/config.html index 2ecbca62..d80825e2 100644 --- a/docs/_site/config.html +++ b/docs/_site/config.html @@ -140,12 +140,6 @@ - - - - - -
    • @@ -164,26 +158,6 @@ -
  • - - Usage - -
    • - - - - - -
  • - - Admin - -
    • - - - - -
  • Hacking @@ -225,12 +199,6 @@ - - - - - -
    • @@ -239,16 +207,6 @@ -
  • - - Contribute - -
    • - - - - -
  • Instances diff --git a/docs/_site/contribute.html b/docs/_site/contribute.html deleted file mode 100644 index 6a00c37a..00000000 --- a/docs/_site/contribute.html +++ /dev/null @@ -1,319 +0,0 @@ - - - - - - - - Contribute - Gancio - - - - - - - - - - - - - - - - - - - -Contribute | Gancio - - - - - - - - - - - - - - - -
    -
    - Gancio - -
    - - -
    -
    -

    This site uses Just the Docs, a documentation theme for Jekyll.

    -
    -
    -
    -
    -
    - -
    -
    - - Search -
    -
    -
    - - - - -
    -
    -
    - - - -
    -

    Contribute

    -

    If you want to contribute, take a look at the issues

    - -
      -
    1. Code
      2. -
    2. Translate
      3. -
    3. Design
      4. -
    4. Documentation
      5. -
    5. Share
      6. -
    - -

    Code

    -

    Translate

    -

    Design

    -

    Documentation

    -

    Share

    - - - -
    -
    -
    -
    - - - diff --git a/docs/_site/dev.html b/docs/_site/dev.html index d91d3a21..de791be2 100644 --- a/docs/_site/dev.html +++ b/docs/_site/dev.html @@ -140,12 +140,6 @@ - - - - - -
    • @@ -164,26 +158,6 @@ -
  • - - Usage - -
    • - - - - - -
  • - - Admin - -
    • - - - - -
  • Hacking @@ -225,12 +199,6 @@ - - - - - -
    • @@ -239,16 +207,6 @@ -
  • - - Contribute - -
    • - - - - -
  • Instances @@ -360,12 +318,6 @@ - - - - - - diff --git a/docs/_site/dev/migration.html b/docs/_site/dev/migration.html index 7dbb7d10..f4e2bf0f 100644 --- a/docs/_site/dev/migration.html +++ b/docs/_site/dev/migration.html @@ -140,12 +140,6 @@ - - - - - -
    • @@ -164,26 +158,6 @@ -
  • - - Usage - -
    • - - - - - -
  • - - Admin - -
    • - - - - -
  • Hacking @@ -225,12 +199,6 @@ - - - - - -
    • @@ -239,16 +207,6 @@ -
  • - - Contribute - -
    • - - - - -
  • Instances diff --git a/docs/_site/dev/structure.html b/docs/_site/dev/structure.html index 55724a13..f822dbc7 100644 --- a/docs/_site/dev/structure.html +++ b/docs/_site/dev/structure.html @@ -140,12 +140,6 @@ - - - - - -
    • @@ -164,26 +158,6 @@ -
  • - - Usage - -
    • - - - - - -
  • - - Admin - -
    • - - - - -
  • Hacking @@ -225,12 +199,6 @@ - - - - - -
    • @@ -239,16 +207,6 @@ -
  • - - Contribute - -
    • - - - - -
  • Instances diff --git a/docs/_site/feed.xml b/docs/_site/feed.xml index 80fb6e11..6bff7c4b 100644 --- a/docs/_site/feed.xml +++ b/docs/_site/feed.xml @@ -1 +1 @@ -Jekyll2019-08-06T01:01:30+02:00https://gancio.org/feed.xmlGancioA shared agenda for local communities \ No newline at end of file +Jekyll2019-08-07T18:50:21+02:00https://gancio.org/feed.xmlGancioA shared agenda for local communities \ No newline at end of file diff --git a/docs/_site/index.html b/docs/_site/index.html index ee3c46a6..721a53db 100644 --- a/docs/_site/index.html +++ b/docs/_site/index.html @@ -142,12 +142,6 @@ - - - - - -
    • @@ -166,26 +160,6 @@ -
  • - - Usage - -
    • - - - - - -
  • - - Admin - -
    • - - - - -
  • Hacking @@ -227,12 +201,6 @@ - - - - - -
    • @@ -241,16 +209,6 @@ -
  • - - Contribute - -
    • - - - - -
  • Instances diff --git a/docs/_site/install.html b/docs/_site/install.html index 94107e4f..17d886dc 100644 --- a/docs/_site/install.html +++ b/docs/_site/install.html @@ -140,12 +140,6 @@ - - - - - -
    • @@ -164,26 +158,6 @@ -
  • - - Usage - -
    • - - - - - -
  • - - Admin - -
    • - - - - -
  • Hacking @@ -225,12 +199,6 @@ - - - - - -
    • @@ -239,16 +207,6 @@ -
  • - - Contribute - -
    • - - - - -
  • Instances diff --git a/docs/_site/install/debian.html b/docs/_site/install/debian.html index c7901485..3ba60116 100644 --- a/docs/_site/install/debian.html +++ b/docs/_site/install/debian.html @@ -140,12 +140,6 @@ - - - - - -
    • @@ -164,26 +158,6 @@ -
  • - - Usage - -
    • - - - - - -
  • - - Admin - -
    • - - - - -
  • Hacking @@ -225,12 +199,6 @@ - - - - - -
    • @@ -239,16 +207,6 @@ -
  • - - Contribute - -
    • - - - - -
  • Instances diff --git a/docs/_site/install/docker.html b/docs/_site/install/docker.html index 5496ac1e..db741bbc 100644 --- a/docs/_site/install/docker.html +++ b/docs/_site/install/docker.html @@ -140,12 +140,6 @@ - - - - - -
    • @@ -164,26 +158,6 @@ -
  • - - Usage - -
    • - - - - - -
  • - - Admin - -
    • - - - - -
  • Hacking @@ -225,12 +199,6 @@ - - - - - -
    • @@ -239,16 +207,6 @@ -
  • - - Contribute - -
    • - - - - -
  • Instances diff --git a/docs/_site/install/nginx.html b/docs/_site/install/nginx.html index b6794413..ca5ec0ba 100644 --- a/docs/_site/install/nginx.html +++ b/docs/_site/install/nginx.html @@ -140,12 +140,6 @@ - - - - - -
    • @@ -164,26 +158,6 @@ -
  • - - Usage - -
    • - - - - - -
  • - - Admin - -
    • - - - - -
  • Hacking @@ -225,12 +199,6 @@ - - - - - -
    • @@ -239,16 +207,6 @@ -
  • - - Contribute - -
    • - - - - -
  • Instances diff --git a/docs/_site/instances.html b/docs/_site/instances.html index 3a035b53..f2327202 100644 --- a/docs/_site/instances.html +++ b/docs/_site/instances.html @@ -140,12 +140,6 @@ - - - - - -
    • @@ -164,26 +158,6 @@ -
  • - - Usage - -
    • - - - - - -
  • - - Admin - -
    • - - - - -
  • Hacking @@ -225,12 +199,6 @@ - - - - - -
    • @@ -239,16 +207,6 @@ -
  • - - Contribute - -
    • - - - - -
  • Instances diff --git a/docs/_site/usage.html b/docs/_site/usage.html deleted file mode 100644 index 9d5f6100..00000000 --- a/docs/_site/usage.html +++ /dev/null @@ -1,309 +0,0 @@ - - - - - - - - Usage - Gancio - - - - - - - - - - - - - - - - - - - -Usage | Gancio - - - - - - - - - - - - - - - -
    -
    - Gancio - -
    - - -
    -
    -

    This site uses Just the Docs, a documentation theme for Jekyll.

    -
    -
    -
    -
    -
    - -
    -
    - - Search -
    -
    -
    - - - - -
    -
    -
    - - - -
    -

    Usage

    - -

    Add event

    -

    Normal

    -

    Multidate

    -

    Recurrent

    - - - -
    -
    -
    -
    - - - diff --git a/locales/en.js b/locales/en.js index 2c643922..1bb1adb9 100644 --- a/locales/en.js +++ b/locales/en.js @@ -72,39 +72,38 @@ export default { 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.

    +To follow updates from a computer or smartphone without the need to periodically open this site, the recommended method is RSS Feeds.

    -

    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.

    - -
  • Se hai Android, ti consigliamo Flym o Feeder
    • -
  • Per iPhone/iPad puoi usare Feed4U
    • -
  • Per il computer fisso/portatile consigliamo Feedbro, da installare all'interno di Firefox o di Chrome e compatibile con tutti i principali sistemi operativi.
    • -
    - Aggiungendo questo link al tuo lettore di feed, rimarrai aggiornata.`, - ical_description: `I computer e gli smartphone sono comunemente attrezzati con un'applicazione per gestire un calendario. A questi programmi solitamente è possibile far importare un calendario remoto.`, - list_description: `Se hai un sito web e vuoi mostrare una lista di eventi, puoi usare il seguente codice` +

    With rss feeds you use a special app to receive updates from the sites that interest you most. It's a good way to follow many sites very quickly, without the need to create an account or other complications.

    + +
  • If you have Android, we recommend Flym or Feeder
    • +
  • For iPhone / iPad you can use Feed4U
    • +
  • For the desktop / laptop we recommend Feedbro, to be installed in Firefox or Chrome and compatible with all major operating systems.
    • +
    +Adding this link to your feed reader will keep you up to date.`, + ical_description: `Computers and smartphones are commonly equipped with an application to manage a calendar. These programs can usually be used to import a remote calendar.`, + list_description: `If you have a website and want to show a list of events, you can use the following code` }, register: { - description: `I movimenti hanno bisogno di organizzarsi e autofinanziarsi.
    Questo è un dono per voi, usatelo solo per eventi non commerciali e ovviamente antifascisti, antisessisti, antirazzisti. -
    Prima di poter pubblicare dobbiamo approvare l'account, considera che dietro questo sito ci sono delle persone di - carne e sangue, scrivici quindi due righe per farci capire che eventi vorresti pubblicare.`, + description: ` + Social movements need to organize and self-finance.
    This is a gift for you, use it only for non-commercial and obviously anti-fascist, anti-sexist, anti-racist events. +
    Before you can publish we must approve the account , consider that behind this site there are people of + flesh and blood, so write us two lines to let us know what events you would like to publish.`, error: 'Error: ', complete: 'Registration has to be confirmed.' }, event: { 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.

    - Puoi invece fare il login o registrarti, - altrimenti vai avanti e riceverai una risposta il prima possibile. `, - same_day: 'Same day', - what_description: 'Event\'s name', + anon_description: `You can add an event without registering or logging in, but in this case you will have to wait for someone to read it + confirming that it is an event suitable for this space, delegating this choice. Furthermore it will not be possible to modify it.

    + You can instead log in or register, otherwise go ahead and get an answer as soon as possible.`, + same_day: 'on same day', + what_description: 'Title', description_description: 'Description', tag_description: 'Tag', - media_description: 'You could add an event\'s flyer (optional)', + media_description: 'You can add flyer (optional)', added: 'Event added', added_anon: 'Event added but has to be confirmed.', where_description: `Where's the event? If not present, write it and press enter. `, @@ -113,9 +112,12 @@ export default { remove_confirmation: `Are you sure to remove this event?`, recurrent: `Recurrent`, recurrent_description: 'Choose the frequency and select the days', - multidate_description: 'It\'s a festival? Choose when it starts and when it ends?', + multidate_description: 'It\'s a festival? Choose when it starts and when it ends', multidate: 'More days', normal: 'Normal', + each_week: 'Each week', + each_2w: 'Each two weeks', + each_month: 'Each month', normal_description: 'Choose the day.', recurrent_1w_days: 'Each {days}', recurrent_2w_days: 'A {days} each two', @@ -125,13 +127,13 @@ export default { recurrent_2m_ordinal: '|The {n} {days} a month each two|The {n} {days} a month each two', due: 'due', from: 'From', - image_too_big: 'Image too big! Max 4M', + image_too_big: 'Too big image! Max 4M', interact_with_me_at: 'Interact with me on fediverse at' }, admin: { - place_description: `Nel caso in cui un luogo sia errato o cambi indirizzo, puoi modificarlo.
    Considera che tutti gli eventi associati a questo luogo cambieranno indirizzo (anche quelli passati!)`, - event_confirm_description: 'Puoi confermare qui gli eventi inseriti da utenti anonimi', + place_description: `In the event that a place is incorrect or change address, you can change it.
    Consider that all events associated with this place will change address (even past ones!)`, + event_confirm_description: 'You can confirm here the events entered by anonymous users', delete_user: 'Remove', remove_admin: 'Remove admin', delete_user_confirm: 'Are you sure to remove this user?', @@ -154,8 +156,8 @@ export default { change_password: 'Modify your password', password_updated: 'Password updated', danger_section: 'Dangerous section', - remove_account: 'Premendo il seguente tasto il tuo utente verrà eliminato. Gli eventi da te pubblicati invece no.', - remove_account_confirm: 'Stai per eliminare definitivamente il tuo account', + remove_account: 'By pressing the following button your user will be deleted. The events you published instead no.', + remove_account_confirm: 'You are about to permanently delete your account', }, err: { @@ -172,36 +174,6 @@ export default { }, about: ` -

    - Gancio is a shared agenda for local communities. - - Gancio e' un progetto dell'underscore hacklab e uno dei - servizi di cisti.org.

    - -
    Cos'è gancio?
    -

    Uno strumento di condivisione di eventi per comunità radicali. - Dentro gancio puoi trovare e inserire eventi. - Gancio, come tutto cisti.org è uno strumento - antisessista, antirazzista, antifascista e anticapitalista, riflettici quando - pubblichi un evento.

    - -
    Ok, ma cosa vuol dire gancio?
    -

    - Se vieni a Torino e dici: "ehi, ci diamo un gancio alle 8?" nessuno si presenterà con i guantoni per fare a mazzate. - Darsi un gancio vuol dire beccarsi alle ore X in un posto Y.

    - - - - -
    Contatti
    -

    - Hai scritto una nuova interfaccia per gancio? Vuoi aprire un nuovo nodo di gancio nella tua città? - C'è qualcosa che vorresti migliorare? Per contribuire i sorgenti sono liberi e disponibili - qui. Aiuti e suggerimenti sono sempre benvenuti, puoi scriverci - su underscore chicciola autistici.org

    +

    Gancio is a shared agenda for local communities.

    ` -} - +} \ No newline at end of file diff --git a/locales/it.js b/locales/it.js index 0c1ed24d..d50c2a67 100644 --- a/locales/it.js +++ b/locales/it.js @@ -99,7 +99,7 @@ export default { 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.

    - Puoi invece fare il login o registrarti, + Puoi invece fare il login o registrarti, altrimenti vai avanti e riceverai una risposta il prima possibile. `, same_day: 'Stesso giorno', what_description: 'Nome evento', @@ -209,5 +209,4 @@ export default { su underscore chicciola autistici.org

    ` -} - +} \ No newline at end of file diff --git a/package.json b/package.json index 20ce6adf..24b54962 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "start": "cross-env sequelize db:migrate && NODE_ENV=production node server/cli.js", "lint": "eslint --ext .js,.vue --ignore-path .gitignore .", "doc": "cd docs && bundle exec jekyll b", + "doc:dev": "cd docs && bundle exec jekyll s --drafts", "migrate:dev": "sequelize db:migrate", "migrate": "NODE_ENV=production sequelize db:migrate" }, diff --git a/pages/event/_id.vue b/pages/event/_id.vue index 9ca948bb..a31b75ea 100644 --- a/pages/event/_id.vue +++ b/pages/event/_id.vue @@ -39,9 +39,10 @@ el-button(plain type='danger' size='mini' @click.prevent='remove') {{$t('common.remove')}} el-button(plain type='primary' size='mini' @click='$router.replace(`/add/${event.id}`)') {{$t('common.edit')}} - small {{event.likes.length}} - {{event.boost.length}} //- comments from fediverse #comments.card-body(v-if='settings.enable_federation') + small.float-right 🔖 {{event.likes.length}} + small.float-right.mr-3 ✊ {{event.boost.length}}
    strong {{$t('common.comments')}} - {{$t('event.interact_with_me_at')}} {{event.user.username}}@{{settings.baseurl|url2host}} @@ -73,7 +74,7 @@ export default { head () { if (!this.event) return {} return { - title: this.event.title, + title: `${this.settings.title} - ${this.event.title}`, meta: [ // hid is used as unique identifier. Do not use `vmid` for it as it will not work { hid: 'description', name: 'description', @@ -100,9 +101,9 @@ export default { try { const [ id, start_datetime ] = params.id.split('_') const event = await $axios.$get(`/event/${id}`) - event.start_datetime = start_datetime ? start_datetime : event.start_datetime + event.start_datetime = start_datetime ? Number(start_datetime) : event.start_datetime event.end_datetime = event.end_datetime - return { event, id } + return { event, id: Number(id) } } catch(e) { error({ statusCode: 404, message: 'Event not found'}) } @@ -114,7 +115,7 @@ export default { let found = false const event = this.filteredEvents.find(e => { if (found) return e - if (e.start_datetime === this.event.start_datetime && e.id === this.event.id) found = true + found = (e.start_datetime === this.event.start_datetime && e.id === this.event.id) }) if (!event) return false if (event.recurrent) { diff --git a/pages/export.vue b/pages/export.vue index 188d2fdc..d620b346 100644 --- a/pages/export.vue +++ b/pages/export.vue @@ -9,6 +9,7 @@ Search el-tabs.mt-2(v-model='type') + //- TOFIX //- el-tab-pane.pt-1(label='email' name='email') //- p(v-html='$t(`export.email_description`)') //- el-form(@submit.native.prevent) @@ -45,6 +46,7 @@ el-button.float-right(plain v-clipboard:copy='listScript' type='primary' icon='el-icon-document') {{$t('common.copy')}} + //- TOFIX //- el-tab-pane.pt-1(label='calendar' name='calendar') //- p(v-html='$t(`export.calendar_description`)') //- //- no-ssr @@ -65,6 +67,11 @@ import { Message } from 'element-ui' export default { name: 'Export', components: { List, Search }, + head () { + return { + title: `${this.settings.title} - ${this.$t('common.export')}` + } + }, data () { return { type: 'feed', diff --git a/views/feed/rss.pug b/views/feed/rss.pug index 716b00ca..67f46d5f 100644 --- a/views/feed/rss.pug +++ b/views/feed/rss.pug @@ -5,18 +5,17 @@ rss(version='2.0') link #{config.baseurl} description #{config.description} language #{config.locale} - //- if events.length - lastBuildDate= new Date(posts[0].publishedAt).toUTCString() each event in events item - title [#{moment(event.start_datetime).format("D-MM-YY")}] #{event.title} @#{event.place.name} + title [#{moment.unix(event.start_datetime).format("YY-MM-DD")}] #{event.title} @#{event.place.name} link #{config.baseurl}/event/#{event.id} description | #{event.title} | #{event.place.name} - #{event.place.address} - | #{moment(event.start_datetime).format("dddd, D MMMM HH:mm")}
    - | + | (#{moment.unix(event.start_datetime).format("dddd, D MMMM HH:mm")})
    + if (event.image_path) + | | 
    !{event.description}
    | ]]> pubDate= new Date(event.createdAt).toUTCString()