Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Script d'import de photos #85

Merged
merged 210 commits into from
Jul 8, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
210 commits
Select commit Hold shift + click to select a range
a7f68f5
Merge pull request #12 from PnX-SI/dev
HamoudaAmine Dec 3, 2018
2528c4d
Some minor changes and fix
20cents Dec 3, 2018
e4dc571
Merge branch 'master' of https://github.com/PnX-SI/GeoPaysages into v…
20cents Dec 3, 2018
ee1da0b
Minor css, add obs button
20cents Dec 3, 2018
9ec0241
Comparator unpinned photos sort by date
20cents Dec 3, 2018
1b8174c
config.py.tpl is back
20cents Dec 3, 2018
2268876
Merge pull request #13 from PnX-SI/vincent
20cents Dec 3, 2018
acaaedc
Comparator rm zoom on photos pair, minor css
20cents Dec 3, 2018
6d3bd14
Comparator support site legend and optional testimonial
20cents Dec 3, 2018
c43b15f
Comparator enable download photo
20cents Dec 3, 2018
1fc4347
Comparator download photo available from medium display
20cents Dec 3, 2018
2167d32
Galery display the first photo of each site
20cents Dec 3, 2018
bb7c1ea
Home block display the site legend instead of description
20cents Dec 3, 2018
4ceb765
Minor css change
20cents Dec 4, 2018
bb0245b
Merge pull request #14 from PnX-SI/vincent
20cents Dec 4, 2018
ac6f064
delete site
HamoudaAmine Dec 5, 2018
b722beb
Merge branch 'master' of https://github.com/PnX-SI/GeoPaysages into a…
HamoudaAmine Dec 5, 2018
0d146f1
patch site
HamoudaAmine Dec 6, 2018
35d8c44
Merge pull request #15 from PnX-SI/amine
HamoudaAmine Dec 6, 2018
6298f81
add gallery
HamoudaAmine Dec 12, 2018
5f31c57
Merge branch 'master' of https://github.com/PnX-SI/GeoPaysages into a…
HamoudaAmine Dec 12, 2018
e3a7f0c
Merge pull request #16 from PnX-SI/amine
HamoudaAmine Dec 12, 2018
6aac9ec
fix delete_photo
HamoudaAmine Dec 13, 2018
d5b4ea8
Merge pull request #17 from PnX-SI/amine
HamoudaAmine Dec 13, 2018
6ece8e1
add edit marker
HamoudaAmine Dec 14, 2018
e21987c
Merge pull request #18 from PnX-SI/amine
HamoudaAmine Dec 14, 2018
e775c15
Support ref_site
20cents Dec 17, 2018
765137c
Enable comparator oppv notice
20cents Dec 17, 2018
9f89f4b
Date format on comparator
20cents Dec 17, 2018
015d629
Gallery css justify-content-center
20cents Dec 17, 2018
a3f820d
Minor changes on text, css, link, ...
20cents Dec 17, 2018
6896d05
Header logo href to home
20cents Dec 17, 2018
d6c370c
Gallery display site.main_photo
20cents Dec 17, 2018
eeee87c
Gallery css changes
20cents Dec 17, 2018
386bc73
Add meta viewport
20cents Dec 17, 2018
8dfc841
Gallery display city name
20cents Dec 17, 2018
88e0abb
Perform caparator modal layout
20cents Dec 17, 2018
31d3f0d
Comparator display ref site and city
20cents Dec 17, 2018
46c742b
Home random sites, minor text change
20cents Dec 17, 2018
9c89acb
Improve header title layout
20cents Dec 17, 2018
d9720ef
Merge pull request #19 from PnX-SI/vincent
20cents Dec 18, 2018
754456c
Display only published sites
20cents Dec 18, 2018
524fc2f
Map layer chooser WiP, some beautify
20cents Dec 18, 2018
f197814
WiP
HamoudaAmine Dec 18, 2018
2811a7e
fix conflicts
HamoudaAmine Dec 18, 2018
e2c7e56
Merge pull request #20 from PnX-SI/amine
HamoudaAmine Dec 18, 2018
7e4413e
Merge branch 'master' of https://github.com/PnX-SI/GeoPaysages into v…
20cents Dec 18, 2018
55a7b53
Map open marker popup on site hover
20cents Dec 18, 2018
9ff940c
Map css improvement
20cents Dec 18, 2018
7100af2
Map update sites list on filter
20cents Dec 18, 2018
49da953
Map filter arrow position
20cents Dec 18, 2018
90c12d3
Map site list display township
20cents Dec 18, 2018
26887dd
Map display scale
20cents Dec 18, 2018
80a5f2e
Map enable restore bbox and zoom
20cents Dec 19, 2018
8ed7b14
Merge pull request #21 from PnX-SI/vincent
20cents Dec 19, 2018
2066d85
Comparator minor changes
20cents Dec 19, 2018
d652aa8
Comparator display french date, change copyright
20cents Dec 19, 2018
a843386
Copyright under image, support new table communes
20cents Dec 19, 2018
42374b8
Map use communes table
20cents Dec 19, 2018
0fdd6cb
Add infos in large image caption
20cents Dec 19, 2018
454f8f4
Gallery caption improvement
20cents Dec 19, 2018
3e4bbce
Map subthemes are filtered again
20cents Dec 19, 2018
fe8de8d
Map enable filter storage and clear
20cents Dec 19, 2018
fa94fa0
Footer minor css
20cents Dec 19, 2018
dbcf319
Footer layout
20cents Dec 20, 2018
fb97e07
Merge pull request #22 from PnX-SI/vincent
20cents Dec 20, 2018
50b3afc
Comparator improve caption
20cents Dec 20, 2018
cc75ab5
Merge pull request #23 from PnX-SI/vincent
20cents Dec 20, 2018
fae16cf
add notice
HamoudaAmine Dec 20, 2018
f486711
Merge branch 'master' of https://github.com/PnX-SI/GeoPaysages into a…
HamoudaAmine Dec 20, 2018
cba3815
pull master
HamoudaAmine Dec 20, 2018
38cccd7
Merge pull request #24 from PnX-SI/amine
HamoudaAmine Dec 20, 2018
cfe70c9
Gallery takes the most recent photo by default
20cents Dec 20, 2018
ccfcf77
Map sort years desc
20cents Dec 20, 2018
639e288
Map minor changes on sites list
20cents Dec 20, 2018
df509cf
Fix cancel filters feature
20cents Dec 20, 2018
dea17a4
Gallery minor changes
20cents Dec 20, 2018
36bc10b
Footer fix some typo
20cents Dec 20, 2018
0e9602f
Merge branch 'master' of https://github.com/PnX-SI/GeoPaysages into v…
20cents Dec 20, 2018
3e392bc
Large and download image is not the same anymore, add author in caption
20cents Dec 20, 2018
844c1da
Merge pull request #25 from PnX-SI/vincent
20cents Dec 20, 2018
5eba39d
Fix home missing main photo, use a dedicated image format
20cents Dec 20, 2018
c69f105
Fix unexisting t_role on caption
20cents Dec 20, 2018
404707a
Merge pull request #26 from PnX-SI/vincent
20cents Dec 20, 2018
0ddf4e5
Home use medium image format
20cents Dec 20, 2018
2284a64
Merge pull request #27 from PnX-SI/vincent
20cents Dec 20, 2018
67c3aca
Fix comparator when photos number < 2
20cents Dec 20, 2018
871b7ce
Merge pull request #28 from PnX-SI/vincent
20cents Dec 20, 2018
7534c99
Use babel for i18n, dynamic external links
20cents Dec 21, 2018
10a2afe
Fix no external_links
20cents Dec 21, 2018
7eba635
Minor changes
20cents Dec 21, 2018
a1ff507
Different caption on image large and download
20cents Dec 21, 2018
c7d2c85
Change nav btn order
20cents Dec 21, 2018
e72608c
Map marker popup display township
20cents Dec 21, 2018
ca0f568
Map filter years display on 3 columns
20cents Dec 21, 2018
ff11462
Add township on homepage block
20cents Dec 21, 2018
2d251b4
Minor css change
20cents Dec 21, 2018
8b8da53
Fix home blocks on narrow screen
20cents Dec 21, 2018
6c6d338
Enable map fullscreen
20cents Dec 21, 2018
1c31470
Merge branch 'master' of https://github.com/PnX-SI/GeoPaysages into v…
20cents Dec 21, 2018
14837a6
Merge pull request #30 from PnX-SI/vincent
20cents Dec 21, 2018
da08bc0
Map sites lisy display ref
20cents Dec 21, 2018
46054c6
Merge pull request #31 from PnX-SI/vincent
20cents Dec 21, 2018
1a1e7f2
Expose dbconf in jinja
20cents Dec 21, 2018
90a2d80
Merge pull request #32 from PnX-SI/vincent
20cents Dec 21, 2018
2f5cf71
add IGN map
HamoudaAmine Dec 26, 2018
6708aef
Merge pull request #33 from PnX-SI/amine
HamoudaAmine Dec 26, 2018
5ba386c
add install scripts
HamoudaAmine Dec 27, 2018
d14016b
Merge pull request #34 from PnX-SI/amine
HamoudaAmine Dec 27, 2018
4ca4d7d
add config files
HamoudaAmine Dec 27, 2018
63ab5d7
Merge pull request #35 from PnX-SI/amine
HamoudaAmine Dec 27, 2018
50693c4
add remove notice + check photos name
HamoudaAmine Jan 3, 2019
5ac2a7c
add custom css
HamoudaAmine Jan 3, 2019
d39d547
Merge pull request #36 from PnX-SI/amine
HamoudaAmine Jan 3, 2019
ed65314
add custom zoom map
HamoudaAmine Jan 3, 2019
78763a0
Merge pull request #37 from PnX-SI/amine
HamoudaAmine Jan 3, 2019
8800e55
fix sthemes input
HamoudaAmine Jan 3, 2019
085c0af
change the hover color of filter's buttons
HamoudaAmine Jan 4, 2019
a4f40a1
Merge pull request #38 from PnX-SI/amine
HamoudaAmine Jan 4, 2019
d7b346e
Improve customisation
20cents Jan 9, 2019
7913a8a
Merge pull request #39 from PnX-SI/vincent
20cents Jan 14, 2019
1ca6d2a
update install script, remove author && coypright required
HamoudaAmine Jan 14, 2019
98728f0
Merge pull request #40 from PnX-SI/amine
HamoudaAmine Jan 14, 2019
410e68b
Update installation.rst
20cents Jan 15, 2019
1fc5e36
Add page min-height css variable
20cents Jan 18, 2019
58cdb06
Add sample page
20cents Jan 18, 2019
6c47696
Merge pull request #41 from PnX-SI/vincent
20cents Jan 18, 2019
bd478d3
review workflow
HamoudaAmine Jan 18, 2019
182386b
Merge pull request #42 from PnX-SI/amine
HamoudaAmine Jan 18, 2019
87a3400
fix the empty author and copyright values
HamoudaAmine Jan 18, 2019
484e014
CREATION BDD OPP - Ajout CREATE SCHEMA
camillemonchicourt Jan 18, 2019
c20a75c
Merge pull request #43 from PnX-SI/fix-create-bdd
HamoudaAmine Jan 18, 2019
e3ad03b
review install scripts
HamoudaAmine Jan 22, 2019
2deee93
Merge pull request #49 from PnX-SI/amine
HamoudaAmine Jan 22, 2019
37e9ff6
Minor change on photo caption
20cents Jan 24, 2019
5a74c26
update photo form
HamoudaAmine Jan 24, 2019
c2bc89e
Merge pull request #50 from PnX-SI/amine
HamoudaAmine Jan 25, 2019
6b96f4b
review install scripts
HamoudaAmine Jan 29, 2019
caff70c
Update installation.rst
HamoudaAmine Jan 29, 2019
eeb3ce0
add wheel install
HamoudaAmine Jan 29, 2019
346e75b
Merge branch 'master' of https://github.com/PnX-SI/GeoPaysages
HamoudaAmine Jan 29, 2019
117c721
fix id-application && add demo data
HamoudaAmine Feb 4, 2019
645348a
fix DB user passwod && delete user_pg
HamoudaAmine Feb 8, 2019
3235e2c
add screenshot
HamoudaAmine Mar 19, 2019
c77f5f6
Fix: comparator page allow notice empty
HamoudaAmine Mar 21, 2019
a73dc98
Add some conf
20cents Apr 25, 2019
08484c1
Minot layout change
20cents Apr 25, 2019
87f9093
Add, but inactivated, use reverse proxy on dev
20cents Apr 25, 2019
727d7c7
Ignore logs
20cents Apr 25, 2019
b70d670
Minor pathname change
20cents Apr 25, 2019
da31e9f
Update translations
20cents Apr 25, 2019
84eb122
Some maps improvements
20cents Apr 25, 2019
bfa7f4d
update backoffice
HamoudaAmine Apr 25, 2019
b184a04
Minor change in install process
20cents Apr 25, 2019
b70aa62
WiP update process
20cents Apr 25, 2019
dc5460e
Merge branch 'master' of https://github.com/PnX-SI/GeoPaysages
20cents Apr 25, 2019
661ad5e
Backoffice Staticfile not necessary anymore
20cents Apr 26, 2019
d939817
WiP update process
20cents Apr 26, 2019
154d50b
Update process RC
20cents Apr 26, 2019
5ecb7cb
Enable update process
20cents Apr 26, 2019
e8502e5
Author is not used anymore
20cents Apr 26, 2019
8763cb3
rm duplicated sql insert
20cents Apr 26, 2019
694f9b4
Update installation.rst
Chrispnv May 9, 2019
4cc70ef
Update installation.rst
Chrispnv May 14, 2019
1a70d1b
Update installation.rst
Chrispnv May 14, 2019
1dcb648
Update installation.rst
Chrispnv May 14, 2019
cbb3bb3
Support map layers configuration
20cents May 16, 2019
b24b4f7
Merge branch 'master' of https://github.com/PnX-SI/GeoPaysages
20cents May 16, 2019
795828c
Add map layers default conf
20cents May 16, 2019
70aee11
Add script to rm generated photos
20cents May 16, 2019
1c2c02d
add toastr error && fix typo
HamoudaAmine May 16, 2019
758211b
fix disabled submit btn
HamoudaAmine May 16, 2019
95d45d6
fix issus #59 #61 #62
HamoudaAmine Jul 23, 2019
d85ccdc
add map center to config #64
HamoudaAmine Jul 23, 2019
fd46a48
Img alt not hard coded anymore
20cents Jul 24, 2019
b722b33
Vuejs production mode
20cents Jul 24, 2019
724117d
Support field display_gal_photo
20cents Jul 24, 2019
abceac4
Script of update add new translation placeholders
20cents Jul 24, 2019
cacc280
Fix pybabel path on update's script
20cents Jul 24, 2019
44e5f24
add map config
HamoudaAmine Sep 5, 2019
2410575
Merge branch 'master' of https://github.com/PnX-SI/GeoPaysages
HamoudaAmine Sep 5, 2019
0b47097
Handling DataBase Exceptions
HamoudaAmine Oct 10, 2019
96f175f
Update installation.rst
20cents Oct 18, 2019
4865111
Update installation.rst
20cents Oct 18, 2019
08ebf62
Update installation.rst
Chrispnv Jan 22, 2020
869ad43
Update installation.rst
Chrispnv Jan 22, 2020
2f9c4ae
Update installation.rst
Chrispnv Jan 23, 2020
2339515
Update installation.rst
Chrispnv Jan 23, 2020
0593e1d
Update installation.rst
Chrispnv Jan 23, 2020
7e3ccea
description_licence_photo is no used anymore
20cents Feb 7, 2020
24d30c1
Support photos without credit
20cents Feb 7, 2020
add672e
add sort by refrence
HamoudaAmine Mar 30, 2020
6a316da
Update installation.rst to fix #73
20cents Jun 23, 2020
1edaadf
Update README.md
orovellotti Jun 25, 2020
20131fd
custom #64
HamoudaAmine Jun 30, 2020
5ee5c66
Add VERSION file
camillemonchicourt Jul 1, 2020
c9d4c95
Back to DEV
camillemonchicourt Jul 1, 2020
fcd44ac
first commit
mvoundy Jul 7, 2020
9988e55
removing unused import
mvoundy Jul 7, 2020
67a6b9f
gitignore update
mvoundy Jul 7, 2020
9e6705b
Merge branch 'master' of https://github.com/PnX-SI/GeoPaysages into f…
mvoundy Jul 7, 2020
f3495c3
added copyright notice option in config template
mvoundy Jul 7, 2020
8c2017a
image processing rework
mvoundy Jul 7, 2020
cbd4a2b
image processing rework
mvoundy Jul 7, 2020
ac9ebee
update img processing tests
mvoundy Jul 7, 2020
274dfe8
ftp fetch teardown update. will remove fetched files
mvoundy Jul 7, 2020
b98fc1c
refacted db and images
mvoundy Jul 7, 2020
88d376b
fixed missing import
mvoundy Jul 7, 2020
5dffbbd
readme update
mvoundy Jul 7, 2020
868b8d5
readme update
mvoundy Jul 7, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,16 @@ bazel-*
test-project-host-*
dist/
dist-schema/
var/


