Skip to content

Commit 8ccfe56

Browse files
durgatechvardurgatechvar
authored
Merge pull request #46 from SwapnilTechVariable/bug/deployment-ui
UI deployment issues
2 parents 8bd2ac7 + 6e6ca18 commit 8ccfe56

7 files changed

Lines changed: 49 additions & 47 deletions

File tree

‎src/components/common/buttons/icon-button-basic/readme.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
- [editor-page](../../../editorPage/editor-page)
3131
- [insert-node-modal](../../../editorPage/insert-node-modal)
3232
- [save-query-modal](../../../editorPage/save-query-modal)
33-
- [side-bar](../../../settingsPage/side-bar)
3433

3534
### Graph
3635
```mermaid
@@ -40,7 +39,6 @@ graph TD;
4039
editor-page --> icon-button-basic
4140
insert-node-modal --> icon-button-basic
4241
save-query-modal --> icon-button-basic
43-
side-bar --> icon-button-basic
4442
style icon-button-basic fill:#f9f,stroke:#333,stroke-width:4px
4543
```
4644

‎src/components/permissionPage/add-role/add-role.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ export class AddRole {
5757
disabled={!hasAccess(this.parsedPermissions, { name: 'permissions', permission: 'write' })}
5858
clickHandler={() => this.toggleModalState()}
5959
varient="outlined"
60+
color="tertiary"
6061
>
6162
Add Role
6263
</icon-label-submit-button>

‎src/components/permissionPage/permission-editor/permission-editor.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ export class PermissionEditor {
232232
disabled={this.syncVal === '' || !hasAccess(this.parsedPermissions, { name: 'permissions', permission: 'update' }) || this.isLoading}
233233
loading={this.isLoading}
234234
varient="outlined"
235-
color="primary"
235+
color="tertiary"
236236
>
237237
Update
238238
</icon-label-submit-button>

‎src/components/settingsPage/basic-settings/basic-settings.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ export class BasicSettings {
200200
<div
201201
id="dropdown"
202202
style={{ zIndex: '5' }}
203-
class={` max-h-80 overflow-auto custom-scrollbar bg-white divide-y divide-gray-100 rounded-lg shadow w-44 dark:bg-gray-700 ${
203+
class={` max-h-80 overflow-auto custom-scrollbar bg-white divide-y divide-gray-100 rounded-lg shadow w-44 ${
204204
this.viewClasses[`${this.generalSettingsState[item]['dropDownOpen']}`]
205205
}`}
206206
>
@@ -210,7 +210,7 @@ export class BasicSettings {
210210
<li>
211211
<button
212212
onClick={() => this.generalSettingsSelectHandler(selectedOption, item)}
213-
class="w-full font-medium block px-4 py-2 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white overflow-hidden overflow-ellipsis"
213+
class="w-full font-medium block px-4 py-2 bg-white hover:bg-gray-200 text-gray-800 overflow-hidden overflow-ellipsis"
214214
>
215215
{selectedOption.toUpperCase()}
216216
</button>
@@ -302,7 +302,7 @@ export class BasicSettings {
302302
<li>
303303
<button
304304
onClick={() => this.selectHandler(selectedOption, item)}
305-
class="w-full font-medium block px-4 py-2 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white overflow-hidden overflow-ellipsis"
305+
class="w-full font-medium block px-4 py-2 hover:bg-gray-200 text-gray-700 dark:hover:bg-gray-600 dark:hover:text-white overflow-hidden overflow-ellipsis"
306306
>
307307
{selectedOption.toUpperCase()}
308308
</button>

‎src/components/settingsPage/side-bar/readme.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,11 @@
1717

1818
### Depends on
1919

20-
- [icon-button-basic](../../common/buttons/icon-button-basic)
2120
- [icon-label-submit-button](../../common/buttons/icon-label-submit-button)
2221

2322
### Graph
2423
```mermaid
2524
graph TD;
26-
side-bar --> icon-button-basic
2725
side-bar --> icon-label-submit-button
2826
style side-bar fill:#f9f,stroke:#333,stroke-width:4px
2927
```

‎src/components/settingsPage/side-bar/side-bar.tsx‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,12 @@ export class SideBar {
126126
<td class="px-6 py-4 ">{this.api}</td>
127127

128128
<td class="px-6 py-4 text-right">
129-
<icon-button-basic
129+
<icon-label-submit-button
130130
title="Copy to Clip Board"
131+
varient="text"
132+
color="tertiary"
131133
clickHandler={() => this.copyToClipboard()}
132-
color="secondary"
133-
icon={
134+
startIcon={
134135
<svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
135136
<path
136137
stroke-linecap="round"
@@ -146,7 +147,7 @@ export class SideBar {
146147
<icon-label-submit-button
147148
title="Delete API key"
148149
varient="text"
149-
color="secondary"
150+
color="tertiary"
150151
disabled={!hasAccess(this.parsedPermissions, { name: 'settings', permission: 'delete' })}
151152
clickHandler={() => this.deleteHandler()}
152153
startIcon={
@@ -158,7 +159,7 @@ export class SideBar {
158159
/>
159160
</svg>
160161
}
161-
></icon-label-submit-button>
162+
/>
162163
</td>
163164
</tr>
164165
</tbody>
@@ -176,7 +177,7 @@ export class SideBar {
176177
title="Create New API Key"
177178
clickHandler={() => this.createHandler()}
178179
disabled={!hasAccess(this.parsedPermissions, { name: 'settings', permission: 'write' })}
179-
color="secondary"
180+
color="tertiary"
180181
customClass="mt-3"
181182
>
182183
Create New Key

‎src/global/global.css‎

Lines changed: 37 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -618,6 +618,11 @@ Ensure the default browser behavior of the `hidden` attribute.
618618
margin-right: 0.5rem;
619619
}
620620

621+
.mx-4 {
622+
margin-left: 1rem;
623+
margin-right: 1rem;
624+
}
625+
621626
.mx-1\.5 {
622627
margin-left: 0.375rem;
623628
margin-right: 0.375rem;
@@ -638,11 +643,6 @@ Ensure the default browser behavior of the `hidden` attribute.
638643
margin-bottom: 1.5rem;
639644
}
640645

641-
.mx-4 {
642-
margin-left: 1rem;
643-
margin-right: 1rem;
644-
}
645-
646646
.-mx-3 {
647647
margin-left: -0.75rem;
648648
margin-right: -0.75rem;
@@ -686,6 +686,10 @@ Ensure the default browser behavior of the `hidden` attribute.
686686
margin-right: -0.25rem;
687687
}
688688

689+
.mt-2 {
690+
margin-top: 0.5rem;
691+
}
692+
689693
.ml-0 {
690694
margin-left: 0px;
691695
}
@@ -710,10 +714,6 @@ Ensure the default browser behavior of the `hidden` attribute.
710714
margin-bottom: 1.5rem;
711715
}
712716

713-
.mt-2 {
714-
margin-top: 0.5rem;
715-
}
716-
717717
.mb-2 {
718718
margin-bottom: 0.5rem;
719719
}
@@ -810,8 +810,8 @@ Ensure the default browser behavior of the `hidden` attribute.
810810
height: 2rem;
811811
}
812812

813-
.h-12 {
814-
height: 3rem;
813+
.h-10 {
814+
height: 2.5rem;
815815
}
816816

817817
.h-7 {
@@ -838,6 +838,10 @@ Ensure the default browser behavior of the `hidden` attribute.
838838
height: 24rem;
839839
}
840840

841+
.h-12 {
842+
height: 3rem;
843+
}
844+
841845
.h-11 {
842846
height: 2.75rem;
843847
}
@@ -846,10 +850,6 @@ Ensure the default browser behavior of the `hidden` attribute.
846850
height: 5rem;
847851
}
848852

849-
.h-10 {
850-
height: 2.5rem;
851-
}
852-
853853
.max-h-60 {
854854
max-height: 15rem;
855855
}
@@ -1102,6 +1102,10 @@ Ensure the default browser behavior of the `hidden` attribute.
11021102
gap: 0.25rem;
11031103
}
11041104

1105+
.gap-8 {
1106+
gap: 2rem;
1107+
}
1108+
11051109
.space-y-2 > :not([hidden]) ~ :not([hidden]) {
11061110
--tw-space-y-reverse: 0;
11071111
margin-top: calc(0.5rem * calc(1 - var(--tw-space-y-reverse)));
@@ -1414,6 +1418,11 @@ Ensure the default browser behavior of the `hidden` attribute.
14141418
background-color: rgb(224 242 254 / var(--tw-bg-opacity));
14151419
}
14161420

1421+
.bg-green-200 {
1422+
--tw-bg-opacity: 1;
1423+
background-color: rgb(187 247 208 / var(--tw-bg-opacity));
1424+
}
1425+
14171426
.bg-opacity-75 {
14181427
--tw-bg-opacity: 0.75;
14191428
}
@@ -2492,6 +2501,11 @@ Ensure the default browser behavior of the `hidden` attribute.
24922501
}
24932502

24942503
@media (min-width: 640px) {
2504+
.sm\:mx-auto {
2505+
margin-left: auto;
2506+
margin-right: auto;
2507+
}
2508+
24952509
.sm\:my-8 {
24962510
margin-top: 2rem;
24972511
margin-bottom: 2rem;
@@ -2502,11 +2516,6 @@ Ensure the default browser behavior of the `hidden` attribute.
25022516
margin-right: 0px;
25032517
}
25042518

2505-
.sm\:mx-auto {
2506-
margin-left: auto;
2507-
margin-right: auto;
2508-
}
2509-
25102519
.sm\:mt-0 {
25112520
margin-top: 0px;
25122521
}
@@ -2636,10 +2645,6 @@ Ensure the default browser behavior of the `hidden` attribute.
26362645
width: 50%;
26372646
}
26382647

2639-
.md\:w-80 {
2640-
width: 20rem;
2641-
}
2642-
26432648
.md\:w-3\/4 {
26442649
width: 75%;
26452650
}
@@ -2652,6 +2657,10 @@ Ensure the default browser behavior of the `hidden` attribute.
26522657
width: 100%;
26532658
}
26542659

2660+
.md\:w-80 {
2661+
width: 20rem;
2662+
}
2663+
26552664
.md\:grid-cols-2 {
26562665
grid-template-columns: repeat(2, minmax(0, 1fr));
26572666
}
@@ -2675,15 +2684,14 @@ Ensure the default browser behavior of the `hidden` attribute.
26752684
}
26762685

26772686
@media (min-width: 1024px) {
2678-
.lg\:mx-auto {
2679-
margin-left: auto;
2680-
margin-right: auto;
2681-
}
2682-
26832687
.lg\:flex {
26842688
display: flex;
26852689
}
26862690

2691+
.lg\:w-80 {
2692+
width: 20rem;
2693+
}
2694+
26872695
.lg\:w-2\/3 {
26882696
width: 66.666667%;
26892697
}
@@ -2692,10 +2700,6 @@ Ensure the default browser behavior of the `hidden` attribute.
26922700
width: 50%;
26932701
}
26942702

2695-
.lg\:w-80 {
2696-
width: 20rem;
2697-
}
2698-
26992703
.lg\:grid-cols-3 {
27002704
grid-template-columns: repeat(3, minmax(0, 1fr));
27012705
}

0 commit comments

Comments
 (0)