Skip to content
This repository was archived by the owner on Jun 23, 2019. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
102 commits
Select commit Hold shift + click to select a range
bce7dce
Put the source files in a src folder
laruiss Dec 17, 2018
c09563e
Add create-react-app boilerplate
laruiss Dec 17, 2018
7c64def
Split the server and client - almost working
laruiss Dec 17, 2018
c5f2533
Upgrade react-router and use redux
laruiss Dec 17, 2018
e5e85ef
fixup! Upgrade react-router and use redux
laruiss Dec 19, 2018
55ee09b
Fix react runtime error
laruiss Dec 17, 2018
5cb9461
Use .map() properly (not as a forEach)
laruiss Dec 17, 2018
4850154
Setup a proxy to use the RESTful API
laruiss Dec 17, 2018
965a1b1
Refactor Admin features
laruiss Dec 18, 2018
594b0d4
Clean up login candidat
laruiss Dec 18, 2018
32244fd
Refactor Candidat app
laruiss Dec 18, 2018
ff10d8e
Prepare for deployment on /candilib
laruiss Dec 18, 2018
201135f
Now the client has its own build
laruiss Dec 18, 2018
fe73b67
Let's be more professional
laruiss Dec 18, 2018
72392d8
Add a node server to simulate prod
laruiss Dec 18, 2018
8c64357
Fix bug in admin for creneaux
laruiss Dec 18, 2018
73d9c2b
Upgrade babel and AVA
laruiss Dec 18, 2018
bd904df
Add npm script lint and fix eslint errors
laruiss Dec 19, 2018
abdf84a
Dockerfile.front + compose + make
pli01 Dec 19, 2018
1107a45
Merge pull request #108 from pli01/tech/split-client-server-clean
Dec 19, 2018
6a78941
nginx front
pli01 Dec 19, 2018
691118e
Merge pull request #109 from pli01/tech/split-client-server-clean
Dec 19, 2018
9b67041
Put all of server in its own folder
laruiss Dec 19, 2018
17b8be0
Get back-end ready to run in docker container
laruiss Dec 19, 2018
83dc502
Make build-back ; docker-compose all
pli01 Dec 19, 2018
9ed18cc
Validation front/back/db
pli01 Dec 19, 2018
2a3d711
Merge pull request #110 from pli01/tech/split-client-server-clean
Dec 19, 2018
b8a6a4b
Upgrade mongoose
laruiss Dec 19, 2018
eb45b36
Start server only after mongodb connection
laruiss Dec 19, 2018
2d58a3b
Fix important bug!
laruiss Dec 19, 2018
3f38199
Fix upload Aurige
laruiss Dec 19, 2018
86bf32d
Fix message displayed to candidat
laruiss Dec 19, 2018
4f22a7c
Fix travis with new target
pli01 Dec 19, 2018
1eb6f7d
Merge pull request #111 from pli01/tech/split-client-server-clean
Dec 19, 2018
44cbc44
Fix upload Aurige CSV
laruiss Dec 19, 2018
9272f36
Put signout button in header
laruiss Dec 19, 2018
b66c374
Fix dateReussiteETG check
laruiss Dec 19, 2018
ad1963e
Clean up dependencies and use standard rules
laruiss Dec 19, 2018
2ba354d
Even more clean up
laruiss Dec 19, 2018
1771332
Too much clean up, maybe?
laruiss Dec 19, 2018
be419cc
Add simple check: back is running ?
Dec 19, 2018
fdfc443
Merge pull request #113 from pli01/tech/split-client-server-clean
Dec 20, 2018
1673ff8
Add a date column as it where
laruiss Dec 20, 2018
8439718
Improve UI
laruiss Dec 20, 2018
07aae8d
Automatically latinize the lastname in signup form
laruiss Dec 20, 2018
a3acabf
Add MI favicon
laruiss Dec 20, 2018
63514bf
fix merge nom and nomNaissance to uppercase and latinize
baudointran Dec 20, 2018
d142d3c
fix merge nom and nomNaissance to uppercase and latinize-1
baudointran Dec 20, 2018
6278aa0
fix merge nom and nomNaissance to uppercase and latinize-2
baudointran Dec 20, 2018
3a7eb48
Fix makefile archive
pli01 Dec 20, 2018
2ca6b77
Merge pull request #114 from pli01/tech/split-client-server-clean
Dec 20, 2018
a87814e
Clean up unused code
laruiss Dec 20, 2018
bfc656c
Consistently set success false in server response
laruiss Dec 20, 2018
69f7d5a
Try 10 times the first connection to Mongo
laruiss Dec 20, 2018
f2a369b
Fix lint errors and add a npm script format
laruiss Dec 20, 2018
ae637ba
Fix error messages on Login
laruiss Dec 20, 2018
ffaba50
Set the logo and the beta icon
laruiss Dec 20, 2018
1fc48e4
Reduce docker image size with node:8-slim
Dec 22, 2018
8bf240c
build mode develop
baudointran Dec 27, 2018
c768cec
admin list candidats tri and label date d'obtention
baudointran Dec 27, 2018
34a672d
trim nom, email and neph
baudointran Dec 27, 2018
7c73433
correction mail convocation
baudointran Dec 27, 2018
03ef317
test correction image beta
baudointran Dec 27, 2018
3940012
correction image from data
baudointran Dec 27, 2018
3cfb84a
Merge pull request #118 from LAB-MI/correction-v1.0.1
Dec 28, 2018
57c0561
Correction neph inscription
baudointran Dec 28, 2018
ec93858
Try group list candidat
baudointran Jan 3, 2019
b126645
Export CSV candidats réservé
baudointran Jan 4, 2019
6caabfd
API: export CSV candidats with params date, inspecteur and centre
baudointran Jan 7, 2019
49a3644
Correction
baudointran Jan 7, 2019
fd6a13a
Merge pull request #119 from LAB-MI/split-client-server-clean/listcan…
baudointran Jan 8, 2019
dce0c9a
Replace version in package.json
pli01 Jan 8, 2019
31b1eb7
add version in footer, route api/version
baudointran Jan 8, 2019
d7d0228
Merge pull request #117 from pli01/ci/fix-image-size
baudointran Jan 9, 2019
b606ed0
Merge pull request #121 from pli01/features/add_version
baudointran Jan 9, 2019
569d291
Merge pull request #122 from LAB-MI/split-client-server-clean/display…
baudointran Jan 9, 2019
edcd9fc
fix docker-compose and dockerfile to dev
baudointran Jan 9, 2019
e320624
Fix escape key on crenau dialogbox and fix error error_json
baudointran Jan 9, 2019
b146d65
Merge pull request #123 from LAB-MI/split-client-server-clean/fix-dia…
baudointran Jan 9, 2019
3e3c18c
Detect tty in CI mode
pli01 Jan 10, 2019
1efa5a0
Merge pull request #124 from pli01/feature/devops-ci-detect-tty
baudointran Jan 10, 2019
bbac0ff
fix message annulation in snackbar
baudointran Jan 15, 2019
ba6a361
Merge pull request #125 from LAB-MI/split-client-server-clean/fix-sna…
baudointran Jan 15, 2019
3cc8de1
trim in centre and inspecteur from CSVF file
baudointran Jan 17, 2019
99cdfe6
Nom de naissance in inscription page
baudointran Jan 17, 2019
b5f15bb
correction lint
baudointran Jan 18, 2019
91517c4
Merge pull request #126 from LAB-MI/split-client-server-clean/fix-upl…
baudointran Jan 18, 2019
419f026
Add Site: Saint-Brice
baudointran Feb 26, 2019
adab731
Add Sites in Front
baudointran Feb 26, 2019
f41dd26
update build to dev
baudointran Mar 5, 2019
ffb55a0
env example
baudointran Mar 5, 2019
52ee9a4
init delete function
philippeBron Mar 7, 2019
e07838d
add deleteCreneau frunction
philippeBron Mar 8, 2019
aea1eb0
add client side
philippeBron Mar 8, 2019
b18ec43
correct refresh calendat
philippeBron Mar 9, 2019
dc5a2d8
add delay before next reservation
philippeBron Mar 9, 2019
dddf122
correct lint issue
philippeBron Mar 9, 2019
6113e75
correct lint issue
philippeBron Mar 9, 2019
4b73998
fix typo and undefined date
philippeBron Mar 11, 2019
b9b1d92
Merge pull request #127 from LAB-MI/tech/delete_creneaux
baudointran Mar 15, 2019
ba970d4
patch heure d'été
philippeBron Mar 19, 2019
fbc5b18
Merge pull request #128 from LAB-MI/tech/patch_summer_time
baudointran Mar 20, 2019
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
9 changes: 0 additions & 9 deletions .babelrc

