Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug fix border color #2243

Merged
merged 4 commits into from
Apr 19, 2023
Merged

Bug fix border color #2243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aba6772
Update tailwind theme and fix border color
mrloureed Apr 18, 2023
a1170e5
update RDK version
mrloureed Apr 18, 2023
383dfe9
linting
mrloureed Apr 18, 2023
4db6b35
Merge remote-tracking branch 'origin/main' into bug-fix-border-color
mrloureed Apr 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 9 additions & 9 deletions web/frontend/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions web/frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@viamrobotics/remote-control",
"version": "0.2.15",
"version": "0.2.16",
"license": "Apache-2.0",
"type": "module",
"files": [
Expand All @@ -16,7 +16,7 @@
"dependencies": {
"@fontsource/space-mono": "^4.5.12",
"@improbable-eng/grpc-web": "^0.13.0",
"@viamrobotics/prime": "^0.1.7",
"@viamrobotics/prime": "^0.1.10",
"@viamrobotics/rpc": "^0.1.34",
"@viamrobotics/sdk": "^0.0.34",
"@vueuse/core": "^9.13.0",
Expand Down
14 changes: 7 additions & 7 deletions web/frontend/src/components/arm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,11 +227,11 @@ const armCopyJoints = (status: ArmStatus) => {
@click.stop="stop()"
/>
</div>
<div class="border border-t-0 border-black p-4">
<div class="border-border-1 border border-t-0 p-4">
<div class="mb-4 flex flex-wrap gap-4">
<div
v-if="toggle[name]"
class="border border-black p-4"
class="border-border-1 border p-4"
>
<h3 class="mb-2">
END POSITION (mms)
Expand All @@ -244,7 +244,7 @@ const armCopyJoints = (status: ArmStatus) => {
<label class="py-1 pr-2 text-right">{{ cc.endPosition[1] }}</label>
<input
v-model="cc.endPositionValue"
class="border border-black px-4 py-1"
class="border-border-1 border px-4 py-1"
>
</template>
</div>
Expand All @@ -264,7 +264,7 @@ const armCopyJoints = (status: ArmStatus) => {
</div>
<div
v-if="toggle[name]"
class="border border-black p-4"
class="border-border-1 border p-4"
>
<h3 class="mb-2">
JOINTS (degrees)
Expand All @@ -277,7 +277,7 @@ const armCopyJoints = (status: ArmStatus) => {
<label class="py-1 pr-2 text-right">Joint {{ bb.joint }}</label>
<input
v-model="bb.jointValue"
class="border border-black px-4 py-1"
class="border-border-1 border px-4 py-1"
>
</template>
</div>
Expand All @@ -299,7 +299,7 @@ const armCopyJoints = (status: ArmStatus) => {
<div class="flex flex-wrap gap-4">
<div
v-if="status"
class="border border-black p-4"
class="border-border-1 border p-4"
>
<h3 class="mb-2">
END POSITION (mms)
Expand Down Expand Up @@ -354,7 +354,7 @@ const armCopyJoints = (status: ArmStatus) => {
</div>
<div
v-if="status"
class="border border-black p-4"
class="border-border-1 border p-4"
>
<h3 class="mb-2">
JOINTS (degrees)
Expand Down
2 changes: 1 addition & 1 deletion web/frontend/src/components/audio-input.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const toggleExpand = async () => {
slot="title"
crumbs="audio_input"
/>
<div class="h-auto border-x border-b border-black p-2">
<div class="border-border-1 h-auto border-x border-b p-2">
<div class="container mx-auto">
<div class="pt-4">
<div class="flex items-center gap-2">
Expand Down
4 changes: 2 additions & 2 deletions web/frontend/src/components/base.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ onUnmounted(() => {
@click="stop"
/>

<div class="flex flex-wrap gap-4 border border-t-0 border-black sm:flex-nowrap">
<div class="border-border-1 flex flex-wrap gap-4 border border-t-0 sm:flex-nowrap">
<div class="flex min-w-fit flex-col gap-4 p-4">
<h2 class="font-bold">
Motor Controls
Expand Down Expand Up @@ -454,7 +454,7 @@ onUnmounted(() => {
</div>
<div
data-parent="base"
class="justify-start gap-4 border-black p-4 sm:border-l"
class="border-border-1 justify-start gap-4 p-4 sm:border-l"
:class="selectedView === 'Stacked' ? 'flex flex-col' : 'grid grid-cols-2 gap-4'"
>
<!-- ******* CAMERAS ******* -->
Expand Down
24 changes: 12 additions & 12 deletions web/frontend/src/components/board.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,48 +86,48 @@ const setPWMFrequency = async () => {
slot="title"
crumbs="board"
/>
<div class="overflow-auto border border-t-0 border-black p-4">
<div class="border-border-1 overflow-auto border border-t-0 p-4">
<h3 class="mb-2">
Analogs
</h3>
<table class="mb-4 table-auto border border-black">
<table class="border-border-1 mb-4 table-auto border">
<tr
v-for="(analog, analogName) in status.analogsMap"
:key="analogName"
>
<th class="border border-black p-2">
<th class="border-border-1 border p-2">
{{ analogName }}
</th>
<td class="border border-black p-2">
<td class="border-border-1 border p-2">
{{ analog.value || 0 }}
</td>
</tr>
</table>
<h3 class="mb-2">
Digital Interrupts
</h3>
<table class="mb-4 w-full table-auto border border-black">
<table class="border-border-1 mb-4 w-full table-auto border">
<tr
v-for="(di, interruptName) in status.digitalInterruptsMap"
:key="interruptName"
>
<th class="border border-black p-2">
<th class="border-border-1 border p-2">
{{ interruptName }}
</th>
<td class="border border-black p-2">
<td class="border-border-1 border p-2">
{{ di.value || 0 }}
</td>
</tr>
</table>
<h3 class="mb-2">
GPIO
</h3>
<table class="mb-4 w-full table-auto border border-black">
<table class="border-border-1 mb-4 w-full table-auto border">
<tr>
<th class="border border-black p-2">
<th class="border-border-1 border p-2">
Get
</th>
<td class="border border-black p-2">
<td class="border-border-1 border p-2">
<div class="flex flex-wrap items-end gap-2">
<v-input
label="Pin"
Expand All @@ -154,7 +154,7 @@ const setPWMFrequency = async () => {
</td>
</tr>
<tr>
<th class="border border-black p-2">
<th class="border-border-1 border p-2">
Set
</th>
<td class="p-2">
Expand All @@ -167,7 +167,7 @@ const setPWMFrequency = async () => {
/>
<select
v-model="setLevel"
class="mr-2 h-[30px] border border-black bg-white text-sm"
class="border-border-1 mr-2 h-[30px] border bg-white text-sm"
>
<option>low</option>
<option>high</option>
Expand Down
2 changes: 1 addition & 1 deletion web/frontend/src/components/camera/cameras-list.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const setupCamera = (cameraName: string) => {
crumbs="camera"
/>

<div class="flex flex-col gap-4 border-x border-b border-black p-4">
<div class="border-border-1 flex flex-col gap-4 border-x border-b p-4">
<v-switch
:label="camera.name"
:aria-label="openCameras[camera.name] ? `Hide Camera: ${camera.name}` : `View Camera: ${camera.name}`"
Expand Down
6 changes: 3 additions & 3 deletions web/frontend/src/components/do-command.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ const namesToPrettySelect = (resourcesToPretty: commonApi.ResourceName.AsObject[
title="DoCommand()"
class="doCommand"
>
<div class="h-full w-full border border-t-0 border-black p-4">
<div class="border-border-1 h-full w-full border border-t-0 p-4">
<v-select
label="Selected Component"
placeholder="Select a component"
Expand All @@ -90,7 +90,7 @@ const namesToPrettySelect = (resourcesToPretty: commonApi.ResourceName.AsObject[
<p class="text-large">
Input
</p>
<div class="h-[250px] w-full max-w-full border border-black p-2">
<div class="border-border-1 h-[250px] w-full max-w-full border p-2">
<v-code-editor
language="json"
value="{}"
Expand All @@ -110,7 +110,7 @@ const namesToPrettySelect = (resourcesToPretty: commonApi.ResourceName.AsObject[
<p class="text-large">
Output
</p>
<div class="h-[250px] w-full border border-black p-2">
<div class="border-border-1 h-[250px] w-full border p-2">
<v-code-editor
language="json"
:value="output"
Expand Down
2 changes: 1 addition & 1 deletion web/frontend/src/components/gamepad.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ watch(() => enabled, () => {
>Disabled</span>
</div>
<div class="h-full w-full border border-t-0 border-black p-4">
<div class="border-border-1 h-full w-full border border-t-0 p-4">
<div class="flex flex-row">
<label class="subtitle mr-2">Enabled</label>
<v-switch
Expand Down
16 changes: 8 additions & 8 deletions web/frontend/src/components/gantry.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,20 +62,20 @@ const stop = () => {
@click.stop="stop"
/>
</div>
<div class="overflow-auto border border-t-0 border-black p-4">
<table class="border border-t-0 border-black p-4">
<div class="border-border-1 overflow-auto border border-t-0 p-4">
<table class="border-border-1 border border-t-0 p-4">
<thead>
<tr>
<th class="border border-black p-2">
<th class="border-border-1 border p-2">
axis
</th>
<th
class="border border-black p-2"
class="border-border-1 border p-2"
colspan="2"
>
position
</th>
<th class="border border-black p-2">
<th class="border-border-1 border p-2">
length
</th>
</tr>
Expand All @@ -85,7 +85,7 @@ const stop = () => {
v-for="pp in status.parts"
:key="pp.axis"
>
<th class="border border-black p-2">
<th class="border-border-1 border p-2">
{{ pp.axis }}
</th>
<td class="flex gap-2 p-2">
Expand All @@ -107,10 +107,10 @@ const stop = () => {
@click="increment(pp.axis, 10)"
/>
</td>
<td class="border border-black p-2">
<td class="border-border-1 border p-2">
{{ pp.pos.toFixed(2) }}
</td>
<td class="border border-black p-2">
<td class="border-border-1 border p-2">
{{ pp.length }}
</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion web/frontend/src/components/gripper.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ const grab = () => {
@click.stop="stop"
/>
</div>
<div class="flex gap-2 border border-t-0 border-black p-4">
<div class="border-border-1 flex gap-2 border border-t-0 p-4">
<v-button
label="Open"
@click="open"
Expand Down
2 changes: 1 addition & 1 deletion web/frontend/src/components/input-controller.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ const controls = $computed(() => {
label="Disconnected"
/>
</div>
<div class="border border-t-0 border-black p-4">
<div class="border-border-1 border border-t-0 p-4">
<template v-if="connected">
<div
v-for="control in controls"
Expand Down
2 changes: 1 addition & 1 deletion web/frontend/src/components/motor-detail.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ onMounted(async () => {
</div>
<div>
<div class="border border-t-0 border-black p-4">
<div class="border-border-1 border border-t-0 p-4">
<v-radio
label="Set Power"
:options="properties?.positionReporting ? 'Go, Go For, Go To' : 'Go'"
Expand Down