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.

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

Jamie february papercuts 3 extra bits and pieces #2725

Merged
merged 84 commits into from
Feb 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
1b3f539
feat: darker text in content switcher buttons
jamiewaese-uncharted Jul 13, 2023
696ff88
Merge branch 'main' of https://github.com/DARPA-ASKEM/Terarium
jamiewaese-uncharted Jul 14, 2023
3f29442
Merge branch 'main' of https://github.com/DARPA-ASKEM/Terarium
jamiewaese-uncharted Jul 14, 2023
8d271e0
Merge branch 'main' of https://github.com/DARPA-ASKEM/Terarium
jamiewaese-uncharted Jul 14, 2023
9e059d3
Merge branch 'main' of https://github.com/DARPA-ASKEM/Terarium
jamiewaese-uncharted Jul 17, 2023
0733410
Merge branch 'main' of https://github.com/DARPA-ASKEM/Terarium
jamiewaese-uncharted Jul 17, 2023
36bbf01
Merge branch 'main' of https://github.com/DARPA-ASKEM/Terarium
jamiewaese-uncharted Jul 18, 2023
fb88e51
Merge branch 'main' of https://github.com/DARPA-ASKEM/Terarium
jamiewaese-uncharted Jul 19, 2023
6bb287f
Merge branch 'main' of https://github.com/DARPA-ASKEM/Terarium
jamiewaese-uncharted Jul 19, 2023
1cdc024
Merge branch 'main' of https://github.com/DARPA-ASKEM/Terarium
jamiewaese-uncharted Jul 19, 2023
1919fd1
Merge branch 'main' of https://github.com/DARPA-ASKEM/Terarium
jamiewaese-uncharted Jul 20, 2023
dc47094
Merge branch 'main' of https://github.com/DARPA-ASKEM/Terarium
jamiewaese-uncharted Jul 21, 2023
6f52d1e
Merge branch 'main' of https://github.com/DARPA-ASKEM/Terarium
jamiewaese-uncharted Jul 24, 2023
305bf66
Merge branch 'main' of https://github.com/DARPA-ASKEM/Terarium
jamiewaese-uncharted Jan 4, 2024
3e34780
Merge branch 'main' of https://github.com/DARPA-ASKEM/Terarium
jamiewaese-uncharted Jan 8, 2024
a5d6c81
Merge branch 'main' of https://github.com/DARPA-ASKEM/Terarium
jamiewaese-uncharted Jan 11, 2024
305a650
Merge branch 'main' of https://github.com/DARPA-ASKEM/Terarium
jamiewaese-uncharted Jan 22, 2024
ee17593
Merge branch 'main' of https://github.com/DARPA-ASKEM/Terarium
jamiewaese-uncharted Jan 24, 2024
83d6dcf
Merge branch 'main' of https://github.com/DARPA-ASKEM/Terarium
jamiewaese-uncharted Jan 26, 2024
e06bc7a
Merge branch 'main' of https://github.com/DARPA-ASKEM/Terarium
jamiewaese-uncharted Jan 26, 2024
3350006
Merge branch 'main' of https://github.com/DARPA-ASKEM/Terarium
jamiewaese-uncharted Feb 7, 2024
40a7a9e
Added Lottie-file empty state image to the home page
jamiewaese-uncharted Feb 7, 2024
cb40adb
Added Lottie loading and nothing found animations to Explorer view
jamiewaese-uncharted Feb 7, 2024
f426496
Merge branch 'main' into jamie-add-lottie-files-empty-state-images
jamiewaese-uncharted Feb 8, 2024
1e16bfe
Delete package-lock.json
jamiewaese-uncharted Feb 8, 2024
4f5ef99
Merge branch 'main' of https://github.com/DARPA-ASKEM/Terarium
jamiewaese-uncharted Feb 8, 2024
f49ade5
Merge branch 'main' into jamie-february-papercuts-1
jamiewaese-uncharted Feb 8, 2024
e0d71e7
normalized font size in the Home page Sort Options and Column Toggler…
jamiewaese-uncharted Feb 8, 2024
6f43bca
added highlight color to focus state dropdown menu elements
jamiewaese-uncharted Feb 8, 2024
84e293a
Fixed spacing of stats icons in the Home page table view
jamiewaese-uncharted Feb 8, 2024
328ca8e
Adjusted default column widths, not perfect but better than before
jamiewaese-uncharted Feb 8, 2024
8040406
changed the sample thumbnail svg in the Create New dialogue to a stan…
jamiewaese-uncharted Feb 8, 2024
a2f5815
added logic preventing the Show More and Show Less buttons from showi…
jamiewaese-uncharted Feb 8, 2024
2fd96fb
More beautiful About modal and Create new projects dialog
jamiewaese-uncharted Feb 8, 2024
1fe6a0d
beautiful new skeleton state facets for when the panel is empty
jamiewaese-uncharted Feb 8, 2024
88ff126
just tweaking the skeleton settings to be perrrfect
jamiewaese-uncharted Feb 8, 2024
8612cb5
Changed "Facets" label to "Filters"
jamiewaese-uncharted Feb 9, 2024
ed50dfb
adjusted styling of toasts, tried to add a success toast but only got…
jamiewaese-uncharted Feb 9, 2024
3886ad7
Misc style updates to the toast messages.
jamiewaese-uncharted Feb 9, 2024
d9eef4f
Sentence cased the option labels in the New dropdown
jamiewaese-uncharted Feb 13, 2024
774e962
Added 'Upload resources' to bottom of resources panel
jamiewaese-uncharted Feb 13, 2024
aa440fb
Merge branch 'main' into jamie-february-papercuts-1
jamiewaese-uncharted Feb 13, 2024
03b8d0e
Changed workflow title to H4 for consistency
jamiewaese-uncharted Feb 13, 2024
ba4fa0a
Adjusted size, label and gap of workflow toolbar buttons
jamiewaese-uncharted Feb 13, 2024
0388eeb
Added disabled tags to workflow toolbar buttons that are incomplete
jamiewaese-uncharted Feb 13, 2024
7ec73a9
Improved the renaming workflow: larger input, wider, nowrap on the bu…
jamiewaese-uncharted Feb 13, 2024
a4cb8b0
made workflow connection lines and dots grey instead of green
jamiewaese-uncharted Feb 13, 2024
fd3d947
Reduced document title to h6 and added truncation after three lines
jamiewaese-uncharted Feb 13, 2024
3466d12
removed errant max-width
jamiewaese-uncharted Feb 13, 2024
0c5a3d6
truncate input & output port labels, align them properly, add icon to…
jamiewaese-uncharted Feb 13, 2024
b9f00f0
Added forward & backward buttons to carousel (on hover) so users don'…
jamiewaese-uncharted Feb 13, 2024
80834b7
made placholder images smaller to match design
jamiewaese-uncharted Feb 13, 2024
4cad1e4
Made placholder proper English
jamiewaese-uncharted Feb 13, 2024
9e92e78
made heading h6
jamiewaese-uncharted Feb 13, 2024
3676bbb
Converted placeholder text to proper English
jamiewaese-uncharted Feb 13, 2024
6c76de3
Made all operator titles h6 instead of h5
jamiewaese-uncharted Feb 13, 2024
98b5e28
Added gray-50 background and removed unnecesary border from model dia…
jamiewaese-uncharted Feb 13, 2024
ef2efc0
correct thumbnails in operators, correct font-size in operator header…
jamiewaese-uncharted Feb 14, 2024
67b8029
Merge branch 'main' into jamie-february-papercuts-2-the-workflow-edition
jamiewaese-uncharted Feb 14, 2024
a31bfb3
removed unnecessary text from empty skeleton-state facet panel
jamiewaese-uncharted Feb 14, 2024
af897bd
corrected padding in drilldowns, sized buttons, removed printMargin i…
jamiewaese-uncharted Feb 14, 2024
c6da788
made footer buttons in model config "large" per design
jamiewaese-uncharted Feb 14, 2024
1c1c2ea
made footer float over content, 80% opaque & background blur, larger …
jamiewaese-uncharted Feb 14, 2024
9630245
smaller font for labels, added space between inputs, made placeholder…
jamiewaese-uncharted Feb 14, 2024
b0902b4
Added colored background to expanded rows, removed extra padding from…
jamiewaese-uncharted Feb 14, 2024
8d32f2b
Added matrix label to button, changed other label to 'Click to view',…
jamiewaese-uncharted Feb 14, 2024
80ff07c
made text color secondary
jamiewaese-uncharted Feb 14, 2024
95d94da
replaced old filter and New Project dropdown with full width filter a…
jamiewaese-uncharted Feb 14, 2024
f1a191b
Restored direction of accordion chevrons to standard, adjusted positi…
jamiewaese-uncharted Feb 14, 2024
7e70374
various beautification of the Code blocks panel, dynamics card, save …
jamiewaese-uncharted Feb 14, 2024
1a5a7bf
prettier arrangement of the Save and Cancel buttons
jamiewaese-uncharted Feb 14, 2024
02b2461
moved name and buttons from header into toolbar, improved UX of renam…
jamiewaese-uncharted Feb 15, 2024
f597186
Hide unnecessary top bar
jamiewaese-uncharted Feb 15, 2024
b6709db
just a bit of space between buttons
jamiewaese-uncharted Feb 15, 2024
8fa601f
Update packages/client/hmi-client/src/components/code/tera-code-dynam…
YohannParis Feb 15, 2024
927c601
Update packages/client/hmi-client/src/components/code/tera-code-dynam…
YohannParis Feb 15, 2024
0c3583f
Update packages/client/hmi-client/src/components/code/tera-code.vue
YohannParis Feb 15, 2024
b194633
Update packages/client/hmi-client/src/components/code/tera-code.vue
YohannParis Feb 15, 2024
2f706ff
Update packages/client/hmi-client/src/components/drilldown/tera-drill…
YohannParis Feb 15, 2024
dcd9676
Update packages/client/hmi-client/src/components/drilldown/tera-drill…
YohannParis Feb 15, 2024
41cc7b8
Update packages/client/hmi-client/src/components/drilldown/tera-drill…
YohannParis Feb 15, 2024
99eb5eb
Update packages/client/hmi-client/src/components/operator/tera-operat…
YohannParis Feb 15, 2024
0cfd40a
Update packages/client/hmi-client/src/workflow/ops/model-coupling/ter…
YohannParis Feb 15, 2024
35978c8
Update packages/client/hmi-client/src/workflow/tera-workflow.vue
YohannParis Feb 15, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ $colors: (
);

$emphasis-high: rgba(16, 24, 40, 1) !default;
$emphasis-medium: rgba(0, 0, 0, .60) !default;
$emphasis-medium: #6A7682 !default;
$emphasis-low: var(--surface-border) !default;
$emphasis-lower: rgba(208, 213, 221, 1) !default;
$overlayColor: #000000 !default;
Expand Down Expand Up @@ -96,7 +96,7 @@ $inputBorder: 1px solid var(--surface-border) !default;
$inputHoverBorderColor: $emphasis-medium !default;
$inputFocusBorderColor: $primaryColor !default;
$inputErrorBorderColor: $errorColor !default;
$inputPlaceholderTextColor: $emphasis-medium !default;
$inputPlaceholderTextColor: $emphasis-medium !important;
$inputFilledBg: #f5f5f5 !default;
$inputFilledHoverBg: #ececec !default;
$inputFilledFocusBg: #dcdcdc !default;
Expand Down Expand Up @@ -931,6 +931,7 @@ $petri-inputBox: var(--surface-0);
--surface-overlay: #ffffff;
--surface-ground: var(--gray-100);
--surface-ground-transparent: rgba(245, 245, 245, .85);
--surface-glass: rgba(255, 255, 255, 0.8);
--surface-disabled: #F4F4F4;
--surface-highlight: #EBF4F3;
--surface-highlight-hover: #bddad6;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@

