diff --git a/.gitignore b/.gitignore
index b0a6167c56..cac4668651 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,6 +50,7 @@
!/public/images/research_plans/.keep
/public/images/*
+!/public/images/wild_card/
/uploads/attachments/*
/uploads/thumbnails
diff --git a/app/assets/javascripts/components/PubchemLabels.js b/app/assets/javascripts/components/PubchemLabels.js
index 500137c964..7055ee5940 100644
--- a/app/assets/javascripts/components/PubchemLabels.js
+++ b/app/assets/javascripts/components/PubchemLabels.js
@@ -28,9 +28,9 @@ export default class PubchemLabels extends React.Component {
render() {
let {element, color} = this.props
- let pubchemLogo = "/images/pubchem.svg"
+ let pubchemLogo = "/images/wild_card/pubchem.svg"
let pubchem = (
- 
+
)
let labelStyle = {
diff --git a/app/assets/javascripts/components/ResearchPlanDetails.js b/app/assets/javascripts/components/ResearchPlanDetails.js
index a460d5157e..3f7b1e7690 100644
--- a/app/assets/javascripts/components/ResearchPlanDetails.js
+++ b/app/assets/javascripts/components/ResearchPlanDetails.js
@@ -24,7 +24,7 @@ export default class ResearchPlanDetails extends Component {
svgOrLoading(research_plan) {
let svgPath = "";
if (this.state.loadingMolecule) {
- svgPath = "/images/loading-bubbles.svg";
+ svgPath = "/images/wild_card/loading-bubbles.svg";
} else {
svgPath = research_plan.svgPath;
}
diff --git a/app/assets/javascripts/components/SampleDetails.js b/app/assets/javascripts/components/SampleDetails.js
index b5e5ce91cd..8ca6532e5d 100644
--- a/app/assets/javascripts/components/SampleDetails.js
+++ b/app/assets/javascripts/components/SampleDetails.js
@@ -181,7 +181,7 @@ export default class SampleDetails extends React.Component {
svgOrLoading(sample) {
let svgPath = "";
if (this.state.loadingMolecule) {
- svgPath = "/images/loading-bubbles.svg";
+ svgPath = "/images/wild_card/loading-bubbles.svg";
} else {
svgPath = sample.svgPath;
}
diff --git a/app/assets/javascripts/components/SampleDetailsContainers.js b/app/assets/javascripts/components/SampleDetailsContainers.js
index a8bcb54828..2456e6d504 100644
--- a/app/assets/javascripts/components/SampleDetailsContainers.js
+++ b/app/assets/javascripts/components/SampleDetailsContainers.js
@@ -103,8 +103,8 @@ export default class SampleDetailsContainers extends Component {
PreviewImg(container) {
const rawImg = container.preview_img
- const noAttSvg = '/images/no_attachment.svg'
- const noAvaSvg = '/images/not_available.svg'
+ const noAttSvg = '/images/wild_card/no_attachment.svg'
+ const noAvaSvg = '/images/wild_card/not_available.svg'
switch(rawImg) {
case null:
case undefined:
diff --git a/app/assets/javascripts/components/models/Reaction.js b/app/assets/javascripts/components/models/Reaction.js
index 7e6dfa790d..98317aabb6 100644
--- a/app/assets/javascripts/components/models/Reaction.js
+++ b/app/assets/javascripts/components/models/Reaction.js
@@ -443,7 +443,7 @@ export default class Reaction extends Element {
if(this.reaction_svg_file && this.reaction_svg_file != '***')
return `/images/reactions/${this.reaction_svg_file}`
else
- return `images/no_image_180.svg`
+ return `images/wild_card/no_image_180.svg`
}
SMGroupValid() {
@@ -480,7 +480,7 @@ export default class Reaction extends Element {
let group = this['_' + cats[i]]
if (group) {
let index = group.findIndex(x => x.id == material.id)
-
+
if (index >= 0) {
this['_' + cats[i]][index] = new Sample(material)
break
diff --git a/app/assets/javascripts/components/models/ResearchPlan.js b/app/assets/javascripts/components/models/ResearchPlan.js
index 407068b06a..583de445b0 100644
--- a/app/assets/javascripts/components/models/ResearchPlan.js
+++ b/app/assets/javascripts/components/models/ResearchPlan.js
@@ -33,7 +33,7 @@ export default class ResearchPlan extends Element {
if (this.svg_file){
return `/images/research_plans/${this.svg_file}`;
} else {
- return `/images/no_image_180.svg`
+ return `/images/wild_card/no_image_180.svg`
}
}
}
diff --git a/app/assets/javascripts/components/models/Sample.js b/app/assets/javascripts/components/models/Sample.js
index e3eebfca05..d246c47d05 100644
--- a/app/assets/javascripts/components/models/Sample.js
+++ b/app/assets/javascripts/components/models/Sample.js
@@ -658,7 +658,7 @@ export default class Sample extends Element {
get svgPath() {
if (this.sample_svg_file){
if(this.sample_svg_file === '***')
- return `/images/no_image_180.svg`
+ return `/images/wild_card/no_image_180.svg`
else
return `/images/samples/${this.sample_svg_file}`;
} else {
diff --git a/public/images/loading-bubbles.svg b/public/images/wild_card/loading-bubbles.svg
similarity index 80%
rename from public/images/loading-bubbles.svg
rename to public/images/wild_card/loading-bubbles.svg
index a84581f36c..6a9f5bf995 100644
--- a/public/images/loading-bubbles.svg
+++ b/public/images/wild_card/loading-bubbles.svg
@@ -1,13 +1,13 @@