geolba/tethys
6
0
Fork 0
Code Issues 2 Pull Requests Packages Projects 1 Releases Wiki Activity

- Tethys heading

Browse Source 
- better tsconfig.json
- dashboard without php reports
This commit is contained in:
Arno Kaimbacher 2019-11-28 19:06:51 +01:00
parent e2c131edd1
commit 9d056b0b9f
7 changed files with 62 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/backend/publish/datasetPublish.js
View File

File diff suppressed because one or more lines are too long

7
public/css/style.css vendored
View File

@ -62,6 +62,13 @@ a {
width: 100%; width: 100%;
} }
.main-heading {
text-align: center;
font-weight: bold;
text-transform: uppercase;
color: inherit;
}
/* Separator */ /* Separator */
.separator { .separator {

4
resources/js/components/LocationsMap.vue
View File

@ -263,7 +263,7 @@ export default {
// https://github.com/vuejs-templates/webpack/issues/121 // https://github.com/vuejs-templates/webpack/issues/121
// npm install node-sass sass-loader --save-dev // npm install node-sass sass-loader --save-dev
<style lang="scss"> <style lang="scss">
// Import CSS from Leaflet and plugins. /* Import CSS from Leaflet and plugins.*/
@import "~leaflet/dist/leaflet.css"; @import "~leaflet/dist/leaflet.css";
@import "~leaflet-draw/dist/leaflet.draw.css"; @import "~leaflet-draw/dist/leaflet.draw.css";
@ -282,6 +282,6 @@ export default {
border: none; border: none;
width: 120px; width: 120px;
z-index: 999; z-index: 999;
// height: 120px; /*height: 120px;*/
} }
</style> </style>

8
resources/js/datasetPublish.js
View File

@ -63,7 +63,7 @@ Vue.use(VeeValidate, {
const STATUS_INITIAL = 0, STATUS_SAVING = 1, STATUS_SUCCESS = 2, STATUS_FAILED = 3; const STATUS_INITIAL = 0, STATUS_SAVING = 1, STATUS_SUCCESS = 2, STATUS_FAILED = 3;
const app = new Vue({ const app = new Vue({
el: '#app', el: '#app',
components: { MyAutocomplete, LocationsMap,VueCountdown, modal, PersonTable }, components: { MyAutocomplete, LocationsMap, VueCountdown, modal, PersonTable },
data() { data() {
return { return {
list: [ list: [
@ -364,7 +364,7 @@ const app = new Vue({
{ {
headers: { headers: {
'Content-Type': 'multipart/form-data', 'Content-Type': 'multipart/form-data',
'X-CSRF-TOKEN' : document.querySelector('meta[name="csrf-token"]').getAttribute('content'), 'X-CSRF-TOKEN': document.querySelector('meta[name="csrf-token"]').getAttribute('content'),
'X-Requested-With': 'XMLHttpRequest', 'X-Requested-With': 'XMLHttpRequest',
} }
}) })
@ -406,14 +406,14 @@ const app = new Vue({
var error = 'The file you tried to upload is too large.'; var error = 'The file you tried to upload is too large.';
_this.serrors.push(error); _this.serrors.push(error);
} }
else if(error.response && error.response.status == 419) { else if (error.response && error.response.status == 419) {
// session timed out | not authenticated // session timed out | not authenticated
// _this.serrors.push(error.response.data.message); // _this.serrors.push(error.response.data.message);
_this.serrors.push('This page has expired due to inactivity, please refresh and try again'); _this.serrors.push('This page has expired due to inactivity, please refresh and try again');
window.location = '/login'; window.location = '/login';
} }
if (error.message && error.message) { if (error.message && error.message) {
_this.serrors.push( error.message); _this.serrors.push(error.message);
} }
_this.currentStatus = STATUS_FAILED; _this.currentStatus = STATUS_FAILED;
}); });

5
resources/views/frontend/home/index.blade.php
View File

@ -6,9 +6,10 @@
<div class="hero-image"></div> <div class="hero-image"></div>
<div class="container centered"> <div class="container centered">
<div class="twelve columns"> <div class="twelve columns">
<h1 class="separator">Research Data Repository</h1> <h1 class="main-heading">Tethys</h1>
<h2 class="separator">Research Data Repository</h1>
<h2> <h2>
Data Publisher for Geo- and Atmospheric Science Austria Data Publisher for Geoscience Austria
</h2> </h2>
</div> </div>
</div> </div>

4
resources/views/settings/dashboard.blade.php
View File

@ -92,14 +92,14 @@
<div class="pure-u-1 pure-u-md-1"> <div class="pure-u-1 pure-u-md-1">
{{-- <canvas id="myChart" width="400" height="260"></canvas> --}} {{-- <canvas id="myChart" width="400" height="260"></canvas> --}}
<div class="php-info"> <div class="php-info">
@php {{-- @php
ob_start(); ob_start();
phpinfo(); phpinfo();
$pinfo = ob_get_contents(); $pinfo = ob_get_contents();
ob_end_clean(); ob_end_clean();
$pinfo = preg_replace( '%^.*<body>(.*)</body>.*$%ms','$1',$pinfo); $pinfo = preg_replace( '%^.*<body>(.*)</body>.*$%ms','$1',$pinfo);
echo $pinfo; echo $pinfo;
@endphp @endphp --}}
</div> </div>
</div> </div>
</div> </div>

1
tsconfig.json
View File

@ -6,6 +6,7 @@
"sourceMap": true, "sourceMap": true,
"outDir": "public/js/search", "outDir": "public/js/search",
"experimentalDecorators": true, "experimentalDecorators": true,
"lib": [ "es2015", "es2017", "dom" ]
}, },
"include": [ "include": [
"resources/js/**/*" "resources/js/**/*"