Merged branch #19
Merged
Merged branch #19
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
May 3, 2017 23:44
merge back and front
HLNaima
approved these changes
May 5, 2017
nathan-K-
added a commit
that referenced
this pull request
Jun 7, 2017
* add gitignore * adding docbox * adding makefile for docker * updating script * Merge/connexion (#4) * adding scripts for database * users * nodejs * Connextion to the database not yet configured but everything is set! * Connexion db under work * authentification, and status code * adding a '=' * better error code, quick doc * tokens! * adding geoPoints test * Front end/login (#3) * début du front end * Update main.py * Gestion login * Login OK * DAO début! * dao avec des fonctions callback pour le gestion des erreurs et le traitement des résultats * grandLyonDataAddFeature to insert one feature object to the database * getting the data from grand lyon and putting them into our database * react native initial commit, some screeens made * en plus propre + création des tables pour parcours et suite centres d'inérêt * centres d'interêts * Added router to navigate between screens * tables bdd * basic sql parcours qques chgts ds node * add course, add coi * database * update db * updating docbox for the new entry point * adding endpoint to gather parcours (level <= x) * updating docbox + endpoint * modifs des insertions du .sql * COI class, with to geoJson * some doc and node-modules directory deleted * COI in DB -> custom COI objects * Set up the data store with Redux * Manage login with backend * synchronisation d'appels asynchrones * Update Login process * Login process done. * authentificate retuns pseudo, level, nb_points, ... * Feature/dao (#7) * DAO début! * dao avec des fonctions callback pour le gestion des erreurs et le traitement des résultats * grandLyonDataAddFeature to insert one feature object to the database * getting the data from grand lyon and putting them into our database * en plus propre + création des tables pour parcours et suite centres d'inérêt * centres d'interêts * tables bdd * basic sql parcours qques chgts ds node * add course, add coi * database * update db * updating docbox for the new entry point * adding endpoint to gather parcours (level <= x) * updating docbox + endpoint * modifs des insertions du .sql * COI class, with to geoJson * some doc and node-modules directory deleted * COI in DB -> custom COI objects * synchronisation d'appels asynchrones * authentificate retuns pseudo, level, nb_points, ... * Get weather and air quality given latitude and longitude * elevation given the latitude and longitude of a COI + documentation * Levels set from the data store * Update data store struct + Levels data fetching * Courses: use the store data rather than static data * return geojson (featurecollection) for specific run (warning, json seems to be invalid...) * returning valid JSON * update user information * adding doc * Manage gmaps * fixing doc (#10) * port 80 * Feature/qrcode (#11) * QR scan version 1 * SCAN QR code * zoom, détail marker * bouton scan QR au bon endroit * passage de params en dure au QRscreen * Redux en place * Levels correctly set from the store! * making a join * Quelques modifs du back * virgule oubliée * Getting the cois from the store * scan qr and counts the cois validated * completing a level! * Add duration and distance props on maps * rien de spécial! * Ajouts nouvelles images et modifs design * mise à jour bdd pour niveau et parcours finis * Fix colors * Remove debug button when logging fails * des modifs * Ajout Signin * ign in update * fix background color input fields login * update siginin pre demo * signin endpoint + doc * Signin update post present v1 * port 8080 * Feature/more datas (#12) * more datas ! * nohup * Ajout des énigmes sur le parcours test * nohup updt - port 80 * add titi, lvl 3 * Update insert_datas.sql * better datas (#13) * Update insert_datas.sql * useless commit :/ * Feature/end level (#14) * Add alert when levels and courses are completed * Manage current user geolocation * serveur distant set * Change header color * Add alerts * Fix alerts * Fix alerts 2 * Fix alerts 3 * Fix alerts 4 * Feature/parcours (#15) * port 8080 * changement en cours * météo + AQI * changements ! * Feature/parcours (#16) * port 8080 * changement en cours * météo + AQI * dénivelé en différence entre altitude max et min entre les points * parcours avec nouveaux pins presque en place ! * affichage des nouveaux pins ça a l'air plutôt pas mal ! * à peu près acceptable! * modifs * Merge Sign up screen (#19) * add backend * Update README.md * Update README.md * Update README.md * Readme (#20) * readme * readme * fini * Update README.md
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.