Merge pull request #25 from chk1/beta

Campusplan 2.0 AngularJS rewrite
ifgi-webteam · Jun 2, 2015 · d47afa8 · d47afa8
2 parents 132d248 + 6e285e4
commit d47afa8
Show file tree

Hide file tree

Showing 263 changed files with 15,490 additions and 13,813 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,9 @@
-cache/
+api/cache/*
 piwik/
 routes/
 tiles/
+bower_components/
+node_modules/
+coverage/
 piwik.php
 keys.php
diff --git a/.htaccess b/.htaccess
@@ -1,3 +1,9 @@
-AddDefaultCharset UTF-8
 RewriteEngine on
-RewriteRule ^tiles/([0-9]+)/([0-9]+)/([0-9]+).png$ tiles.php?z=$1&x=$2&y=$3 [L]
+
+RewriteRule ^piwik - [L,NC]
+# Don't rewrite files or directories
+RewriteCond %{REQUEST_FILENAME} -f [OR]
+RewriteCond %{REQUEST_FILENAME} -d
+RewriteRule ^ - [L]
+# Rewrite everything else to index.html to allow html5 state links
+RewriteRule ^ index.html [L]
diff --git a/INSTALL.md b/INSTALL.md
diff --git a/Icons/Fachbereiche.pdf b/Icons/Fachbereiche.pdf
diff --git a/Icons/Favoriten.pdf b/Icons/Favoriten.pdf
diff --git a/Icons/Hörsäle.pdf b/Icons/Hörsäle.pdf
diff --git a/Icons/Info.pdf b/Icons/Info.pdf
diff --git a/Icons/Karte.pdf b/Icons/Karte.pdf
diff --git a/Icons/Loader-big.psd b/Icons/Loader-big.psd
diff --git a/Icons/Loader-grey.psd b/Icons/Loader-grey.psd
diff --git a/Icons/Loader.psd b/Icons/Loader.psd
diff --git a/Icons/Mensen.pdf b/Icons/Mensen.pdf
diff --git a/Icons/ULB-Katalog.pdf b/Icons/ULB-Katalog.pdf
diff --git a/Icons/Uni A-Z.pdf b/Icons/Uni A-Z.pdf
diff --git a/Icons/WWU Logo weiss.pdf b/Icons/WWU Logo weiss.pdf
diff --git a/Icons/WWU Logo.pdf b/Icons/WWU Logo.pdf
diff --git a/Icons/Wohnheime.pdf b/Icons/Wohnheime.pdf
diff --git a/Icons/start-icon.pdf b/Icons/start-icon.pdf
diff --git a/README.md b/README.md
@@ -1,3 +1,29 @@
 # WWU Campus Plan App 
 
-This is a web app version of a the **Campus Plan App** developed by the [University of Münster](http://www.uni-muenster.de/). The goal of this web app is to subsequently replace the existing native versions for [iOS](http://itunes.apple.com/de/app/wwu-campus-plan/id474030032?mt=8) and [Android](https://play.google.com/store/apps/details?id=ifgi.android) in order to reduce the maintenance effort to one code base.
+This is a web app version of a the **Campus Plan App** developed by the [University of Münster](http://www.uni-muenster.de/). The goal of this web app is to subsequently replace the existing native versions for [iOS](http://itunes.apple.com/de/app/wwu-campus-plan/id474030032?mt=8) and [Android](https://play.google.com/store/apps/details?id=ifgi.android) in order to reduce the maintenance effort to one code base.
+
+![Screenshot](screenshot.png)
+
+## Installation
+
+### Requirements
+
+* Apache Webserver
+	* mod_rewrite enabled
+* NGINX works too, see [configuration example](https://gist.github.com/chk1/d8149378fcea2cf72778)
+* PHP 5.x
+* bower
+
+### Installation
+
+1. Clone the repository into your webserver htdocs
+2. Configure your webserver to redirect requests to `index.html`
+2. Run ```bower update``` to install the JS libraries and CSS files
+3. Create the directory ```api/cache``` and give your webserver read/write access: ```chmod www-data:www-data api/cache/```
+
+## Attributions
+
+* Map icons `img/awesomemarkers-*.png` derived from the [Awesome Markers](https://github.com/lvoogdt/Leaflet.awesome-markers) project (MIT license)
+* Navigation & menu icons from [Iconmonstr](http://iconmonstr.com/) (Creative Commons license) and [The Noun Project](http://thenounproject.com/) (Public Domain)
+* [Weather icons](http://erikflowers.github.io/weather-icons/) (`fonts/weathericons*`) by Lukas Bischoff & Erik Flowers (SIL Open Font License 1.1 & MIT License)
+* [Signika font](http://www.google.com/fonts/specimen/Signika) by Anna Giedryś (SIL Open Font License 1.1)
diff --git a/api/fachbereiche.php b/api/fachbereiche.php
@@ -0,0 +1,3 @@
+<?php
+include("functions.php");
+echo getFachbereiche();