&:not(.p-accordion-tab-active) {
.p-accordion-toggle-icon {
transform: rotate(-270deg);
transform: translate(0px, 1px);
}
}

&.p-accordion-tab-active {
.p-accordion-toggle-icon {
transform: rotate(-180deg);
transform: translate(0px, 1px);
}
}

Expand Down
179 changes: 179 additions & 0 deletions packages/client/hmi-client/src/assets/svg/trimming-plant.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<ul>
<li v-for="(codeBlocks, filename) in formattedCodeBlocks" :key="filename">
<h3>{{ filename ?? '' }}</h3>
<p class="mb-2 text-sm">{{ filename ?? '' }}</p>
<ul>
<li v-for="(codeBlock, i) in codeBlocks" :key="i">
<tera-asset-block
Expand All @@ -14,7 +14,7 @@
:key="i"
>
<template #header>
<h5>Code Block</h5>
<h5>Code block</h5>
</template>
<div
v-if="
Expand All @@ -26,20 +26,28 @@
</div>
<div class="edit-container" v-else>
<div class="edit-input-container">
<label for="code-dynamic-start">Start</label>
<InputNumber v-model="startLine" input-id="code-dynamic-start" />
<label class="text-sm" for="code-dynamic-start">Start line</label>
<InputNumber
class="small-input-number"
v-model="startLine"
input-id="code-dynamic-start"
/>
</div>

<div class="edit-input-container">
<label for="code-dynamic-start">End</label>
<InputNumber v-model="endLine" input-id="code-dynamic-end" />
<label class="text-sm" for="code-dynamic-start">End line</label>
<InputNumber
class="small-input-number"
v-model="endLine"
input-id="code-dynamic-end"
/>
</div>
</div>

<template #footer v-if="editRef?.index === i && editRef?.filename === filename">
<div class="footer-container">
<Button outlined label="Cancel" @click="editRef = null" />
<Button label="OK" @click="saveCodeBlockChanges" />
<Button outlined label="Cancel" @click="editRef = null" size="small" />
<Button label="Save" @click="saveCodeBlockChanges" size="small" />
</div>
</template>
</tera-asset-block>
Expand Down Expand Up @@ -139,6 +147,20 @@ ul {
}

.edit-input-container:deep(.p-inputnumber-input) {
width: 100px;
width: 107px;
height: 2rem;
}

.footer-container {
display: flex;
justify-content: end;
gap: var(--gap-small);
}

:deep(.p-panel .p-panel-content) {
padding: 0 0 var(--gap) var(--gap) !important;
}
:deep(.p-panel .p-panel-footer) {
padding: 0 var(--gap) var(--gap) 0 !important;
}
</style>
Loading
Loading