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>

76
resources/js/datasetPublish.js
View File

@ -56,14 +56,14 @@ Vue.use(VeeValidate, {
locale: 'en', locale: 'en',
useConstraintAttrs: true, useConstraintAttrs: true,
dictionary: { dictionary: {
en: { messages: messagesEN } en: { messages: messagesEN }
} }
}); });
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: [
@ -71,7 +71,7 @@ const app = new Vue({
{ id: 2, name: "Brooke", sport: "foot" }, { id: 2, name: "Brooke", sport: "foot" },
{ id: 3, name: "Courtenay", sport: "volley" }, { id: 3, name: "Courtenay", sport: "volley" },
{ id: 4, name: "David", sport: "rugby" } { id: 4, name: "David", sport: "rugby" }
], ],
dragging: true, dragging: true,
rows: [ rows: [
//initial data //initial data
@ -95,7 +95,7 @@ const app = new Vue({
dataset: new Dataset(), dataset: new Dataset(),
elevation: "no_elevation", elevation: "no_elevation",
depth: "no_depth", depth: "no_depth",
time: "no_time" time: "no_time"
} }
}, },
created: function () { created: function () {
@ -123,24 +123,24 @@ const app = new Vue({
} }
}); });
const isUnique = (value, [objectArray, index]) => const isUnique = (value, [objectArray, index]) =>
new Promise(resolve => { new Promise(resolve => {
setTimeout(() => { setTimeout(() => {
if (objectArray.some((item, i) => item.value === value && index !== i)) { if (objectArray.some((item, i) => item.value === value && index !== i)) {
return resolve({
valid: false,
data: {
message: value + ' is already taken.'
}
});
}
return resolve({ return resolve({
valid: false, valid: true
data: {
message: value + ' is already taken.'
}
}); });
} }, 200);
return resolve({ });
valid: true
});
}, 200);
});
VeeValidate.Validator.extend("unique", { VeeValidate.Validator.extend("unique", {
getMessage: (field, params, data) => field + ' ' + data.message, getMessage: (field, params, data) => field + ' ' + data.message,
validate: isUnique, validate: isUnique,
}); });
}, },
mounted() { mounted() {
@ -150,7 +150,7 @@ const app = new Vue({
computed: { computed: {
keywords_length() { keywords_length() {
return this.dataset.keywords.length; return this.dataset.keywords.length;
}, },
isInitial() { isInitial() {
return this.currentStatus === STATUS_INITIAL; return this.currentStatus === STATUS_INITIAL;
}, },
@ -294,12 +294,12 @@ const app = new Vue({
formData.append('licenses[' + i + ']', this.dataset.checkedLicenses[i]); formData.append('licenses[' + i + ']', this.dataset.checkedLicenses[i]);
} }
// for (var i = 0; i < this.dataset.checkedAuthors.length; i++) { // for (var i = 0; i < this.dataset.checkedAuthors.length; i++) {
// formData.append('authors[' + i + ']', this.dataset.checkedAuthors[i]); // formData.append('authors[' + i + ']', this.dataset.checkedAuthors[i]);
// } // }
for (var i = 0; i < this.dataset.persons.length; i++) { for (var i = 0; i < this.dataset.persons.length; i++) {
let person = this.dataset.persons[i]; let person = this.dataset.persons[i];
formData.append('authors[' + i + '][first_name]', person.first_name); formData.append('authors[' + i + '][first_name]', person.first_name);
formData.append('authors[' + i + '][last_name]', person.last_name); formData.append('authors[' + i + '][last_name]', person.last_name);
formData.append('authors[' + i + '][email]', person.email); formData.append('authors[' + i + '][email]', person.email);
@ -314,7 +314,7 @@ const app = new Vue({
// formData.append('contributors[' + i + ']', this.dataset.checkedContributors[i]); // formData.append('contributors[' + i + ']', this.dataset.checkedContributors[i]);
// } // }
for (var i = 0; i < this.dataset.contributors.length; i++) { for (var i = 0; i < this.dataset.contributors.length; i++) {
let contributor = this.dataset.contributors[i]; let contributor = this.dataset.contributors[i];
formData.append('contributors[' + i + '][first_name]', contributor.first_name); formData.append('contributors[' + i + '][first_name]', contributor.first_name);
formData.append('contributors[' + i + '][last_name]', contributor.last_name); formData.append('contributors[' + i + '][last_name]', contributor.last_name);
formData.append('contributors[' + i + '][email]', contributor.email); formData.append('contributors[' + i + '][email]', contributor.email);
@ -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',
} }
}) })
@ -405,16 +405,16 @@ const app = new Vue({
// console.log('The file you tried to upload is too large.') // console.log('The file you tried to upload is too large.')
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;
}); });
}, },
@ -505,7 +505,7 @@ const app = new Vue({
addNewAuthor() { addNewAuthor() {
let newAuthor = { status: 0, first_name: '', last_name: '', email: '', academic_title: '', identifier_orcid: '' }; let newAuthor = { status: 0, first_name: '', last_name: '', email: '', academic_title: '', identifier_orcid: '' };
this.dataset.persons.push(newAuthor); this.dataset.persons.push(newAuthor);
}, },
removeAuthor(key) { removeAuthor(key) {
this.dataset.persons.splice(key, 1); this.dataset.persons.splice(key, 1);
}, },
@ -517,16 +517,16 @@ const app = new Vue({
} else if (this.dataset.contributors.filter(e => e.id === person.id).length > 0) { } else if (this.dataset.contributors.filter(e => e.id === person.id).length > 0) {
this.$toast.error("person is already defined as contributor"); this.$toast.error("person is already defined as contributor");
} else { } else {
//person.sort_order = this.dataset.persons.length; //person.sort_order = this.dataset.persons.length;
this.dataset.persons.push(person); this.dataset.persons.push(person);
this.dataset.checkedAuthors.push(person.id); this.dataset.checkedAuthors.push(person.id);
this.$toast.success("person has been successfully added as author"); this.$toast.success("person has been successfully added as author");
} }
}, },
addNewContributor() { addNewContributor() {
let newContributor = { status: 0, first_name: '', last_name: '', email: '', academic_title: '', identifier_orcid: '' }; let newContributor = { status: 0, first_name: '', last_name: '', email: '', academic_title: '', identifier_orcid: '' };
this.dataset.contributors.push(newContributor); this.dataset.contributors.push(newContributor);
}, },
onAddContributor(person) { onAddContributor(person) {
//if person is not in contributors array //if person is not in contributors array
//if (this.contributors.includes(person) == false) { //if (this.contributors.includes(person) == false) {
@ -582,8 +582,8 @@ const app = new Vue({
// save it // save it
this.save(status); this.save(status);
}, },
handleTimeExpire() { handleTimeExpire() {
window.location = '/login'; window.location = '/login';
} }
} }
}); });

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>

17
tsconfig.json
View File

@ -1,12 +1,13 @@
{ {
"compilerOptions": { "compilerOptions": {
"module": "es2015", "module": "es2015",
"target": "es5", "target": "es5",
"moduleResolution": "node", "moduleResolution": "node",
"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/**/*"
] ]