phyks/flatisfy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'last-update' into 'master'

Browse Source 
Last update

See merge request phyks/Flatisfy!37
This commit is contained in:
Phyks 2019-01-17 09:08:15 +01:00
commit 5083f002d2
14 changed files with 111 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
flatisfy/cmds.py
View File

@ -6,6 +6,7 @@ from __future__ import absolute_import, print_function, unicode_literals
import collections
import logging
import os
import flatisfy.filters
from flatisfy import database
@ -203,6 +204,14 @@ def import_and_filter(config, load_from_db=False):
if config["send_email"]:
email.send_notification(config, new_flats)
# Touch a file to indicate last update timestamp
ts_file = os.path.join(
config["data_directory"],
"timestamp"
)
with open(ts_file, 'w'):
os.utime(ts_file, None)
LOGGER.info("Done!")

2
flatisfy/web/app.py
View File

@ -107,6 +107,8 @@ def get_app(config):
app.route("/api/v1/opendata/postal_codes", "GET",
api_routes.opendata_postal_codes_v1)
app.route("/api/v1/metadata", ["GET", "OPTIONS"], api_routes.metadata_v1)
# Index
app.route("/", "GET", lambda: _serve_static_file("index.html"))

7
flatisfy/web/js_src/api/index.js
View File

@ -161,3 +161,10 @@ export const doSearch = function (query, callback) {
console.error('Unable to perform search: ' + ex)
})
}
export const getMetadata = function (callback) {
fetch('/api/v1/metadata', { credentials: 'same-origin' })
.then(response => response.json())
.then(json => callback(json.data))
.catch(ex => console.error('Unable to fetch application metadata: ' + ex))
}

6
flatisfy/web/js_src/components/flatstable.vue
View File

@ -56,13 +56,13 @@
<script>
import 'font-awesome-webpack'
import FlatsTableLine from './flatstableline.vue';
import FlatsTableLine from './flatstableline.vue'
import { capitalize } from '../tools'
export default {
components: {
FlatsTableLine,
FlatsTableLine
},
data () {
@ -129,7 +129,7 @@ export default {
this.sortBy = field
}
},
capitalize: capitalize,
capitalize: capitalize
}
}
</script>

26
flatisfy/web/js_src/components/flatstableline.vue
View File

@ -66,33 +66,33 @@ export default {
props: {
flat: Object,
showNotationColumn: Boolean,
showNotes: Boolean,
showNotes: Boolean
},
computed: {
capitalizedStatus() {
return capitalize(this.$t('status.followed'));
capitalizedStatus () {
return capitalize(this.$t('status.followed'))
},
photo() {
photo () {
if (this.flat.photos && this.flat.photos.length > 0) {
if (this.flat.photos[0].local) {
return `/data/img/${this.flat.photos[0].local}`;
return `/data/img/${this.flat.photos[0].local}`
}
return this.flat.photos[0].url;
return this.flat.photos[0].url
}
return null;
},
notationRange() {
return range(this.flat.notation);
return null
},
notationRange () {
return range(this.flat.notation)
}
},
methods: {
updateFlatStatus (id, status) {
this.$store.dispatch('updateFlatStatus', { flatId: id, newStatus: status })
},
},
};
}
}
}
</script>
<style scoped>

10
flatisfy/web/js_src/components/slider.vue
View File

