diff --git a/app/Http/routes.php b/app/Http/routes.php
index b40e811442ad0ff240db7e1ec7a734458a201106..52fdfa0033cc7735a8c3efcbd82f2dd46c23725a 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -38,6 +38,15 @@
return view('team.pubkey-wsb')
->with('title', 'Team');
});
+
+ Route::get('kontakt', function()
+ {
+ return view('kontakt.kontakt')
+ ->with('title', 'Kontakt')
+ ->with('css', 'kontakt.css')
+ ->with('js', ['openpgp.min.js','kontakt.js']);
+ });
+ Route::post('kontakt', 'MailController@contactMail');
});
diff --git a/composer.json b/composer.json
index d9d715e8d990a994ab9d4dfbf9c62dc89b8791d1..e28012140e3b96dce66d14c59e10eaa1c13545ca 100644
--- a/composer.json
+++ b/composer.json
@@ -7,7 +7,8 @@
"require": {
"php": ">=5.5.9",
"laravel/framework": "5.2.*",
- "mcamara/laravel-localization": "^1.1"
+ "mcamara/laravel-localization": "^1.1",
+ "guzzlehttp/guzzle": "^6.2"
},
"require-dev": {
"fzaninotto/faker": "~1.4",
diff --git a/composer.lock b/composer.lock
index 1ba4b8deb0e33cd47a26ec396bfb53c0f2231f8f..10a4602d231b68a5a66f42cdeff02b830e19fa1a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "ae0e551aa39df220a04748f0adc554b9",
- "content-hash": "456deaed864467045ee5a98a26b13260",
+ "hash": "78c5a9e749a72f3904e42c8e327605d9",
+ "content-hash": "0c9fdb698d482f8c9df582568e514b26",
"packages": [
{
"name": "classpreloader/classpreloader",
@@ -161,6 +161,177 @@
],
"time": "2015-11-06 14:35:42"
},
+ {
+ "name": "guzzlehttp/guzzle",
+ "version": "6.2.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/guzzle/guzzle.git",
+ "reference": "d094e337976dff9d8e2424e8485872194e768662"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/guzzle/guzzle/zipball/d094e337976dff9d8e2424e8485872194e768662",
+ "reference": "d094e337976dff9d8e2424e8485872194e768662",
+ "shasum": ""
+ },
+ "require": {
+ "guzzlehttp/promises": "~1.0",
+ "guzzlehttp/psr7": "~1.1",
+ "php": ">=5.5.0"
+ },
+ "require-dev": {
+ "ext-curl": "*",
+ "phpunit/phpunit": "~4.0",
+ "psr/log": "~1.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "6.2-dev"
+ }
+ },
+ "autoload": {
+ "files": [
+ "src/functions_include.php"
+ ],
+ "psr-4": {
+ "GuzzleHttp\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Michael Dowling",
+ "email": "mtdowling@gmail.com",
+ "homepage": "https://github.com/mtdowling"
+ }
+ ],
+ "description": "Guzzle is a PHP HTTP client library",
+ "homepage": "http://guzzlephp.org/",
+ "keywords": [
+ "client",
+ "curl",
+ "framework",
+ "http",
+ "http client",
+ "rest",
+ "web service"
+ ],
+ "time": "2016-03-21 20:02:09"
+ },
+ {
+ "name": "guzzlehttp/promises",
+ "version": "1.1.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/guzzle/promises.git",
+ "reference": "bb9024c526b22f3fe6ae55a561fd70653d470aa8"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/guzzle/promises/zipball/bb9024c526b22f3fe6ae55a561fd70653d470aa8",
+ "reference": "bb9024c526b22f3fe6ae55a561fd70653d470aa8",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.5.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "~4.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "GuzzleHttp\\Promise\\": "src/"
+ },
+ "files": [
+ "src/functions_include.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Michael Dowling",
+ "email": "mtdowling@gmail.com",
+ "homepage": "https://github.com/mtdowling"
+ }
+ ],
+ "description": "Guzzle promises library",
+ "keywords": [
+ "promise"
+ ],
+ "time": "2016-03-08 01:15:46"
+ },
+ {
+ "name": "guzzlehttp/psr7",
+ "version": "1.3.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/guzzle/psr7.git",
+ "reference": "31382fef2889136415751badebbd1cb022a4ed72"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/guzzle/psr7/zipball/31382fef2889136415751badebbd1cb022a4ed72",
+ "reference": "31382fef2889136415751badebbd1cb022a4ed72",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.4.0",
+ "psr/http-message": "~1.0"
+ },
+ "provide": {
+ "psr/http-message-implementation": "1.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "~4.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "GuzzleHttp\\Psr7\\": "src/"
+ },
+ "files": [
+ "src/functions_include.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Michael Dowling",
+ "email": "mtdowling@gmail.com",
+ "homepage": "https://github.com/mtdowling"
+ }
+ ],
+ "description": "PSR-7 message implementation",
+ "keywords": [
+ "http",
+ "message",
+ "stream",
+ "uri"
+ ],
+ "time": "2016-04-13 19:56:01"
+ },
{
"name": "jakub-onderka/php-console-color",
"version": "0.1",
@@ -834,6 +1005,55 @@
],
"time": "2016-03-18 20:34:03"
},
+ {
+ "name": "psr/http-message",
+ "version": "1.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-fig/http-message.git",
+ "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-fig/http-message/zipball/85d63699f0dbedb190bbd4b0d2b9dc707ea4c298",
+ "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Psr\\Http\\Message\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "PHP-FIG",
+ "homepage": "http://www.php-fig.org/"
+ }
+ ],
+ "description": "Common interface for HTTP messages",
+ "keywords": [
+ "http",
+ "http-message",
+ "psr",
+ "psr-7",
+ "request",
+ "response"
+ ],
+ "time": "2015-05-04 20:22:00"
+ },
{
"name": "psr/log",
"version": "1.0.0",
diff --git a/resources/views/kontakt.blade.php b/resources/views/kontakt.blade.php
deleted file mode 100644
index cc67628647cd44c1c8ba28634250cd385a1bacbe..0000000000000000000000000000000000000000
--- a/resources/views/kontakt.blade.php
+++ /dev/null
@@ -1,135 +0,0 @@
-@extends('layouts.subPages')
-
-@section('title', $title )
-
-@section('content')
-<h1>Kontakt
-</h1>
-<h2>Forum
-</h2>
-<p>
- <span class="bold">Bitte stellen Sie Ihre Frage zuerst in unserem
- <a href="http://forum.suma-ev.de/" target="_blank">Forum.
- </a>
- </span>
- <span>So können auch andere von einer Antwort profitieren.
- </span>
-</p>
-<p>
- <a href="" target="_blank">
- </a>
-</p>
-<h2>Sicheres Kontakformular
-</h2>
-<p>Über dieses Formular können Sie uns verschlüsselt kontaktieren.
- Alternativ können Sie uns natürlich auch per
- <a href="mailto:office@suma-ev.de">email
- </a> erreichen.
-</p>
-<p>Beachten Sie: Aufgrund der Vielzahl der Anfragen sind wir personell nicht immer in der Lage, alles zeitnah zu beantworten.
-</p>
-<p class="bold">Wenn Sie keine email-Adresse angeben, können wir Ihnen nicht antworten.
-</p>
-<form class="contact" name="contact" method="post" action="senden.php">
- <div class="form-group">
- <input class="form-control" name="email" placeholder="Ihre e-mail-Adresse (optional)" type="text">
- </div>
- <div class="form-group">
- <textarea class="form-control" id="message" name="message" placeholder="Ihre Nachricht">
- </textarea>
- </div>
- <div class="form-group">
- <p>
- <span class="bold">Ihre Nachricht wird vor dem Absenden mit
- <a href="http://openpgpjs.org/.">OpenPGP.js
- </a> verschlüsselt. Dafür wird Javascript benötigt.
- </span>
- <span>Falls Sie Javascript deaktiviert haben, wird Ihre Eingabe unverschlüsselt gesendet.
- </span>
- </p>
- <button title="" data-original-title="" class="btn btn-default" type="submit">Verschlüsseln und senden
- </button>
- </div>
-</form>
-<h2>Per E-Mail
-</h2>
-<p>Sie können uns auch direkt eine e-mail an die folgende Adresse schicken:
- <a href="mailto:office@suma-ev.de">office@suma-ev.de
- </a>Falls Sie diese verschlüsseln wollen, finden Sie nachfolgend unseren öffentlichen OpenPGP-Schlüssel:
-</p>
-<code id="pubkey">-----BEGIN PGP PUBLIC KEY BLOCK-----
- Version: GnuPG v1
- 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
- =LZAA
- -----END PGP PUBLIC KEY BLOCK-----
-</code>
-<h2>Per Brief-Post
-</h2>
-<p>Wir ziehen es vor, auf digitalem Wege kontaktiert zu werden.
- Wenn Sie jedoch eine postalische Kontaktaufnahme als unbedingt nötig erachten,
- erreichen Sie uns unter der folgenden Addresse:
-</p>
-<adress>SUMA-EV
- Röselerstr. 3
- 30159 Hannover
- Germany
-</adress>
-
-@endsection
\ No newline at end of file
diff --git a/resources/views/layouts/staticPages.blade.php b/resources/views/layouts/staticPages.blade.php
index 174f9abb40b00ad5334fd775e054532e829641ae..e3dcf69881b764bf16ae92aecee76d3c07b07dab 100644
--- a/resources/views/layouts/staticPages.blade.php
+++ b/resources/views/layouts/staticPages.blade.php
@@ -130,9 +130,16 @@
</div>
</nav>
</header>
+
<div class="wrapper">
<main class="mg-panel container">
- @yield('content')
+ @if (isset($success))
+ <div class="alert alert-success" role="alert">{{ $success }}</div>
+ @endif
+ @if (isset($error))
+ <div class="alert alert-danger" role="alert">{{ $error }}</div>
+ @endif
+ @yield('content')
</main>
<footer>
<ul class="list-inline hidden-xs">
@@ -157,6 +164,9 @@
<script type="text/javascript" src="/js/jquery.js"></script>
<script type="text/javascript" src="/js/bootstrap.js"></script>
<script type="text/javascript" src="/js/scriptStartPage.js"></script>
+ @foreach ($js as $script)
+ <script type="text/javascript" src="/js/{{ $script }}"></script>
+ @endforeach
<!--[if lte IE 8]><script type="text/javascript" src="/js/html5shiv.min.js"></script><![endif]-->
</body>
</html>
\ No newline at end of file