search

FAOEuFMD / milestones-dashboard

An open-source dashboard that tracks the completion of yearly EuFMD Program Targets until the year 2027.
https://milestones-dashboard-staging.onrender.com/
0 stars 0 forks source link

chore: local database setup #35

Closed irenezatti closed 2 months ago

irenezatti commented 2 months ago

Shurdhi and I connected to the local database and everything is working fine. However, it shows it cannot merge automatically. Sophie, can you look at it so that if everything is good to go we can integrate it into staging?

Thanks

sssoja commented 2 months ago

Hi @irenezatti , please see the tutorial I left on Slack regarding merge conflicts.

In the meantime, can you update the description of this pull request just to give a little context as to what's been changed.

See an example in the engineering wiki here

irenezatti commented 2 months ago

The files we changed were: package.json in client, database.js, helper.js, and package.json in root. We have done so in order to connect correctly with the database and to set up the backend correctly. This is the push I have done after I managed to successfully connect locally to the database. This should be the latest version with all the correct details.