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.

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

Finished wireframe #1 basic functionality #26

Open
wants to merge 87 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
7b44840
Finished wireframe #1 basic functionality
Hackerry Feb 16, 2021
454dcec
update A5
Feb 16, 2021
59e5587
Add configuration files to specify line endings
Hackerry Feb 16, 2021
a5ee8a9
Finish wireframe 2
Hackerry Feb 16, 2021
27445bf
update A5
Feb 16, 2021
2e8e3a5
update viewport
Feb 17, 2021
27be833
Test nav bar
Hackerry Feb 17, 2021
1bdf3c1
Merge branch 'A5' of https://github.com/Hackerry/ixd-skeleton into A5
Hackerry Feb 17, 2021
838eff9
Add nav bar and link all routes
Hackerry Feb 17, 2021
70a4607
Remove addConfirmation page
Hackerry Feb 17, 2021
52b4a34
update logout feature
Feb 17, 2021
3d29fdd
Update package-lock.json
Feb 17, 2021
a9b7f57
upload login page
Feb 17, 2021
c11ba38
Change to local jquery
Hackerry Feb 19, 2021
78c6a10
Add confirmation page and login/signup basic logic
Hackerry Feb 20, 2021
9b77fef
update "add" page
Feb 21, 2021
f3da946
Update add.handlebars
Feb 21, 2021
3074eb1
Database implemented
Hackerry Feb 22, 2021
a7780c9
Update activities.json
Feb 22, 2021
75ab29e
Add login page to overall logic
Hackerry Feb 23, 2021
ee57d9d
update data
Feb 23, 2021
480cdbc
Add visibility icon
Hackerry Feb 24, 2021
8276fc6
update
Feb 24, 2021
a9934ff
Fix some links
Hackerry Feb 24, 2021
0384061
Merge branch 'A5' of https://github.com/Hackerry/ixd-skeleton into A5
Hackerry Feb 24, 2021
e1335b0
update
Feb 24, 2021
6f4633d
Merge branch 'A5' of https://github.com/Hackerry/ixd-skeleton into A5
Feb 24, 2021
500b102
Finish database logic
Hackerry Feb 24, 2021
6a40815
Change database format
Hackerry Feb 24, 2021
36e0b7a
Update activities.json
Feb 25, 2021
8d85bc4
Merge branch 'A5' of https://github.com/Hackerry/ixd-skeleton into A5
Feb 25, 2021
ba7b5b0
Update users.json
Feb 25, 2021
516c9e2
Added external sources
Hackerry Feb 25, 2021
de5cd8d
Merge branch 'A5' of https://github.com/Hackerry/ixd-skeleton into A5
Hackerry Feb 25, 2021
dd6d31e
Update activities.json to use new format
Hackerry Feb 25, 2021
bb92136
update account
Feb 25, 2021
fe6953f
Merge branch 'A5' of https://github.com/Hackerry/ixd-skeleton into A5
Feb 25, 2021
162a290
update
Feb 25, 2021
7fb45fb
added "help" page
Feb 25, 2021
badf534
Update activities.json
Feb 25, 2021
224cbd1
Merge branch 'A5' of https://github.com/Hackerry/ixd-skeleton into A5
Feb 25, 2021
cf6c972
Add details page
Hackerry Feb 25, 2021
82f3307
update
Feb 26, 2021
cdfe05f
Add nav bar to help and all activities page
Hackerry Feb 26, 2021
6f05c3c
Update home.handlebars
Feb 26, 2021
588a120
Merge branch 'A5' of https://github.com/Hackerry/ixd-skeleton into A5
Feb 26, 2021
6135b0c
update "Help" page
Feb 26, 2021
590d785
Update index.handlebars
Feb 26, 2021
cda1c1d
Add more activities options
Hackerry Feb 28, 2021
791c0da
Merge branch 'A5' of https://github.com/Hackerry/ixd-skeleton into A5
Feb 28, 2021
13c0503
Update activities.json
Mar 1, 2021
66b6420
BG
Mar 1, 2021
4952524
Merge branch 'A5' of https://github.com/Hackerry/ixd-skeleton into A5
Mar 1, 2021
a6f6697
update styling
Mar 1, 2021
3aebc04
update styling
Mar 1, 2021
d4c36df
up
Mar 1, 2021
a527113
update styling
Mar 1, 2021
e414d80
update
Mar 1, 2021
6c3a9d3
Add edit functionality
Hackerry Mar 1, 2021
6a44927
Minor adjustments with delete button
Hackerry Mar 1, 2021
060e471
Update help.handlebars
Mar 1, 2021
2226644
Update login.css
Mar 1, 2021
3bd6e58
Update help.handlebars
Mar 1, 2021
b2774fe
Change day to real recorded days
Hackerry Mar 1, 2021
323b6bb
Merge branch 'A5' of https://github.com/Hackerry/ixd-skeleton into A5
Hackerry Mar 1, 2021
86e24ec
Update activities.json
Mar 1, 2021
9b5c963
Merge branch 'A5' of https://github.com/Hackerry/ixd-skeleton into A5
Mar 1, 2021
6d0af99
Add drop down help screen
Hackerry Mar 1, 2021
c670ff3
update
Mar 1, 2021
cbb7b7f
Merge branch 'A5' of https://github.com/Hackerry/ixd-skeleton into A5
Mar 1, 2021
d559867
Update help.handlebars
Mar 1, 2021
15e6c7f
Add drop down button
Hackerry Mar 2, 2021
c0d9d52
Add drop down button
Hackerry Mar 2, 2021
f37a584
Update
Mar 2, 2021
5815a2f
Show fixed number hours
Hackerry Mar 4, 2021
61c2e2c
Update help.handlebars
Mar 4, 2021
b9705d7
Merge branch 'A5' of https://github.com/Hackerry/ixd-skeleton into A5
Mar 4, 2021
85e7311
Update users.json
Mar 4, 2021
604160f
Incorporate settings page to workflow
Hackerry Mar 4, 2021
3bfb1e3
Incorporate settings page to workflow
Hackerry Mar 4, 2021
01f7b17
Add color coding scheme
Hackerry Mar 4, 2021
df76e9f
update
Mar 4, 2021
0ff4b95
update
Mar 4, 2021
a4293a6
Change all activities page style and fix minor issues
Hackerry Mar 4, 2021
d26e219
update styling
Mar 5, 2021
4a17c2d
update styling
Mar 5, 2021
3dea5bf
update styling
Mar 5, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
eol=lf
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ logs
results

