-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
Changes from 15 commits
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 627bc5b
Implement view to avoid arches chrome
jacobtylerwalls 23a8352
Move declarations.d.ts
jacobtylerwalls 04054b1
Reconcile apps.py and github actions
jacobtylerwalls ccac31f
Remove underscore
jacobtylerwalls 3709437
@cbyrd troubleshoot tsconfig-paths
chrabyrd 1b34320
updates GH test runners
chrabyrd 10836fb
nit
chrabyrd 2a0fdc6
nit
chrabyrd 3535b1c
nit
chrabyrd 82f08ce
nit
chrabyrd a9f774d
nit
chrabyrd d11de7d
nit
chrabyrd cd108bd
nit
chrabyrd ee3e24a
Add arches_references to test settings
jacobtylerwalls 6640f22
Remove dummy tests
jacobtylerwalls 084765c
Update test settings and directory structure
jacobtylerwalls 7c47ae1
nit
chrabyrd eafebcf
Merge branch 'jtw/fix-aliasing' of https://github.com/archesproject/a…
chrabyrd File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,14 @@ | ||
from django.apps import AppConfig | ||
from django.conf import settings | ||
|
||
from arches.settings_utils import generate_frontend_configuration | ||
|
||
class Arches_LingoConfig(AppConfig): | ||
|
||
class ArchesLingoConfig(AppConfig): | ||
name = "arches_lingo" | ||
verbose_name = "Arches Lingo" | ||
is_arches_application = True | ||
|
||
def ready(self): | ||
if settings.APP_NAME.lower() == self.name: | ||
generate_frontend_configuration() |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
14 changes: 0 additions & 14 deletions
14
arches_lingo/media/js/views/components/plugins/reference-data-manager.js
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
import LingoApp from '@/arches_lingo/App.vue'; | ||
import createVueApplication from 'arches/arches/app/media/js/utils/create-vue-application'; | ||
|
||
createVueApplication(LingoApp).then(vueApp => { | ||
vueApp.mount('#lingo-mounting-point'); | ||
}); |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
<script setup> | ||
import Foo from "@/arches_lingo/components/FooComponent.vue"; | ||
</script> | ||
|
||
<template> | ||
<Foo /> | ||
</template> |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,4 @@ | ||
// import declarations from other projects or Arches core | ||
import("../../node_modules/arches/arches/app/src/declarations.d.ts"); | ||
|
||
// declare untyped modules that have been added to your project in `package.json` | ||
// Module homepage on npmjs.com uses logos "TS" or "DT" to indicate if typed | ||
declare module "arches"; | ||
|
||
// declare filetypes used in `./src/` folder | ||
declare module "*.ts"; | ||
declare module "*.vue"; | ||
import("@/arches/declarations.d.ts"); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
{% extends "base-root.htm" %} | ||
|
||
{% block title %} | ||
|
||
{% endblock title %} | ||
|
||
{% block body %} | ||
<div id="lingo-mounting-point"></div> | ||
{% endblock body %} |
1 change: 0 additions & 1 deletion
1
arches_lingo/templates/views/components/plugins/reference-data-manager.htm
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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 bottomThere was a problem hiding this comment.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(oooO maybe not...arches.app
only ever has templates, notmedia/build/...
)There was a problem hiding this comment.
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
There was a problem hiding this comment.
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 underarches/media
, so this should be A-OK.There was a problem hiding this comment.
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 abovearches
because there are commands inarches_references/packages.py
that need to be included in the packages options. I'll fix as part of #53