opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove webpack for initial version, fix default location

Browse Source
This commit is contained in:
Alexander OSTROVSKY
2021-09-16 23:23:03 -04:00
committed by Dannon Baker
parent a8fb9b5983
commit c5825e07db
8 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/components/NewUserWelcome/components/Slides.vue
+1 -6
View File
@@ -31,11 +31,6 @@
<script>
import { getAppRoot } from "onload/loadConfig";
export default {
// data() {
// return {
// imageLoc: "static/plugins/welcome_page/new_user/static/topics/",
// }
// },
props: {
header: {type: String, required: true},
slides: {type: Array, required: true},
@@ -44,7 +39,7 @@
methods: {
imgUrl(src) {
const root = getAppRoot();
const url = `${root}${this.imageLoc}${src}`.replace("//", "/");
const url = `${root}static/${this.imageLoc}${src}`.replace("//", "/");
return url;
}
}
client/src/components/NewUserWelcome/components/Subtopics.vue
+1 -1
View File
@@ -42,7 +42,7 @@
methods: {
imgUrl(src) {
const root = getAppRoot();
const url = `${root}${this.imageLoc}${src}`.replace("//", "/");
const url = `${root}static/${this.imageLoc}${src}`.replace("//", "/");
return url;
}
}
client/src/components/NewUserWelcome/components/Topics.vue
+1 -2
View File
@@ -32,7 +32,6 @@
<script>
import { getAppRoot } from "onload/loadConfig";
export default {
props: {
topics: {type: Array, required: true},
imageLoc: {type: String, required: false, default: "static/plugins/welcome_page/new_user/static/topics/"},
@@ -40,7 +39,7 @@ export default {
methods: {
imgUrl(src) {
const root = getAppRoot();
const url = `${root}${this.imageLoc}${src}`.replace("//", "/");
const url = `${root}static/${this.imageLoc}${src}`.replace("//", "/");
return url;
}
}
client/src/components/NewUserWelcome/newUserWelcome.vue
+2 -2
View File
@@ -6,7 +6,7 @@
v-bind="currentNode"
@select="down"
@back="up"
:image-loc="config.welcome_directory || defaultLocation"
:image-loc="config.welcome_directory"
>
</component>
</ConfigProvider>
@@ -60,7 +60,7 @@ export default {
methods: {
imgUrl(src) {
const root = getAppRoot();
const url = `${root}${this.imageLoc}${src}`.replace("//", "/");
const url = `${root}static/${this.imageLoc}${src}`.replace("//", "/");
return url;
},
up(){
client/src/entry/analysis/AnalysisRouter.js
-3
View File
@@ -433,13 +433,10 @@ export const getAnalysisRouter = (Galaxy) => {
},
mountWelcome: async function() {
import(/* webpackIgnore: true */ getAppRoot() + "static/plugins" + Galaxy.config.welcome_directory + "topics.js").then(module=> {
const propsData = {
newUserDict,
};
this._display_vue_helper(NewUserWelcome, propsData);
}
)
},
/** load the center panel with a tool form described by the given params obj */
doc/source/admin/galaxy_options.rst
+1 -1
View File
@@ -4796,7 +4796,7 @@
Location of New User Welcome data, a single directory containing
the images and JSON of Topics/Subtopics/Slides as export. This
location is relative to galaxy/static
:Default: ``/welcome_page/new_user/static/``
:Default: ``plugins/welcome_page/new_user/static/topics/``
:Type: str
lib/galaxy/config/sample/galaxy.yml.sample
+1 -1
View File
@@ -2349,5 +2349,5 @@ galaxy:
# Location of New User Welcome data, a single directory containing the
# images and JSON of Topics/Subtopics/Slides as export. This location
# is relative to galaxy/static
#welcome_directory: /welcome_page/new_user/static/
#welcome_directory: plugins/welcome_page/new_user/static/topics/
lib/galaxy/webapps/galaxy/config_schema.yml
+1 -1
View File
@@ -3497,7 +3497,7 @@ mapping:
welcome_directory:
type: str
default: /welcome_page/new_user/static/
default: plugins/welcome_page/new_user/static/topics/
required: false
desc: |
Location of New User Welcome data, a single directory containing the