Skip to content

Commit 85f496d

Browse files
siosonelsiosonel
committed
Use bower to track dependencies;
1 parent 7e170be commit 85f496d

13 files changed

+148
-118
lines changed

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
_exclude/*
2+
bower_components/*
3+
24
config/*
35
config.php
46
tools/builds/*

‎bower.json

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"name": "tatag-ui",
3+
"authors": [
4+
"Edgar Sioson <[email protected]>"
5+
],
6+
"description": "a front-end user interface for the Tatag API",
7+
"main": "index.php",
8+
"moduleType": [],
9+
"license": "MIT",
10+
"homepage": "http://edgarsioson.com/",
11+
"ignore": [
12+
"**/.*",
13+
"node_modules",
14+
"bower_components",
15+
"test",
16+
"tests"
17+
],
18+
"dependencies": {
19+
"foundation": "5.5.*",
20+
"foundation-icon-fonts": "*",
21+
"colorbrewer": "^1.0.0",
22+
"d3": "3",
23+
"jquery": "2.1.4"
24+
},
25+
"resolutions": {
26+
"jquery": ">= 2.1.0",
27+
"q": "1.0.1",
28+
"foundation": "5.5.*"
29+
}
30+
}

‎css/admin.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ body {
1616
right:5px;
1717
font-size: 0.9rem;
1818
cursor: pointer;
19-
color: #999;
19+
color: #777;
2020
}
2121

2222
#helpPrompt:hover {

‎css/wallet.css

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ body {
1616
right:5px;
1717
font-size: 0.9rem;
1818
cursor: pointer;
19+
color: #777;
1920
}
2021

2122
#titleBar {

‎home-about.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@
138138
</div>
139139
</div>
140140

141-
<script type="text/javascript" src="/ui/lib/d3/d3.v3.min.js"></script>
142-
<script type="text/javascript" src="/ui/lib/colorbrewer.js"></script>
141+
<script type="text/javascript" src="/ui/bower_components/d3/d3.min.js"></script>
142+
<script type="text/javascript" src="/ui/bower_components/colorbrewer/colorbrewer.js"></script>
143143

144144
<script src='/ui/js/homeMain.js'></script>
145145
<script src='/ui/js/homeAbout.js'></script>

‎home-faq.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<dd class="accordion-navigation">
3737
<a href="#panel3b">Why would a seller refuse a payment?</a>
3838
<div id="panel3b" class="content">
39-
<p>One reason is similar to having coupon restrictions: <b>a team would typically limit its commitments</b> to the platform as far as providing goods and services. In fact, recipient tokens in Tatag are created with default restrictions on how often it's used by a user, team, or overall in a given seven day period. A user may also be forced to wait a given number of hours before beign able to reuse a recipient token to initiate a payment.</p>
39+
<p>One reason is similar to having coupon restrictions: <b>a team would typically limit its commitments</b> to the platform as far as providing goods and services. In fact, recipient tokens in Tatag are created with default restrictions on how often it's used by a user, team, or overall within a seven day window. A user may also be forced to wait a given number of hours before beign able to reuse a recipient token to initiate a payment.</p>
4040
4141
<p>Another reason is that <b>the seller already has spendable funds</b> via its expense budget, so there is not as much pressure to blindly accept payments regardless of the issuing team's reputation. A team can be more selective on who benefits from its goods and services.</p>
4242

‎home.php

+11-16
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,8 @@
1111

1212
<link rel="stylesheet" href="/ui/css/normalize.css">
1313

14-
<script type="text/javascript" src="/common2/lib/jQuery/jquery-1.8.2.min.js"></script>
15-
<script type="text/javascript" src="/node_modules/q/q.js"></script>
16-
<script type="text/javascript" src="/ui/js/phlatSimple.js"></script>
17-
<script type="text/javascript" src="/ui/js/phlatDriver.js"></script>
18-
19-
<link rel="stylesheet" href="/common2/lib/foundation-5.3.3/css/foundation.min.css">
20-
<link rel="stylesheet" href="/common2/lib/foundation-5.3.3/icons/foundation-icons.css">
21-
22-
<!--<link rel="stylesheet" type="text/css" href="/common2/lib/slick/slick.css"/>
23-
<link rel="stylesheet" type="text/css" href="/common2/lib/slick/slick-theme.css"/>
24-
<script type="text/javascript" src="/common2/lib/slick/slick.min.js"></script>-->
14+
<link rel="stylesheet" href="/ui/bower_components/foundation/css/foundation.css">
15+
<link rel="stylesheet" href="/ui/bower_components/foundation-icon-fonts/foundation-icons.css">
2516

