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

Added Feedback Link #548

Merged
merged 1 commit into from
Dec 19, 2023
Merged

Added Feedback Link #548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions packages/web-new/src/scripts/console.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { openApiTab, openApiJsonBtn, openApiYamlBtn, openApiView } from './open-
import { asyncApiTab, asyncApiJsonBtn, asyncApiYamlBtn, asyncApiView } from './async-api'
import { AASView } from './aas'
import { defaultsView, defaultsJsonBtn, defaultsYamlBtn, defaultsAddBtn } from './defaults'
import { visualize } from './visualize'
import { visualize, visualizeTab } from './visualize'
import { validationView, validationTab } from './validation'
import { convertTDYamlToJson, detectProtocolSchemes } from '../../../core/dist/web-bundle.min.js'
import { generateOAP, generateAAP, addDefaultsUtil, validate, generateAAS, resetValidationStatus } from './util'
Expand Down Expand Up @@ -60,12 +60,15 @@ minMaxBtn.addEventListener("click", () => {
})

setTimeout(() => {
mainContentElement.style.flex = "0 200px"
mainContentElement.style.flex = "0 210px"
consoleElement.style.flex = `1 0`
minMaxBtn.children[0].classList.add("fa-down-left-and-up-right-to-center")
minMaxBtn.children[0].classList.remove("fa-up-right-and-down-left-from-center")
}, 50);

if (visualizeTab.checked === true) {
visualizeTab.click()
}
}, 100);
}
})

Expand Down
2 changes: 1 addition & 1 deletion packages/web-new/src/scripts/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ function onmousemoveY(e) {
// UP
if (deltaY < 0) {
const h = Math.round(parseInt(getComputedStyle(t).height) + deltaY)
t.style.flex = `0 ${h < 210 ? 200 : h}px`
t.style.flex = `0 ${h < 220 ? 210 : h}px`
b.style.flex = "1 0"

if(h < 714){
Expand Down
4 changes: 2 additions & 2 deletions packages/web-new/src/scripts/visualize.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ const treeInputs = document.querySelector(".visualize-inputs__tree")
const visViews = [graphViewInput, treeViewInput]

/**
* parses the edito value, if it works, checks the the vis type
* and initializes the rescpective visualization and well as
* parses the editor value, if it works, checks the the vis type
* and initializes the respective visualization and well as
* enabling the respective inputs
* @param { String } editorValue
*/
Expand Down
7 changes: 5 additions & 2 deletions packages/web-new/src/styles/_control-panel.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,11 @@
transition: all 250ms ease;

&:last-child {
border-bottom: none;
border-color: var(--clr-neutral-50);

&:hover{
border-color: var(--clr-primary-500);
}
}

&:hover {
Expand All @@ -57,7 +61,6 @@
.text-icon {
width: fit-content;
opacity: 1;
margin-top: 1rem;
transform: scaleX(1);
transition: opacity 250ms var(--trans-bouncy), transform 250ms var(--trans-bouncy);
}
Expand Down
4 changes: 3 additions & 1 deletion packages/web-new/src/styles/_examples-menu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,10 @@
text-rendering: auto;
-webkit-font-smoothing: antialiased;
font: var(--fa-font-solid);
content: "\f0d7";
content: "\f107";
pointer-events: none;
color: var(--clr-neutral-900);
font-size: var(--fs-p);
}
}

Expand Down
7 changes: 4 additions & 3 deletions packages/web-new/src/styles/_json-yaml-warning.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,12 @@
font-size: var(--fs-p);
font-weight: var(--fw-bold);
font-family: var(--ff-primary);
color: var(--clr-neutral-900);
color: var(--clr-neutral-50);
// color: var(--clr-neutral-900);
transition: background-color 250ms ease-in-out;
}
.confirm-btn{
background-color: var(--clr-success-500);
background-color: var(--clr-success-700);
margin-right: 1rem;

&:hover{
Expand All @@ -71,7 +72,7 @@
}

.cancel-btn{
background-color: var(--clr-error-500);
background-color: var(--clr-error-700);

&:hover{
background-color: var(--clr-error-900);
Expand Down
37 changes: 29 additions & 8 deletions packages/web-new/src/styles/_settings-menu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,15 +122,36 @@
font-weight: var(--fw-bold);
}

select {
.select-container {
width: 60%;
background-color: var(--clr-neutral-50);
color: var(--clr-neutral-900);
padding: .5rem 1rem;
border-radius: 5px;
border: none;
cursor: pointer;
font-family: var(--ff-primary);
position: relative;

select {
width: 100%;
appearance: none;
background-color: var(--clr-neutral-50);
color: var(--clr-neutral-900);
padding: .5rem 1rem;
border-radius: 5px;
border: none;
cursor: pointer;
font-family: var(--ff-primary);
}

&::after {
position: absolute;
top: 50%;
right: 1rem;
transform: translateY(-50%);
display: inline-block;
text-rendering: auto;
-webkit-font-smoothing: antialiased;
font: var(--fa-font-solid);
content: "\f107";
pointer-events: none;
color: var(--clr-neutral-900);
font-size: var(--fs-footer);
}
}

.font-range-container {
Expand Down
43 changes: 33 additions & 10 deletions packages/web-new/src/styles/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@ header .navbar__links {
display: flex;
align-items: center;
justify-content: center;
gap: 3rem;
}
header .navbar__links a {
display: flex;
Expand All @@ -244,9 +245,6 @@ header .navbar__links a {
header .navbar__links a:hover {
color: var(--clr-neutral-200);
}
header .navbar__links .cli-link {
margin-right: 3rem;
}
header .navbar__links i {
font-size: var(--fs-i);
margin-bottom: 0.5rem;
Expand Down Expand Up @@ -630,7 +628,10 @@ main .console {
transition: all 250ms ease;
}
.control-panel__btn:last-child {
border-bottom: none;
border-color: var(--clr-neutral-50);
}
.control-panel__btn:last-child:hover {
border-color: var(--clr-primary-500);
}
.control-panel__btn:hover {
color: var(--clr-neutral-50);
Expand All @@ -646,7 +647,6 @@ main .console {
width: -moz-fit-content;
width: fit-content;
opacity: 1;
margin-top: 1rem;
transform: scaleX(1);
transition: opacity 250ms var(--trans-bouncy), transform 250ms var(--trans-bouncy);
}
Expand Down Expand Up @@ -1558,8 +1558,15 @@ main .console {
.settings-menu .settings__editor .form-field span {
font-weight: var(--fw-bold);
}
.settings-menu .settings__editor .form-field select {
.settings-menu .settings__editor .form-field .select-container {
width: 60%;
position: relative;
}
.settings-menu .settings__editor .form-field .select-container select {
width: 100%;
-webkit-appearance: none;
-moz-appearance: none;
appearance: none;
background-color: var(--clr-neutral-50);
color: var(--clr-neutral-900);
padding: 0.5rem 1rem;
Expand All @@ -1568,6 +1575,20 @@ main .console {
cursor: pointer;
font-family: var(--ff-primary);
}
.settings-menu .settings__editor .form-field .select-container::after {
position: absolute;
top: 50%;
right: 1rem;
transform: translateY(-50%);
display: inline-block;
text-rendering: auto;
-webkit-font-smoothing: antialiased;
font: var(--fa-font-solid);
content: "\f107";
pointer-events: none;
color: var(--clr-neutral-900);
font-size: var(--fs-footer);
}
.settings-menu .settings__editor .form-field .font-range-container {
display: flex;
flex-direction: row;
Expand Down Expand Up @@ -1818,8 +1839,10 @@ main .console {
text-rendering: auto;
-webkit-font-smoothing: antialiased;
font: var(--fa-font-solid);
content: "\f0d7";
content: "\f107";
pointer-events: none;
color: var(--clr-neutral-900);
font-size: var(--fs-p);
}
.examples-menu .examples-menu-container__filter .category-field select,
.examples-menu .examples-menu-container__filter .category-field .search-bar,
Expand Down Expand Up @@ -2389,18 +2412,18 @@ main .console {
font-size: var(--fs-p);
font-weight: var(--fw-bold);
font-family: var(--ff-primary);
color: var(--clr-neutral-900);
color: var(--clr-neutral-50);
transition: background-color 250ms ease-in-out;
}
.json-yaml-warning__container .warning-btns .confirm-btn {
background-color: var(--clr-success-500);
background-color: var(--clr-success-700);
margin-right: 1rem;
}
.json-yaml-warning__container .warning-btns .confirm-btn:hover {
background-color: var(--clr-success-900);
}
.json-yaml-warning__container .warning-btns .cancel-btn {
background-color: var(--clr-error-500);
background-color: var(--clr-error-700);
}
.json-yaml-warning__container .warning-btns .cancel-btn:hover {
background-color: var(--clr-error-900);
Expand Down
2 changes: 1 addition & 1 deletion packages/web-new/src/styles/styles.css.map
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 1 addition & 4 deletions packages/web-new/src/styles/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,7 @@ header {
display: flex;
align-items: center;
justify-content: center;
gap: 3rem;

a {
display: flex;
Expand All @@ -285,10 +286,6 @@ header {
}
}

.cli-link {
margin-right: 3rem;
}

i {
font-size: var(--fs-i);
margin-bottom: .5rem;
Expand Down
14 changes: 9 additions & 5 deletions packages/web-new/src/template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,8 @@
<h1>Thing Description Playground <span>- BETA Version</span></h1>
</div>
<div class="navbar__links">
<a href="https://github.com/eclipse-thingweb/playground/discussions/492" class="feedback-link"
target="_blank"><i class="fa-solid fa-comments"></i><span>Feedback</span></a>
<a href="https://github.com/eclipse-thingweb/playground/tree/master/packages/cli" class="cli-link"
target="_blank"><i class="fa-solid fa-terminal"></i><span>CLI</span></a>
<a href="https://github.com/eclipse-thingweb/playground" class="git-link" target="_blank"><i
Expand Down Expand Up @@ -529,11 +531,13 @@ <h3 class="settings__preferences">Preferences</h3>
<form action="#" class="settings__editor">
<div class="form-field">
<label for="theme-picker">Theme:</label>
<select name="theme-picker" id="theme-picker" class="theme-picker">
<option value="light-mode" selected>Light Mode</option>
<option value="dark-mode">Dark Mode</option>
<option value="monochrome-mode">Monochrome</option>
</select>
<div class="select-container">
<select name="theme-picker" id="theme-picker" class="theme-picker">
<option value="light-mode" selected>Light Mode</option>
<option value="dark-mode">Dark Mode</option>
<option value="monochrome-mode">Monochrome</option>
</select>
</div>
</div>

<div class="form-field">
Expand Down
Loading