Skip to content

Commit cddf9ac

Browse files
authored
Pine/empty bearer (#375)
* fix empty bearer token * fix connected styling * fix overflow
1 parent c54ade9 commit cddf9ac

File tree

3 files changed

+31
-3
lines changed

3 files changed

+31
-3
lines changed

client/src/assets/css/App.scss

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,31 @@ body {
66
width: 100vw;
77
}
88

9+
// Fontawesome variables that the old Ratel depends on
10+
:root {
11+
--blue: #007bff;
12+
--indigo: #6610f2;
13+
--purple: #6f42c1;
14+
--pink: #e83e8c;
15+
--red: #dc3545;
16+
--orange: #fd7e14;
17+
--yellow: #ffc107;
18+
--green: #28a745;
19+
--teal: #20c997;
20+
--cyan: #17a2b8;
21+
--white: #fff;
22+
--gray: #6c757d;
23+
--gray-dark: #343a40;
24+
--primary: #007bff;
25+
--secondary: #6c757d;
26+
--success: #28a745;
27+
--info: #17a2b8;
28+
--warning: #ffc107;
29+
--danger: #dc3545;
30+
--light: #f8f9fa;
31+
--dark: #343a40;
32+
}
33+
934
#root {
1035
display: flex;
1136
flex-direction: row;

client/src/components/ServerConnectionModal.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
justify-content: space-between;
2424
}
2525
.modal.server-connection .modal-body {
26+
overflow: hidden;
27+
2628
.main-row {
2729
min-height: 60vh;
2830
}

client/src/lib/helpers.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,10 @@ export async function setCurrentServerQueryTimeout(timeout) {
128128
}
129129

130130
export function setCurrentServerSlashApiKey(slashApiKey) {
131-
clientStubOptions.headers["X-Auth-Token"] = slashApiKey;
132-
clientStubOptions.headers["Authorization"] = "Bearer " + slashApiKey;
131+
if (slashApiKey) {
132+
clientStubOptions.headers["X-Auth-Token"] = slashApiKey;
133+
clientStubOptions.headers["Authorization"] = "Bearer " + slashApiKey;
134+
}
133135
}
134136

135137
export function setCurrentServerAuthToken(authToken) {
@@ -160,7 +162,6 @@ export async function executeQuery(
160162
}
161163

162164
const client = await getDgraphClient();
163-
console.log("client", client);
164165

165166
if (action === "query") {
166167
return client

0 commit comments

Comments
 (0)