npm-debug.log
#node_modules
node_modules
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,11 @@ repo
====

Project Description

External Sources Used:
1. W3Schools Tutorials: https://www.w3schools.com/
2. MDN Documentation Example JS code: https://developer.mozilla.org/en-US/docs/Web/JavaScript
3. Jquery Source code and Example code: https://jquery.com/download/
4. jQuery.ptTimeSelect widget: http://pttimeselect.sourceforge.net/example/index.html
5. Past lab code: https://ixd.ucsd.edu/home/w21/index.php#calendar
6. Google Fonts: https://fonts.google.com/
1 change: 1 addition & 0 deletions activities.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"harry":{"2/25/2021":[{"name":"COGS 120","type":"School","start":"3:00 AM","end":"10:00 PM","duration":68400}],"2/10/2021":[{"name":"COGS 120","type":"School","start":"10:00 AM","end":"4:00 PM","duration":21600}],"7/10/2020":[{"name":"Work","type":"Work","start":"1:00 AM","end":"8:00 AM","duration":25200}],"3/1/2021":[{"name":"Sleep In Class","type":"Family","start":"3:00 PM","end":"6:00 PM","duration":10800},{"name":"Lunch with mom","type":"Family","start":"11:00 AM","end":"12:00 PM","duration":3600}],"3/3/2021":[{"name":"Sleep123123","type":"Other","start":"7:00 AM","end":"11:00 AM","duration":14400},{"name":"COGS 120","type":"Family","start":"1:00 AM","end":"2:45 AM","duration":6300},{"name":"Homework","type":"School","start":"7:00 AM","end":"8:45 AM","duration":6300}]},"cogs121":{"2/28/2021":[{"name":"COGS 120","type":"School","start":"3:00 PM","end":"4:00 PM","duration":3600},{"name":"dinner","type":"Family","start":"8:00 PM","end":"9:00 PM","duration":3600},{"name":"123","type":"Other","start":"1:00 AM","end":"2:00 AM","duration":3600},{"name":"Project 1","type":"Work","start":"10:00 PM","end":"11:00 PM","duration":3600}],"3/1/2021":[{"name":"COGS 120","type":"Family","start":"2:00 PM","end":"4:00 PM","duration":7200}],"3/4/2021":[{"name":"project CSE 110","type":"Work","start":"10:00 PM","end":"11:00 PM","duration":3600},{"name":"COGS 102B","type":"School","start":"3:30 PM","end":"4:50 PM","duration":4800}]},"anwai":{"3/2/2021":[{"name":"Cooking","type":"Family","start":"6:00 AM","end":"7:00 AM","duration":3600},{"name":"Exercise","type":"Other","start":"7:05 AM","end":"8:00 AM","duration":3300},{"name":"Class","type":"School","start":"9:00 AM","end":"1:00 PM","duration":14400}]}}
34 changes: 34 additions & 0 deletions activityTypes.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"types": [
{
"name": "Family",
"color": "#A2E1DD",
"bgColor": "#A2E1DD",
"textColor": "#000000"
},
{
"name": "Fun",
"color": "#EB8484",
"bgColor": "#EB8484",
"textColor": "#000000"
},
{
"name": "School",
"color": "#91AC7B",
"bgColor": "#91AC7B",
"textColor": "#000000"
},
{
"name": "Work",
"color": "#E9CD6A",
"bgColor": "#E9CD6A",
"textColor": "#000000"
},
{
"name": "Other",
"color": "#6C59DB",
"bgColor": "#6C59DB",
"textColor": "#000000"
}
]
}
27 changes: 25 additions & 2 deletions app.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,15 @@ var handlebars = require('express3-handlebars')

var index = require('./routes/index');
// Example route
// var user = require('./routes/user');
var add = require('./routes/add');
var report = require('./routes/report');
var home = require('./routes/home');
var addConfirmation = require('./routes/addConfirmation');
var userAction = require('./routes/userAction');
var settings = require('./routes/settings');
var suggestions = require('./routes/suggestions');
var help = require('./routes/help');
var details = require('./routes/details');

var app = express();

Expand All @@ -36,7 +44,22 @@ if ('development' == app.get('env')) {

app.get('/', index.view);
// Example route
// app.get('/users', user.list);
app.get('/add', add.view);
app.get('/report', report.view);
app.get('/home', home.view);
app.get('/help', help.view);
app.get('/addConfirmation', addConfirmation.view);
app.get('/userSignUp', userAction.signUpAction);
app.get('/userLogIn', userAction.logInAction);
app.get('/settings', settings.view);
app.get('/userRetrieveSettings', userAction.retrieveSettings);
app.get('/userGetActivities', userAction.getActivities);
app.get('/userDeleteActivity', userAction.deleteActivity);
app.get('/userGetTypes', userAction.getTypes);
app.get('/userEditActivity', userAction.editActivity);
app.get('/userSetSettings', userAction.setSettings);
app.get('/suggestions', suggestions.view);
app.get('/details', details.view);

http.createServer(app).listen(app.get('port'), function(){
console.log('Express server listening on port ' + app.get('port'));
Expand Down
File renamed without changes.

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

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

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

48 changes: 48 additions & 0 deletions node_modules/amdefine/package.json

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

File renamed without changes.
65 changes: 65 additions & 0 deletions node_modules/async/package.json

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

39 changes: 39 additions & 0 deletions node_modules/batch/package.json

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

Loading