Skip to content

Commit

Permalink
Merge branch 'feat/v2.0.0' into docs/docs-textcat-tutorial
Browse files Browse the repository at this point in the history
  • Loading branch information
davidberenstein1957 authored Jun 19, 2024
2 parents ecccaa2 + e876783 commit a78e95c
Show file tree
Hide file tree
Showing 66 changed files with 1,658 additions and 1,033 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/argilla-frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@ on:
pull_request:
paths:
- "argilla-frontend/**"
types:
- opened
- edited
- reopened
- synchronize
- ready_for_review

jobs:
build:
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/argilla-server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ on:
push:
paths:
- argilla-server/**
tags:
- "*"
branches:
- main
- develop
Expand All @@ -26,10 +24,6 @@ on:
paths:
- argilla-server/**

release:
types:
- published

jobs:
build:
name: Build `argilla-server` package
Expand Down
7 changes: 0 additions & 7 deletions .github/workflows/argilla-v1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ on:
push:
paths:
- argilla-v1/**
tags:
- "*"
branches:
- main
- develop
Expand All @@ -23,11 +21,6 @@ on:
paths:
- argilla-v1/**

release:
types:
- "published"
- "released"

jobs:
build:
runs-on: ubuntu-latest
Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/argilla.docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ on:
# - "develop"
- "feat/v2.0.0" # Fixing this branch until we merge everything into develop
- "docs/**" # When we create a new branch only for docs
tags:
- "*"

defaults:
run:
Expand Down Expand Up @@ -54,8 +52,7 @@ jobs:
git config --global user.email "${{ github.actor }}@users.noreply.github.com"
- name: Print GitHub ref info
run:
echo "${{ github.ref }}"
run: echo "${{ github.ref }}"
echo "${{ github.head_ref }}"

- run: pdm run mike deploy dev --push
Expand All @@ -77,4 +74,4 @@ jobs:
- run: pdm run mike deploy ${{ steps.extract_branch_name.outputs.branch_name }} --push
if: startsWith(github.ref, 'refs/heads/docs') || startsWith(github.head_ref, 'docs/')
env:
GH_ACCESS_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }}
GH_ACCESS_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }}
4 changes: 0 additions & 4 deletions .github/workflows/argilla.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ on:
- argilla/**
- "!argilla/docs/**"

release:
types:
- "published"

defaults:
run:
working-directory: argilla
Expand Down
2 changes: 1 addition & 1 deletion argilla-frontend/assets/scss/base/base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ a {
}
.--body3 {
@include font-size(13px);
@include line-height(16px);
@include line-height(18px);
}
.--body4 {
@include font-size(12px);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,12 @@
borderColor: badgeBorderColor,
}"
>
<svgicon :name="icon" width="22" height="22" :color="iconColor" />
<svgicon
:name="icon"
:width="badgeSize"
:height="badgeSize"
:color="iconColor"
/>
</i>
</BaseButton>
</template>
Expand Down Expand Up @@ -49,6 +54,10 @@ export default {
badgeBorderColor: {
type: String,
},
badgeSize: {
type: String,
default: "22",
},
},
methods: {
onClickIcon() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,6 @@
>
</li>
</ul>
<base-action-tooltip :tooltip="$t('copied')">
<a
v-if="copyButton"
class="breadcrumbs__copy"
@click.prevent="
$copyToClipboard(
filteredBreadcrumbs[filteredBreadcrumbs.length - 1].name
)
"
>
<svgicon name="copy" width="16" height="16" />
</a>
</base-action-tooltip>
</div>
</template>

Expand Down Expand Up @@ -76,7 +63,6 @@ export default {

<style lang="scss" scoped>
.breadcrumbs {
margin-right: auto;
margin-left: 1em;
display: flex;
align-items: center;
Expand Down Expand Up @@ -109,21 +95,6 @@ export default {
}
}
}
&__copy {
user-select: none;
cursor: pointer;
@include media("<=tablet") {
display: none;
}
&:hover {
.svg-icon {
fill: darken(palette(white), 10%);
}
}
.svg-icon {
fill: palette(white);
}
}
&__item {
color: palette(white);
text-decoration: none;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
<template>
<div class="panel" :class="isExpanded ? '--expanded' : '--collapsed'">
<BaseButton class="panel__header" @click="toggleExpand(isExpanded)">
<slot name="panelHeader" />
<svgicon
class="panel__header__icon"
:name="isExpanded ? 'chevron-down' : 'chevron-right'"
width="12"
height="12"
/>
</BaseButton>

<div class="panel__content" v-if="isExpanded">
<slot name="panelContent" />
</div>
</div>
</template>

<script>
import "assets/icons/chevron-right";
import "assets/icons/chevron-down";
export default {
props: {
isExpanded: {
type: Boolean,
default: false,
},
},
methods: {
toggleExpand(value) {
this.$emit("toggle-expand", !value);
},
},
};
</script>
<style lang="scss" scoped>
.panel {
flex: 1;
align-items: center;
display: flex;
flex-direction: column;
justify-content: center;
border-top: 1px solid $black-10;
&__header {
width: 100%;
display: flex;
justify-content: space-between;
align-items: center;
padding: $base-space $base-space * 2;
@include font-size(13px);
:deep(p) {
text-transform: uppercase;
}
&__icon {
padding: 0;
flex-shrink: 0;
}
&:hover {
:deep(p),
:deep(svg) {
color: darken(palette(grey, 300), 10%);
}
}
}
&__content {
width: 100%;
height: 100%;
padding: $base-space $base-space * 2;
overflow-y: auto;
@include font-size(13px);
}
}
</style>
113 changes: 55 additions & 58 deletions argilla-frontend/components/base/base-progress/BaseCircleProgress.vue
Original file line number Diff line number Diff line change
@@ -1,78 +1,75 @@
<template>
<div
class="circle-progress"
:style="{ width: `${size}px`, height: `${size}px` }"
>
<div class="circle-progress__circle">
<div
class="circle-progress__progress"
:style="{
'background-image': `conic-gradient(${progressColor} ${
value * 3.6
}deg,#fafafa 0deg)`,
}"
></div>
<div class="circle-progress__value">{{ value }}</div>
</div>
</div>
<div class="donut-chart" :style="pieStyles"></div>
</template>

<script>
export default {
props: {
progressColor: {
type: String,
default: "#ff675f",
},
value: {
type: Number,
required: true,
validator: (value) => value >= 0 && value <= 100,
},
size: {
type: Number,
default: 28,
default: 60,
},
slices: {
type: Array,
default: () => [],
},
},
computed: {
pieStyles() {
let acum = 0;
const styles = this.slices.map(
(slice) => `${slice.color} 0 ${(acum += slice.percent)}%`
);
return {
background: `radial-gradient(#fafafa 40%, transparent 41%), conic-gradient( ${styles.join(
","
)} )`,
};
},
sizeStyles() {
return `${this.size}px`;
},
},
};
</script>

<style lang="scss" scoped>
.circle-progress {
display: flex;
justify-content: center;
align-items: center;
&__circle {
position: relative;
width: 100%;
height: 100%;
border-radius: 50%;
}
&__progress {
<style scoped lang="scss">
@property --a {
syntax: "<angle>";
inherits: false;
initial-value: 360deg;
}
.donut-chart {
position: relative;
width: v-bind(sizeStyles);
height: v-bind(sizeStyles);
border-radius: 50%;
overflow: hidden;
&:before {
--a: 360deg;
content: "";
position: absolute;
width: 102%;
height: 102%;
top: 0;
left: 0;
width: 100%;
height: 100%;
border-radius: 50%;
box-sizing: border-box;
transform-origin: center center;
right: 0;
bottom: 0;
background-image: conic-gradient(
transparent var(--a),
palette(grey, 800) 0deg
);
animation: progress 0.5s ease-in-out;
}
&__value {
position: absolute;
height: calc(100% - 6px);
width: calc(100% - 6px);
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
display: flex;
align-items: center;
justify-content: center;
@include font-size(11px);
font-weight: 500;
color: $black-54;
background: palette(white);
border-radius: 50%;
}
@keyframes progress {
1% {
--a: 0deg;
}
100% {
--a: 360deg;
}
}
</style>
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@
@mouseenter="hoveredRange = range"
@mouseleave="hoveredRange = null"
>
<div
class="progress__bar"
:style="{ backgroundColor: range.color }"
></div>
<div class="progress__bar" :style="{ background: range.color }"></div>
</div>
</div>
<template v-if="showTooltip && !!hoveredRange">
Expand Down
Loading

0 comments on commit a78e95c

Please sign in to comment.