Commit d8818a38 authored by Sebastian Mieruch's avatar Sebastian Mieruch
Browse files

update

parent 14787ebe
/db
/webodv/public/downloads/*
/webodv/storage/app/default/*
/webodv/node_modules/*
*~
/ODV
/settings
/odv_software
/ODV_Data
/ODV.zip
\ No newline at end of file
......@@ -11,6 +11,7 @@ return [
'emodnet_url' => getenv('emodnet_url'),
'explore_url' => getenv('explore_url'),
'awi_url' => getenv('awi_url'),
'set_auth' => true,
'home_url' => getenv('home_url'),
'mode' => '.min', //empty or '.min'
'copyrights' => 'webODV 2021',
......
......@@ -64,14 +64,15 @@ services:
# ODV bathy data
- ./ODV:/home/woody/Documents/ODV:rw
# data
- ./ODV_Data:/var/www/html/webodv/storage/app/default:rw
#- ./ODV_Data:/var/www/html/webodv/storage/app/default:rw
- /home/smieruch/Docker/odv_data/SeaView:/var/www/html/webodv/storage/app/default:rw
#- settings
- ./settings:/var/www/html/webodv/storage/app/settings/settings_webodv:rw
# init
- ./init.bash:/var/www/html/init.bash
#
# development: "xhost +" to tunnel X11 apps
#- ./webodv:/var/www/html/webodv:rw
- ./webodv:/var/www/html/webodv:rw
#- /home/smieruch/.Xauthority:/root/.Xauthority
#- /tmp/.X11-unix:/tmp/.X11-unix
#
......@@ -81,8 +82,8 @@ services:
settings_path: /var/www/html/webodv/storage/app/settings
path_to_odv_settings: settings_webodv
proxy_ws: webodv_ProxyPass.txt
REVERSE_PROXY: 0 #o or 1 for false and true
FORCE_SCHEME: http #see AppServiceProvider
REVERSE_PROXY: 1 #o or 1 for false and true
FORCE_SCHEME: https #see AppServiceProvider
FORCE_ROOT_URL: https://dev.webodv.awi.de
networks:
webodv-dev:
......
{
"datasetname": "BATS>BATS_bottle_data_1988-2016",
"header": "BATS>BATS_bottle_data_1988-2016.odv",
"path": "\/var\/www\/html\/webodv\/storage\/app\/default\/BATS\/BATS_bottle_data_1988-2016.odv",
"permission": "ReadOnly",
"disable_exports": "dummy",
"auto_shutdown": "-auto_shutdown",
"text": "",
"services": {
"Data Extraction": {
"disable_exports": "dummy",
"auto_shutdown": "-auto_shutdown"
},
"Data Exploration": {
"disable_exports": "dummy",
"auto_shutdown": "-auto_shutdown"
}
},
"services_texts": {
"Data Extraction": "The data extraction service provides fast and easy to use cruise, domain and variable selection functionality and download of different file formats (netcdf, odv, ASCII). More details in <a href=\"https:\/\/dev.webodv.awi.de\/documentation\/webodv-data-extractor-howto.pdf\" style=\"color:#0a71b4;\" target=\"_blank\">webodv-data-extractor-howto.pdf<\/a>.",
"Data Exploration": "The data exploration service allows <i>ODV-like<\/i> interactive analysis and visualization of the data. More information and HowTo descriptions of frequent tasks can be found in the <a href=\"https:\/\/dev.webodv.awi.de\/documentation\/odv-online-howto.pdf\" style=\"color:#0a71b4;\" target=\"_blank\">odv-online-howto.pdf<\/button><\/a> document. As easiest way to get started use <i>View > Load View<\/i> to activate one of the prepared views."
},
"extractor_info": {
"download_allowed": true,
"point_size": 0.5,
"dates": [
"01\/01\/1850",
"12\/31\/2021"
],
"default_koordinates": [
"-1e10",
"1e10",
"-1e10",
"1e10"
],
"mandatory_output_vars": [],
"default_output_vars": [],
"cruises": [],
"station_info_show": true,
"cruises_show": true,
"zoom_show": true,
"left_mouse_click_on_map": true,
"map_domain_show": true,
"date_show": true,
"required_variables_show": false,
"point_size_show": false,
"reset_show": true,
"outliers_show": true,
"default_x_visualization": 2,
"default_y_visualization": 1,
"depth_var_num": 1
},
"output_var_extra_text": ""
}
\ No newline at end of file
{
"datasetname": "HOT>bottle>HOT_bottle_data_1988-2008",
"header": "HOT>bottle>HOT_bottle_data_1988-2008.odv",
"path": "\/var\/www\/html\/webodv\/storage\/app\/default\/HOT\/bottle\/HOT_bottle_data_1988-2008.odv",
"permission": "ReadOnly",
"disable_exports": "dummy",
"auto_shutdown": "-auto_shutdown",
"text": "",
"services": {
"Data Extraction": {
"disable_exports": "dummy",
"auto_shutdown": "-auto_shutdown"
},
"Data Exploration": {
"disable_exports": "dummy",
"auto_shutdown": "-auto_shutdown"
}
},
"services_texts": {
"Data Extraction": "The data extraction service provides fast and easy to use cruise, domain and variable selection functionality and download of different file formats (netcdf, odv, ASCII). More details in <a href=\"https:\/\/dev.webodv.awi.de\/documentation\/webodv-data-extractor-howto.pdf\" style=\"color:#0a71b4;\" target=\"_blank\">webodv-data-extractor-howto.pdf<\/a>.",
"Data Exploration": "The data exploration service allows <i>ODV-like<\/i> interactive analysis and visualization of the data. More information and HowTo descriptions of frequent tasks can be found in the <a href=\"https:\/\/dev.webodv.awi.de\/documentation\/odv-online-howto.pdf\" style=\"color:#0a71b4;\" target=\"_blank\">odv-online-howto.pdf<\/button><\/a> document. As easiest way to get started use <i>View > Load View<\/i> to activate one of the prepared views."
},
"extractor_info": {
"download_allowed": true,
"point_size": 0.5,
"dates": [
"01\/01\/1850",
"12\/31\/2021"
],
"default_koordinates": [
"-1e10",
"1e10",
"-1e10",
"1e10"
],
"mandatory_output_vars": [],
"default_output_vars": [],
"cruises": [],
"station_info_show": true,
"cruises_show": true,
"zoom_show": true,
"left_mouse_click_on_map": true,
"map_domain_show": true,
"date_show": true,
"required_variables_show": false,
"point_size_show": false,
"reset_show": true,
"outliers_show": true,
"default_x_visualization": 2,
"default_y_visualization": 1,
"depth_var_num": 1
},
"output_var_extra_text": ""
}
\ No newline at end of file
<li><i class="fa fa-plus"></i> <label> <input id="var_0" data-id="0" type="checkbox" /> All</label><ul ><li ><label><input class="hummingbird-end-node" id="var_1" data-id="1" type="checkbox" /> Depth</label></li><li ><label><input class="hummingbird-end-node" id="var_2" data-id="2" type="checkbox" /> Cast Number</label></li><li ><label><input class="hummingbird-end-node" id="var_3" data-id="3" type="checkbox" /> Niskin Number</label></li><li ><label><input class="hummingbird-end-node" id="var_4" data-id="4" type="checkbox" /> Decimal Year</label></li><li ><label><input class="hummingbird-end-node" id="var_5" data-id="5" type="checkbox" /> Temperature ITS-90</label></li><li ><label><input class="hummingbird-end-node" id="var_6" data-id="6" type="checkbox" /> CTD Salinity</label></li><li ><label><input class="hummingbird-end-node" id="var_7" data-id="7" type="checkbox" /> Salinity-1</label></li><li ><label><input class="hummingbird-end-node" id="var_8" data-id="8" type="checkbox" /> Sigma-Theta</label></li><li ><label><input class="hummingbird-end-node" id="var_9" data-id="9" type="checkbox" /> Oxygen-1</label></li><li ><label><input class="hummingbird-end-node" id="var_10" data-id="10" type="checkbox" /> Oxygen Fix Temp</label></li><li ><label><input class="hummingbird-end-node" id="var_11" data-id="11" type="checkbox" /> Oxy Anomaly-1</label></li><li ><label><input class="hummingbird-end-node" id="var_12" data-id="12" type="checkbox" /> Dissolved Inorganic Carbon</label></li><li ><label><input class="hummingbird-end-node" id="var_13" data-id="13" type="checkbox" /> Alkalinity</label></li><li ><label><input class="hummingbird-end-node" id="var_14" data-id="14" type="checkbox" /> Nitrate+Nitrite-1</label></li><li ><label><input class="hummingbird-end-node" id="var_15" data-id="15" type="checkbox" /> Nitrite-1</label></li><li ><label><input class="hummingbird-end-node" id="var_16" data-id="16" type="checkbox" /> Phosphate-1</label></li><li ><label><input class="hummingbird-end-node" id="var_17" data-id="17" type="checkbox" /> Silicate-1</label></li><li ><label><input class="hummingbird-end-node" id="var_18" data-id="18" type="checkbox" /> POC</label></li><li ><label><input class="hummingbird-end-node" id="var_19" data-id="19" type="checkbox" /> PON</label></li><li ><label><input class="hummingbird-end-node" id="var_20" data-id="20" type="checkbox" /> TOC</label></li><li ><label><input class="hummingbird-end-node" id="var_21" data-id="21" type="checkbox" /> TN</label></li><li ><label><input class="hummingbird-end-node" id="var_22" data-id="22" type="checkbox" /> Bacteria enumeration</label></li><li ><label><input class="hummingbird-end-node" id="var_23" data-id="23" type="checkbox" /> POP</label></li><li ><label><input class="hummingbird-end-node" id="var_24" data-id="24" type="checkbox" /> Total dissolved Phosphorus</label></li><li ><label><input class="hummingbird-end-node" id="var_25" data-id="25" type="checkbox" /> Low-level phosphorus</label></li><li ><label><input class="hummingbird-end-node" id="var_26" data-id="26" type="checkbox" /> Particulate biogenic silica</label></li><li ><label><input class="hummingbird-end-node" id="var_27" data-id="27" type="checkbox" /> Particulate lithogenic silica</label></li><li ><label><input class="hummingbird-end-node" id="var_28" data-id="28" type="checkbox" /> Prochlorococcus</label></li><li ><label><input class="hummingbird-end-node" id="var_29" data-id="29" type="checkbox" /> Synechococcus</label></li><li ><label><input class="hummingbird-end-node" id="var_30" data-id="30" type="checkbox" /> Picoeukaryotes</label></li><li ><label><input class="hummingbird-end-node" id="var_31" data-id="31" type="checkbox" /> Nanoeukaryotes</label></li><li ><label><input class="hummingbird-end-node" id="var_32" data-id="32" type="checkbox" /> Chlorophyll c3</label></li><li ><label><input class="hummingbird-end-node" id="var_33" data-id="33" type="checkbox" /> Chlorophyllide_a</label></li><li ><label><input class="hummingbird-end-node" id="var_34" data-id="34" type="checkbox" /> Chlorophyll c1+c2</label></li><li ><label><input class="hummingbird-end-node" id="var_35" data-id="35" type="checkbox" /> Peridinin</label></li><li ><label><input class="hummingbird-end-node" id="var_36" data-id="36" type="checkbox" /> 19-Butanoyloxyfucoxanthin</label></li><li ><label><input class="hummingbird-end-node" id="var_37" data-id="37" type="checkbox" /> Fucoxanthin</label></li><li ><label><input class="hummingbird-end-node" id="var_38" data-id="38" type="checkbox" /> 19-Hexanoyloxyfucoxanthin</label></li><li ><label><input class="hummingbird-end-node" id="var_39" data-id="39" type="checkbox" /> Prasinoxanthin</label></li><li ><label><input class="hummingbird-end-node" id="var_40" data-id="40" type="checkbox" /> Diadinoxanthin</label></li><li ><label><input class="hummingbird-end-node" id="var_41" data-id="41" type="checkbox" /> Alloxanthin</label></li><li ><label><input class="hummingbird-end-node" id="var_42" data-id="42" type="checkbox" /> Diatoxanthin</label></li><li ><label><input class="hummingbird-end-node" id="var_43" data-id="43" type="checkbox" /> Zeaxanthin+lutein</label></li><li ><label><input class="hummingbird-end-node" id="var_44" data-id="44" type="checkbox" /> Chlorophyll b</label></li><li ><label><input class="hummingbird-end-node" id="var_45" data-id="45" type="checkbox" /> Chlorophyll a</label></li><li ><label><input class="hummingbird-end-node" id="var_46" data-id="46" type="checkbox" /> a+b Carotene</label></li><li ><label><input class="hummingbird-end-node" id="var_47" data-id="47" type="checkbox" /> Turner Chlorophyll_ a</label></li><li ><label><input class="hummingbird-end-node" id="var_48" data-id="48" type="checkbox" /> Turner Phaeopigments</label></li><li ><label><input class="hummingbird-end-node" id="var_49" data-id="49" type="checkbox" /> Lutein</label></li><li ><label><input class="hummingbird-end-node" id="var_50" data-id="50" type="checkbox" /> Zeaxanthin</label></li><li ><label><input class="hummingbird-end-node" id="var_51" data-id="51" type="checkbox" /> a-Carotene</label></li><li ><label><input class="hummingbird-end-node" id="var_52" data-id="52" type="checkbox" /> b-Carotene</label></li></ul></li>
\ No newline at end of file
<li><i class="fa fa-plus"></i> <label> <input id="var_0" data-id="0" type="checkbox" /> All</label><ul ><li ><label><input class="hummingbird-end-node" id="var_1" data-id="1" type="checkbox" /> Depth</label></li><li ><label><input class="hummingbird-end-node" id="var_2" data-id="2" type="checkbox" /> Temperature</label></li><li ><label><input class="hummingbird-end-node" id="var_3" data-id="3" type="checkbox" /> Salinity</label></li><li ><label><input class="hummingbird-end-node" id="var_4" data-id="4" type="checkbox" /> Oxygen</label></li><li ><label><input class="hummingbird-end-node" id="var_5" data-id="5" type="checkbox" /> Phosphate</label></li><li ><label><input class="hummingbird-end-node" id="var_6" data-id="6" type="checkbox" /> Silicate</label></li><li ><label><input class="hummingbird-end-node" id="var_7" data-id="7" type="checkbox" /> Nitrate</label></li><li ><label><input class="hummingbird-end-node" id="var_8" data-id="8" type="checkbox" /> pH</label></li><li ><label><input class="hummingbird-end-node" id="var_9" data-id="9" type="checkbox" /> Chlorophyll</label></li></ul></li>
\ No newline at end of file
......@@ -12,6 +12,6 @@ class VerifyCsrfToken extends Middleware
* @var array
*/
protected $except = [
//
'*',
];
}
......@@ -95,6 +95,10 @@ class create_hummingbird_treeview {
foreach ($odv_file as $value) {
//remove $.
$value = preg_replace('/\$./', '', $value);
//remove special chars
$value = preg_replace('/[~%&#*$^]/', '', $value);
/////////////////////////////////////////////////////
////////// cut out variables start
......
......@@ -18,8 +18,10 @@ trait trait_webodvextractor_download
//check auth
if (!Auth::check()){
return ["auth" => false];
if (config('webodv.set_auth')){
if (!Auth::check()){
return ["auth" => false];
}
}
/* Log::info(print_r($request->all(),1)); */
......@@ -95,7 +97,11 @@ trait trait_webodvextractor_download
Log::info(print_r($webodv_settings,1));
//get user
$email = Auth::user()->email;
if (Auth::check()){
$email = Auth::user()->email;
} else {
$email = Str::random(8)."@webodv.de";
}
//$email = "hallo@hallo.de";
$user = str_replace('@','.at.',$email);
$user = 'download_'.$user;
......
......@@ -11,6 +11,7 @@ return [
'emodnet_url' => getenv('emodnet_url'),
'explore_url' => getenv('explore_url'),
'awi_url' => getenv('awi_url'),
'set_auth' => true,
'home_url' => getenv('home_url'),
'mode' => '.min', //empty or '.min'
'copyrights' => 'webODV 2021',
......
......@@ -11,6 +11,7 @@ return [
'emodnet_url' => getenv('emodnet_url'),
'explore_url' => getenv('explore_url'),
'awi_url' => getenv('awi_url'),
'set_auth' => false,
'home_url' => getenv('home_url'),
'mode' => '', //empty or '.min'
'copyrights' => 'webODV 2021',
......
......@@ -65,6 +65,7 @@ $(document).ready(function() {
func: "create_treeview_from_folder_ajax",
error: function(data){
console.log("ERROR");
console.log(data)
},
success: function(data){
console.log("SUCCESS 123");
......
......@@ -95,6 +95,10 @@ class create_hummingbird_treeview {
foreach ($odv_file as $value) {
//remove $.
$value = preg_replace('/\$./', '', $value);
//remove special chars
$value = preg_replace('/[~%&#*$^]/', '', $value);
/////////////////////////////////////////////////////
////////// cut out variables start
......
......@@ -18,8 +18,10 @@ trait trait_webodvextractor_download
//check auth
if (!Auth::check()){
return ["auth" => false];
if (config('webodv.set_auth')){
if (!Auth::check()){
return ["auth" => false];
}
}
/* Log::info(print_r($request->all(),1)); */
......@@ -95,7 +97,11 @@ trait trait_webodvextractor_download
Log::info(print_r($webodv_settings,1));
//get user
$email = Auth::user()->email;
if (Auth::check()){
$email = Auth::user()->email;
} else {
$email = Str::random(8)."@webodv.de";
}
//$email = "hallo@hallo.de";
$user = str_replace('@','.at.',$email);
$user = 'download_'.$user;
......
......@@ -154,10 +154,12 @@
<li class="nav-item" style="" id="contact_li">
<a class="nav-link" href="#" id="contact_a" data-toggle="tooltip" data-placement="auto" title="Contact"><i class="fa fa-paper-plane-o help_color" style="font-size:20px;"></i></a>
</li>
@guest
@guest
@if (Route::has('login'))
<li class="nav-item">
<a class="nav-link" href="{{ route('login') }}">{{ __('Login') }}</a>
</li>
@endif
@if (Route::has('register'))
<li class="nav-item">
<a class="nav-link" href="{{ route('register') }}">{{ __('Register') }}</a>
......
......@@ -14,9 +14,17 @@
//Route::group(['middleware' => ['auth.basic.once']], function () {
//Route::group(['middleware' => ['web','header','auth']], function () {
Route::group(['middleware' => ['web','header','auth']], function () {
if (config('webodv.set_auth')){
$use_middleware = ['web','header','auth'];
} else {
$use_middleware = ['web','header'];
}
Route::group(['middleware' => $use_middleware], function () {
//stats
Route::get('/webodv/stats/get', 'webodv\webodvcore\WebodvcoreController@stats')->name('stats');
......
......@@ -19,7 +19,9 @@
//Route::get('/home', 'HomeController@index')->name('home');
Auth::routes();
if (config('webodv.set_auth')){
Auth::routes();
}
/* Auth::routes([ */
/* 'register' => false, */
/* 'login' => false, */
......
This diff is collapsed.
body {
/* font-family: 'Fira Sans',sans-serif; */
font-family: "Open Sans", arial, helvetica, sans-serif;
}
.py-4{
background-color: rgb(250,250,250);
}
.navbar {
background-color: #2f7bad !important;
border-style: none;
/* border-width: 1px; */
/* border-color: #ccc; */
/* color: white !important; */
/* background-color: #b4b4b4; */
/* height: 40px; */
/* min-height: 40px; */
}
.top_nav_link{
color:rgb(220,220,220);
}
.top_nav_link:hover{
color:rgb(220,220,220);
}
.nav-item,.nav-link,.navbar-brand {
color: white !important;
}
.nav-link:hover {
text-decoration: underline !important;
}
h4 {
color:#012E58;
}
.text-emodnet-dark-blue {
color:#012E58;
}
.text-emodnet-light-blue {
/* color:#61aadf; */
}
.text-emodnet-orange {
color:#f8b334!important;
}
.emodnet-orange-border {
/* border-color:#f8b334!important; */
/* border-width:1px!important; */
/* text-transform: uppercase; */
}
.emodnet-orange-border:hover {
/* background-color:black!important; */
background-color:#1e6482!important;
color:#c8f0f0!important;
}
.emodnet-func-dark-blue {
/* background-color:#1e6482; */
background-color:#264755;
border-style:solid;
/* border-radius:0.25rem; */
border-color:#264755;
border-width:1px;
font-size:16px;
color:#ffffff;
/* color:#012E58; */
text-transform: uppercase;
}
.emodnet-func-dark {
background-color:#333333;
border-style:solid;
border-width:1px;
font-size: 16px;
color:white;
margin: 0px;
text-transform: uppercase;
font-weight:bold;
}
.btn-emodnet-grey:hover {
/* background-color:black!important; */
background-color:a0a0a0!important;
color:#f2f2f2!important;
}
.emodnet-func-orange {
/* background-color:#c8f0f0; */
background-color:#cfd1d0;
border-style:solid;
/* border-radius:0.25rem; */
border-color:#cfd1d0;
border-width:1px;
font-size:16px;
/* color:rgb(100,100,100); */
margin: 0px;
text-transform: uppercase;
}
.bottom-three {
margin-bottom: 5px;
}
.bg-left{
background-color:#ecf2f6;
}
.bg-right{
background-color:#ecf2f6;
}
.bg-center{
background-color:rgb(240,240,240);
}
.py-4{
padding-bottom:0px !important;
}
.dropdown-menu{
border:solid;
}
.loading_snippet {
/* position:relative; */
/* left:0; */
/* right:0; */
/* margin-left:auto; */
/* width:300px; */
/* margin-right:auto; */
/* z-index:5; */
margin: auto;
position: absolute;
top: 50px; left: 50px;
width:300px;
height:60px;
bottom: 50px; right: 50px;
z-index:5;
text-align: center;
border: 3px solid rgb(170, 170, 170);
background-color:white;
color: #00000;
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment