Serve front-end dist from express app

[arabyalhomsi]

https://github.com/paulodiovani/hacktoberrank/issues/30

[arabyalhomsi]

npm run build needs to be changed in Travis

[paulodiovani]

We must also update README.md, adding:

• cp .env.example .env
• npm start

[paulodiovani]

Hey @arabyalhomsi , We have just a couple more days to finish the challenge. Do you have some time for this? :running_man:

[arabyalhomsi]

@paulodiovani I'll try to do it now

[arabyalhomsi]

I do not understand where this conflict is coming from

[arabyalhomsi]

There is no merge conflicts in my local repo, I just do not get why there is conflict

[paulodiovani]

because upstream has more recent commits, you can do this:

# add original repo as upstream 
git remote add upstream https://github.com/paulodiovani/hacktoberrank.git

# sync your local master branch with upstream
# this is a good idea to do always before starting a new branch/PR
git fetch upstream
git checkout master
git merge upstream/master

# now, just sync your feature branch and fix conflicts normally
git checkout feature/serve-front-from-back
git merge master  # and so on...

[arabyalhomsi]

My filesystem is acting really weird. I am not sure how to fix it and I do not have that much time unfortunately

[paulodiovani]

@arabyalhomsi you explicit changed file modes in these two commits.

• https://github.com/paulodiovani/hacktoberrank/pull/34/commits/641fc98473787f7cb2e6e736d5af8119563e252e
• https://github.com/paulodiovani/hacktoberrank/pull/34/commits/2b4285cea00d1a507de647c965d9f6cc26c133ff

Files should have 0644 mode, unless they are executable (bin) files.

Could you please revert these commits at least?

Also, the .env was commited, it should not.

[paulodiovani]

I'll do this by command line.