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

Jump to bottom

Feat/create time periods #21

Merged
merged 2 commits into from
Feb 28, 2024
Merged

Feat/create time periods #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27d9418
feat(ui): create time periods, create grant pool working
mattyg Feb 28, 2024
0ede6a9
feat(ui): local full date time in time period list
mattyg Feb 28, 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
4 changes: 2 additions & 2 deletions dnas/grant_pools/zomes/integrity/grants/src/application.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
use alloy_primitives::U256;
use hdi::prelude::*;
#[derive(Serialize, Deserialize, Debug, Clone, Eq, PartialEq)]
#[derive(Serialize, Deserialize, Debug, Clone, Eq, PartialEq, SerializedBytes)]
pub struct ApplicationOutcome {
approved: bool,
grant_pool: ActionHash,
}
#[derive(Serialize, Deserialize, Debug, Clone, Eq, PartialEq)]
#[derive(Serialize, Deserialize, Debug, Clone, Eq, PartialEq, SerializedBytes)]
#[serde(tag = "type")]
pub enum ApplicationStatus {
Draft,
Expand Down
6 changes: 3 additions & 3 deletions dnas/grant_pools/zomes/integrity/grants/src/evaluation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
use hdi::prelude::*;
#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, SerializedBytes)]
#[serde(tag = "type")]
pub enum EvaluationStatus {
Draft,
Submitted,
}

#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, SerializedBytes)]
pub struct AttributeScore {
label: String,
value: u64,
}

#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, SerializedBytes)]
pub enum Score {
Single(u64),
Weighted(Vec<AttributeScore>),
Expand Down
6 changes: 3 additions & 3 deletions dnas/grant_pools/zomes/integrity/grants/src/evaluation_template.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
use hdi::prelude::*;
use serde_json::Value;

#[derive(Serialize, Deserialize, Debug, Clone, Eq, PartialEq)]
#[derive(Serialize, Deserialize, Debug, Clone, Eq, PartialEq, SerializedBytes)]
pub struct NumberRange {
min: u32,
max: u32,
}

#[derive(Serialize, Deserialize, Debug, Clone, Eq, PartialEq)]
#[derive(Serialize, Deserialize, Debug, Clone, Eq, PartialEq, SerializedBytes)]
pub struct AttributeScoreTemplate {
label: String,
weight: u32,
}

#[derive(Serialize, Deserialize, Debug, Clone, Eq, PartialEq)]
#[derive(Serialize, Deserialize, Debug, Clone, Eq, PartialEq, SerializedBytes)]
#[serde(tag = "type", content = "content")]
pub enum ScoreTemplate {
Single,
Expand Down
2 changes: 1 addition & 1 deletion dnas/grant_pools/zomes/integrity/grants/src/grant_pool.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use alloy_primitives::U256;
use hdi::prelude::*;

#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, SerializedBytes)]
pub struct AmountRange {
min: U256,
max: U256,
Expand Down
203 changes: 201 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"dependencies": {
"@holochain-open-dev/profiles": "^0.17.3",
"@holochain/client": "^0.16.7",
"@imask/svelte": "^7.4.0",
"@material/mwc-button": "^0.27.0",
"@material/mwc-checkbox": "^0.27.0",
"@material/mwc-formfield": "^0.27.0",
Expand All @@ -28,10 +29,13 @@
"@msgpack/msgpack": "^2.7.2",
"@pragmatic-engineering/svelte-form-builder-community": "^1.0.2",
"@vaadin/date-time-picker": "^23.2.8",
"date-picker-svelte": "^2.11.0",
"dayjs": "^1.11.10",
"flowbite-svelte-icons": "^1.4.0",
"imask": "^7.4.0",
"lodash": "^4.17.21",
"uuid": "^9.0.1"
"uuid": "^9.0.1",
"viem": "^2.7.15"
},
"devDependencies": {
"@fontsource/fira-mono": "^4.5.10",
Expand Down
3 changes: 3 additions & 0 deletions ui/src/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export const ACCEPTED_TOKEN_DECIMALS = 6;
export const ACCEPTED_TOKEN_SYMBOL = 'USDC';
export const ACCEPTED_TOKEN_ADDRESS_ETHEREUM = '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48';
Loading
Loading