Skip to content

Commit

Permalink
Merge from master
Browse files Browse the repository at this point in the history
  • Loading branch information
@mikepsinn
mikepsinn committed May 17, 2020
2 parents 42cb872 + 75f4143 commit 23f93c1
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 19 deletions.
3 changes: 3 additions & 0 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@
if(window.location.href.indexOf('api/docs') !== -1){
url = document.location.origin + "/api/docs/swagger/swagger.json?access_token=demo";
}
if(window.location.href.indexOf('dev-docs') !== -1){
url = document.location.origin + "/dev-docs/swagger/swagger.json?access_token=demo";
}
if(window.location.host === "docs.quantimo.do"){url = "https://docs.quantimo.do/swagger/swagger.json?access_token=demo"}
if(window.location.host === "dev-docs.quantimo.do"){url = "https://dev-docs.quantimo.do/swagger/swagger.json?access_token=demo"}
window.ui = SwaggerUIBundle({
Expand Down
12 changes: 6 additions & 6 deletions public/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31983,7 +31983,7 @@ <h2 class="panel-title">
</dt>
<dd>
<p>Ex:
<a href="https://maxcdn.icons8.com/Color/PNG/96/Healthcare/pill-96.png">https://maxcdn.icons8.com/Color/PNG/96/Healthcare/pill-96.png</a>
<a href="https://static.quantimo.do/img/variable_categories/pill-96.png">https://static.quantimo.do/img/variable_categories/pill-96.png</a>
</p>
</dd>
<dt data-property-name="variableCategoryName" class="has-description">
Expand Down Expand Up @@ -35365,7 +35365,7 @@ <h2 class="panel-title">
</dt>
<dd>
<p>Ex:
<a href="https://maxcdn.icons8.com/Color/PNG/96/Household/sleeping_in_bed-96.png">https://maxcdn.icons8.com/Color/PNG/96/Household/sleeping_in_bed-96.png</a>
<a href="https://static.quantimo.do/img/variable_categories/sleeping_in_bed-96.png">https://static.quantimo.do/img/variable_categories/sleeping_in_bed-96.png</a>
</p>
</dd>
<dt data-property-name="causeVariableIonIcon" class="has-description">
Expand All @@ -35383,7 +35383,7 @@ <h2 class="panel-title">
</dt>
<dd>
<p>Ex:
<a href="https://maxcdn.icons8.com/Color/PNG/96/Cinema/theatre_mask-96.png">https://maxcdn.icons8.com/Color/PNG/96/Cinema/theatre_mask-96.png</a>
<a href="https://static.quantimo.do/img/variable_categories/theatre_mask-96.png">https://static.quantimo.do/img/variable_categories/theatre_mask-96.png</a>
</p>
</dd>
<dt data-property-name="effectVariableIonIcon" class="has-description">
Expand Down Expand Up @@ -37021,7 +37021,7 @@ <h2 class="panel-title">
</dt>
<dd>
<p>Ex:
<a href="https://maxcdn.icons8.com/Color/PNG/96/Messaging/sad-96.png">https://maxcdn.icons8.com/Color/PNG/96/Messaging/sad-96.png</a>
<a href="https://static.quantimo.do/img/variable_categories/sad-96.png">https://static.quantimo.do/img/variable_categories/sad-96.png</a>
</p>
</dd>
<dt data-property-name="variableCategoryName" class="has-description">
Expand Down Expand Up @@ -37975,7 +37975,7 @@ <h2 class="panel-title">
</dt>
<dd>
<p>Ex:
<a href="https://maxcdn.icons8.com/Color/PNG/96/Cinema/theatre_mask-96.png">https://maxcdn.icons8.com/Color/PNG/96/Cinema/theatre_mask-96.png</a>
<a href="https://static.quantimo.do/img/variable_categories/theatre_mask-96.png">https://static.quantimo.do/img/variable_categories/theatre_mask-96.png</a>
</p>
</dd>
<dt data-property-name="variableCategoryName" class="has-description">
Expand Down Expand Up @@ -41430,7 +41430,7 @@ <h2 class="panel-title">
</dt>
<dd>
<p>Ex:
<a href="https://maxcdn.icons8.com/Color/PNG/96/Cinema/theatre_mask-96.png">https://maxcdn.icons8.com/Color/PNG/96/Cinema/theatre_mask-96.png</a>
<a href="https://static.quantimo.do/img/variable_categories/theatre_mask-96.png">https://static.quantimo.do/img/variable_categories/theatre_mask-96.png</a>
</p>
</dd>
<dt data-property-name="ionIcon" class="has-description">
Expand Down
2 changes: 1 addition & 1 deletion swagger-ui-bundle.js
View file

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions swagger/swagger.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1907,7 +1907,7 @@
"type": "integer"
},
"variableCategoryImageUrl": {
"description": "Ex: https://maxcdn.icons8.com/Color/PNG/96/Healthcare/pill-96.png",
"description": "Ex: https://static.quantimo.do/img/variable_categories/pill-96.png",
"type": "string"
},
"variableCategoryName": {
Expand Down Expand Up @@ -2763,15 +2763,15 @@
"StudyImages": {
"properties": {
"causeVariableImageUrl": {
"description": "Ex: https://maxcdn.icons8.com/Color/PNG/96/Household/sleeping_in_bed-96.png",
"description": "Ex: https://static.quantimo.do/img/variable_categories/sleeping_in_bed-96.png",
"type": "string"
},
"causeVariableIonIcon": {
"description": "Ex: ion-ios-cloudy-night-outline",
"type": "string"
},
"effectVariableImageUrl": {
"description": "Ex: https://maxcdn.icons8.com/Color/PNG/96/Cinema/theatre_mask-96.png",
"description": "Ex: https://static.quantimo.do/img/variable_categories/theatre_mask-96.png",
"type": "string"
},
"effectVariableIonIcon": {
Expand Down Expand Up @@ -3411,7 +3411,7 @@
"type": "integer"
},
"variableCategoryImageUrl": {
"description": "Ex: https://maxcdn.icons8.com/Color/PNG/96/Messaging/sad-96.png",
"description": "Ex: https://static.quantimo.do/img/variable_categories/sad-96.png",
"type": "string"
},
"variableCategoryName": {
Expand Down Expand Up @@ -3812,7 +3812,7 @@
"type": "integer"
},
"variableCategoryImageUrl": {
"description": "Ex: https://maxcdn.icons8.com/Color/PNG/96/Cinema/theatre_mask-96.png",
"description": "Ex: https://static.quantimo.do/img/variable_categories/theatre_mask-96.png",
"type": "string"
},
"variableCategoryName": {
Expand Down Expand Up @@ -5155,7 +5155,7 @@
"type": "integer"
},
"imageUrl": {
"description": "Ex: https://maxcdn.icons8.com/Color/PNG/96/Cinema/theatre_mask-96.png",
"description": "Ex: https://static.quantimo.do/img/variable_categories/theatre_mask-96.png",
"type": "string"
},
"ionIcon": {
Expand Down
12 changes: 6 additions & 6 deletions swagger/swagger.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1406,7 +1406,7 @@ definitions:
description: 'Ex: 13'
type: integer
variableCategoryImageUrl:
description: 'Ex: https://maxcdn.icons8.com/Color/PNG/96/Healthcare/pill-96.png'
description: 'Ex: https://static.quantimo.do/img/variable_categories/pill-96.png'
type: string
variableCategoryName:
description: 'Ex: Emotions, Treatments, Symptoms...'
Expand Down Expand Up @@ -2034,13 +2034,13 @@ definitions:
StudyImages:
properties:
causeVariableImageUrl:
description: 'Ex: https://maxcdn.icons8.com/Color/PNG/96/Household/sleeping_in_bed-96.png'
description: 'Ex: https://static.quantimo.do/img/variable_categories/sleeping_in_bed-96.png'
type: string
causeVariableIonIcon:
description: 'Ex: ion-ios-cloudy-night-outline'
type: string
effectVariableImageUrl:
description: 'Ex: https://maxcdn.icons8.com/Color/PNG/96/Cinema/theatre_mask-96.png'
description: 'Ex: https://static.quantimo.do/img/variable_categories/theatre_mask-96.png'
type: string
effectVariableIonIcon:
description: 'Ex: ion-happy-outline'
Expand Down Expand Up @@ -2550,7 +2550,7 @@ definitions:
description: 'Ex: 10'
type: integer
variableCategoryImageUrl:
description: 'Ex: https://maxcdn.icons8.com/Color/PNG/96/Messaging/sad-96.png'
description: 'Ex: https://static.quantimo.do/img/variable_categories/sad-96.png'
type: string
variableCategoryName:
description: 'Ex: Emotions, Treatments, Symptoms...'
Expand Down Expand Up @@ -2856,7 +2856,7 @@ definitions:
description: 'Ex: 1'
type: integer
variableCategoryImageUrl:
description: 'Ex: https://maxcdn.icons8.com/Color/PNG/96/Cinema/theatre_mask-96.png'
description: 'Ex: https://static.quantimo.do/img/variable_categories/theatre_mask-96.png'
type: string
variableCategoryName:
description: 'Ex: Emotions, Treatments, Symptoms...'
Expand Down Expand Up @@ -3873,7 +3873,7 @@ definitions:
description: 'Ex: 1'
type: integer
imageUrl:
description: 'Ex: https://maxcdn.icons8.com/Color/PNG/96/Cinema/theatre_mask-96.png'
description: 'Ex: https://static.quantimo.do/img/variable_categories/theatre_mask-96.png'
type: string
ionIcon:
description: 'Ex: ion-happy-outline'
Expand Down

0 comments on commit 23f93c1

Please sign in to comment.