Skip to content
Snippets Groups Projects
Commit 2eb17fe4 authored by Moises Sacal's avatar Moises Sacal
Browse files

fixed inital path selector

parent 72ddd619
1 merge request!2Refactor
Hide whitespace changes
Inline Side-by-side
test_data/sample/describo.json
+ 81
− 87
View file @ 2eb17fe4
...@@ -32,38 +32,46 @@ ...@@ -32,38 +32,46 @@
"value": "0" "value": "0"
} }
] ]
}, }
"id": "0"
}, },
"1": { "2": {
"properties": { "properties": {
"type": [ "name": [
{ {
"value": "Person" "value": "Place(2)"
} }
], ],
"name": [ "description": [
{ {
"value": "Person(1)" "value": ""
} }
], ],
"affiliation": [ "URL": [
{ {
"id": "" "value": ""
} }
], ],
"email": [ "geo": [
{ {
"value": " " "value": ""
} }
], ],
"URL": [ "Address": [
{
"value": ""
}
],
"type": [
{
"value": "Place"
}
],
"id": [
{ {
"value": " " "value": "2"
} }
] ]
}, }
"show": true
}, },
"http://uts.edu.au": { "http://uts.edu.au": {
"properties": { "properties": {
...@@ -92,8 +100,56 @@ ...@@ -92,8 +100,56 @@
"value": "http://uts.edu.au" "value": "http://uts.edu.au"
} }
] ]
}, }
"id": "http://uts.edu.au" },
"./": {
"properties": {
"name": [
{
"value": "This is my sample"
}
],
"description": [
{
"value": ""
}
],
"contactPoint": [],
"creator": [
{
"id": "0"
}
],
"contributor": [],
"URL": [
{
"value": ""
}
],
"hasPart": [
{
"id": "pics"
},
{
"id": "lots_of_little_files"
}
],
"type": [
{
"value": "Dataset"
}
],
"id": [
{
"value": "./"
}
],
"path": [
{
"value": "./"
}
]
}
}, },
"pics": { "pics": {
"properties": { "properties": {
...@@ -128,8 +184,7 @@ ...@@ -128,8 +184,7 @@
"value": "pics" "value": "pics"
} }
] ]
}, }
"id": "pics"
}, },
"lots_of_little_files": { "lots_of_little_files": {
"properties": { "properties": {
...@@ -154,8 +209,7 @@ ...@@ -154,8 +209,7 @@
"value": "lots_of_little_files" "value": "lots_of_little_files"
} }
] ]
}, }
"id": "lots_of_little_files"
}, },
"pics/2017-06-11 12.56.14.jpg": { "pics/2017-06-11 12.56.14.jpg": {
"properties": { "properties": {
...@@ -192,8 +246,7 @@ ...@@ -192,8 +246,7 @@
"value": "pics/2017-06-11 12.56.14.jpg" "value": "pics/2017-06-11 12.56.14.jpg"
} }
] ]
}, }
"id": "pics/2017-06-11 12.56.14.jpg"
}, },
"pics/sepia_fence.jpg": { "pics/sepia_fence.jpg": {
"properties": { "properties": {
...@@ -225,8 +278,7 @@ ...@@ -225,8 +278,7 @@
"value": "pics/sepia_fence.jpg" "value": "pics/sepia_fence.jpg"
} }
] ]
}, }
"id": "pics/sepia_fence.jpg"
}, },
"pics/thumbs/2017-06-11 12.56.14.png": { "pics/thumbs/2017-06-11 12.56.14.png": {
"properties": { "properties": {
...@@ -258,8 +310,7 @@ ...@@ -258,8 +310,7 @@
"value": "pics/thumbs/2017-06-11 12.56.14.png" "value": "pics/thumbs/2017-06-11 12.56.14.png"
} }
] ]
}, }
"id": "pics/thumbs/2017-06-11 12.56.14.png"
}, },
"pics/thumbs": { "pics/thumbs": {
"properties": { "properties": {
...@@ -299,8 +350,7 @@ ...@@ -299,8 +350,7 @@
"value": "pics/thumbs" "value": "pics/thumbs"
} }
] ]
}, }
"id": "pics/thumbs"
}, },
"pics/thumbs/sepia_fence.png": { "pics/thumbs/sepia_fence.png": {
"properties": { "properties": {
...@@ -332,64 +382,8 @@ ...@@ -332,64 +382,8 @@
"value": "pics/thumbs/sepia_fence.png" "value": "pics/thumbs/sepia_fence.png"
} }
] ]
}, }
"id": "pics/thumbs/sepia_fence.png"
},
"/Users/124411/working/describo/test_data/sample": {
"properties": {
"name": [
{
"value": "This is my sample"
}
],
"description": [
{
"value": ""
}
],
"contactPoint": [],
"creator": [
{
"id": "0"
},
{
"value": "",
"id": "1",
"new_type": "Person"
}
],
"contributor": [],
"URL": [
{
"value": ""
}
],
"hasPart": [
{
"id": "pics"
},
{
"id": "lots_of_little_files"
}
],
"type": [
{
"value": "Dataset"
}
],
"id": [
{
"value": "./"
}
],
"path": [
{
"value": "./"
}
]
},
"id": "/Users/124411/working/describo/test_data/sample"
} }
}, },
"root": "/Users/124411/working/describo/test_data/sample" "root": "./"
} }
\ No newline at end of file
views/index.ejs
+ 5
− 6
View file @ 2eb17fe4
...@@ -34,9 +34,8 @@ ...@@ -34,9 +34,8 @@
Package a dataset here Package a dataset here
</template> </template>
</a> </a>
<a class="nav-link" v-else="" <a class="nav-link cursor" v-else=""
data-toggle="modal" data-target="#addPathModal" data-toggle="modal" data-target="#addPathModal">Start with a folder</a>
>Add a Path</a>
</div> </div>
<div class="navbar-item mr-auto"> <div class="navbar-item mr-auto">
<a <a
...@@ -60,7 +59,7 @@ ...@@ -60,7 +59,7 @@
</a> </a>
<a class="nav-link cursor" v-else>No dataset path</a> <a class="nav-link cursor" v-else>No dataset path</a>
</div> </div>
<template v-if="context"> <template v-if="context && dataset_path && display_path">
<div class="navbar-item mr-auto"> <div class="navbar-item mr-auto">
<div class="btn-group"> <div class="btn-group">
<a class="nav-link dropdown-toggle cursor" id="dropdownMenuButton" <a class="nav-link dropdown-toggle cursor" id="dropdownMenuButton"
...@@ -262,7 +261,7 @@ ...@@ -262,7 +261,7 @@
<div class="modal-dialog" role="document"> <div class="modal-dialog" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h5 class="modal-title">Start with a Path</h5> <h5 class="modal-title">Start with a folder</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"> <button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span> <span aria-hidden="true">&times;</span>
</button> </button>
...@@ -272,7 +271,7 @@ ...@@ -272,7 +271,7 @@
<div class="form-group"> <div class="form-group">
<label for="addAPathInput">Path</label> <label for="addAPathInput">Path</label>
<input type="text" class="form-control" name="addAPathInput" aria-describedby="path" placeholder="path"> <input type="text" class="form-control" name="addAPathInput" aria-describedby="path" placeholder="path">
<small id="path" class="form-text text-muted">Input path</small> <small id="path" class="form-text text-muted">Select a location for Describo!</small>
</div> </div>
<button type="submit" class="btn btn-primary">Go</button> <button type="submit" class="btn btn-primary">Go</button>
</form> </form>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment