New Update to 4.2.0

[SMiLeY]

Ok so I used - 'git remote add origin https://github.com/byNeHo/CoD4x-WebAdmin.git'
and then ran - 'git pull origin master'

See below.

From https://github.com/byNeHo/CoD4x-WebAdmin

• branch master -> FETCH_HEAD
  error: Your local changes to the following files would be overwritten by merge:
  app/controllers/admin/servers.js
  app/controllers/index/home.js
  app/routes/admin.js
  app/routes/index.js
  app/seed/dbseed.js
  app/views/admin/home/index.pug
  app/views/frontpage/home/index.pug
  app/views/layout/home.pug
  bin/www
  locales/de/frontpages.json
  locales/en/frontpages.json
  locales/es/frontpages.json
  locales/hr/frontpages.json
  package.json
  public/css/app_1.min.css
  public/css/app_2.min.css
  public/js/client.js
  server.js
  update.js
  Please commit your changes or stash them before you merge.
  error: The following untracked working tree files would be overwritten by merge:
  app/config/config.json
  Please move or remove them before you merge.
  Aborting

[SMiLeY]

Ok, seems to updated now. (did it manually) Populated the db etc db app starts up ok and can see it is 4.2.1 but ....

[SMiLeY]

Did it all from scratch with same results. Starting to think this is a 20.04 and node modules problem?

[SMiLeY]

After updating files manually I stopped app and ran ran git pull origin master && npm run update again and all is ok...Working again..

As said before great job on the update.

[SMiLeY]

And dark mode looks awesome

[NeHo]

Glad you solved it

[NeHo]

@smiley If you face this problem next time make sure first that you backup your config file, profile images (best would be to save the whole public folder so later on you can copy back profile, ban images), it will be lost

/app/config/config.json

After that run this commands on root

git clean -d -f

copy back your config file what you just saved, images

and finally

git pull origin master && npm run update

[SMiLeY]

NeHo,

Thanks for that. Good info and yes I will do that if it happens again.

Once again I will say great work. I think it looks awesome in dark mode and like the shout box.

The only thing that does not work well for me is that the player chat history does not come up, top players does not record everyone ( I really would like that too and post link so players can see theirs scores/ratio ), and the site map is just text on a page. I am using Apache but I know you said NGINX was the way ahead to me Not sure if that makes any difference with things like this but I am looking to make the switch..last time i tried I failed and could not get my webpage to display haha....Round two ..

[wkuzma]

Hi all - seems my problem was with Ubuntu 18.04 - no matter what I did I was unable to update to 4.21 or 4.3.0 while using that version of Ubuntu.
so i started from scratch and saved a copy of the app I was using - I then installed Ubuntu 20.04 downloaded the 4.3.0 app from https://github.com/byNeHo/CoD4x-WebAdmin and installed that on Ubuntu 20.04 - everything went smooth and I got no errors - Then I copied my img folder to the new setup and so far all is running ok.

I tried the same thing on Ubuntu 18.04 and got nothing but errors so I will stick with Ubuntu 20.04.. The only problem I have is there is no .git directory in the new setup to use git pull origin master && npm run update and if I copied it from my old setup it errors. So I guess I will have to manually download each update and install it.

[wkuzma]

Oh and thank you Neho for adding Players by Country - it works great.

[SMiLeY]

I am also on 20.04 and when I did the upgrade to 4.3.0 using NeHo's method of
git stash
git pull origin master
git stash pop

All worked fine. Loving the new dark mode as I already said But still one or two things not working for me. Not sure why but overall it does everything I need. Awesome job.