Commit graph

342 commits

Author SHA1 Message Date
Tyler Renelle
6d204fb08c remove poormanscron() from refresh for now, only in setInterval 2012-08-06 12:34:54 -04:00
Tyler Renelle
2e3e99e366 small passed.cron bug fix 2012-08-06 10:15:58 -04:00
Tyler Renelle
0f013d2ef3 DRY daysPassed with helpers.daysBetween 2012-08-06 09:48:18 -04:00
Tyler Renelle
364641740a use node.extend module to deep-copy schema.userSchema when creating
new users - was a bug that duplicated initial tasks for each new user
2012-08-02 22:51:39 -04:00
Tyler Renelle
e2c5096311 removing accesscontrol for now, but at least only subscribing to the
necessary data
2012-08-02 14:36:55 -04:00
Tyler Renelle
71a4430efc almost got accessControl working, getting errors in createWriteGuard 2012-08-02 14:12:17 -04:00
Tyler Renelle
595ad960f3 attempts at purlMiddleware - using server/index.js to set
session.userId so can properly handle access paths
2012-07-31 19:21:45 -04:00
Tyler Renelle
630a6bf9ce Remove loading of a bunch of external javascript files if usign mobile device 2012-07-31 12:59:42 -04:00
Tyler Renelle
b2c9035ca9 convert viewHelpers to helpers, for other util functions in there.
some template code for next schema update
2012-07-30 17:25:04 -04:00
Tyler Renelle
035a705805 put stuff in viewHelpers file 2012-07-28 17:02:09 -04:00
Tyler Renelle
3895d0610a many bug fixes regarding schema updates 2012-07-28 16:26:06 -04:00
Tyler Renelle
994efb5f79 Add clear-completed button 2012-07-28 00:01:58 -04:00
Tyler Renelle
8c50969899 Add a schema and schema-updating mechanism. not ideal the way it is,
but bette than nothing
2012-07-27 23:10:20 -04:00
Tyler Renelle
05121a2d18 Finished _todoList/_completedList transfering. instead of remove/push
on lists, just splice/push to todoIds and completedIds
2012-07-27 22:29:02 -04:00
Tyler Renelle
33c5acf5ec use 'passed' parameter to ignore *.completed on cron 2012-07-27 21:56:21 -04:00
Tyler Renelle
b9a9239bbd moved tally functionality into scoring file 2012-07-27 21:11:53 -04:00
Tyler Renelle
52a96eb5e3 fix for *.completed on dailies 2012-07-27 20:47:59 -04:00
Tyler Renelle
1eae25ae54 _completedList working properly for todos, messes up dailies 2012-07-27 20:35:05 -04:00
Tyler Renelle
aff781ad3d Attempt at _completedList. still has race condition with setting *.copmleted 2012-07-27 19:38:28 -04:00
Tyler Renelle
bcc3c488bb Use racer.uuid() instead of Guid.raw() 2012-07-20 21:45:53 -04:00
Tyler Renelle
0b58c24e58 Moved scoring functionality into score.coffee, separate it out so i
can start implementing services
2012-07-20 21:39:29 -04:00
Tyler Renelle
2f008533bc more comment on accessControls not being called 2012-07-19 14:59:45 -04:00
Tyler Renelle
d53668065d comment on accessControl failing 2012-07-19 14:52:03 -04:00
Tyler Renelle
2bb4af286e All the setup necessary to get accessControl working (theoretically),
still doesn't work
2012-07-19 14:48:49 -04:00
Tyler Renelle
1afdfaaa53 remove some debugging code 2012-07-18 08:59:29 -04:00
Tyler Renelle
5bed0351af Update model.session.userId for next requests 2012-07-17 18:10:17 -04:00
Tyler Renelle
7f1693b425 fixed initial tasks not havign .id 2012-07-17 16:35:26 -04:00
Tyler Renelle
39329dba3a Almost fixed saved session management 2012-07-17 15:55:36 -04:00
Tyler Renelle
bc6b30ee5a better defaultTasks implementation 2012-07-17 15:45:05 -04:00
Tyler Renelle
4261ff82c7 Closer to getting initial contentn imported properly 2012-07-17 15:33:08 -04:00
Tyler Renelle
036badb3e4 Step towards working with new middleware, still broken 2012-07-17 14:47:19 -04:00
Tyler Renelle
98e824eb2e Remove tyler defaults & "toggle debug" button 2012-07-16 18:10:01 -05:00
Tyler Renelle
e6e8f87d3d try using "for in []" isntead of underscore for cron debugging 2012-07-16 18:01:18 -05:00
Tyler Renelle
961d06a5ee Remove hp & exp logging 2012-07-16 17:06:44 -05:00
Tyler Renelle
3a155fb306 Trying (new Date) instead of new Date() due to multiple crons on 1 day bug 2012-07-13 09:43:53 -05:00
Tyler Renelle
2620b25ffb Check at least if url is a guid, better to check if model exists but
that's not working
2012-07-11 20:14:29 -04:00
Tyler Renelle
2fa58da27e purl bug fix 2012-07-11 20:07:54 -04:00
Tyler Renelle
584dd1c4b0 Note on a purl error that is bound to happen, properly link purl text 2012-07-11 19:44:52 -04:00
Tyler Renelle
08632bd17a Add persistent URL for accessing data accross multiple
browsers (temporary solution to no authentication)
2012-07-11 19:27:53 -04:00
Tyler Renelle
42610f189e And removing it, dangerous 2012-07-11 16:24:58 -04:00
Tyler Renelle
186bcac166 Adding loadUserSession debugging 2012-07-11 16:24:41 -04:00
Tyler Renelle
8417e8fd62 Add cron to debugging buttons 2012-07-11 15:58:17 -04:00
Tyler Renelle
03b5361be9 history charts: use date.toDateString() when done debugging 2012-07-11 15:38:01 -04:00
Tyler Renelle
25d42f078f remove console.log on previous 2012-07-11 15:26:27 -04:00
Tyler Renelle
095865ff2e lastCron: set as midnight using new Date().toDateString() 2012-07-11 15:24:23 -04:00
Tyler Renelle
8f43f7d0c7 lastCron: setting as difference between two dates on midnight,
currently a bug where it calculates the difference in 24h between two
dates
2012-07-11 15:13:08 -04:00
Tyler Renelle
48f26edfb7 use math.floor, not math.round, when computing daysPassed on cron 2012-07-11 14:37:47 -04:00
Tyler Renelle
e4257766a6 poormanscron: run once ever hour on client 2012-07-11 10:17:47 -04:00
Tyler Renelle
b974d98f36 Add "revive" modal on death 2012-07-08 23:29:54 -04:00
Tyler Renelle
9f671548b5 implemented exp & hp modifiers based on lvl & armor/weapon 2012-07-08 22:23:57 -04:00
Tyler Renelle
4120a39df5 fix popover bug (they didn't show aftre editing stuff) , model.on
'set', * which isn't very efficient, revisit
2012-07-08 21:51:25 -04:00
Tyler Renelle
87f832be12 Implemented re-roll 2012-07-08 21:35:32 -04:00
Tyler Renelle
c71f1d9424 more bug fixes, store still messed up when final armor & weapon purchased 2012-07-08 21:20:30 -04:00
Tyler Renelle
f58cd5609a many bug fixes, but weapon is still tripping out 2012-07-08 19:56:55 -04:00
Tyler Renelle
ecc3bdee2d purchasing weapons & armor now updates the images 2012-07-08 19:37:36 -04:00
Tyler Renelle
3305697a4e Can buy items, storing to user now. many bug fixes 2012-07-08 18:58:11 -04:00
Tyler Renelle
2ddbe61141 put unlockedMessage in content.coffee, some prep for purchase button 2012-07-08 18:06:13 -04:00
Tyler Renelle
2d8f0ee39b Popover telling user they've unlocked Items Store 2012-07-08 17:59:50 -04:00
Tyler Renelle
b38da2803d added updateStats(), Setter for user.stats: handles death, leveling
up, etc
2012-07-08 17:28:10 -04:00
Tyler Renelle
3b4a3f27d4 refactored so user = {stats: {hp, lvl, exp, money}, items = {weapon,
armor, ..}, tasks, ...}
2012-07-08 16:59:07 -04:00
Tyler Renelle
73dffc8ffb Static rewards now in list 2012-07-08 13:29:18 -04:00
Tyler Renelle
74513509bb Static rewards in content.coffee. displayed as such in index.html & index.coffee 2012-07-07 23:43:35 -04:00
Tyler Renelle
c849ceddf1 Added the tourSteps in content.coffee 2012-07-07 22:34:34 -04:00
Tyler Renelle
69c4c257d9 starting to put all the content in content.coffee, so it doesn't
clutter the functionality
2012-07-07 22:29:34 -04:00
Tyler Renelle
2c042dd65b Modify my debugging defaults 2012-07-07 18:00:58 -04:00
Tyler Renelle
a4675defec Default tasks are now the rest of the tour, removing the helpIcons
from task columns
2012-07-07 13:58:56 -04:00
Tyler Renelle
a45cb18db2 Help icons 2012-07-07 12:58:34 -04:00
Tyler Renelle
7fb26ab7c5 Adding bootstrap-tour with some initial steps 2012-07-07 12:31:51 -04:00
Tyler Renelle
16c8ba8370 Sortable is working!!!!!!!! 2012-07-07 00:07:30 -04:00
Tyler Renelle
623db84502 Generalized exports.toggleChart function that takes data- attributes
for arguments
2012-07-06 22:46:22 -04:00
Tyler Renelle
690d3fbcdd Fix bug for items staying in _user.tasks when removed from _{type}List 2012-07-06 22:09:51 -04:00
Tyler Renelle
9332d9c175 Fix bug on 0 lvl exp-chart 2012-07-06 17:21:36 -04:00
Tyler Renelle
2444676cc4 use underscore's _().times for daysPassed 2012-07-06 16:57:17 -04:00
Tyler Renelle
97478120ff Add user-experience chart (need to put it in a modal or popover or something) 2012-07-06 16:54:57 -04:00
Tyler Renelle
8d9fb109a4 Add habit history (only implemented for up + down habits, need to
implement for only-up or only-down somehow)
2012-07-06 16:30:18 -04:00
Tyler Renelle
39a66facf5 Better default tasks, and debug button for loading my own starter tasks 2012-07-06 15:44:14 -04:00
Tyler Renelle
bb37272c07 Add debugging buttons if _debug=true 2012-07-06 15:22:47 -04:00
Tyler Renelle
40fd835e44 Some notes about removing poormanscron, removing window.model = model 2012-07-06 14:51:06 -04:00
Tyler Renelle
e49f97615b fixed NaN on first load error. note had to remove model.setNull
'_user.tasks', []
2012-07-06 01:12:35 -04:00
Tyler Renelle
412f7bf50b lastCron bug fix (still buggy though) 2012-06-29 10:16:02 -04:00
Tyler Renelle
459f0ce91a total todos tally chart 2012-06-29 09:45:50 -04:00
Tyler Renelle
2ca050d61e Bug fixes on endOfDayTally, put it back into htlm for testing purposes 2012-06-29 09:04:35 -04:00
Tyler Renelle
6fe6274eb4 readable dates on chart 2012-06-29 04:51:50 -04:00
Tyler Renelle
7375282124 chart background color 2012-06-29 04:44:52 -04:00
Tyler Renelle
7189a8fcfb And we have charts! easier than i thought it would be :o 2012-06-29 04:33:09 -04:00
Tyler Renelle
bed2c2e9f6 General <taskMeta:> component for handling charts, edit, and whatever
else might come along
2012-06-28 22:32:19 -04:00
Tyler Renelle
18e8472099 Add task.history = [], updated on cron. this will be used for charts later 2012-06-28 21:22:24 -04:00
Tyler Renelle
d4aee014b0 poormanscron() which is run on refresh, and performs endOfDayTally()
for every day missed. TODO: put this in a proper cron location
2012-06-28 19:15:46 -04:00
Tyler Renelle
d7f658eeec cleanup of previous 2012-06-28 18:11:13 -04:00
Tyler Renelle
7f00846af0 endOfDayTally is implemented, but is not working for
model.at('_users') and is not on cron, it's on click of <a>. come back
to this
2012-06-28 18:03:51 -04:00
Tyler Renelle
376d442a27 Add my starter lists until db is stable, then i'll add in good starter lists 2012-06-28 15:07:39 -04:00
Tyler Renelle
042f6983e3 temporary solution to https://github.com/codeparty/derby/issues/101 ,
_{type}List all subscribe to all tasks (rather than query-filtered
tasks), but pushing to _{type}Ids is what filters them from eachother.
not ideal, revisit later
2012-06-28 14:46:59 -04:00
Tyler Renelle
4c6bd8bc84 Implemented Remaining | Completed tabs by having two identical lists
with each <li> hidden based on model.get('_hideCompleted') - which is
set by tab clicks. This sucks, revisit when I understand managing
refLists better
2012-06-27 09:37:36 -04:00
Tyler Renelle
a88898729b push default tasks, problem with list handling 2012-06-26 16:51:47 -04:00
Tyler Renelle
53897665f2 Unified _user.tasks list, not separate. using queries instead of paths 2012-06-26 15:51:50 -04:00
Tyler Renelle
2369b05108 ul.{type} instead of {type} ul, but still not working 2012-06-26 12:01:57 -04:00
Tyler Renelle
15dda64aab Add class={type} back in for sort (sort still not working) 2012-06-26 11:44:37 -04:00
Tyler Renelle
ca88626ba5 Remove reconnect code (in UI) 2012-06-26 11:44:10 -04:00
Tyler Renelle
881b7b3903 add skel for clearCompleted 2012-06-26 11:34:45 -04:00
Tyler Renelle
96c13ff55c Add skel code for cron 2012-06-26 11:31:58 -04:00
Tyler Renelle
64da77d5ad tnl bug 2012-06-26 11:07:20 -04:00
Tyler Renelle
fa6014d275 Fixed purchases by renaming both "score" and "price" to "value" 2012-06-26 11:02:29 -04:00
Tyler Renelle
1733bdd658 fixed checkbox vote 2012-06-26 10:55:24 -04:00
Tyler Renelle
df195b8857 completed css 2012-06-26 08:48:24 -04:00
Tyler Renelle
9d06f09d29 bug 2012-06-26 08:08:39 -04:00
Tyler Renelle
7212a00b12 bug in setting task.score & task.done 2012-06-26 08:05:03 -04:00
Tyler Renelle
6d62baeafe Support task.score in css classes 2012-06-26 08:02:16 -04:00
Tyler Renelle
76c130bf69 Seem to have fixed the list.push issue (removing manual creation of {type}Ids 2012-06-25 18:26:12 -04:00
Tyler Renelle
f37aee3217 i dunno 2012-06-24 22:49:32 -04:00
Tyler Renelle
a8126ec487 popover notes instead of tooltip 2012-06-24 22:39:01 -04:00
Tyler Renelle
f91461353d escape data-selector for $_id 2012-06-24 22:12:31 -04:00
Tyler Renelle
4d3b882b89 screw it. not using modal or popover for now, just hidden div like pivotal 2012-06-24 21:51:13 -04:00
Tyler Renelle
d1ecf7d772 Got modal edit working 2012-06-24 20:51:42 -04:00
Tyler Renelle
aafcfbbb69 Add ui connection alert 2012-06-20 20:47:08 -04:00
Tyler Renelle
9466791970 Add test note to habit 2012-06-20 18:40:56 -04:00
Tyler Renelle
dbf104aaa6 removing old progressbar 2012-06-20 18:40:49 -04:00
Tyler Renelle
541ab5c656 progress bars using bootstrap 2012-06-20 18:34:15 -04:00
Tyler Renelle
9e9823c10f begin using derby-ui-boot 2012-06-20 18:15:38 -04:00
Tyler Renelle
47b54c1bec Dunno, looks like a bunch of new line diffs 2012-06-20 17:43:23 -04:00
Tyler Renelle
fbcfc041e5 round, gold, silver, and users status 2012-06-20 17:30:10 -04:00
Tyler Renelle
4e2d80fbab Cleanup instances of tnl() 2012-06-20 17:14:22 -04:00
Tyler Renelle
af706e59b3 add model.fn '_tnl' & temporary window.model debugging function 2012-06-20 17:13:47 -04:00
Tyler Renelle
15e4f987a6 don't use model async increase (revisit this) 2012-06-20 16:45:39 -04:00
Tyler Renelle
bc73c100e3 .vote() properly gets model.at, user.set instead of user.attr= 2012-06-20 16:40:59 -04:00
Tyler Renelle
52b26c3f94 at least onclick calls :s 2012-06-09 21:16:11 -04:00
Tyler Renelle
b8e9ccdb70 pulled in habit.js.coffee & user.js.coffee 2012-06-09 20:41:21 -04:00
Tyler Renelle
58d9f929eb DRY view complete! still need to get rid of "type" attribute on task
and put in a view helper somehow
2012-06-09 20:15:33 -04:00
Tyler Renelle
cf7a271eb6 DRY addTask function 2012-06-09 14:25:10 -04:00
Tyler Renelle
d49dcc4ace Lists sortable, but not persisting 2012-06-08 15:19:11 -04:00
Tyler Renelle
36bbd6a222 small cleanup in index.coffee, getRoom() doesn't make sense 2012-06-08 15:03:29 -04:00
Tyler Renelle
b32e2e20d7 rename habitType to type 2012-05-09 12:26:43 -04:00
Tyler Renelle
eb06eb70bc set _user.exp example 2012-05-03 21:03:09 -04:00
Tyler Renelle
017e579386 initialize habits with proper defaults 2012-05-03 20:03:08 -04:00
Tyler Renelle
8d6a907cfc Some *.completed refactoring 2012-05-03 09:35:48 -04:00
Tyler Renelle
4313515c4d Adding proper default attributes to habit types 2012-05-02 21:15:29 -04:00
Tyler Renelle
ee90208bad Adding basic functionality for adding the different habit types, & in html 2012-05-02 21:07:36 -04:00
Tyler Renelle
955592a3b8 Add habits, dailies, & rewards in 2012-05-02 20:32:29 -04:00
Tyler Renelle
14f34cbe25 At last, got todoIds working 2012-05-02 20:16:40 -04:00
Tyler Renelle
d9e8c8f42a Closer to correct use of todoIds 2012-05-02 19:44:12 -04:00
Tyler Renelle
6101a32b1b First stab at associating Todos with a user 2012-05-02 15:50:43 -04:00
Tyler Renelle
5ea976ad0b Replacing current app (app/index.coffee, views/app/index.coffee) with
todo.js example
2012-04-27 13:04:44 -04:00
Tyler Renelle
45caad3c3c Using coffee instead (derby new --coffee first-project) 2012-04-26 22:19:31 -04:00