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.

Sign up for GitHub

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

Feat/events resolve ids #364

Merged
merged 3 commits into from
Jan 16, 2025
Merged

Feat/events resolve ids #364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2494420
feat: events user can read user-mgnt db
makelicious Jan 14, 2025
b772367
feat: add time format for event history translations
makelicious Jan 14, 2025
d9b1b19
chore: add external dependencies as envs
makelicious Jan 15, 2025
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
4 changes: 3 additions & 1 deletion infrastructure/docker-compose.deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,7 +680,9 @@ services:
- jwt-public-key.{{ts}}
environment:
- NODE_ENV=production
- MONGO_URL=mongodb://events:${EVENTS_MONGODB_PASSWORD}@mongo1/events?replicaSet=rs0
- EVENTS_MONGO_URL=mongodb://events:${EVENTS_MONGODB_PASSWORD}@mongo1/events?replicaSet=rs0
- USER_MGNT_MONGO_URL=mongodb://user-mgnt:${USER_MGNT_MONGODB_PASSWORD}@mongo1/user-mgnt?replicaSet=rs0
- ES_URL=http://search-user:${ROTATING_SEARCH_ELASTIC_PASSWORD}@elasticsearch:9200
deploy:
labels:
- 'traefik.enable=false'
Expand Down
6 changes: 3 additions & 3 deletions infrastructure/mongodb/on-deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ if [[ $EVENTS_USER != "FOUND" ]]; then
db.createUser({
user: 'events',
pwd: '$EVENTS_MONGODB_PASSWORD',
roles: [{ role: 'readWrite', db: 'events' }]
roles: [{ role: 'readWrite', db: 'events' }, {role: 'read', db: 'user-mgnt'}]
})
EOF
else
Expand All @@ -271,7 +271,7 @@ else
use events
db.updateUser('events', {
pwd: '$EVENTS_MONGODB_PASSWORD',
roles: [{ role: 'readWrite', db: 'events' }]
roles: [{ role: 'readWrite', db: 'events' }, {role: 'read', db: 'user-mgnt'}]
})
EOF
fi
fi
1 change: 1 addition & 0 deletions src/translations/client.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -798,6 +798,7 @@ error.title,Error title,Oops!,Oups !
error.title.unauthorized,Error title unauthorized,Unauthorized!,Non autorisé !
error.userListError,Error message when user list loads fails,Failed to load users,Impossible de charger les utilisateurs
error.weAreTryingToFixThisError,Error description,This page could not be found,"Ce n'est pas vous, c'est nous. C'est notre faute."
event.history.timeFormat,"MMMM dd, yyyy · hh.mm a","MMMM dd, yyyy · hh.mm a",
event.tennis-club-membership.action.declare.form.label,This is what this form is referred as in the system,Tennis club membership application,Demande d'adhésion au club de tennis
event.tennis-club-membership.action.declare.form.section.recommender.field.firstname.label,This is the label for the field,Recommender's first name,Prénom du recommandeur
event.tennis-club-membership.action.declare.form.section.recommender.field.id.label,This is the label for the field,Recommender's membership ID,ID d'adhésion du recommandeur
Expand Down
Loading