luisgulo/photoprism
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Frontend: Rename export to share and some code clean-up

Browse source
This commit is contained in:
Michael Mayer 2019-06-09 05:20:23 +02:00
parent 8642b6f664
commit 971135f782
9 changed files with 38 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frontend/karma.conf.js
View file

@ -8,7 +8,7 @@ module.exports = (config) => {
logLevel: config.LOG_INFO,
webpackMiddleware: {
stats: "errors-only"
stats: "errors-only",
},
frameworks: ["mocha"],

8
frontend/src/component/p-navigation.vue
View file

@ -191,7 +191,7 @@
<v-list-tile to="/import" @click="">
<v-list-tile-action>
<v-icon>add_circle</v-icon>
<v-icon>camera_roll</v-icon>
</v-list-tile-action>
<v-list-tile-content>
@ -199,13 +199,13 @@
</v-list-tile-content>
</v-list-tile>
<v-list-tile to="/export" @click="">
<v-list-tile to="/share" @click="">
<v-list-tile-action>
<v-icon>save</v-icon>
<v-icon>share</v-icon>
</v-list-tile-action>
<v-list-tile-content>
<v-list-tile-title>Export</v-list-tile-title>
<v-list-tile-title>Share</v-list-tile-title>
</v-list-tile-content>
</v-list-tile>

2
frontend/src/model/label.js
View file

@ -44,7 +44,7 @@ class Label extends Abstract {
}
getDateString() {
return moment(this.CreatedAt).format('LLL');
return moment(this.CreatedAt).format("LLL");
}
toggleLike() {

2
frontend/src/model/photo.js
View file

@ -91,7 +91,7 @@ class Photo extends Abstract {
}
getDateString() {
return moment(this.TakenAt).format('LLL');
return moment(this.TakenAt).format("LLL");
}
hasLocation() {

13
frontend/src/pages/labels.vue
View file

@ -70,7 +70,7 @@
<v-card-title primary-title class="pa-3">
<div>
<h3 class="subheading mb-2">{{ label.LabelName | capitalize }}</h3>
<h3 class="subheading">{{ label.LabelName | capitalize }}</h3>
</div>
</v-card-title>
</v-card>
@ -90,15 +90,6 @@
props: {
staticFilter: Object
},
watch: {
'$route'() {
const query = this.$route.query;
this.filter.q = query['q'];
this.lastFilter = {};
this.search();
}
},
data() {
const query = this.$route.query;
const q = query['q'] ? query['q'] : '';
@ -197,7 +188,7 @@
if (this.scrollDisabled) {
this.$alert.info(this.results.length + ' labels found');
} else {
this.$alert.info('More than 50 labels found');
this.$alert.info('More than 20 labels found');
this.$nextTick(() => this.$emit("scrollRefresh"));
}

7
frontend/src/pages/photos.vue
View file

@ -29,15 +29,21 @@
},
watch: {
'$route' () {
if(this.routeName === this.$route.name) {
return;
}
const query = this.$route.query;
this.filter.q = query['q'];
this.lastFilter = {};
this.routeName = this.$route.name;
this.search();
}
},
data() {
const query = this.$route.query;
const routeName = this.$route.name;
const order = query['order'] ? query['order'] : 'newest';
const camera = query['camera'] ? parseInt(query['camera']) : 0;
const q = query['q'] ? query['q'] : '';
@ -55,6 +61,7 @@
settings: settings,
filter: filter,
lastFilter: {},
routeName: routeName,
};
},
methods: {

28
frontend/src/pages/settings.vue
View file

@ -1,17 +1,18 @@
<template>
<div>
<v-toolbar flat color="blue-grey lighten-4">
<v-toolbar-title>Settings</v-toolbar-title>
<v-toolbar-title>Not implemented yet</v-toolbar-title>
<v-spacer></v-spacer>
</v-toolbar>
<v-container>
<p>
<v-btn v-on:click="showSuccess()">Show Success</v-btn>
<v-btn v-on:click="showInfo()">Show Info</v-btn>
<v-btn v-on:click="showError()">Show Error</v-btn>
<v-btn v-on:click="showWarning()">Show Warning</v-btn>
Issues labeled <a href="https://github.com/photoprism/photoprism/labels/help%20wanted">help wanted</a> /
<a href="https://github.com/photoprism/photoprism/labels/easy">easy</a> can be good (first)
contributions.
Our <a href="https://github.com/photoprism/photoprism/wiki">Developer Guide</a> contains all information
necessary to get you started.
</p>
</v-container>
</div>
@ -19,23 +20,10 @@
<script>
export default {
name: 'settings',
name: 'todo',
data() {
return {};
},
methods: {
showSuccess() {
this.$alert.success('Action successfully completed');
},
showInfo() {
this.$alert.info('This is an info');
},
showError() {
this.$alert.error('An error has occurred - please check logs');
},
showWarning() {
this.$alert.warning('This is a warning');
},
}
methods: {}
};
</script>

2
frontend/src/pages/export.vue → frontend/src/pages/share.vue
View file

@ -1,7 +1,7 @@
<template>
<div>
<v-toolbar flat color="blue-grey lighten-4">
<v-toolbar-title>Export</v-toolbar-title>
<v-toolbar-title>Not implemented yet</v-toolbar-title>
<v-spacer></v-spacer>
</v-toolbar>

54
frontend/src/routes.js
View file

@ -1,17 +1,11 @@
import PhotosPage from "pages/photos.vue";
import PlacesPage from "pages/places.vue";
import PhotosEdit from "pages/photosEdit.vue";
import Albums from "pages/albums.vue";
import Albums2 from "pages/albums2.vue";
import Import2 from "pages/import2.vue";
import Import3 from "pages/import3.vue";
import Import from "pages/import.vue";
import Export from "pages/export.vue";
import Settings from "pages/settings.vue";
import Photos from "pages/photos.vue";
import Places from "pages/places.vue";
import Labels from "pages/labels.vue";
import Todo from "pages/todo.vue";
import Events from "pages/events.vue";
import People from "pages/people.vue";
import Share from "pages/share.vue";
import Settings from "pages/settings.vue";
import Todo from "pages/todo.vue";
export default [
{
@ -22,20 +16,20 @@ export default [
{
name: "Photos",
path: "/photos",
component: PhotosPage,
component: Photos,
meta: {area: "Photos"},
},
{
name: "Favorites",
path: "/favorites",
component: PhotosPage,
component: Photos,
meta: {area: "Favorites"},
props: {staticFilter: {favorites: true}},
},
{
name: "Places",
path: "/places",
component: PlacesPage,
component: Places,
meta: {area: "Places"},
},
{
@ -56,12 +50,6 @@ export default [
component: People,
meta: {area: "People"},
},
{
name: "PhotosEdit",
path: "/photosEdit",
component: Todo,
meta: {area: "Photos"},
},
{
name: "Filters",
path: "/filters",
@ -74,12 +62,6 @@ export default [
component: Todo,
meta: {area: "Albums"},
},
{
name: "Albums2",
path: "/albums2",
component: Albums2,
meta: {area: "Albums"},
},
{
name: "Import",
path: "/import",
@ -87,25 +69,15 @@ export default [
meta: {area: "Import"},
},
{
name: "Import2",
path: "/import2",
component: Import2, meta: {area: "Import"},
},
{
name: "Import3",
path: "/import3",
component: Import3, meta: {area: "Import"},
},
{
name: "Export",
path: "/export",
component: Todo,
meta: {area: "Export"},
name: "Share",
path: "/share",
component: Share,
meta: {area: "Share"},
},
{
name: "Settings",
path: "/settings",
component: Todo,
component: Settings,
meta: {area: "Settings"},
},
{