Skip to content

Commit

Permalink
Merge branch 'adg/100-scheme-editor-side-panel' into adg/125-namespac…
Browse files Browse the repository at this point in the history
…e-section
  • Loading branch information
aarongundel committed Dec 3, 2024
2 parents 679715a + 639c60d commit 90428f9
Show file tree
Hide file tree
Showing 5 changed files with 86 additions and 27 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ const schemeComponents = [
const emit = defineEmits(["maximize", "side", "close", "updated"]);
const toggleSize = () => {
if (props.editorMax) {
emit("maximize");
Expand Down Expand Up @@ -64,34 +63,37 @@ const updateScheme = async () => {
}),
);
emit('updated');
emit("updated");
};
</script>

<template>
<div>
<div class="header">
<div class="header">
<div>
<h3>{{ $gettext("Scheme Editor Tools") }}</h3>
<div>
<h2>{{ $gettext("Editor Tools") }}</h2>
<div>
<Button @click="toggleSize">
<i
:class="{
pi: true,
'pi-window-maximize': props.editorMax,
'pi-window-minimize': !props.editorMax,
}"
aria-hidden="true"
/>
</Button>
<Button @click="$emit('close')">
<i
class="pi pi-times"
aria-hidden="true"
/>
</Button>
</div>
<Button
:aria-label="$gettext('toggle editor size')"
@click="toggleSize"
>
<i
:class="{
pi: true,
'pi-window-maximize': props.editorMax,
'pi-window-minimize': !props.editorMax,
}"
aria-hidden="true"
/>
</Button>
<Button
:aria-label="$gettext('close editor')"
@click="$emit('close')"
>
<i
class="pi pi-times"
aria-hidden="true"
/>
</Button>
</div>
</div>
<div class="content">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,3 @@ const { $gettext } = useGettext();
abc
</SchemeReportSection>
</template>

5 changes: 3 additions & 2 deletions arches_lingo/src/arches_lingo/pages/SchemePage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import SchemeStandard from "@/arches_lingo/components/scheme/report/SchemeStanda
import SchemeAuthority from "@/arches_lingo/components/scheme/report/SchemeAuthority.vue";
import SchemeEditor from "@/arches_lingo/components/scheme/editor/SchemeEditor.vue";
const editorVisible = ref<boolean>(true);
const sectionVisible = ref<boolean>(true);
const editorVisible = ref(true);
const sectionVisible = ref(true);
const editorTab = ref<string>();
type sectionTypes =
| typeof SchemeNamespace
Expand All @@ -19,6 +19,7 @@ type sectionTypes =
| typeof SchemeAuthority
| typeof SchemeNote;
const childRefs = ref<Array<sectionTypes>>([]);
const onMaximize = () => {
editorVisible.value = true;
sectionVisible.value = false;
Expand Down
25 changes: 25 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
version: "3.8"
services:
arches-lingo:
container_name: arches-lingo
image: lingo-test
command: run_dev_server
volumes:
# To change these variables, modify/add the .env file prior to launch - NOT env_file.env
- ${ARCHES_CORE_HOST_DIR:-../arches/}:/web_root/arches
- ./:/web_root/arches-lingo
- $HOME/.aws/:/root/.aws/
ports:
- ${HOST_PROJECT_PORT:-8059}:80
- ${HOST_PROJECT_DEBUG_PORT:-5544}:5678
stdin_open: true
env_file:
- ./docker/development/env_file.env
tty: true
labels:
- traefik.http.routers.my-container.rule=Host(`ca-shpo-online.local`)
- traefik.frontend.passHostHeader=true
networks:
default:
external: true
name: arches7-0-dev
32 changes: 32 additions & 0 deletions docker/development/env_file.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#arches
ARCHES_PROJECT=arches-lingo
INSTALL_DEFAULT_GRAPHS=False
INSTALL_DEFAULT_CONCEPTS=False
PGPASSWORD=postgis
PGHOST=postgres14-3_arches7-0
PGPORT=5432
ARCHES_PUBLIC_SERVER_ADDRESS=http://localhost:80
PGUSER=postgres
PGDATABASE=arches_lingo
ARCHES_ESHOST=elasticsearch8-3_arches7-0
ARCHES_ESPORT=9200
ARCHES_DJANGO_DEBUG=True
DJANGO_MODE=DEV
DOMAIN_NAMES=*
DJANGO_PORT=80
#DJANGO_REMOTE_DEBUG=False
PYTHONUNBUFFERED=0
TZ=PST
ELASTICSEARCH_PREFIX=disco

#rabbitmq
RABBITMQ_USER=guest
RABBITMQ_PASS=guest

#cantaloupe
CANTALOUPE_ENDPOINT_ADMIN_ENABLED=true
CANTALOUPE_ENDPOINT_ADMIN_USERNAME=admin
CANTALOUPE_ENDPOINT_ADMIN_SECRET=admin
CANTALOUPE_HOST=cantaloupe_disco
CANTALOUPE_PORT=8182
CANTALOUPE_FILESYSTEMSOURCE_BASICLOOKUPSTRATEGY_PATH_PREFIX=/imageroot/

0 comments on commit 90428f9

Please sign in to comment.