#doc
documentation
documentation
geopaysagesftpclient/geopaysagesftpclient/tests/pt_200_400.jpg~
geopaysagesftpclient/geopaysagesftpclient/tests/pt_300_500.jpg~
geopaysagesftpclient/geopaysagesftpclient/tests/pt_400_600.jpg~
geopaysagesftpclient/config.ini
geopaysagesftpclient/pytest.ini
geopaysagesftpclient/.vscode/
geopaysagesftpclient/geopaysagesftpclient.egg-info/
geopaysagesftpclient/output/
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
Application web permettant de publier un observatoire photographique des paysages.

## Install
Documentation d'installation : https://github.com/PnX-SI/GeoPaysages/tree/master/docs/installation.rst

- Créer et activer un environnement virtuel python 3.
- cd ./backend
Expand All @@ -23,8 +24,15 @@ Le projet est porté par le Parc national de la Vanoise. Le site qui sera dével

A suivre...

![alt text](./docs/screenshot.jpg)

## Présentation

- CCTP 2017 : http://geonature.fr/documents/autres/geopaysages/2017-11-13-CDC-OPPV-PNV.pdf
- Annexe CCTP 2017 : http://geonature.fr/documents/autres/geopaysages/2017-11-24-OPPV-PNV-ANNEXES-CDC.zip
- Réflexion 2016 : http://geonature.fr/documents/autres/geopaysages/2016-11-OPP-reflexion.pdf

## DEMO

http://5.196.209.137/

1 change: 1 addition & 0 deletions VERSION
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.0.1.dev0
3 changes: 3 additions & 0 deletions backend/.vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"python.pythonPath": "/usr/bin/python3"
}
Loading