2617
<link rel="stylesheet" href="/ui/css/admin.css">
2718
<link rel="stylesheet" href="/ui/css/home.css">
@@ -75,11 +66,15 @@
7566
<button id='vizViewPrompt' class='small-4 tiny'>Viz</button>
7667
</div>
7768

78-
<script src="/common2/lib/foundation-5.3.3/js/foundation.min.js"></script>
79-
<script src="/common2/lib/foundation-5.3.3/js/foundation/foundation.reveal.js"></script>
80-
<script src="/common2/lib/foundation-5.3.3/js/foundation/foundation.accordion.js"></script>
81-
<script src="/common2/lib/foundation-5.3.3/js/foundation/foundation.dropdown.js"></script>
82-
<script src="/common2/lib/foundation-5.3.3/js/vendor/modernizr.js"></script>
69+
<script src="/ui/bower_components/jquery/dist/jquery.min.js"></script>
70+
<script src="/ui/bower_components/q/q.js"></script>
71+
<script src="/ui/bower_components/foundation/js/foundation.min.js"></script>
72+
<script src="/ui/bower_components/foundation/js/foundation/foundation.reveal.js"></script>
73+
<script src="/ui/bower_components/foundation/js/foundation/foundation.accordion.js"></script>
74+
<script src="/ui/bower_components/foundation/js/foundation/foundation.dropdown.js"></script>
75+
76+
<script src="/ui/js/phlatSimple.js"></script>
77+
<script src="/ui/js/phlatDriver.js"></script>
8378

8479
<div id='mainWrapper'>
8580
<?php

‎js/vizFunding.js

