Merge branch 'move_service_page' into 'master'

Move service page

See merge request !35

.gitlab-ci.yml

@@ -28,3 +28,13 @@ pages:
     - public
   only:
   - master
+ghost service update:
+  stage: deploy
+  trigger:
+    project: feneas/infrastructure/ghost-theme
+    strategy: depend
+  only:
+    refs:
+      - master
+    changes:
+      - services.json

scripts/gen.sh

@@ -50,9 +50,4 @@ gojsontmpl \
   -html-files templates/index.html.tmpl,templates/header.html.tmpl,templates/footer.html.tmpl \
   -json-file documents.json > ${stage}/index.html || exit 1
 
-gojsontmpl \
-  -html-base-file services.html.tmpl \
-  -html-files templates/services.html.tmpl,templates/header.html.tmpl,templates/footer.html.tmpl \
-  -json-file services.json > ${stage}/services.html || exit 1
-
 exit 0

services.json

 [
   {
-    "url_icon": null,
+    "__EXAMPLE__": "__SERVICE__",
+    "url_icon": "Absolute path to the image file or the filename in https://git.feneas.org/feneas/infrastructure/ghost-theme/tree/master/assets/images/.",
+    "fa_icon": "Fontawesome classes e.g. 'fas fa-comments'",
+    "name": "Name of the service",
+    "description": "Description of the service 30-40 words (only plain text!).",
+    "register_url": "Registration or sign-up link for the service (Feneas specific)",
+    "url": "Link to the offical documentation of the service or a blog post (extra information).",
+    "access": "Access level 0=everyone, 1=partially everyone, 2=only feneas member"
+  },
+  {
+    "url_icon": "matrixorg.png",
     "fa_icon": "fas fa-comments",
     "name": "Matrix / Riot",
-    "description": "Federated group chat with e2e encryption. Register at <a href=\"https://chat.feneas.org\">chat.feneas.org</a>.",
+    "description": "Federated group chat with e2e encryption.",
+    "register_url": "https://chat.feneas.org",
+    "url": "https://matrix.org",
     "access": 0
   },
   {
-    "url_icon": null,
+    "url_icon": "friendica.png",
     "fa_icon": "fas fa-pencil-alt",
     "name": "Friendica",
-    "description": "Federated social network. Friendica federates with the whole Fediverse using multiple protocols. Register at <a href=\"https://friendica.feneas.org\">friendica.feneas.org</a>.",
+    "description": "Federated social network. Friendica federates with the whole Fediverse using multiple protocols.",
+    "register_url": "https://friendica.feneas.org",
+    "url": "https://friendi.ca",
     "access": 0
   },
   {
-    "url_icon": null,
+    "url_icon": "diaspora.svg",
     "fa_icon": "fas fa-pencil-alt",
     "name": "Diaspora",
-    "description": "Federated social network. Diaspora is a decentralized social network, consisting of many individual servers, called \"pods\". The current pod <a href=\"https://joindiaspora.com\">joindiaspora.com</a> is closed and therefore only available to members (ask on the <a href=\"mailto:members@feneas.org\">members@feneas.org</a> mailing-list).",
+    "description": "Federated social network. Diaspora is a decentralized social network, consisting of many individual servers, called \"pods\". The current pod Joindiaspora is closed and therefore only available to members. Ask on the members mailing-list for access.",
+    "register_url": "mailto:members@feneas.org",
+    "url": "https://wiki.diasporafoundation.org",
     "access": 2
   },
   {
-    "url_icon": null,
+    "url_icon": "etherpad.png",
     "fa_icon": "fas fa-file-alt",
     "name": "Etherpad",
-    "description": "Collaborative online text editor. Find our instance at <a href=\"https://pad.feneas.org\">pad.feneas.org</a>.",
+    "description": "Collaborative online text editor.",
+    "register_url": "https://pad.feneas.org",
+    "url": "https://etherpad.org",
     "access": 0
   },
   {
-    "url_icon": null,
+    "url_icon": "gitlab.svg",
     "fa_icon": "fab fa-gitlab",
     "name": "GitLab",
-    "description": "Code hosting on steroids. Open to all but only a <a href=\"https://feneas.org/membership/\">member</a> will be able to enjoy all the features of the <a href=\"https://about.gitlab.com/pricing/self-managed/feature-comparison/\">premium instance</a> (License provided by GitLab Inc <i class=\"fas fa-heart text-danger\"></i>) of ours.",
+    "description": "Code hosting on steroids. Open to all but only a member will be able to enjoy all the features of our premium instance (License provided by GitLab Inc <3).",
+    "register_url": "https://git.feneas.org",
+    "url": "https://about.gitlab.com",
     "access": 1
   },
   {
-    "url_icon": null,
+    "url_icon": "nextcloud.svg",
     "fa_icon": "fas fa-cloud",
     "name": "Nextcloud",
-    "description": "Federated file hosting, calendar, tasks, contacts and more. <a href=\"https://feneas.org/membership/\">Members</a> only. Log in at <href=\"https://cloud.feneas.org\">cloud.feneas.org</a> using member LDAP credentials.",
+    "description": "Federated file hosting, calendar, tasks, contacts and more!",
+    "register_url": "https://cloud.feneas.org",
+    "url": "https://nextcloud.com",
     "access": 2
   },
   {
-    "url_icon": null,
+    "url_icon": "collabora.png",
     "fa_icon": "fas fa-cloud",
     "name": "Collabora",
-    "description": "Provides you the powerful on-premise office suites, that enable you to access documents, author new content and work collaboratively. Log in at <href=\"https://cloud.feneas.org\">cloud.feneas.org</a> using member LDAP credentials.",
+    "description": "Provides you the powerful on-premise office suites, that enable you to access documents, author new content and work collaboratively.",
+    "register_url": "https://cloud.feneas.org",
+    "url": "https://nextcloud.com/collaboraonline",
     "access": 2
   },
   {
-    "url_icon": null,
+    "url_icon": "discourse.svg",
     "fa_icon": "fas fa-comment-alt",
     "name": "Discourse",
-    "description": "Forum for discussion about anything related to the federated world. Register at <a href=\"https://talk.feneas.org\">talk.feneas.org</a>. Members can log in via their LDAP credentials.",
+    "description": "Forum for discussion about anything related to the federated world. Members can log in via their LDAP credentials.",
+    "register_url": "https://talk.feneas.org",
+    "url": "https://www.discourse.org",
     "access": 0
   },
   {
-    "url_icon": null,
+    "url_icon": "wedistribute.png",
     "fa_icon": "fas fa-file-alt",
     "name": "WeDistribute",
-    "description": "WeDistribute is a publication service dedicated to Free Software, decentralized communication technologies, and sustainability. This service is developed to broadcast news to the Fediverse and other parts of the Free Network. <a href=\"https://wedistribute.org/\">Visit the blog</a> it doesn't require any kind of registration.. it's free :)",
+    "description": "WeDistribute is a publication service dedicated to Free Software, decentralized communication technologies, and sustainability. This service is developed to broadcast news to the Fediverse and other parts of the Free Network. Visit the blog it doesn't require any kind of registration.. it's free :)",
+    "register_url": "https://wedistribute.org",
+    "url": null,
     "access": 0
   }
 ]

templates/header.html.tmpl

@@ -11,8 +11,6 @@
 
     <link rel="stylesheet" type="text/css" href="https://feneas.org/assets/built/screen.css" />
     <link rel="stylesheet" media="all" href="https://feneas.org/assets/built/share-connect-support.css">
-    <!-- Font Awesome CSS -->
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.2/css/all.css" integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" crossorigin="anonymous">
   </head>
   <body class="post-template tag-feneas tag-meetings">
   <div class="site-wrapper">
@@ -24,7 +22,6 @@
             <ul class="nav" role="menu">
               <li class="nav-home" role="menuitem"><a href="https://feneas.org">Back to blog</a></li>
               <li class="nav-mission" role="menuitem"><a href="index.html">Documents</a></li>
-              <li class="nav-membership" role="menuitem"><a href="services.html">Services</a></li>
             </ul>
           </div>
           <div class="site-nav-right">

templates/services.html.tmpl

-{{set . "title" "Service Comparison"}}
-{{template "header" .}}
-
-<section class="post-full-content">
-  <table>
-    <thead>
-      <tr>
-          <th>Service</th>
-          <th>Non-Member</th>
-          <th>Member</th>
-          <th>Description</th>
-      </tr>
-    </thead>
-    <tbody>
-      {{range .JSON}}
-      <tr>
-          <th style="white-space:nowrap;">
-            {{- if .url_icon}}
-            <img style="max-width:100%;" src="{{.url_icon}}" alt="{{.url_icon}}" />
-            {{- else}}
-            {{- if .fa_icon}}
-            <i class="{{.fa_icon}}"></i>
-            {{- end}}
-            {{- end}} <b>{{.name}}</b>
-          </th>
-          <td style="text-align:center;">
-            {{- $level := toint .access}}
-            {{- if eq $level 0}}
-            <i class="fas fa-check-circle" style="color:#28a745;"></i>
-            {{- end}}
-            {{- if eq $level 1}}
-            <i class="fas fa-minus-circle"></i>
-            {{- end}}
-            {{- if eq $level 2}}
-            <i class="fas fa-times-circle" style="color:#dc3545;"></i>
-            {{- end}}
-          </td>
-          <td style="text-align:center;">
-            <i class="fas fa-check-circle text-success" style="color:#28a745;"></i>
-          </td>
-          <td style="white-space:normal;">{{raw .description}}</td>
-      </tr>
-      {{end}}
-    </tbody>
-  </table>
-  <p>We will extend this list in future! We want to provide many services but we need your help.</p>
-  <p>
-    Become a <a href="https://feneas.org/membership">member</a>,
-    a supporter on <a href="https://www.patreon.com/feneas">Patreon</a>
-    or buy some cool swag from our <a href="https://holvi.com/shop/feneas/">shop</a>
-    so that we can bring more federated and decentralized instances up.
-  </p>
-  <p>
-    <a href="https://www.patreon.com/bePatron?u=22141851" data-patreon-widget-type="become-patron-button">Become a Patron!</a><script async src="https://c6.patreon.com/becomePatronButton.bundle.js"></script>
-  </p>
-</section>
-
-{{template "footer" .}}