Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
157 commits
Select commit Hold shift + click to select a range
b16ec2b
change .env.local, run codegen, point codegen yml to local api
hichana Oct 2, 2021
6242675
add helpful print statements
hichana Oct 2, 2021
497b524
allow AccountBottomBar to render for all EntityType types
hichana Oct 2, 2021
4e4a1aa
add state for selecting which account's resources to view in projectM…
hichana Oct 2, 2021
95a5cdd
add button that changes new data members in project provider with ind…
hichana Oct 2, 2021
d965032
simplify selected resource account setter function in project provider
hichana Oct 2, 2021
46b6f64
link up button click to setting of state for viewing a given user's s…
hichana Oct 2, 2021
9c71fc0
decouple button click in sidebar on account from button that renders …
hichana Oct 2, 2021
a7b94c3
remove 'key' prop on Example component to resolve browser errors
hichana Oct 4, 2021
9ea2439
fix key error in react component and ts warning
hichana Oct 4, 2021
a061e25
fix web console errors
hichana Oct 5, 2021
fb5b48e
add prototype method of flagging acct that had storage update
hichana Oct 5, 2021
3009f16
add Capabilities to parsed data set for resources explorer
hichana Oct 6, 2021
0c0b5c1
add prototype insert tx onclick
hichana Oct 6, 2021
af10b7b
add URL param functionality for 'storage' url param
hichana Oct 7, 2021
5f5db75
add prototype URL params to persist resources explorer across user ac…
hichana Oct 7, 2021
dcb10af
remove .vscode/settings: remove to align with master
hichana Oct 7, 2021
f6935f5
run graphql codegen
hichana Oct 7, 2021
715918e
cleanup
hichana Oct 8, 2021
428a2ba
use account string (ex '0x01') as a url param for storage instead of …
hichana Oct 8, 2021
0bcaed6
add prototype button for selecting resource account
hichana Oct 9, 2021
e6647c8
fix key render error
hichana Oct 9, 2021
f83d2f6
nest resources explorer button inside sidebar item
hichana Oct 9, 2021
c74bca4
make button green for selected storage account
hichana Oct 9, 2021
8c46962
make clicking on user in sidebar not change storage param in url
hichana Oct 9, 2021
92787f9
add temp badges for milestone 2
hichana Oct 9, 2021
66da1ed
remove unecessary Flex component in AccountList
hichana Oct 9, 2021
9296f9d
remove unecessary css
hichana Oct 9, 2021
37d4eb1
remove Flex import
hichana Oct 9, 2021
791beab
add alignment to contents of resource explorer item
hichana Oct 9, 2021
c9916ef
use placeholder popup in AccountBottomBar
hichana Oct 9, 2021
b125d71
button toggles template popup
hichana Oct 9, 2021
909813e
add customizable white overlay backround capability
hichana Oct 9, 2021
dea550a
add popup creation of script/tx template creator
hichana Oct 9, 2021
8ab45f2
add pair data for knowing what storage has been updated by who
hichana Oct 9, 2021
d0b7a1e
add prototype for toast
hichana Oct 10, 2021
8b49e7d
add type annotation for removeNotification setter
hichana Oct 10, 2021
f0f1feb
add typescript annotation
hichana Oct 10, 2021
392173c
add prototype of expanding Arguments container instead of toast
hichana Oct 11, 2021
bae724b
revise prototype for user tx notifications
hichana Oct 11, 2021
34dd701
clean styles.tsx
hichana Oct 11, 2021
1e3da1b
cleanup and minor fixes before milestone 2 submission
hichana Oct 11, 2021
1b3a77e
change Heading styling to accept no text-transform, change resources …
hichana Oct 13, 2021
4c89d60
cleanup
hichana Oct 13, 2021
a4007e4
add display of resources explorer for account with nothing in storage
hichana Oct 13, 2021
e4d0ec0
make resource explorer buttons toggle
hichana Oct 13, 2021
b59161a
change the logic for rendering resources explorer for 'none' state of…
hichana Oct 13, 2021
3b56e0c
fix bug when user clicks on resources explorer icon and resoruces sho…
hichana Oct 13, 2021
ba3c5de
cleanup
hichana Oct 13, 2021
2340d3d
make and use accounts.ts util
hichana Oct 13, 2021
6a88c02
add method for aligning which accts signed a tx with which accounts h…
hichana Oct 14, 2021
937bac7
add string interpolation of account signers and accounts updated to t…
hichana Oct 14, 2021
4af57dd
cleanup
hichana Oct 14, 2021
7b989b0
update timing for when toast renders and styling of toast
hichana Oct 14, 2021
bf8b909
remove unecessary function in util
hichana Oct 14, 2021
4f32eec
remove unecessary props from toast container
hichana Oct 14, 2021
d4c21ae
add basic messaging in toast for failed transaction
hichana Oct 14, 2021
9527670
add new message to failed tx toast
hichana Oct 14, 2021
4289501
working on first tx with error processed bug shows no toast
hichana Oct 14, 2021
74c9d62
adds handling of struct and nil type to resources explorer
hichana Oct 14, 2021
a0edee7
add prototype for badge display of all storage types
hichana Oct 14, 2021
302cfad
refactor badge and change colors of badges
hichana Oct 15, 2021
e0a6515
cleanup, refactor badges and change colors of badges
hichana Oct 15, 2021
a6d28bd
re-add transaction/script templay plus button to resources explorer, …
hichana Oct 15, 2021
24816da
fix bug in selecting correct storage account on page load
hichana Oct 15, 2021
515daa9
cleanup
hichana Oct 15, 2021
a835ed6
cleanup
hichana Oct 15, 2021
5d22e49
add object path to resources explorer, add styling
hichana Oct 15, 2021
7bc1534
add partial prototype method for generating tx and script templates
hichana Oct 15, 2021
ba39b59
finalize prototype method for generating tx templates
hichana Oct 15, 2021
c0d6615
cleanup
hichana Oct 15, 2021
929db39
fix key error on option element
hichana Oct 15, 2021
fbab4c9
show Capaility name in transaction template popup
hichana Oct 16, 2021
efef0bb
cleanup
hichana Oct 16, 2021
5772a32
set default select for dropdown in tx template popup
hichana Oct 16, 2021
4b33223
add default selection for tx template dropdown
hichana Oct 16, 2021
33937dd
connect placeholder tx with user selection placeholder string
hichana Oct 16, 2021
5f0adcd
add prototype interpolated code
hichana Oct 16, 2021
043b8a0
add interpolated code to tx code placeholder
hichana Oct 16, 2021
10b4562
mafke sample string nested in code
hichana Oct 16, 2021
1486275
progress on template implementation
hichana Oct 16, 2021
f856750
add terrible horrible buggy placeholder for creating a single script …
hichana Oct 17, 2021
78ef95c
cleanup
hichana Oct 17, 2021
091738e
start re-architecting template creator modal by generalizing the stor…
hichana Oct 17, 2021
2af1170
cleanup
hichana Oct 17, 2021
5a19a04
rewire button in sidebar to pull up template selector modal
hichana Oct 17, 2021
8134d45
remove inline buttons in resource explorer and connected modal functi…
hichana Oct 17, 2021
761c4e8
cleanup
hichana Oct 17, 2021
3b6e52d
remove onInsert prop from MenuList
hichana Oct 17, 2021
75b8abb
cleanup
hichana Oct 17, 2021
53642b8
conditionally create script or tx based on button selected
hichana Oct 17, 2021
9753267
fix conditional for template type
hichana Oct 17, 2021
f24efb3
conditionally render text in popup based on whether is script or tx
hichana Oct 17, 2021
12900dd
fix conditional creation of script or tx in button
hichana Oct 17, 2021
816bad8
change text for template script
hichana Oct 17, 2021
5d4785f
fix util return of blank data, make tx and script generate different …
hichana Oct 17, 2021
1183e1e
move data methods for AutoTemplatePopup into AutoTemplatePopup
hichana Oct 17, 2021
e8d3f27
cleanup
hichana Oct 17, 2021
38f725d
rework how template data is derived
hichana Oct 18, 2021
db2d8ad
add spinner to create button in template modal
hichana Oct 18, 2021
8c0b8ae
use callback on template modal framer motion div to set state after a…
hichana Oct 18, 2021
7400e75
fix data/load issue with initial load of visitor version of playground
hichana Oct 18, 2021
edddf17
make resource explorer button show for visitors
hichana Oct 18, 2021
687e1f5
revise toast placement and add button
hichana Oct 19, 2021
a6e290d
re-add sidebar blank tx or script creation upon add button press
Oct 19, 2021
b3ad81a
re-add button next to each capability
Oct 19, 2021
ea961b7
cleanup
Oct 19, 2021
ad16524
change name of AutoTemplatePopup to just TemplatePopup
Oct 19, 2021
78d35d6
fix toast modal jumping position bug on toast
Oct 19, 2021
65a7b8a
cleanup
Oct 19, 2021
3f909d6
add prototype for new account storage comparison for transactions
Oct 20, 2021
fa7a4a1
add prototype function for deleting toast items
Oct 21, 2021
cd0bcfe
add timer to remove toast item after 5 sec
Oct 21, 2021
91db77b
cleanup
Oct 21, 2021
3f6c8bd
add color for dark primary
Oct 21, 2021
e5f5cb4
add which accouts updated the storage to the toast
Oct 21, 2021
5e27a78
remove 'updatedStorageAccts' from project provider
Oct 21, 2021
55cf6bb
cleanup
Oct 21, 2021
6a06ef9
change display text for toast
Oct 21, 2021
6e589c2
cleanup and make some ts fixes
Oct 21, 2021
224e780
cleanup
Oct 21, 2021
2546131
change project default state field to match initial local project sta…
Oct 21, 2021
665491e
cleanup
hichana Oct 21, 2021
869970c
add basic functionality of script/template popup
hichana Oct 21, 2021
919bb79
add box sizing to Input elem
hichana Oct 21, 2021
2235463
update script and tx templates with basic text
hichana Oct 21, 2021
00bca96
change code style to better match repo
hichana Oct 21, 2021
5ac148b
refactor caret functionality to mitigate console warning
hichana Oct 21, 2021
2fda5d0
cleanup
hichana Oct 21, 2021
6b3dcfc
add size prop to caret
hichana Oct 21, 2021
0ccc617
make prototype refactored/reworked bottom bar scheme
hichana Oct 21, 2021
1721470
fix starting height for deployment result container
hichana Oct 21, 2021
17a1938
re-add sizing featues to DeploymentBottomBar
hichana Oct 21, 2021
ed31272
cleanup
hichana Oct 21, 2021
996b87f
cleanup
hichana Oct 21, 2021
735bda6
cleanup
hichana Oct 21, 2021
7de7f2f
fix width and css properties of deployment container
hichana Oct 21, 2021
4cd7da3
cleanup
hichana Oct 21, 2021
c457e5d
refactor bottom bars configuration and state
hichana Oct 22, 2021
ec00584
cleanup
hichana Oct 22, 2021
9d12f02
refactor bottom bar scheme again to preserve state in resources explo…
hichana Oct 22, 2021
e777402
cleanup
hichana Oct 22, 2021
8052917
make minor style changes
hichana Oct 22, 2021
410c5d5
make minor style and comment changes
hichana Oct 22, 2021
22d62bb
fix state bug when deploying contract
hichana Oct 22, 2021
7cbecde
fix logic bug with rendering resources explorer on first load and swi…
hichana Oct 22, 2021
f8af8f0
Squashed commit of the following:
hichana Oct 22, 2021
3f5d2d4
add contract deploy event to update storage notifications method
hichana Oct 27, 2021
e300d3b
handle 'undefined' as storage item type (encountered during testing o…
hichana Oct 27, 2021
c7f64a8
refine logic for displaying badges
hichana Oct 27, 2021
a55fad6
merge back from master
hichana Oct 27, 2021
4a2d7a9
cleanup
hichana Oct 27, 2021
778594d
squash merge with hichana_milestone3 for flip 29
hichana Oct 27, 2021
d08b848
clenaup console log
hichana Oct 27, 2021
67a216c
remove console log, merge from hichana_milestone3
hichana Oct 27, 2021
37f3e43
add fix for showing resources for contract deployer
hichana Oct 28, 2021
c2a3efa
Merge branch 'hichana_milestone3' into flip-29-master
hichana Oct 28, 2021
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
2 changes: 0 additions & 2 deletions .env.local

This file was deleted.

1 change: 1 addition & 0 deletions codegen.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
overwrite: true
schema:
- "http://localhost:8080/query"
- "https://playground.staging.flow.dapperlabs.com/query"
- "src/api/apollo/local.graphql"
documents: "src/api/apollo/**/*.ts"
Expand Down
21,413 changes: 19 additions & 21,394 deletions package-lock.json

Large diffs are not rendered by default.

302 changes: 151 additions & 151 deletions src/api/apollo/generated/graphql.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,157 +10,43 @@ export type Scalars = {
Boolean: boolean;
Int: number;
Float: number;
UUID: any;
Version: any;
Address: any;
UUID: any;
ExecutionResultValue: any;
RawExecutionResult: any;
};

export type Project = {
__typename?: 'Project';
id: Scalars['UUID'];
publicId: Scalars['UUID'];
parentId?: Maybe<Scalars['UUID']>;
title: Scalars['String'];
seed: Scalars['Int'];
version: Scalars['Version'];
persist?: Maybe<Scalars['Boolean']>;
mutable?: Maybe<Scalars['Boolean']>;
accounts?: Maybe<Array<Account>>;
transactionTemplates?: Maybe<Array<TransactionTemplate>>;
transactionExecutions?: Maybe<Array<TransactionExecution>>;
scriptTemplates?: Maybe<Array<ScriptTemplate>>;
scriptExecutions?: Maybe<Array<ScriptExecution>>;
};

export type NewProject = {
accounts?: Maybe<Array<Scalars['String']>>;
parentId?: Maybe<Scalars['UUID']>;
title: Scalars['String'];
scriptTemplates?: Maybe<Array<NewProjectScriptTemplate>>;
seed: Scalars['Int'];
accounts?: Maybe<Array<Scalars['String']>>;
title: Scalars['String'];
transactionTemplates?: Maybe<Array<NewProjectTransactionTemplate>>;
scriptTemplates?: Maybe<Array<NewProjectScriptTemplate>>;
};

export type NewProjectTransactionTemplate = {
title: Scalars['String'];
script: Scalars['String'];
};

export type NewScriptExecution = {
projectId: Scalars['UUID'];
script: Scalars['String'];
arguments?: Maybe<Array<Scalars['String']>>;
};

export type ProgramPosition = {
__typename?: 'ProgramPosition';
offset: Scalars['Int'];
line: Scalars['Int'];
column: Scalars['Int'];
};

export type Query = {
__typename?: 'Query';
account: Account;
activeProject: Scalars['Boolean'];
activeProjectId?: Maybe<Scalars['Int']>;
cachedExecutionResults: Array<Maybe<ExecutionResults>>;
localProject?: Maybe<Project>;
playgroundInfo: PlaygroundInfo;
project: Project;
scriptTemplate: ScriptTemplate;
transactionTemplate: TransactionTemplate;
};


export type QueryAccountArgs = {
accountId?: Maybe<Scalars['String']>;
id: Scalars['UUID'];
projectId: Scalars['UUID'];
};


export type QueryProjectArgs = {
id: Scalars['UUID'];
};


export type QueryScriptTemplateArgs = {
id: Scalars['UUID'];
projectId: Scalars['UUID'];
};


export type QueryTransactionTemplateArgs = {
id: Scalars['UUID'];
projectId: Scalars['UUID'];
};

export type TransactionTemplate = {
__typename?: 'TransactionTemplate';
id: Scalars['UUID'];
index: Scalars['Int'];
title: Scalars['String'];
script: Scalars['String'];
};

export type TransactionExecution = {
__typename?: 'TransactionExecution';
id: Scalars['UUID'];
script: Scalars['String'];
arguments?: Maybe<Array<Scalars['String']>>;
signers: Array<Account>;
errors?: Maybe<Array<ProgramError>>;
events: Array<Maybe<Event>>;
logs: Array<Scalars['String']>;
};

export type NewTransactionTemplate = {
projectId: Scalars['UUID'];
title: Scalars['String'];
script: Scalars['String'];
};

export type UpdateTransactionTemplate = {
export type UpdateProject = {
id: Scalars['UUID'];
persist?: Maybe<Scalars['Boolean']>;
title?: Maybe<Scalars['String']>;
projectId: Scalars['UUID'];
index?: Maybe<Scalars['Int']>;
script?: Maybe<Scalars['String']>;
};



export type ProgramError = {
__typename?: 'ProgramError';
message: Scalars['String'];
startPosition?: Maybe<ProgramPosition>;
endPosition?: Maybe<ProgramPosition>;
};

export type ScriptExecution = {
__typename?: 'ScriptExecution';
id: Scalars['UUID'];
export type NewScriptTemplate = {
projectId: Scalars['UUID'];
script: Scalars['String'];
arguments?: Maybe<Array<Scalars['String']>>;
errors?: Maybe<Array<ProgramError>>;
value: Scalars['String'];
logs: Array<Scalars['String']>;
};

export type NewProjectScriptTemplate = {
title: Scalars['String'];
script: Scalars['String'];
};

export type UpdateScriptTemplate = {
id: Scalars['UUID'];
title?: Maybe<Scalars['String']>;
export type NewScriptExecution = {
arguments?: Maybe<Array<Scalars['String']>>;
projectId: Scalars['UUID'];
index?: Maybe<Scalars['Int']>;
script?: Maybe<Scalars['String']>;
script: Scalars['String'];
};

export type Mutation = {
Expand Down Expand Up @@ -255,61 +141,175 @@ export type MutationUpdateTransactionTemplateArgs = {
input: UpdateTransactionTemplate;
};


export type ProgramPosition = {
__typename?: 'ProgramPosition';
column: Scalars['Int'];
line: Scalars['Int'];
offset: Scalars['Int'];
};

export type UpdateTransactionTemplate = {
id: Scalars['UUID'];
index?: Maybe<Scalars['Int']>;
projectId: Scalars['UUID'];
script?: Maybe<Scalars['String']>;
title?: Maybe<Scalars['String']>;
};


export type Project = {
__typename?: 'Project';
accounts?: Maybe<Array<Account>>;
id: Scalars['UUID'];
mutable?: Maybe<Scalars['Boolean']>;
parentId?: Maybe<Scalars['UUID']>;
persist?: Maybe<Scalars['Boolean']>;
publicId: Scalars['UUID'];
scriptExecutions?: Maybe<Array<ScriptExecution>>;
scriptTemplates?: Maybe<Array<ScriptTemplate>>;
seed: Scalars['Int'];
title: Scalars['String'];
transactionExecutions?: Maybe<Array<TransactionExecution>>;
transactionTemplates?: Maybe<Array<TransactionTemplate>>;
version: Scalars['Version'];
};

export type ProgramError = {
__typename?: 'ProgramError';
endPosition?: Maybe<ProgramPosition>;
message: Scalars['String'];
startPosition?: Maybe<ProgramPosition>;
};

export type NewTransactionExecution = {
arguments?: Maybe<Array<Scalars['String']>>;
projectId: Scalars['UUID'];
script: Scalars['String'];
signers?: Maybe<Array<Scalars['Address']>>;
};

export type NewTransactionTemplate = {
projectId: Scalars['UUID'];
script: Scalars['String'];
title: Scalars['String'];
};

export type UpdateScriptTemplate = {
id: Scalars['UUID'];
index?: Maybe<Scalars['Int']>;
projectId: Scalars['UUID'];
script?: Maybe<Scalars['String']>;
title?: Maybe<Scalars['String']>;
};

export type ScriptTemplate = {
__typename?: 'ScriptTemplate';
id: Scalars['UUID'];
index: Scalars['Int'];
script: Scalars['String'];
title: Scalars['String'];
};

export type NewProjectScriptTemplate = {
script: Scalars['String'];
title: Scalars['String'];
};

export type UpdateAccount = {
deployedCode?: Maybe<Scalars['String']>;
draftCode?: Maybe<Scalars['String']>;
id: Scalars['UUID'];
projectId: Scalars['UUID'];
};


export type PlaygroundInfo = {
__typename?: 'PlaygroundInfo';
apiVersion: Scalars['Version'];
cadenceVersion: Scalars['Version'];
};

export type TransactionTemplate = {
__typename?: 'TransactionTemplate';
id: Scalars['UUID'];
index: Scalars['Int'];
script: Scalars['String'];
title: Scalars['String'];
};

export type Event = {
__typename?: 'Event';
type: Scalars['String'];
values: Array<Scalars['String']>;
};

export type ScriptTemplate = {
__typename?: 'ScriptTemplate';
id: Scalars['UUID'];
index: Scalars['Int'];
title: Scalars['String'];
script: Scalars['String'];
export type Query = {
__typename?: 'Query';
account: Account;
activeProject: Scalars['Boolean'];
activeProjectId?: Maybe<Scalars['Int']>;
cachedExecutionResults: Array<Maybe<ExecutionResults>>;
localProject?: Maybe<Project>;
playgroundInfo: PlaygroundInfo;
project: Project;
scriptTemplate: ScriptTemplate;
transactionTemplate: TransactionTemplate;
};

export type UpdateProject = {

export type QueryAccountArgs = {
accountId?: Maybe<Scalars['String']>;
id: Scalars['UUID'];
title?: Maybe<Scalars['String']>;
persist?: Maybe<Scalars['Boolean']>;
projectId: Scalars['UUID'];
};

export type UpdateAccount = {

export type QueryProjectArgs = {
id: Scalars['UUID'];
projectId: Scalars['UUID'];
draftCode?: Maybe<Scalars['String']>;
deployedCode?: Maybe<Scalars['String']>;
};

export type Account = {
__typename?: 'Account';

export type QueryScriptTemplateArgs = {
id: Scalars['UUID'];
address: Scalars['Address'];
draftCode: Scalars['String'];
deployedCode: Scalars['String'];
deployedContracts: Array<Scalars['String']>;
state: Scalars['String'];
projectId: Scalars['UUID'];
};


export type NewTransactionExecution = {
export type QueryTransactionTemplateArgs = {
id: Scalars['UUID'];
projectId: Scalars['UUID'];
script: Scalars['String'];
signers?: Maybe<Array<Scalars['Address']>>;
};

export type TransactionExecution = {
__typename?: 'TransactionExecution';
arguments?: Maybe<Array<Scalars['String']>>;
errors?: Maybe<Array<ProgramError>>;
events: Array<Maybe<Event>>;
id: Scalars['UUID'];
logs: Array<Scalars['String']>;
script: Scalars['String'];
signers: Array<Account>;
};

export type NewScriptTemplate = {
projectId: Scalars['UUID'];
title: Scalars['String'];
export type ScriptExecution = {
__typename?: 'ScriptExecution';
arguments?: Maybe<Array<Scalars['String']>>;
errors?: Maybe<Array<ProgramError>>;
id: Scalars['UUID'];
logs: Array<Scalars['String']>;
script: Scalars['String'];
value: Scalars['String'];
};

export type Account = {
__typename?: 'Account';
address: Scalars['Address'];
deployedCode: Scalars['String'];
deployedContracts: Array<Scalars['String']>;
draftCode: Scalars['String'];
id: Scalars['UUID'];
state: Scalars['String'];
};


Expand Down
Loading