This file was deleted.

11 changes: 11 additions & 0 deletions .env.exemple
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
APP_NAME=candilib
SECRET=<clé pour le token>
PORT=8000
PORT_MAIL=3000
HOST=http://localhost
SMTP_SERVER=<server smtp host>
SMTP_PORT=25
MAIL_FROM=<adresse mail>
CANDIDAT_EXPIREDIN=72h
EMAIL_SUPPORT=<adresse mail>
PUBLIC_URL=http://localhost:3000
37 changes: 0 additions & 37 deletions .eslintrc

This file was deleted.

3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ server/config.js
server/models/__tests__
.history
.env
.env-prod
.env-prod
env/*
server/util/sendMail\.js\.cloud

Expand All @@ -28,3 +28,4 @@ server/config\.home\.js
candilib-build/
db/
data/
client/build/
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ script:
- echo "# build & run production"
- make build-all-images
- docker images && docker ps
- make up-prod
- make up-all-prod
- make test-up
- make down-prod
- make down-all-prod
after_script:
- make clean-images clean-dir
- echo "END"
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ RUN if [ ! -z "$proxy" ] ; then \
[ -z "$npm_registry" ] || npm config set registry=$npm_registry ; \
npm install

COPY .env .eslintignore .eslintrc server/inbox/sites.json .babelrc index.js nodemon.json webpack.config.babel.js webpack.config.dev.js webpack.config.prod.js webpack.config.server.js ./
COPY .env .eslintignore .eslintrc server/inbox/sites.json .babelrc index.js nodemon.json webpack.config.babel.js webpack.config.prod.js webpack.config.server.js ./
COPY client ./client
COPY server ./server
CMD ["npm", "start"]
Expand Down
56 changes: 56 additions & 0 deletions Dockerfile.back
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
FROM node:8-slim as base
ARG proxy
ARG npm_registry
# ARG sass_registry
ARG no_proxy

ENV TZ=Europe/Paris
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone

RUN mkdir -p /usr/src/app
WORKDIR /usr/src/app
EXPOSE 8000

RUN if [ ! -z "$proxy" ] ; then \
npm config delete proxy; \
npm config set proxy $proxy; \
npm config set https-proxy $proxy ; \
npm config set no-proxy $no_proxy; \
fi ; \
[ -z "$npm_registry" ] || npm config set registry=$npm_registry

#
# target developement
#
FROM base as development
ENV NODE_ENV development

COPY server/package.json server/package-lock.json ./
RUN set -ex ; npm install

COPY server/inbox/sites.json ./
COPY server ./

CMD ["npm", "start"]

#
# target build
#
FROM development as build
ENV NODE_ENV=production
RUN npm run build
#RUN set -ex ; npm run build 2>&1 | tee npm.log ; \
# egrep -E '(Error|ERR|error)' npm.log && exit 1 ; rm -rf npm.log

#
# target production (build front in prodution mode)
#
FROM base as production
ENV NODE_ENV=production
COPY server/package.json server/package-lock.json server/processes.json ./
RUN set -ex ; npm install --production ; \
npm install pm2 -g

COPY server/index.js ./
COPY --from=build /usr/src/app/dist ./dist
CMD ["pm2-runtime", "processes.json"]
61 changes: 61 additions & 0 deletions Dockerfile.front
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
FROM node:8-slim as base
ARG proxy
ARG npm_registry
# ARG sass_registry
ARG no_proxy

ENV TZ=Europe/Paris
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone

RUN mkdir -p /usr/src/app
WORKDIR /usr/src/app
EXPOSE 8000

RUN if [ ! -z "$proxy" ] ; then \
npm config delete proxy; \
npm config set proxy $proxy; \
npm config set https-proxy $proxy ; \
npm config set no-proxy $no_proxy; \
fi ; \
[ -z "$npm_registry" ] || npm config set registry=$npm_registry

#
# target developement
#
FROM base as development
ENV NODE_ENV development

COPY client/package.json client/package-lock.json ./
RUN set -ex ; npm install

COPY client ./

CMD ["npm", "start"]

#
# target build
#
FROM development as build
ENV NODE_ENV=production
RUN npm run build
#RUN set -ex ; npm run build 2>&1 | tee npm.log ; \
# egrep -E '(Error|ERR|error)' npm.log && exit 1 ; rm -rf npm.log

#
# target production (build front in prodution mode)
#
FROM base as production
ENV NODE_ENV=production

COPY --from=build /usr/src/app/build ./build

#
# last default target (nginx+front build)
#
FROM nginx:latest
COPY --from=production /usr/src/app/build/ /usr/share/nginx/html
COPY nginx/run.sh /run.sh
COPY nginx/nginx-run.template /etc/nginx/conf.d/default.template
COPY nginx/nginx.template /etc/nginx/nginx.template
RUN [ -f "/run.sh" ] && chmod +x /run.sh
CMD ["/run.sh"]
Loading