@ -28,14 +28,14 @@ export default {
},
computed: {
photosURLOrLocal() {
photosURLOrLocal () {
return this.photos.map(photo => {
if (photo.local) {
return `/data/img/${photo.local}`;
return `/data/img/${photo.local}`
}
return photo.url;
});
},
return photo.url
})
}
},
created () {

3
flatisfy/web/js_src/i18n/en/index.js
View File

@ -19,6 +19,7 @@ export default {
},
home: {
'new_available_flats': 'New available flats',
'Last_update': 'Last update:',
'show_expired_flats': 'Show expired flats'
},
flatListing: {
@ -41,7 +42,7 @@ export default {
'utilities_included': '(utilities included)',
'utilities_excluded': '(utilities excluded)',
'Description': 'Description',
'First_posted' : 'First posted',
'First_posted': 'First posted',
'Details': 'Details',
'Metadata': 'Metadata',
'postal_code': 'Postal code',

1
flatisfy/web/js_src/i18n/fr/index.js
View File

@ -19,6 +19,7 @@ export default {
},
home: {
'new_available_flats': 'Nouveaux appartements disponibles',
'Last_update': 'Dernière mise à jour :',
'show_expired_flats': 'Montrer les annonces expirées'
},
flatListing: {

6
flatisfy/web/js_src/store/actions.js
View File

@ -50,5 +50,11 @@ export default {
api.doSearch(query, flats => {
commit(types.REPLACE_FLATS, { flats })
})
},
getMetadata ({ commit }) {
commit(types.IS_LOADING)
api.getMetadata(metadata => {
commit(types.RECEIVE_METADATA, { metadata })
})
}
}

4
flatisfy/web/js_src/store/getters.js
View File

@ -67,5 +67,7 @@ export default {
timeToPlaces: (state, getters) => (constraintName) => {
return state.timeToPlaces[constraintName]
}
},
metadata: state => state.metadata
}

1
flatisfy/web/js_src/store/mutations-types.js
View File

@ -5,4 +5,5 @@ export const UPDATE_FLAT_NOTES = 'UPDATE_FLAT_NOTES'
export const UPDATE_FLAT_NOTATION = 'UPDATE_FLAT_NOTATION'
export const UPDATE_FLAT_VISIT_DATE = 'UPDATE_FLAT_VISIT_DATE'
export const RECEIVE_TIME_TO_PLACES = 'RECEIVE_TIME_TO_PLACES'
export const RECEIVE_METADATA = 'RECEIVE_METADATA'
export const IS_LOADING = 'IS_LOADING'

5
flatisfy/web/js_src/store/mutations.js
View File

@ -5,6 +5,7 @@ import * as types from './mutations-types'
export const state = {
flats: [],
timeToPlaces: [],
metadata: [],
loading: 0
}
@ -58,6 +59,10 @@ export const mutations = {
state.timeToPlaces = timeToPlaces
state.loading -= 1
},
[types.RECEIVE_METADATA] (state, { metadata }) {
state.metadata = metadata
state.loading -= 1
},
[types.IS_LOADING] (state) {
state.loading += 1
}

25
flatisfy/web/js_src/views/home.vue
View File

@ -4,6 +4,11 @@
<h2>
{{ $t("home.new_available_flats") }}
<template v-if="lastUpdate">
<label class="show-last-update">
{{ $t("home.Last_update") }} {{ lastUpdate.fromNow() }}
</label>
</template>
<label class="show-expired-flats-label">
<input type="checkbox" class="show-expired-flats-checkbox" v-model="showExpiredFlats" />
{{ $t("home.show_expired_flats") }}
@ -33,6 +38,7 @@
<script>
import FlatsMap from '../components/flatsmap.vue'
import FlatsTable from '../components/flatstable.vue'
import moment from 'moment'
export default {
components: {
@ -47,12 +53,14 @@ export default {
this.$store.dispatch('getAllFlats')
// Fetch time to places when the component is created
this.$store.dispatch('getAllTimeToPlaces')
// Fetch application metadata when the component is created
this.$store.dispatch('getMetadata')
},
data () {
return {
showExpiredFlats: false,
};
showExpiredFlats: false
}
},
computed: {
@ -71,6 +79,14 @@ export default {
timeToPlaces () {
return this.$store.getters.allTimeToPlaces
},
lastUpdate () {
var metadata = this.$store.getters.metadata
var lastUpdateDate = moment.unix(metadata['last_update'])
if (!lastUpdateDate.isValid()) {
lastUpdateDate = 0
}
return lastUpdateDate
},
isLoading () {
return this.$store.getters.isLoading
}
@ -88,4 +104,9 @@ h2 {
font-weight: initial;
font-size: initial;
}
.show-last-update {
font-weight: initial;
font-size: initial;
}
</style>

32
flatisfy/web/routes/api.py
View File

@ -10,6 +10,7 @@ import datetime
import itertools
import json
import re
import os
import bottle
import vobject
@ -146,7 +147,8 @@ def index_v1():
"flat": "/api/v1/flat/:id",
"search": "/api/v1/search",
"ics": "/api/v1/ics/visits.ics",
"time_to_places": "/api/v1/time_to_places"
"time_to_places": "/api/v1/time_to_places",
"metadata": "/api/v1/metadata"
}
@ -499,3 +501,31 @@ def opendata_postal_codes_v1(db):
}
except Exception as exc: # pylint: disable= broad-except
return JSONError(500, str(exc))
def metadata_v1(config):
"""
API v1 metadata of the application.
Example::
GET /api/v1/metadata
:return: The application metadata.
"""
if bottle.request.method == 'OPTIONS':
# CORS
return {}
try:
ts_file = os.path.join(
config['data_directory'],
'timestamp'
)
ts = os.path.getmtime(ts_file)
return {
'data': {
'last_update': ts
}
}
except Exception as exc: # pylint: disable= broad-except
return JSONError(500, str(exc))