Esri oceans basemap layer

mbari-org / SeafloorMappingDB

Make MBARI seafloor mapping datasets more accessible and useful

GNU General Public License v3.0

3 stars 6 forks source link

Esri oceans basemap layer #176

Closed ksalamy closed 2 years ago

ksalamy commented 2 years ago

Just trying to add and merge my latest changes. Thanks.

ksalamy commented 2 years ago

Another attempt to commit my recent changes to the main repo. Having some issues with my branch being out of sink with the main repo. Hope I get this right this time.

MBARIMike commented 2 years ago

Testing this PR locally the home page looks good:

When I select Data -> Missions I'm taken to https://smdb.shore.mbari.org/missions/ and not my localhost version.

I'll make some code review comments where I think url names should be used instead of hard-coded URLs.

It looks like this PR can be merged after a few simple fixes.

MBARIMike commented 2 years ago

If this PR supersedes https://github.com/mbari-org/SeafloorMappingDB/pull/170 would you please close that one?

ksalamy commented 2 years ago

Hi Mike,

Can you look through this pull request and possibly merge this week? All initial checks have passed. Thanks in advance. Regards

MBARIMike commented 2 years ago

Hi Karen,

Per https://github.com/mbari-org/SeafloorMappingDB/pull/176#pullrequestreview-958153049 would you please update smdb/config/urls.py and smdb/smdb/templates/base.html to use url names?

ksalamy commented 2 years ago

Hi Mike,

I believe I have completed the requested url updates. Let me know if you need anything further to pull these changes in.

Karen

MBARIMike commented 2 years ago

I'm testing now and thing I'm getting the same error you reported with the development server:

django     |   File "/usr/local/lib/python3.8/dist-packages/django_extensions/management/commands/runserver_plus.py", line 326, in make_environ
django     |     del environ['werkzeug.server.shutdown']
django     | KeyError: 'werkzeug.server.shutdown'

Things appear to be fine in production as the Github Actions tests passed. I'll look as try to see why this is happening.

MBARIMike commented 2 years ago

It seems that other errors are causing this error from runserver_plus. I suggest using the standard runserver, restarting your containers, and loading http://localhost:8001/ with your browser's dev tools to see what javascript errors can be fixed. To switch from runserver_plus to runserver edit file smdb/compose/debug/django/start and make the appropriate change.