Skip to content
Snippets Groups Projects
Commit b90f9395 authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

fixed styleing and added asso key

parent 53a4363f
No related branches found
No related tags found
3 merge requests!1895Development,!1874Development,!1840Resolve "Fix Assoziator"
......@@ -14,7 +14,14 @@ class Assoziator extends Controller
return redirect(LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), '/asso'));
}
$url = "https://metager.de/meta/meta.ger3?eingabe=" . urlencode($eingabe) . "&out=atom10&key=" . env('ASSO_KEY', 'test');
$params = [
"eingabe" => $eingabe,
"out" => "atom10",
"key" => env("ASSO_KEY", "test"),
];
$url = "https://metager.de/meta/meta.ger3?" . http_build_query($params, "", "&", PHP_QUERY_RFC3986);
$ch = curl_init();
......@@ -115,8 +122,9 @@ class Assoziator extends Controller
->with('navbarFocus', 'dienste')
->with('words', $words)
->with('keywords', $eingabe)
->with('wordCount', $wordCount);
->with('wordCount', $wordCount)
->with('css', [mix('css/asso/style.css')])
->with('darkcss', [mix('css/asso/dark.css')]);;
die(var_dump($words));
}
}
.reasso {
color: #fd8307;
}
tr:nth-child(odd){
background-color: #333030;
}
\ No newline at end of file
table {
width: 100%;
}
table > tbody > tr {
text-align: center;
}
tr:nth-child(odd){
background-color: #dbd8d8;
}
form div.input-group-addon button {
padding: 9px;
}
.reasso {
color: #06C;
font-size: 1.3rem;
cursor: pointer;
}
.reasso:hover {
color: red;
}
td.association {
display: flex;
align-items: center;
margin-left: 8px;
padding: 8px;
}
.asso-search-link {
margin-right: 10px;
}
\ No newline at end of file
......@@ -3,25 +3,6 @@
@section('title', $title )
@section('content')
<style>
form div.input-group-addon button {
padding: 9px;
}
.reasso {
color: rgb(0, 102, 204);
}
.reasso:hover {
color: red;
}
td.association {
display: flex;
}
.asso-search-link {
margin-right: 10px;
}
</style>
<h1 class="page-title">{{ trans('asso.head.1') }}</h1>
<div class="card-heavy">
<p>{{ trans('asso.1.1') }} <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), '/datenschutz') }}" target="_blank">{{ trans('asso.1.2') }}</a>{{ trans('asso.1.3') }}.</p>
......
......@@ -38,7 +38,9 @@ Route::group(
Route::get('asso', function () {
return view('assoziator.asso')
->with('title', trans('titles.asso'))
->with('navbarFocus', 'dienste');
->with('navbarFocus', 'dienste')
->with('css', [mix('css/asso/style.css')])
->with('darkcss', [mix('css/asso/dark.css')]);
});
Route::post('asso', 'Assoziator@asso')->middleware('browserverification:true', 'humanverification:true');
......
......@@ -55,6 +55,12 @@ mix
.less("resources/less/metager/pages/count/style.less", "public/css/count/style.css", {
strictMath: true
})
.less("resources/less/metager/pages/asso/style-dark.less", "public/css/asso/dark.css", {
strictMath: true
})
.less("resources/less/metager/pages/asso/style.less", "public/css/asso/style.css", {
strictMath: true
})
.less("resources/less/metager/pages/spende/danke.less", "public/css/spende/danke.css", {
strictMath: true
})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment