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

update dapp code according to tupui's review #37

Merged
merged 15 commits into from
Sep 5, 2024
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
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
4 changes: 2 additions & 2 deletions dapp/src/components/Commit.astro
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
import Topic from "./Topic.astro";
import Loading from "./Loading.astro";
import Topic from "./utils/Topic.astro";
import Loading from "./utils/Loading.astro";
---

<div class="relative flex flex-col items-center md:flex-row">
Expand Down
7 changes: 6 additions & 1 deletion dapp/src/components/ConnectWallet.astro
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</style>

<script>
import { kit, setPublicKey } from "./stellar-wallets-kit";
import { kit, loadedPublicKey, setPublicKey } from "./stellar-wallets-kit";

document.addEventListener("astro:page-load", () => {
const ellipsis = document.querySelector(
Expand All @@ -34,6 +34,11 @@
ellipsis.title = publicKey;
}

const connectedPublicKey = loadedPublicKey();
if (connectedPublicKey) {
setLoggedIn(connectedPublicKey);
}

button.addEventListener("click", async () => {
button.disabled = true;

Expand Down
4 changes: 2 additions & 2 deletions dapp/src/components/GetCommit.astro
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
import Topic from "./Topic.astro";
import Loading from "./Loading.astro";
import Topic from "./utils/Topic.astro";
import Loading from "./utils/Loading.astro";
---

<div class="relative flex flex-col items-center md:flex-row">
Expand Down
188 changes: 188 additions & 0 deletions dapp/src/components/ProjectInfo.astro
Original file line number Diff line number Diff line change
@@ -0,0 +1,188 @@
---
import Topic from "./utils/Topic.astro";
import Modal from "./utils/Modal.astro";
---

<div class="relative flex flex-col items-center md:flex-row justify-between">
<Topic title="Project Information" description="" id="project-name-topic"/>
Copy link
Owner

Choose a reason for hiding this comment

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

Sorry maybe I was not clear. This should look like this.

Suggested change
<Topic title="Project Information" description="" id="project-name-topic"/>
<Topic title="Project" description="Details about the project" id="project-name-topic"/>

And when you get the name it should appear in another div right above the list of maintainers. So around L25 here.

Can be like you have in the modal to update the config basically.

<div id="open-update-config-modal-button" class="mb-1.5 mt-12 pr-3 hidden">
<button
update-config
aria-controls="update-config-modal"
class="w-full p-3 bg-zinc-900 rounded-[14px] justify-center gap-2.5 inline-flex"
>
<span class="text-center text-white text-xl font-normal leading-7">
Update Config
</span>
</button>
</div>
</div>

<div
class="relative flex flex-col items-center md:flex-row my-6 bg-zinc-100 rounded-[45px]"
>
<div class="row items-center py-12 px-4 md:px-20 md:w-8/12 md:py-10">
<div class="space-y-6 md:w-full">
<div id="project-maintainers" class="space-y-2">
<h3 class="text-lg font-semibold">Maintainers:</h3>
<ul class="list-disc list-inside"></ul>
</div>
<div id="project-link" class="flex items-center space-x-2">
<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor">
<path fill-rule="evenodd" d="M12.586 4.586a2 2 0 112.828 2.828l-3 3a2 2 0 01-2.828 0 1 1 0 00-1.414 1.414 4 4 0 005.656 0l3-3a4 4 0 00-5.656-5.656l-1.5 1.5a1 1 0 101.414 1.414l1.5-1.5zm-5 5a2 2 0 012.828 0 1 1 0 101.414-1.414 4 4 0 00-5.656 0l-3 3a4 4 0 105.656 5.656l1.5-1.5a1 1 0 10-1.414-1.414l-1.5 1.5a2 2 0 11-2.828-2.828l3-3z" clip-rule="evenodd" />
</svg>
<a href="#" id="github-link" class="text-blue-600 hover:underline" target="_blank" rel="noopener noreferrer">Link to GitHub</a>
</div>
</div>
</div>
</div>

<Modal id="update-config-modal" title="Update Config">
<div id="modal-content" class="space-y-4 w-[600px]">
<h2 id="modal-project-name" class="text-3xl font-bold mb-4">Project Name</h2>

<label class="block mb-2 text-base font-medium text-black">
Maintainers
<input
type="text"
id="modal-maintainers"
class="block p-3 w-full text-base text-black bg-white rounded-lg border shadow-sm focus:ring-black focus:border-black"
placeholder="List of maintainers' addresses as G...,G..."
required
/>
</label>

<label class="block mb-2 text-base font-medium text-black">
URL
<input
type="text"
id="modal-config-url"
class="block p-3 w-full text-base text-black bg-white rounded-lg border shadow-sm focus:ring-black focus:border-black"
placeholder="Information file URL"
required
/>
</label>

<label class="block mb-2 text-base font-medium text-black">
Information file hash
<input
type="text"
id="modal-config-hash"
class="block p-3 w-full text-base text-black bg-white rounded-lg border shadow-sm focus:ring-black focus:border-black"
placeholder="Information file hash"
required
minlength="40"
maxlength="40"
/>
</label>

<div id="wrap-update-button">
<button
id="update-config-button"
class="w-full py-5 bg-zinc-900 rounded-[14px] justify-center gap-2.5 inline-flex"
>
<span class="text-center text-white text-xl font-normal leading-7">
Update Config
</span>
</button>
</div>
</div>
</Modal>

<script>
import { loadedProjectInfo, updateConfig } from "./project";
import { loadedPublicKey } from "./stellar-wallets-kit";

document.addEventListener("astro:page-load", () => {
const topicElement = document.getElementById("project-name-topic");
const topicDescriptionElement = topicElement?.querySelector("p");
const modal = document.getElementById("update-config-modal") as HTMLDialogElement;

function updateProjectInfo() {
const projectInfo = loadedProjectInfo();
if (projectInfo) {
console.log("projectInfo:", projectInfo);
if (topicDescriptionElement) {
topicDescriptionElement.textContent = projectInfo.name;
}
const maintainersList = document.getElementById("project-maintainers");
if (maintainersList) {
const ul = maintainersList.querySelector("ul");
if (ul) {
ul.innerHTML = '';
projectInfo.maintainers.forEach((maintainer: string) => {
const li = document.createElement("li");
li.textContent = maintainer;
ul.appendChild(li);
});
}
}
const githubLink = document.getElementById("github-link") as HTMLAnchorElement;
if (githubLink) {
githubLink.href = `${projectInfo.config.url}`;
}

// Update modal content
const modalProjectName = document.getElementById("modal-project-name");
if (modalProjectName) {
modalProjectName.textContent = projectInfo.name;
}

const modalMaintainers = document.getElementById("modal-maintainers") as HTMLInputElement;
if (modalMaintainers) {
modalMaintainers.value = projectInfo.maintainers.join(',');
}
const modalConfigUrl = document.getElementById("modal-config-url") as HTMLInputElement;
if (modalConfigUrl) {
modalConfigUrl.value = projectInfo.config.url;
}
const modalConfigHash = document.getElementById("modal-config-hash") as HTMLInputElement;
if (modalConfigHash) {
modalConfigHash.value = projectInfo.config.hash;
}

// Check if the connected wallet is a maintainer
const connectedPublicKey = loadedPublicKey();
const isMaintainer = connectedPublicKey ? projectInfo.maintainers.includes(connectedPublicKey) : false;
const updateConfigButton = document.getElementById("open-update-config-modal-button");
if (updateConfigButton) {
updateConfigButton.classList.toggle("hidden", !isMaintainer);
}
}
}

updateProjectInfo();

const button = document.querySelector(
"[update-config]",
) as HTMLButtonElement;
if (button) {
button.addEventListener("click", async () => {
console.log("Update config button clicked");
modal.showModal();
});
}

const updateButton = document.getElementById("update-config-button");
if (updateButton) {
updateButton.addEventListener("click", async () => {
const modalMaintainers = (document.getElementById("modal-maintainers") as HTMLInputElement).value;
const modalConfigUrl = (document.getElementById("modal-config-url") as HTMLInputElement).value;
const modalConfigHash = (document.getElementById("modal-config-hash") as HTMLInputElement).value;

const updateStatus = await updateConfig(
modalMaintainers,
modalConfigUrl,
modalConfigHash
);

if (updateStatus) {
updateProjectInfo();
Copy link
Owner

Choose a reason for hiding this comment

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

For a follow up, I think it should also reload the project info. And same as with the other buttons, it should add the spinner component so users know something happened after they clicked the button.

(document.getElementById("update-config-modal") as HTMLDialogElement).close();
} else {
alert("Failed to update project config. Please try again.");
}
});
}
});
</script>
tupui marked this conversation as resolved.
Show resolved Hide resolved
4 changes: 2 additions & 2 deletions dapp/src/components/RegisterProject.astro
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
import Topic from "./Topic.astro";
import Loading from "./Loading.astro";
import Topic from "./utils/Topic.astro";
import Loading from "./utils/Loading.astro";
---

<div class="relative flex flex-col items-center md:flex-row">
Expand Down
18 changes: 11 additions & 7 deletions dapp/src/components/SetProject.astro
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
import Topic from "./Topic.astro";
import LinkCard from "./LinkCard.astro";
import Topic from "./utils/Topic.astro";
import LinkCard from "./utils/LinkCard.astro";

const SOROBAN_NETWORK = import.meta.env.SOROBAN_NETWORK;
const TANSU_CONTRACT_ID = import.meta.env.PUBLIC_TANSU_CONTRACT_ID;
Expand Down Expand Up @@ -32,9 +32,7 @@ const TANSU_CONTRACT_ID = import.meta.env.PUBLIC_TANSU_CONTRACT_ID;
aria-controls="set-project"
class="w-full py-5 bg-zinc-900 rounded-[14px] justify-center gap-2.5 inline-flex"
>
<span class="text-center text-white text-xl font-normal leading-7"
>Set project</span
>
<span class="text-center text-white text-xl font-normal leading-7">Set project</span>
</button>
</div>
</div>
Expand All @@ -45,7 +43,7 @@ const TANSU_CONTRACT_ID = import.meta.env.PUBLIC_TANSU_CONTRACT_ID;
</div>

<script>
import { setProjectId } from "./project";
import { getProject, setProjectId, setProject } from "./project";
import { navigate } from "astro:transitions/client";

document.addEventListener("astro:page-load", () => {
Expand All @@ -60,7 +58,13 @@ const TANSU_CONTRACT_ID = import.meta.env.PUBLIC_TANSU_CONTRACT_ID;
button.disabled = true;
try {
setProjectId(project_name.value);
navigate("/commit");
const project = await getProject();
if (project && project.name && project.config && project.maintainers) {
setProject(project);
navigate("/commit");
tupui marked this conversation as resolved.
Show resolved Hide resolved
} else {
navigate("/register")
}
} catch (e) {
console.error(e);
}
Expand Down
12 changes: 0 additions & 12 deletions dapp/src/components/Topic.astro

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
import Container from "./Container.astro";
import ConnectWallet from "../components/ConnectWallet.astro";
import Container from "../layout/Container.astro";
import ConnectWallet from "../ConnectWallet.astro";
---

<header class="mt-32">
Expand Down
Loading