Skip to content

Commit 0427a95

Browse files
wickstjowickstjo
committedSep 3, 2018
Fixed config
1 parent 7a92091 commit 0427a95

20 files changed

+563
-2527
lines changed
 

‎README.md

-43
This file was deleted.

‎TODO.txt

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// WEB3 DOUBLE PROMISE FIX
2+
// FIGURE OUT BETTER WAY TO LOAD/RELOAD CONFIG
3+
4+
// FIX ACTIONS ADD
5+
6+
// FIX WEIRD ADDRESS SAVING IN CONTRACT STRUCT
7+
8+
// IMPLEMENT MEMBERS ARRAY TO CONTRACT IN ORDER TO LOAD IT IN PROMISE-ALL PHASE
9+
10+
11+
12+
13+
14+
15+
// CRITICAL
16+
// ADD "POINTING" SYSTEM TO TRACKER
17+
18+
// GET RID OF EVENTS.JS, EVENT-FUNCS.JS
19+
PUT SECTION EVENTS INTO CONTENT/PAGE.JS
20+
PUT ALL SECTION FUNCTIONS INTO ONE FILE
21+
RENAME ACTIONS SECTION

‎build/contracts/Main.json

+147-135
Large diffs are not rendered by default.

‎build/contracts/Migrations.json

+119-119
Large diffs are not rendered by default.

‎contracts/Main.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pragma solidity ^0.4.2;
33
contract Main {
44

55
// WHITELIST
6-
mapping(address => User) public whitelist;
6+
mapping (address => User) public whitelist;
77

88
// DECLARE MASTER
99
address public master = 0xFffC9F737D80E9031F8b1B01D7FAF59Ce45def3B;

‎js/app.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ $(document).ready(() => {
1010
$('body').on('click', '#menu a', () => {
1111

1212
// CLICKED MENU ELEMENT VALUE
13-
var val = $(event.target).text();
14-
val = val.toLowerCase();
13+
var value = $(event.target).text();
14+
value = value.toLowerCase();
1515

16-
if (current != val) {
16+
if (current != value) {
1717

1818
// REMOVE UNDERLINE FROM EVERY ELEMENT
1919
$('#menu a').css('text-decoration', 'none');
@@ -24,7 +24,7 @@ $('body').on('click', '#menu a', () => {
2424
// PLACEHOLDER MODULE
2525
var sectionModule;
2626

27-
switch (val) {
27+
switch (value) {
2828

2929
// ACTIVITY
3030
case 'activity':

‎js/bundle.js

+151-2,152
Large diffs are not rendered by default.

‎js/classes/actions.js

+33-34
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
var Buffer = require('buffer/').Buffer
22
var Mutable = require('./mutable.js');
3-
var Ethereum = require('./ethereum.js');
43
var config = require('../config.js')();
54

65
class Actions {
@@ -13,7 +12,7 @@ class Actions {
1312

1413
// CHECK IF TRACKER IS EMPTY
1514
if ($.isEmptyObject(config.tracker) == false) {
16-
log('Releasing new version..\n----')
15+
log('Releasing new version..\n----');
1716

1817
var mutable = new Mutable();
1918
significance = significance.toLowerCase();
@@ -210,45 +209,45 @@ class Actions {
210209
}
211210

212211
// ADD USER TO WHITELIST
213-
add(_name, _permission, _address) {
214-
config.then((config) => {
212+
// add(_name, _permission, _address) {
213+
// config.then((config) => {
215214

216-
// FETCH ETHEREUM MODULE
217-
var ethereum = new Ethereum();
215+
// // FETCH ETHEREUM MODULE
216+
// var ethereum = new Ethereum();
218217

219-
ethereum.master().then((master) => {
218+
// ethereum.master().then((master) => {
220219

221-
// MAKE SURE LOGGED USER IS THE MASTER
222-
if (config.metamask.address == master) {
220+
// // MAKE SURE LOGGED USER IS THE MASTER
221+
// if (config.metamask.address == master) {
223222

224-
return new Promise((resolve, reject) => {
225-
ethereum.whitelist(_address).then((row) => {
223+
// return new Promise((resolve, reject) => {
224+
// ethereum.whitelist(_address).then((row) => {
226225

227-
// IF ENTRY DOESNT ALREADY EXIST IN MAP
228-
if (row[0] == '') {
226+
// // IF ENTRY DOESNT ALREADY EXIST IN MAP
227+
// if (row[0] == '') {
229228

230-
// ADD ENTRY
231-
ethereum.add(_name, _permission, _address).then(() => {
232-
if (error) {
233-
log(error);
234-
} else {
235-
resolve('Added "' + _name + '" to the whitelist!');
236-
}
237-
});
229+
// // ADD ENTRY
230+
// ethereum.add(_name, _permission, _address).then(() => {
231+
// if (error) {
232+
// log(error);
233+
// } else {
234+
// resolve('Added "' + _name + '" to the whitelist!');
235+
// }
236+
// });
238237

239-
} else {
240-
resolve('That user already exists!');
241-
}
242-
});
243-
});
244-
245-
// USER ISNT THE MASTER
246-
} else {
247-
log('Permission Denied!');
248-
}
249-
});
250-
});
251-
}
238+
// } else {
239+
// resolve('That user already exists!');
240+
// }
241+
// });
242+
// });
243+
244+
// // USER ISNT THE MASTER
245+
// } else {
246+
// log('Permission Denied!');
247+
// }
248+
// });
249+
// });
250+
// }
252251

253252
}
254253

‎js/classes/ethereum.js

+22
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
class Ethereum {
22

3+
// FETCH WEB3 ETH ACCOUNTLIST
4+
sessions() {
5+
return new Promise((resolve, reject) => {
6+
web3.eth.getAccounts((error, result) => {
7+
if (error) { reject(error); } else { resolve(result); }
8+
});
9+
});
10+
}
11+
312
// FETCH ROW FROM WHITELIST
413
userInfo (address) {
514
return new Promise((resolve, reject) => {
@@ -8,6 +17,19 @@ class Ethereum {
817
});
918
});
1019
}
20+
21+
// ADD USER TO WHITELIST
22+
add (_name, _permission, _address) {
23+
return new Promise((resolve, reject) => {
24+
contract.add(_name, _permission, _address, (error, result) => {
25+
if (error) {
26+
reject(error);
27+
} else {
28+
resolve('User "' + _name + '" was successfully added!');
29+
}
30+
});
31+
});
32+
}
1133

1234
}
1335

‎js/classes/immutable.js

+2-6
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,10 @@ class Immutable {
1313
get (value) { return ipfs.files.get(value); }
1414

1515
// ADD FILE TO IPFS
16-
add_file(content) {
17-
return ipfs.files.add(Buffer.from(content));
18-
}
16+
add_file (content) { return ipfs.files.add(Buffer.from(content)); }
1917

2018
// ADD DIRECTORY TO IPFS
21-
add_dir(fileArray) {
22-
return ipfs.files.add(fileArray);
23-
}
19+
add_dir (fileArray) { return ipfs.files.add(fileArray); }
2420
}
2521

2622
// EXPORT CLASS AS MODULE

‎js/classes/metamask.js

-14
This file was deleted.

‎js/classes/misc.js

+13-1
Original file line numberDiff line numberDiff line change
@@ -119,18 +119,30 @@ function capitalize(string) {
119119
return string.charAt(0).toUpperCase() + string.slice(1);
120120
}
121121

122-
// CHECK IF TWO ARRAYS ARE THE SAME
122+
// CHECK IF TWO ARRAYS HAVE THE SAME CONTENT
123123
function compareArrays(first, second) {
124+
125+
// START BY SORTING BOTH
126+
first = first.sort();
127+
second = second.sort();
128+
129+
// ASSIST VARS
124130
var value = false;
125131
var num = 0;
126132

133+
// CHECK IF ARRAYS ARE SAME SIZE
127134
if (first.length == second.length) {
135+
136+
// CHECK THAT EACH EACH ELEMENT ARE THE SAME
128137
for (var x = 0; x < first.length; x++) {
129138
if (first[x] == second[x]) {
139+
140+
// IF THEY DO, INCREMENT NUM
130141
num++;
131142
}
132143
}
133144

145+
// IF NUM EQUALS ARRAY SIZE, RETURN TRUE
134146
if (num == first.length) {
135147
value = true;
136148
}

‎js/classes/mutable.js

+10-10
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@ class Mutable {
77
constructor() { this.checkLogs(); }
88

99
// LIST OUT DIR CONTENT
10-
ls(dir = '') { return ipfs.files.ls('/' + dir); }
10+
list (dir = '') { return ipfs.files.ls('/' + dir); }
1111

1212
// REMOVE FILE -- RECURSIVELY
13-
rm(path) { return ipfs.files.rm('/' + path, { recursive: true }); }
13+
remove (path) { return ipfs.files.rm('/' + path, { recursive: true }); }
1414

1515
// FETCH FILE CONTENT -- BINARY ARRAY -- .toString('utf8')
16-
read(path) { return ipfs.files.read('/' + path); }
16+
read (path) { return ipfs.files.read('/' + path); }
1717

1818
// WRITE INTO FILE -- OVERWRITE IF FILE EXISTS & CREATE IF NOT
19-
write(path, content) { return ipfs.files.write('/' + path, Buffer.from(content), { truncate: true, create: true }); }
19+
write (path, content) { return ipfs.files.write('/' + path, Buffer.from(content), { truncate: true, create: true }); }
2020

2121
// CHECK IF LOGFILES EXIST
22-
checkLogs() {
23-
this.ls().then((files) => {
22+
checkLogs () {
23+
this.list().then((files) => {
2424
var keys = Object.keys(files);
2525
var list = [];
2626

@@ -39,7 +39,7 @@ class Mutable {
3939
log('Expected files:');
4040
log(whitelist);
4141
log('Current files:');
42-
log(files);
42+
log(list);
4343

4444
// NUKE LOGS IF SOMETHING IS MISSING
4545
this.nukeLogs(list);
@@ -48,14 +48,14 @@ class Mutable {
4848
}
4949

5050
// RESET ALL LOGS TO THEIR DEFAULT VALUE
51-
nukeLogs(files) {
51+
nukeLogs (files) {
5252
log('\nNuking initiated!');
5353

5454
// GENERATE & PUSH A PROMISE FOR REMOVING ALL OLD CONTENT
5555
var promiseList = [];
5656

5757
for (var x = 0; x < files.length; x++) {
58-
promiseList.push(this.rm(files[x]));
58+
promiseList.push(this.remove(files[x]));
5959
}
6060

6161
// WAIT FOR ALL PROMISES TO GET RESOLVED
@@ -94,7 +94,7 @@ class Mutable {
9494
this.write('activity.json', JSON.stringify(activityDefault)).then(() => {
9595
log('Activity log created!');
9696

97-
log('Nuking complete!')
97+
log('Nuking complete!');
9898
});
9999
});
100100
});

‎js/config.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
var Mutable = require('./classes/mutable.js');
33
var mutable = new Mutable();
44

5-
// FETCH METAMASK MODULE
6-
var Metamask = require('./classes/metamask.js')
7-
var metamask = new Metamask();
8-
95
// FETCH SMART CONTRACT MODULE
106
var Ethereum = require('./classes/ethereum.js');
117
var ethereum = new Ethereum();
@@ -17,7 +13,7 @@ function build() {
1713
var history = mutable.read('history.json');
1814
var tracker = mutable.read('tracker.json');
1915
var activity = mutable.read('activity.json');
20-
var sessions = metamask.sessions();
16+
var sessions = ethereum.sessions();
2117

2218
// WAIT FOR ALL PROMISES TO BE RESOLVED
2319
return Promise.all([latest, history, tracker, activity, sessions]).then((values) => {

‎js/content/actions.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,11 @@ function render() {
8989
if (name.length != 0 && address.length == 42) {
9090

9191
// FETCH ACTIONS MODULE
92-
var Actions = require('../classes/actions.js');
93-
var actions = new Actions();
92+
var Ethereum = require('../classes/ethereum.js');
93+
var ethereum = new Ethereum();
9494

9595
// EXECUTE & LOG RESPONSE
96-
actions.add(name, permission, address).then((response) => {
96+
ethereum.add(name, permission, address).then((response) => {
9797
log(response);
9898
});
9999

‎package-lock.json

+35
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎shell/deploy.sh

100644100755
File mode changed.

‎shell/ignore-update.sh

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
git rm -r --cached .

‎shell/ipfs.sh

100644100755
File mode changed.

‎shell/push-repo.sh

100644100755
File mode changed.

0 commit comments

Comments
 (0)
Please sign in to comment.