Skip to content

Commit

Permalink
Merge branch 'development' into upstream/development
Browse files Browse the repository at this point in the history
  • Loading branch information
@0x4007
0x4007 committed Nov 2, 2024
2 parents c2a560b + 401be6b commit 79ef08e
Show file tree
Hide file tree
Showing 8 changed files with 60 additions and 8,433 deletions.
Binary file added bun.lockb
View file
Binary file not shown.
1 change: 1 addition & 0 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
},
"scripts": {
"start": "wrangler pages dev --port 8080",
"watch": "tsx build/esbuild-server.ts",
"build": "tsx build/esbuild-build.ts",
"format": "run-s format:lint format:prettier format:cspell",
"format:lint": "eslint --fix .",
Expand Down
11 changes: 5 additions & 6 deletions src/home/authentication.ts
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { trackReferralCode } from "./register-referral";
import { getGitHubAccessToken } from "./getters/get-github-access-token";
import { getGitHubUser } from "./getters/get-github-user";
import { GitHubUser } from "./github-types";
import { trackReferralCode } from "./register-referral";
import { displayGitHubUserInformation } from "./rendering/display-github-user-information";
import { renderGitHubLoginButton } from "./rendering/render-github-login-button";

Expand All @@ -11,14 +11,13 @@ export async function authentication() {
return;
}

const accessToken = await getGitHubAccessToken();
if (!accessToken) {
renderGitHubLoginButton();
}

const gitHubUser: null | GitHubUser = await getGitHubUser();
if (gitHubUser) {
await trackReferralCode();
await displayGitHubUserInformation(gitHubUser);
}
const accessToken = await getGitHubAccessToken();
if (!accessToken) {
renderGitHubLoginButton();
}
}
6 changes: 3 additions & 3 deletions src/home/rendering/display-github-user-information.ts
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { isOrgMemberWithoutScope } from "../getters/get-github-access-token";
import { GitHubUser } from "../github-types";
import { renderErrorInModal } from "./display-popup-modal";
import { getSupabase, renderAugmentAccessButton, authenticationElement } from "./render-github-login-button";
import { toolbar } from "../ready-toolbar";
import { renderErrorInModal } from "./display-popup-modal";
import { authenticationElement, getSupabase, renderAugmentAccessButton } from "./render-github-login-button";

export async function displayGitHubUserInformation(gitHubUser: GitHubUser) {
const authenticatedDivElement = document.createElement("div");
Expand All @@ -18,14 +18,14 @@ export async function displayGitHubUserInformation(gitHubUser: GitHubUser) {
img.classList.add("github-avatar-default");
}
img.alt = gitHubUser.login;
authenticatedDivElement.appendChild(img);

const divNameElement = document.createElement("div");

// Falls back to login because the name is not required for a GitHub user
divNameElement.textContent = gitHubUser.name || gitHubUser.login;
divNameElement.classList.add("full");
authenticatedDivElement.appendChild(divNameElement);
authenticatedDivElement.appendChild(img);

authenticatedDivElement.addEventListener("click", async function signOut() {
const supabase = getSupabase();
Expand Down
2 changes: 1 addition & 1 deletion src/home/sorting/sorting-manager.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export class SortingManager {
const textBox = document.createElement("input");
textBox.type = "text";
textBox.id = `filter-${this._instanceId}`;
textBox.placeholder = "Text Filter";
textBox.placeholder = "Search";

// Handle CTRL+F
document.addEventListener("keydown", (event) => {
Expand Down
73 changes: 23 additions & 50 deletions static/style/inverted-style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,34 +8,28 @@
#bottom-right {
display: none;
}
#toolbar{
#toolbar {
justify-content: space-between;
}
#bottom-bar{
height: 60px;
padding: 10px 20px;
#bottom-bar {
align-items: center;
justify-content: center;
}
#filters-bottom{
margin: 10px 20px;
#filters-bottom {
display: flex;
flex-direction: column;
gap: 10px;
max-width: 600px;
gap: 2px;
}
.labels{
.labels {
margin: 0;
align-items: center;
width: 100%;
}
#filter-bottom{
#filter-bottom {
max-width: 100%;
margin: 0;
padding: 5px 0;
}
}

@media (orientation: landscape) and (width > 800px) {
#bottom-bar,
#filters-bottom {
Expand Down Expand Up @@ -101,7 +95,7 @@
max-width: 640px;
scrollbar-width: none;
-ms-overflow-style: none;
padding: 56px 0;
padding: 48px 0 56px 0;
transition: 0.25s all cubic-bezier(0, 1, 1, 1);
width: 100%;
}
Expand Down Expand Up @@ -155,7 +149,6 @@
#issues-container.keyboard-selection > div.active {
opacity: 0.33;
}

@media (hover: hover) {
#issues-container.keyboard-selection > div.active.selected {
opacity: 1;
Expand All @@ -167,8 +160,7 @@
#issues-container:hover .issue-element-inner {
opacity: 0.5;
}
}

}
#issues-container > div.active {
transition: 125ms all ease-in-out;
opacity: 1;
Expand All @@ -191,7 +183,6 @@
margin: 0;
white-space: nowrap;
}

p {
margin: 0;
line-height: 1;
Expand Down Expand Up @@ -228,7 +219,6 @@
opacity: 0.5;
display: inline-block;
}

label:not([for="view-toggle"]):first-child {
margin-left: 0;
}
Expand Down Expand Up @@ -290,11 +280,9 @@
text-overflow: ellipsis;
margin-top: 2px;
}

.info > .partner > * {
display: inline-block;
}

body {
display: flex;
align-items: center;
Expand All @@ -316,7 +304,6 @@
overflow: hidden;
text-overflow: ellipsis;
}

#issues-container > .issue-element-wrapper {
opacity: 0.5;
transition: 0.33s all cubic-bezier(0, 1, 1, 1);
Expand Down Expand Up @@ -360,21 +347,22 @@
}
.toolbar {
position: fixed;
width: calc(100vw - 8px);
width: 100vw;
height: 48px;
top: 0;
backdrop-filter: blur(8px);
padding: 4px;
display: flex;
border-bottom: 1px solid #7f7f7f20;
-webkit-backdrop-filter: blur(8px);
align-items: center;
}
#authentication {
position: absolute;
right: 0;
cursor: pointer;
vertical-align: middle;
flex: 0 0 auto;
cursor: pointer;
margin-right: 10px;
margin-left: 10px;
}
.toolbar > * {
display: inline-flex;
Expand All @@ -386,13 +374,10 @@
display: inline-flex;
align-items: center;
justify-content: center;
margin: 0 4px;
max-height: 48px;
}
#authenticated > img {
border-radius: 50%;
height: 40px;
padding: 4px 0;
height: 48px;
}
.toolbar[data-authenticated="true"] > #github-login-button {
display: none;
Expand Down Expand Up @@ -438,7 +423,6 @@
.title > h3 {
white-space: nowrap;
}

.full {
display: none !important;
}
Expand Down Expand Up @@ -579,7 +563,6 @@
.preview-body-inner {
padding: 16px;
overflow: scroll;
max-height: calc(100vh - 208px);
}
.preview-body-inner > :last-child {
margin-bottom: 0;
Expand All @@ -591,10 +574,9 @@
border: 1px solid #7f7f7f20;
border-radius: 4px;
opacity: 0;
top: 60px;
top: 54px;
pointer-events: none;
width: calc(100vw - 14px);
max-height: calc(100% - 120px);
}
.preview * {
pointer-events: none;
Expand All @@ -617,7 +599,7 @@
display: flex;
justify-content: space-between;
align-items: center;
padding: 8px 16px;
padding: 4px 16px;
border-bottom: 1px solid #7f7f7f20;
}
.preview-header > a {
Expand Down Expand Up @@ -646,11 +628,10 @@
text-overflow: ellipsis;
}
.preview-body {
overflow: hidden;
height: calc(100% - 180px);
overflow: scroll;
max-height: calc(100vh - 156px);
display: block;
}

.preview button.close-preview {
right: 0;
top: 0;
Expand Down Expand Up @@ -682,7 +663,6 @@
max-width: 500px;
height: 16px;
text-align: center;
min-width: 80px;
}
.filters-container input[type="text"]::placeholder {
font-size: 12px;
Expand Down Expand Up @@ -765,12 +745,11 @@
.user-container {
display: flex;
align-items: center;
margin-right: 8px;
}
.github-avatar-default {
width: 48px;
height: 48px;
background-color: #7f7f7f;
background-color: grey;
}
#view-toggle:checked::after {
content: "Proposals";
Expand Down Expand Up @@ -816,7 +795,6 @@
#bottom-right:hover svg {
fill: #000000;
}

#issues-container::after {
content: "";
display: block;
Expand All @@ -828,12 +806,11 @@
animation:
spin 1.5s cubic-bezier(1, 0, 1, 1) infinite alternate,
fadeOut 1.5s ease-out 5s forwards;
top: calc(50vh - (24px + 2px)); /* 2px to accomodate border width */
top: calc(50vh - (24px + 2px));
position: fixed;
opacity: 1;
transition: 0.5s all ease-in-out;
right: calc(50% - (24px + 2px)); /* 2px to accomodate border width */

right: calc(50% - (24px + 2px));
pointer-events: none;
}
#issues-container.ready::after {
Expand All @@ -842,9 +819,8 @@
}
@keyframes spin {
0% {
transform: rotate(0deg);
transform: rotate(0);
}

75% {
transform: rotate(5400deg);
border-bottom-color: #000000;
Expand All @@ -867,17 +843,14 @@
background: unset;
border: unset;
}

div#mobile-modal-scrub {
position: fixed;
right: 0;
display: none;
}

