Skip to content

Commit

Permalink
feat(#1119): users without personal datasets (#1282)
Browse files Browse the repository at this point in the history
(cherry picked from commit 068e4be)

chore(#1119): fix user dropdown styles (#1318)

Closes #1317
This PR fixes alignment and width

(cherry picked from commit eb70459)

fix(#1323): align text and icon in dataset name (#1324)

Closes #1323

(cherry picked from commit 158fcad)
  • Loading branch information
leiyre authored and frascuchon committed Mar 30, 2022
1 parent 442703c commit 555d41d
Show file tree
Hide file tree
Showing 27 changed files with 734 additions and 231 deletions.
27 changes: 27 additions & 0 deletions frontend/assets/icons/docs.js
@@ -0,0 +1,27 @@
/*
* coding=utf-8
* Copyright 2021-present, the Recognai S.L. team.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

/* eslint-disable */
var icon = require('vue-svgicon')
icon.register({
'docs': {
width: 12,
height: 16,
viewBox: '0 0 12 16',
data: '<g _fill="#4A4A4A" fill-rule="nonzero"><path pid="0" d="M10.62 5.647H8.817a.46.46 0 00-.468.448c0 .247.21.449.468.449h1.801a.46.46 0 01.468.448v7.193a.46.46 0 01-.468.448H1.403a.46.46 0 01-.467-.448V6.992a.46.46 0 01.467-.448h1.802a.46.46 0 00.467-.449.46.46 0 00-.467-.448H1.403C.632 5.647 0 6.252 0 6.992v7.193c0 .74.632 1.344 1.403 1.344h9.193c.772 0 1.403-.605 1.403-1.344V6.99c.024-.739-.608-1.344-1.38-1.344z"/><path pid="1" d="M6.129 10.588a.457.457 0 00.458-.452V5.362c0-1.448 1.193-2.602 2.638-2.602h1.215l-1.1 1.086a.433.433 0 000 .634c.091.09.206.135.32.135.115 0 .23-.045.322-.135l1.88-1.856a.433.433 0 000-.633L9.982.136a.448.448 0 00-.642 0 .433.433 0 000 .633l1.1 1.086H9.225a3.565 3.565 0 00-3.555 3.19c0 .045-.023.068-.023.113v4.978c.023.249.23.452.482.452z"/></g>'
}
})
27 changes: 27 additions & 0 deletions frontend/assets/icons/filtrable-column.js
@@ -0,0 +1,27 @@
/*
* coding=utf-8
* Copyright 2021-present, the Recognai S.L. team.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

/* eslint-disable */
var icon = require('vue-svgicon')
icon.register({
'filtrable-column': {
width: 15,
height: 11,
viewBox: '0 0 15 11',
data: '<path pid="0" d="M.008.008v1.769h14.15V.008H.008zm2.527 6.064h9.096V4.304H2.535v1.768zm2.527 4.296h4.042V8.599H5.062v1.769z" _fill="#0508D9" fill-rule="nonzero"/>'
}
})
20 changes: 3 additions & 17 deletions frontend/assets/icons/index.js
@@ -1,20 +1,3 @@
/*
* coding=utf-8
* Copyright 2021-present, the Recognai S.L. team.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

/* eslint-disable */
require('./annotate-view')
require('./arrow-bottom')
Expand All @@ -41,6 +24,7 @@ require('./datasets-empty')
require('./datasource')
require('./datasources')
require('./delete')
require('./docs')
require('./double-chev')
require('./drop-down')
require('./drop-up')
Expand All @@ -56,6 +40,7 @@ require('./external-link')
require('./external')
require('./feather')
require('./filter')
require('./filtrable-column')
require('./forbidden')
require('./go-back')
require('./help')
Expand All @@ -82,6 +67,7 @@ require('./progress')
require('./refresh')
require('./reject')
require('./search')
require('./sort-table')
require('./sort')
require('./unlock')
require('./zoomin')
Expand Down
8 changes: 4 additions & 4 deletions frontend/assets/icons/logout.js
Expand Up @@ -19,9 +19,9 @@
var icon = require('vue-svgicon')
icon.register({
'logout': {
width: 17,
height: 22,
viewBox: '0 0 17 22',
data: '<path pid="0" d="M9.511 0c2.226 0 4.038 1.79 4.038 3.99a1.014 1.014 0 11-2.03 0c0-1.08-.899-1.96-2.005-1.96H4.038c-1.107 0-2.007.878-2.007 1.96v14.02c0 1.08.9 1.96 2.007 1.96h5.476c1.106 0 2.006-.878 2.006-1.96a1.014 1.014 0 112.03 0c0 2.2-1.813 3.99-4.039 3.99H4.035C1.81 22 0 20.21 0 18.01V3.99C0 1.79 1.81 0 4.035 0h5.476zm3.268 7.094l3.21 3.21.007.007.02.022.013.013.004.005-.037-.04a1.036 1.036 0 01.166.222c.215.389.155.887-.177 1.214l-3.21 3.163a1.02 1.02 0 01-.714.293 1.016 1.016 0 01-.712-1.739l1.447-1.426H6.772a1.014 1.014 0 110-2.03h6.05l-1.48-1.48a1.016 1.016 0 011.436-1.434z" _fill="#0508D9" fill-rule="nonzero"/>'
width: 12,
height: 15,
viewBox: '0 0 12 15',
data: '<path pid="0" d="M6.319 13.95H.945a.185.185 0 01-.184-.187V.955C.76.852.843.769.945.769h5.374a.371.371 0 000-.743H.945a.928.928 0 00-.927.929v12.808c0 .512.416.929.927.929h5.374a.371.371 0 000-.743zm5.554-6.853L8.69 3.913a.371.371 0 10-.525.525l2.55 2.55h-7.24a.371.371 0 000 .742h7.24l-2.55 2.55a.371.371 0 10.525.525l3.183-3.183a.371.371 0 000-.525z" _fill="#4A4A4A" fill-rule="nonzero"/>'
}
})
27 changes: 27 additions & 0 deletions frontend/assets/icons/sort-table.js
@@ -0,0 +1,27 @@
/*
* coding=utf-8
* Copyright 2021-present, the Recognai S.L. team.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

/* eslint-disable */
var icon = require('vue-svgicon')
icon.register({
'sort-table': {
width: 13,
height: 14,
viewBox: '0 0 13 14',
data: ''
}
})
9 changes: 3 additions & 6 deletions frontend/components/commons/datasets-list/DatasetsEmpty.vue
Expand Up @@ -13,7 +13,7 @@
<a href="https://docs.rubrix.ml/" target="_blank">see the docs</a> for
more information.
</p>
<re-code :code="generateCodeSnippet(workspace)"></re-code>
<re-code :code="generateCodeSnippet()"></re-code>
</div>
</template>

Expand All @@ -28,14 +28,11 @@ export default {
},
methods: {
generateCodeSnippet(ws) {
generateCodeSnippet() {
return `import rubrix as rb
# If you are using the default installation you can skip this line
rb.set_workspace("${ws}")
rb.log(
rb.TextClassificationRecord(inputs="my first rubrix example"),
rb.TextClassificationRecord(text="my first rubrix example"),
name='example-dataset'
)`;
},
Expand Down
6 changes: 5 additions & 1 deletion frontend/components/commons/header/appHeader.vue
Expand Up @@ -22,7 +22,7 @@
:class="['header', sticky && dataset ? 'sticky' : null]"
>
<ReTopbarBrand>
<ReBreadcrumbs :breadcrumbs="breadcrumbs" :copy-button="true" />
<ReBreadcrumbs :breadcrumbs="breadcrumbs" :copy-button="copyButton" />
<user />
</ReTopbarBrand>
<slot />
Expand All @@ -49,6 +49,10 @@ export default {
type: Boolean,
default: true,
},
copyButton: {
type: Boolean,
default: true,
},
},
computed: {
currentTask() {
Expand Down

0 comments on commit 555d41d

Please sign in to comment.