Merge branch 'fix/20' into 'master'

Update contact details in footer and improve deployment

Closes #21 and #20

See merge request !1

.gitmodules

@@ -3,8 +3,7 @@
 	url = git@lab.allmende.io:ecobytes/commons/hugo-theme-ecoprey.git
 [submodule "public"]
 	path = public
-	url = git@lab.allmende.io:degrowth/degrowth.net.git
-	branch = public
+	url = dokku@apps.allmende.io:degrowth.net
 [submodule "assets/icons"]
 	path = content/icons
 	url = git@lab.allmende.io:allmende/software-iconography.git

README.md

@@ -4,27 +4,33 @@ This is the source code for the Degrowth.net landing page.
 
 ## Dependencies
 
-- Hugo Extended
-  i.e. as a Snap package https://gohugo.io/getting-started/installing/#linux
-- Node.js, ideally via nvm.sh
-- PostCSS
-  `npm install`
+- [Hugo Extended](https://gohugo.io/getting-started/installing/#linux)
+- Node.js, ideally via [nvm.sh](http://nvm.sh)
+- PostCSS, available after `npm install`
 
 ## Submodules
 
+This repository uses three submodules:
+
+- [`content/icons`](https://lab.allmende.io/allmende/software-iconography)
+- `public` which links with the live website at https://degrowth.net
+- [`themes/ecoprey`](https://lab.allmende.io/ecobytes/commons/hugo-theme-ecoprey)
+
+Run these commands to update metadata and retrieve contents.
+
 ```
 git submodule sync
 git submodule update --init --recursive --remote
 ```
 
-## Dokku Deployment
+These two steps are also neccessary, if an update to the `.gitmodules` occurs.
+
+## Deployment
 
-Initiatilise the Dokku application
+To deploy the site to the default location, issue:
 
 ```
-cd public
-git remote add dokku dokku@apps.allmende.io:degrowth.net
-cd -
+./deploy
 ```
 
 ## Authors

config.toml

@@ -8,7 +8,7 @@ disableKinds = ["taxonomy", "taxonomyTerm"]
 [Params]
     description = "information and communication networks for degrowth"
     author = "Degrowth Group Assembly for Communication and Networking"
-    email = "communication@agora.degrowth.net"
+    email = "communication@groups.degrowth.net"
 
     favicon = "favicon.ico" # expects *.ico
     logo = "images/snail.svg" # expects *.svg
@@ -19,7 +19,7 @@ disableKinds = ["taxonomy", "taxonomyTerm"]
     credit = true
     ajaxFormspree = false
 
-    riot = "#degrowth:matrix.allmende.io"
+    chat = "#welcome:degrowth.net"
     gitlab = "degrowth"
     twitter = "R_Degrowth"
 

content/tools/chat.md

@@ -4,7 +4,6 @@ date = 2018-09-01T01:53:12+02:00
 icon = "exchange"
 alt = ""
 color = ""
-link1 = ""
-link2 = ""
-soon = true
+link1 = "https://chat.degrowth.net/#/room/#welcome:degrowth.net"
+link2 = "https://learn.degrowth.net/tools/chat/"
 +++

content/welcome.md

@@ -8,4 +8,4 @@ You have arrived in the degrowth network.
 
 Below you find information and communication tools.
 
-Jump into **[#degrowth](https://riot.allmende.io/#/room/#degrowth:matrix.allmende.io)** if you have any questions.
+Join **[#welcome:degrowth.net](https://chat.degrowth.net/#/room/#welcome:degrowth.net)** for direct exchange.

deploy

@@ -12,7 +12,10 @@ git add .
 git commit -m "pre $msg"
 
 # Build the project.
-cd public && git checkout public && cd -
+cd public
+git checkout master
+cd -
+
 rm -rf public/*
 hugo # if using a theme, replace with `hugo -t <YOURTHEME>`
 
@@ -24,8 +27,8 @@ git add .
 git commit -m "$msg"
 
 # Push source and build repos.
-git push origin public 
-git push dokku public:master
+git push
+
 # Come Back up to the Project Root
 cd ..
 

public @ f923565a

-Subproject commit 5132480eb96d3a6757338431f344abe8cc386fb3
+Subproject commit f923565ad8331c10dc2dcd27373ea9f9d30a4fd6

ecoprey @ 791c1684

-Subproject commit b1eb84bc0face51b2f7d08ea9b1c45a2d31279a6
+Subproject commit 791c168461653ebe7fb6a0cf10aa67ddb7b1d683