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

Implement new base-root.htm template #38

Merged
merged 19 commits into from
Aug 6, 2024
Merged

Implement new base-root.htm template #38

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
19fe689
Fix plugin paths/aliasing to new 7.6 pattern
jacobtylerwalls Aug 2, 2024
627bc5b
Implement view to avoid arches chrome
jacobtylerwalls Aug 2, 2024
23a8352
Move declarations.d.ts
jacobtylerwalls Aug 2, 2024
04054b1
Reconcile apps.py and github actions
jacobtylerwalls Aug 2, 2024
ccac31f
Remove underscore
jacobtylerwalls Aug 2, 2024
3709437
@cbyrd troubleshoot tsconfig-paths
chrabyrd Aug 5, 2024
1b34320
updates GH test runners
chrabyrd Aug 5, 2024
10836fb
nit
chrabyrd Aug 5, 2024
2a0fdc6
nit
chrabyrd Aug 5, 2024
3535b1c
nit
chrabyrd Aug 5, 2024
82f08ce
nit
chrabyrd Aug 5, 2024
a9f774d
nit
chrabyrd Aug 6, 2024
d11de7d
nit
chrabyrd Aug 6, 2024
cd108bd
nit
chrabyrd Aug 6, 2024
ee3e24a
Add arches_references to test settings
jacobtylerwalls Aug 6, 2024
6640f22
Remove dummy tests
jacobtylerwalls Aug 6, 2024
084765c
Update test settings and directory structure
jacobtylerwalls Aug 6, 2024
7c47ae1
nit
chrabyrd Aug 6, 2024
eafebcf
Merge branch 'jtw/fix-aliasing' of https://github.com/archesproject/a…
chrabyrd Aug 6, 2024
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 arches_lingo/apps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from django.apps import AppConfig
from django.conf import settings

from arches.settings_utils import generate_frontend_configuration

Expand All @@ -9,4 +10,5 @@ class ArchesLingoConfig(AppConfig):
is_arches_application = True

def ready(self):
generate_frontend_configuration()
if settings.APP_NAME.lower() == self.name:
generate_frontend_configuration()
2 changes: 1 addition & 1 deletion arches_lingo/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,6 @@
"django.contrib.staticfiles",
"django.contrib.gis",
"django_hosts",
"arches_references",
"arches",
"arches.app.models",
"arches.management",
Expand All @@ -145,6 +144,7 @@
"corsheaders",
"oauth2_provider",
"django_celery_results",
"arches_references",
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't we want this above arches since it's an arches application?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it doesn't matter, as long as arches.app is at the bottom

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought that was only true for templates, not css/img discovery.

Copy link
Member Author

@jacobtylerwalls jacobtylerwalls Aug 6, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(arches.app only ever has templates, not media/build/...) oooO maybe not...

Copy link
Contributor

@chrabyrd chrabyrd Aug 6, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just tested with an image and the results are as you'd expect ( project -> apps -> core ), but happy to chat if you'd like

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, I'm with you now. I forgot how specialized we made ArchesApplicationsStaticFilesFinder, which even if there's an "arches" in the middle of INSTALLED_APPS, there won't be anything under arches/media, so this should be A-OK.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jacobtylerwalls @chrabyrd back from the future - arches_references has to go above arches because there are commands in arches_references/packages.py that need to be included in the packages options. I'll fix as part of #53

# "silk",
)

Expand Down