+10-10
Original file line numberDiff line numberDiff line change
@@ -16,52 +16,52 @@ var vizFunding = vizMini({
1616
{id: "funding-rightUpper", top: 0.55, left: 0, opacity: 1, html: "<h4>Tatag is a platform for recognizing value in what people do.</h4>"},
1717
{id: "funding-rightLower", top: 0.65, left: 0, opacity: 0, html: ""},
1818

19-
{id: "funding-nextBtn", top: 0.4, left: 0.5, opacity: 1}
19+
{id: "funding-nextBtn", top: 0.45, left: 0.5, opacity: 1}
2020
],
2121
[
2222
{id: "funding-team", top: 0.15, left: 0.25, opacity: 1, duration: 1500},
2323
{id: "funding-market", top: 0.15, left: 0.5, opacity: 0.5},
2424
{id: "funding-regulation", top: 0.15, left: 0.75, opacity: 0.5},
2525

26-
{id: "funding-rightUpper", top: 0.4, opacity: 1, html: "<h4>Guaranteed Funding</h4>"},
27-
{id: "funding-rightLower", top: 0.5, left: 0, opacity: 1, html:
26+
{id: "funding-rightUpper", top: 0.45, opacity: 1, html: "<h4>Guaranteed Funding</h4>"},
27+
{id: "funding-rightLower", top: 0.55, left: 0, opacity: 1, html:
2828
"<ul>"
2929
+ "<li>No need to compete for scarce funding.</li>"
3030
+ "<li>The challenge is in getting your funds accepted as payment by other teams.</li>"
3131
+ "<li>We'll actively recruit users after the testing period, so there'll be more teams to transact with.</li>"
3232
+ "</ul>"
3333
},
34-
{id: "funding-nextBtn", top: 0.3, left: 0.5, opacity: 1}
34+
{id: "funding-nextBtn", top: 0.35, left: 0.5, opacity: 1}
3535
],
3636
[
3737
{id: "funding-team", top: 0.15, left: 0.25, opacity: 0.5, duration: 1500},
3838
{id: "funding-market", top: 0.15, left: 0.5, opacity: 1},
3939
{id: "funding-regulation", top: 0.15, left: 0.75, opacity: 0.5},
4040

41-
{id: "funding-rightUpper", top: 0.4, opacity: 1, html: "<h4>Sustainable Markets</h4>"},
42-
{id: "funding-rightLower", top: 0.5, left: 0, opacity: 1, html:
41+
{id: "funding-rightUpper", top: 0.45, opacity: 1, html: "<h4>Sustainable Markets</h4>"},
42+
{id: "funding-rightLower", top: 0.55, left: 0, opacity: 1, html:
4343
"<ul>"
4444
+ "<li>Select an Advisor application that best fits your team's values.</li>"
4545
+ "<li>Reject payments from disreputable teams.</li>"
4646
+ "<li>Accept payments from reputable teams, especially those who are not viably funded through other means.</li>"
4747
+ "</ul>"
4848
},
49-
{id: "funding-nextBtn", top: 0.3, left: 0.5, opacity: 1}
49+
{id: "funding-nextBtn", top: 0.35, left: 0.5, opacity: 1}
5050
],
5151
[
5252
{id: "funding-team", top: 0.15, left: 0.25, opacity: 0.5, duration: 1500},
5353
{id: "funding-market", top: 0.15, left: 0.5, opacity: 0.5},
5454
{id: "funding-regulation", top: 0.15, left: 0.75, opacity: 1},
5555

56-
{id: "funding-rightUpper", top: 0.4, opacity: 1, html: "<h4>Rewarding Challenge</h4>"},
57-
{id: "funding-rightLower", top: 0.5, left: 0, opacity: 1, html:
56+
{id: "funding-rightUpper", top: 0.45, opacity: 1, html: "<h4>Rewarding Challenge</h4>"},
57+
{id: "funding-rightLower", top: 0.55, left: 0, opacity: 1, html:
5858
"<ul>"
5959
+ "<li>Infrastructure: should Tatag's ledger be decentralized, and how?</li>"
6060
+ "<li>Reporting: auditable aggregation of hashed/chained reports + algorithm used.</li>"
6161
+ "<li>Advising: evaluate teams and offer real-time advise on whether to accept or reject a payment offer.</li>"
6262
+ "</ul>"
6363
},
64-
{id: "funding-nextBtn", top: 0.3, left: 0.5, opacity: 1}
64+
{id: "funding-nextBtn", top: 0.35, left: 0.5, opacity: 1}
6565
]
6666
]);
6767

‎js/walletBudgets.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ function walletBudgets(api) {
1616
.then(renderBudgets, main.errHandler);
1717
}
1818

19-
function renderBudgets(userAccounts) { console.log(userAccounts)
19+
function renderBudgets(userAccounts) {
2020
if (!userAccounts.items.length) {
2121
$("#accountsWrapper").append("<div>You do not have any accounts in your wallet.</div>");
2222
}

‎my-teams.php

+22-25
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,15 @@
55
<link rel="icon" type="image/png" href="css/logo5.png">
66
<meta name="viewport" content="width=device-width, initial-scale=1" />
77

8-
<link rel="stylesheet" href="css/normalize.css">
9-
10-
<script type="text/javascript" src="/common2/lib/jQuery/jquery-1.8.2.min.js"></script>
11-
<script type="text/javascript" src="/node_modules/q/q.js"></script>
12-
<script type="text/javascript" src="/ui/js/phlatSimple.js"></script>
13-
<script type="text/javascript" src="/ui/js/phlatDriver.js"></script>
14-
15-
<script src="/common2/lib/foundation-5.3.3/js/foundation.min.js"></script>
16-
<script src="/common2/lib/foundation-5.3.3/js/foundation/foundation.reveal.js"></script>
17-
<script src="/common2/lib/foundation-5.3.3/js/foundation/foundation.dropdown.js"></script>
18-
<script src="/common2/lib/foundation-5.3.3/js/vendor/modernizr.js"></script>
19-
<link rel="stylesheet" href="/common2/lib/foundation-5.3.3/css/foundation.min.css">
20-
<link rel="stylesheet" href="/common2/lib/foundation-5.3.3/icons/foundation-icons.css">
21-
8+
<link rel="stylesheet" href="css/normalize.css">
9+
<link rel="stylesheet" href="/ui/bower_components/foundation/css/foundation.css">
10+
<link rel="stylesheet" href="/ui/bower_components/foundation-icon-fonts/foundation-icons.css">
2211
<link rel="stylesheet" href="css/admin.css">
23-
24-
<style></style>
2512
</head>
2613
<body>
2714
<div id='login_provider'></div>
15+
16+
<script src="/ui/bower_components/jquery/dist/jquery.min.js"></script>
2817
<?php include 'teamsTopDivs.php' ?>
2918

3019
<div id='mainWrapper'>
@@ -169,15 +158,23 @@
169158
<a class="close-reveal-modal">×</a>
170159
</div>
171160

172-
<script src='js/teamMain.js'></script>
173-
<script src='js/teamBrands.js'></script>
174-
<script src='js/teamAbout.js'></script>
175-
<script src='js/teamMembers.js'></script>
176-
<script src='js/teamAccounts.js'></script>
177-
<script src='js/teamRecords.js'></script>
178-
<script src='js/teamThrottles.js'></script>
179-
<script src='js/adminPromos.js'></script>
180-
<script src='js/adminForms.js'></script>
161+
<script src="/ui/bower_components/q/q.js"></script>
162+
<script src="/ui/bower_components/foundation/js/foundation.min.js"></script>
163+
<script src="/ui/bower_components/foundation/js/foundation/foundation.reveal.js"></script>
164+
<script src="/ui/bower_components/foundation/js/foundation/foundation.dropdown.js"></script>
165+
166+
<script src="/ui/js/phlatSimple.js"></script>
167+
<script src="/ui/js/phlatDriver.js"></script>
168+
169+
<script src='/ui/js/teamMain.js'></script>
170+
<script src='/ui/js/teamBrands.js'></script>
171+
<script src='/ui/js/teamAbout.js'></script>
172+
<script src='/ui/js/teamMembers.js'></script>
173+
<script src='/ui/js/teamAccounts.js'></script>
174+
<script src='/ui/js/teamRecords.js'></script>
175+
<script src='/ui/js/teamThrottles.js'></script>
176+
<script src='/ui/js/adminPromos.js'></script>
177+
<script src='/ui/js/adminForms.js'></script>
181178
<script>
182179
var types = <?php echo file_get_contents(TATAG_DOMAIN ."/ref/brand_classification.json"); ?>;
183180
var locs = <?php echo file_get_contents(TATAG_DOMAIN ."/ref/countries.json"); ?>;

‎teams-admin.php

+28-27
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,16 @@
66
<meta name="viewport" content="width=device-width, initial-scale=1" />
77

88
<link rel="stylesheet" href="css/normalize.css">
9-
10-
<script type="text/javascript" src="/common2/lib/jQuery/jquery-1.8.2.min.js"></script>
11-
<script type="text/javascript" src="/node_modules/q/q.js"></script>
12-
<script type="text/javascript" src="/ui/js/phlatSimple.js"></script>
13-
<script type="text/javascript" src="/ui/js/phlatDriver.js"></script>
14-
15-
<script src="https://maps.googleapis.com/maps/api/js?v=3.exp&signed_in=true&libraries=places"></script>
16-
17-
<script src="/common2/lib/foundation-5.3.3/js/foundation.min.js"></script>
18-
<script src="/common2/lib/foundation-5.3.3/js/foundation/foundation.reveal.js"></script>
19-
<script src="/common2/lib/foundation-5.3.3/js/foundation/foundation.dropdown.js"></script>
20-
<script src="/common2/lib/foundation-5.3.3/js/vendor/modernizr.js"></script>
21-
<link rel="stylesheet" href="/common2/lib/foundation-5.3.3/css/foundation.min.css">
9+
<link rel="stylesheet" href="/common2/lib/foundation-5.3.3/css/foundation.min.css">
2210
<link rel="stylesheet" href="/common2/lib/foundation-5.3.3/icons/foundation-icons.css">
2311

2412
<link rel="stylesheet" href="css/admin.css">
25-
26-
<style></style>
2713
</head>
2814
<body>
29-
<div id='login_provider'></div>
15+
<div id='login_provider'></div>
16+
17+
18+
<script src="/ui/bower_components/jquery/dist/jquery.min.js"></script>
3019
<?php include 'teamsTopDivs.php' ?>
3120

3221
<div id='mainWrapper'>
@@ -334,18 +323,28 @@
334323
<a class="close-reveal-modal">×</a>
335324
</div>
336325
</div>
326+
327+
328+
<script src="/ui/bower_components/q/q.js"></script>
337329

338-
<script src='js/adminMain.js'></script>
339-
<script src='js/adminBrands.js'></script>
340-
<script src='js/adminAbout.js'></script>
341-
<script src='js/adminMembers.js'></script>
342-
<script src='js/adminMemberHoldings.js'></script>
343-
<script src='js/adminAccounts.js'></script>
344-
<script src='js/adminAccountHolders.js'></script>
345-
<script src='js/adminRecords.js'></script>
346-
<script src='js/adminForms.js'></script>
347-
<script src='js/adminPromos.js'></script>
348-
<script src='js/adminThrottles.js'></script>
330+
<script src="/ui/bower_components/foundation/js/foundation.min.js"></script>
331+
<script src="/ui/bower_components/foundation/js/foundation/foundation.reveal.js"></script>
332+
<script src="/ui/bower_components/foundation/js/foundation/foundation.dropdown.js"></script>
333+
334+
<script src="/ui/js/phlatSimple.js"></script>
335+
<script src="/ui/js/phlatDriver.js"></script>
336+
337+
<script src='/ui/js/adminMain.js'></script>
338+
<script src='/ui/js/adminBrands.js'></script>
339+
<script src='/ui/js/adminAbout.js'></script>
340+
<script src='/ui/js/adminMembers.js'></script>
341+
<script src='/ui/js/adminMemberHoldings.js'></script>
342+
<script src='/ui/js/adminAccounts.js'></script>
343+
<script src='/ui/js/adminAccountHolders.js'></script>
344+
<script src='/ui/js/adminRecords.js'></script>
345+
<script src='/ui/js/adminForms.js'></script>
346+
<script src='/ui/js/adminPromos.js'></script>
347+
<script src='/ui/js/adminThrottles.js'></script>
349348
<script>
350349
var types = <?php echo file_get_contents(TATAG_DOMAIN ."/ref/brand_classification.json"); ?>;
351350
var locs = <?php echo file_get_contents(TATAG_DOMAIN ."/ref/countries.json"); ?>;
@@ -354,5 +353,7 @@
354353
</script>
355354

356355
<?php include "me.php" ?>
356+
357+
<script src="https://maps.googleapis.com/maps/api/js?v=3.exp&signed_in=true&libraries=places"></script>
357358
</body>
358359
</html>

‎teams-search.php

+19-16
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,7 @@
66
<meta name="viewport" content="width=device-width, initial-scale=1" />
77

88
<link rel="stylesheet" href="css/normalize.css">
9-
10-
<script type="text/javascript" src="/common2/lib/jQuery/jquery-1.8.2.min.js"></script>
11-
<script type="text/javascript" src="/node_modules/q/q.js"></script>
12-
<script type="text/javascript" src="/ui/js/phlatSimple.js"></script>
13-
<script type="text/javascript" src="/ui/js/phlatDriver.js"></script>
14-
15-
<script src="/common2/lib/foundation-5.3.3/js/foundation.min.js"></script>
16-
<script src="/common2/lib/foundation-5.3.3/js/foundation/foundation.reveal.js"></script>
17-
<script src="/common2/lib/foundation-5.3.3/js/foundation/foundation.dropdown.js"></script>
18-
<script src="/common2/lib/foundation-5.3.3/js/vendor/modernizr.js"></script>
19-
<link rel="stylesheet" href="/common2/lib/foundation-5.3.3/css/foundation.min.css">
9+
<link rel="stylesheet" href="/common2/lib/foundation-5.3.3/css/foundation.min.css">
2010
<link rel="stylesheet" href="/common2/lib/foundation-5.3.3/icons/foundation-icons.css">
2111

2212
<link rel="stylesheet" href="css/admin.css">
@@ -28,16 +18,29 @@
2818
</style>
2919
</head>
3020
<body>
31-
<div id='login_provider'></div>
21+
<div id='login_provider'></div>
22+
23+
<script src="/ui/bower_components/jquery/dist/jquery.min.js"></script>
3224
<?php include 'teamsTopDivs.php' ?>
3325

3426
<div id='mainWrapper'>
3527
<div id='brandsWrapper' class="row"></div>
3628
</div>
37-
38-
<script src='js/searchMain.js'></script>
39-
<script src='js/searchBrands.js'></script>
40-
<script src='js/adminForms.js'></script>
29+
30+
31+
<script src="/ui/bower_components/jquery/dist/jquery.min.js"></script>
32+
<script src="/ui/bower_components/q/q.js"></script>
33+
34+
<script src="/ui/bower_components/foundation/js/foundation.min.js"></script>
35+
<script src="/ui/bower_components/foundation/js/foundation/foundation.reveal.js"></script>
36+
<script src="/ui/bower_components/foundation/js/foundation/foundation.dropdown.js"></script>
37+
38+
<script src="/ui/js/phlatSimple.js"></script>
39+
<script src="/ui/js/phlatDriver.js"></script>
40+
41+
<script src='/ui/js/searchMain.js'></script>
42+
<script src='/ui/js/searchBrands.js'></script>
43+
<script src='/ui/js/adminForms.js'></script>
4144
<script>
4245
var types = <?php echo file_get_contents(TATAG_DOMAIN ."/ref/brand_classification.json"); ?>;
4346
var locs = <?php echo file_get_contents(TATAG_DOMAIN ."/ref/countries.json"); ?>;

0 commit comments

Comments
 (0)