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

Beta -> master (react templates) #226

Merged
merged 5 commits into from
Jul 25, 2024
Merged

Beta -> master (react templates) #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
76fa2c6
chore(deps): bump ajv-formats in the prod-deps-breaking group
dependabot[bot] Jul 15, 2024
9431c9e
chore(deps): bump the npm_and_yarn group across 1 directory with 1 up…
dependabot[bot] Mar 17, 2024
09224bb
feat: enable react templates
SewerynKras Jul 24, 2024
44124ba
Merge pull request #224 from golemfactory/re-enable-react-templates
grisha87 Jul 25, 2024
7334f34
Merge pull request #192 from golemfactory/dependabot/npm_and_yarn/bet…
grisha87 Jul 25, 2024
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
5 changes: 3 additions & 2 deletions data/project-templates/react-js/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@
"preview": "vite preview"
},
"dependencies": {
"@golem-sdk/golem-js": "^3.0.0",
"@golem-sdk/react": "^3.0.1",
"@golem-sdk/golem-js": "^3.1.0",
"@golem-sdk/react": "^4.0.0",
"@golem-sdk/task-executor": "^2.0.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
45 changes: 24 additions & 21 deletions data/project-templates/react-js/src/components/NodeVersionCheck.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,42 @@
import { useExecutor } from "@golem-sdk/react";
import { ProposalFilterFactory } from "@golem-sdk/golem-js";
import { NodeVersionCheckTask } from "./NodeVersionCheckTask.jsx";
import { NodeVersionCheckTask } from "./NodeVersionCheckTask";

export function NodeVersionCheck() {
const { executor, initialize, isInitialized, isInitializing, terminate, error } = useExecutor({
// What do you want to run
package: "golem/node:20-alpine",

// How much you wish to spend
budget: 2,

// How do you want to select market proposals
proposalFilter: ProposalFilterFactory.limitPriceFilter({
start: 1.0,
cpuPerSec: 1.0 / 3600,
envPerSec: 1.0 / 3600,
}),

demand: {
workload: {
imageTag: "golem/node:20-alpine",
},
},
// Where you want to spend
payment: {
network: "goerli",
network: "holesky",
},
market: {
// Let's rent the provider for no more than 15 minutes
rentHours: 15 / 60,
// Let's agree to pay at most 0.5 GLM per hour
pricing: {
model: "burn-rate",
avgGlmPerHour: 0.5,
},
},

// Control the execution of tasks
maxTaskRetries: 0,
taskTimeout: 5 * 60 * 1000,
task: {
taskTimeout: 5 * 60 * 1000,
maxTaskRetries: 0,
},
// Look at the browser console to see what's happening under the hood
enableLogging: true,
});

return (
<div className="node-version-check-wrapper">
{error && <div className="text-error">Error: {error.toString()}</div>}
{isInitialized && <NodeVersionCheckTask executor={executor} />}
{isInitialized && executor && <NodeVersionCheckTask executor={executor} />}
{isInitializing && <div>Executor is initializing</div>}
{!isInitialized && (
<button onClick={initialize} className="bg-progress">
<button onClick={() => initialize()} className="bg-progress">
Initialize executor
</button>
)}
Expand Down
4 changes: 2 additions & 2 deletions data/project-templates/react-js/src/components/NodeVersionCheckTask.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import PropTypes from "prop-types";
export function NodeVersionCheckTask({ executor }) {
const { isRunning, result, run, error } = useTask(executor);

const getNodeVersionTask = async (ctx) => {
return (await ctx.run("node -v")).stdout?.toString() ?? "No version information";
const getNodeVersionTask = async (exe) => {
return (await exe.run("node -v")).stdout?.toString() ?? "No version information";
};

return (
Expand Down
5 changes: 3 additions & 2 deletions data/project-templates/react-ts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@
"preview": "vite preview"
},
"dependencies": {
"@golem-sdk/golem-js": "^3.0.0",
"@golem-sdk/react": "^3.0.1",
"@golem-sdk/golem-js": "^3.1.0",
"@golem-sdk/react": "^4.0.0",
"@golem-sdk/task-executor": "^2.0.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
41 changes: 22 additions & 19 deletions data/project-templates/react-ts/src/components/NodeVersionCheck.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,33 @@
import { useExecutor } from "@golem-sdk/react";
import { ProposalFilterFactory } from "@golem-sdk/golem-js";
import { NodeVersionCheckTask } from "./NodeVersionCheckTask";

export function NodeVersionCheck() {
const { executor, initialize, isInitialized, isInitializing, terminate, error } = useExecutor({
// What do you want to run
package: "golem/node:20-alpine",

// How much you wish to spend
budget: 2,

// How do you want to select market proposals
proposalFilter: ProposalFilterFactory.limitPriceFilter({
start: 1.0,
cpuPerSec: 1.0 / 3600,
envPerSec: 1.0 / 3600,
}),

demand: {
workload: {
imageTag: "golem/node:20-alpine",
},
},
// Where you want to spend
payment: {
network: "goerli",
network: "holesky",
},
market: {
// Let's rent the provider for no more than 15 minutes
rentHours: 15 / 60,
// Let's agree to pay at most 0.5 GLM per hour
pricing: {
model: "burn-rate",
avgGlmPerHour: 0.5,
},
},

// Control the execution of tasks
maxTaskRetries: 0,
taskTimeout: 5 * 60 * 1000,
task: {
taskTimeout: 5 * 60 * 1000,
maxTaskRetries: 0,
},
// Look at the browser console to see what's happening under the hood
enableLogging: true,
});

return (
Expand All @@ -33,7 +36,7 @@ export function NodeVersionCheck() {
{isInitialized && executor && <NodeVersionCheckTask executor={executor} />}
{isInitializing && <div>Executor is initializing</div>}
{!isInitialized && (
<button onClick={initialize} className="bg-progress">
<button onClick={() => initialize()} className="bg-progress">
Initialize executor
</button>
)}
Expand Down
8 changes: 4 additions & 4 deletions data/project-templates/react-ts/src/components/NodeVersionCheckTask.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { TaskExecutor, useTask, Worker } from "@golem-sdk/react";

import { useTask } from "@golem-sdk/react";
import type { TaskFunction, TaskExecutor } from "@golem-sdk/task-executor";
export function NodeVersionCheckTask({ executor }: { executor: TaskExecutor }) {
const { isRunning, result, run, error } = useTask<string>(executor);

const getNodeVersionTask: Worker<string> = async (ctx) => {
return (await ctx.run("node -v")).stdout?.toString() ?? "No version information";
const getNodeVersionTask: TaskFunction<string> = async (exe) => {
return (await exe.run("node -v")).stdout?.toString() ?? "No version information";
};

return (
Expand Down
Loading
Loading