Moved directory articles into data (one top-level directory less)

README.md

@@ -68,7 +68,7 @@ Build a release zip:
 1. Build the project (see above).
 2. Copy the contents of the `dist` directory to your webspace.
 3. Create a `config.xml` (copy and adjust the example).
-4. Give write permissions to the server for directories `articles` and `data`.
+4. Give write permissions to the server for the directory `data` (including subdirectories and files).
 
 
 

src/Gruntfile.js

@@ -39,10 +39,9 @@ module.exports = function (grunt) {
         files: [
           { src: '.htaccess', dest: dist + '/' },
           { expand: true, src: '*.php', dest: dist + '/' },
-          { expand: true, src: 'articles/**', dest: dist + '/' },
-          { src: 'data/dummy.txt', dest: dist + '/' },
           { expand: true, src: 'client/img/**', dest: dist + '/' },
           { expand: true, src: 'client/libs/prism/components/*.min.js', dest: dist + '/' },
+          { expand: true, src: 'data/articles/**', dest: dist + '/' },
           { expand: true, src: 'server/**', dest: dist + '/' }
         ]
       }
@@ -86,7 +85,7 @@ module.exports = function (grunt) {
           {
             expand: true,
             cwd: dist,
-            src: [ '.htaccess', 'config-example.php', 'index.php', 'articles/**', 'client/**', 'data/dummy.txt', 'server/**' ],
+            src: [ '.htaccess', 'config-example.php', 'index.php', 'client/**', 'data/articles/**', 'server/**' ],
             dest: 'slim-wiki/'
           }
         ]

src/data/articles/index.md

@@ -23,10 +23,10 @@ Requirements:
 
 Installation:
 
-1. [Download](https://github.com/til-schneider/slim-wiki/releases/latest) the latest version.
-2. Extract the archive and put the contents on your webspace.
+1. [Download](https://github.com/til-schneider/slim-wiki/releases/latest) the latest `slim-wiki.zip`.
+2. Extract the zip and put the contents on your webspace.
 3. Create a `config.xml` (copy and adjust the example).
-4. Give write permissions to the server for directories `articles` and `data`.
+4. Give write permissions to the server for the directory `data` (including subdirectories and files).
 
 
 

src/data/dummy.txt

@@ -1,2 +0,0 @@
-This is a dummy used to add the data directory to git.
-You can delete this file.

src/server/logic/Context.php

@@ -15,8 +15,8 @@ class Context {
     public function __construct() {
         $appBaseDir = realpath(__DIR__ . '/../../');
 
-        $this->articleBaseDir = $appBaseDir . '/articles/';
         $this->dataBaseDir = $appBaseDir . '/data/';
+        $this->articleBaseDir = $this->dataBaseDir . 'articles/';
     }
 
     public function getConfig() {