div#mobile-modal-scrub > button {
margin-right: 6px;
font-size: 24px;
padding: 0px 48px;
padding: 0 48px;
border: unset;
}
#bottom-bar {
Expand Down
Loading

1 comment on commit 79ef08e

@ubiquity-os
Copy link
Contributor

@ubiquity-os ubiquity-os bot commented on 79ef08e Nov 2, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@0x4007 Configuration is invalid.

Caution

work.ubq.fi/.github/.ubiquity-os.config.yml

Line 1 in 79ef08e

plugins: 

path: plugins/0/uses/0/with
value: undefined
message: Instance does not have required property "registerWalletWithVerification".

Caution

work.ubq.fi/.github/.ubiquity-os.config.yml

Line 105 in 79ef08e

approvalsRequired: 

path: plugins/5/uses/0/with
value: {"approvalsRequired":{"collaborator":1},"mergeTimeout":{"collaborator":"3.5 days"},"repos":{"ignore":["ubiquibot","launch-party","staging","production"]}}
message: Property "approvalsRequired" does not match schema.

Caution

work.ubq.fi/.github/.ubiquity-os.config.yml

Line 106 in 79ef08e

collaborator: 1 

path: plugins/5/uses/0/with/approvalsRequired
value: {"collaborator":1}
message: Instance does not have required property "contributor".

Caution

work.ubq.fi/.github/.ubiquity-os.config.yml

Line 105 in 79ef08e

approvalsRequired: 

path: plugins/5/uses/0/with
value: {"approvalsRequired":{"collaborator":1},"mergeTimeout":{"collaborator":"3.5 days"},"repos":{"ignore":["ubiquibot","launch-party","staging","production"]}}
message: Property "mergeTimeout" does not match schema.

Caution

work.ubq.fi/.github/.ubiquity-os.config.yml

Line 108 in 79ef08e

collaborator: "3.5 days" 

path: plugins/5/uses/0/with/mergeTimeout
value: {"collaborator":"3.5 days"}
message: Instance does not have required property "contributor".

Caution

work.ubq.fi/.github/.ubiquity-os.config.yml

Line 105 in 79ef08e

approvalsRequired: 

path: plugins/5/uses/0/with
value: {"approvalsRequired":{"collaborator":1},"mergeTimeout":{"collaborator":"3.5 days"},"repos":{"ignore":["ubiquibot","launch-party","staging","production"]}}
message: Property "repos" does not match schema.

Caution

work.ubq.fi/.github/.ubiquity-os.config.yml

Line 110 in 79ef08e

ignore: 

path: plugins/5/uses/0/with/repos
value: {"ignore":["ubiquibot","launch-party","staging","production"]}
message: Instance does not have required property "monitor".

Caution

work.ubq.fi/.github/.ubiquity-os.config.yml

Line 118 in 79ef08e

reviewDelayTolerance: "3 Days" 

path: plugins/6/uses/0/with
value: {"reviewDelayTolerance":"3 Days","taskStaleTimeoutDuration":"30 Days","startRequiresWallet":true}
message: Instance does not have required property "maxConcurrentTasks".

Caution

work.ubq.fi/.github/.ubiquity-os.config.yml

Line 118 in 79ef08e

reviewDelayTolerance: "3 Days" 

path: plugins/6/uses/0/with
value: {"reviewDelayTolerance":"3 Days","taskStaleTimeoutDuration":"30 Days","startRequiresWallet":true}
message: Instance does not have required property "emptyWalletText".

Caution

work.ubq.fi/.github/.ubiquity-os.config.yml

Line 118 in 79ef08e

reviewDelayTolerance: "3 Days" 

path: plugins/6/uses/0/with
value: {"reviewDelayTolerance":"3 Days","taskStaleTimeoutDuration":"30 Days","startRequiresWallet":true}
message: Instance does not have required property "rolesWithReviewAuthority".

Caution

work.ubq.fi/.github/.ubiquity-os.config.yml

Line 1 in 79ef08e

plugins: 

path: plugins/7/uses/0/with
value: undefined
message: Instance does not have required property "matchThreshold".

Caution

work.ubq.fi/.github/.ubiquity-os.config.yml

Line 1 in 79ef08e

plugins: 

path: plugins/7/uses/0/with
value: undefined
message: Instance does not have required property "warningThreshold".

Caution

work.ubq.fi/.github/.ubiquity-os.config.yml

Line 1 in 79ef08e

plugins: 

path: plugins/7/uses/0/with
value: undefined
message: Instance does not have required property "jobMatchingThreshold".

Please sign in to comment.