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

Test master #41

Open
wants to merge 70 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
04cec47
Home page
Feb 16, 2021
92225c1
added activity screen
Feb 16, 2021
2dbc384
Update index.handlebars
Feb 16, 2021
979dd5b
finish activity
Feb 16, 2021
293a827
activity
Feb 16, 2021
ffdf91d
Update
Feb 16, 2021
c0b27b4
no color
Feb 17, 2021
b73f46e
no color
Feb 17, 2021
a80cf61
setting_about
Feb 17, 2021
1daa63c
Merge branch 'master' of https://github.com/LongAli/ixd-skeleton
Feb 17, 2021
7c56623
Update README.md
LongAli Feb 17, 2021
25b9de1
untracked node_modules
Feb 17, 2021
d39d44a
dd
Feb 17, 2021
1e269c5
delete log
Feb 17, 2021
599f9a7
new
Feb 17, 2021
e603c34
json file added
ndevanag Feb 22, 2021
0d70020
finished setting
Feb 24, 2021
5e089d1
finish merge
Feb 24, 2021
f8482ee
finished timer
Feb 24, 2021
26d9d39
facebook login but picture not working
ndevanag Feb 24, 2021
c1a1fc0
conflict
ndevanag Feb 24, 2021
1897585
filter
Feb 24, 2021
f71144c
new
Feb 24, 2021
dea56e6
json added
ndevanag Feb 24, 2021
df44db9
pictures fixed
ndevanag Feb 24, 2021
2e5420d
actLog json added
ndevanag Feb 24, 2021
ac05a4d
for merging
Feb 25, 2021
edb728c
stuff
Feb 25, 2021
2f0b57e
filter
Feb 25, 2021
16e7ced
filter
Feb 25, 2021
fe45da4
fixed setting
Feb 25, 2021
786f477
stuff
Feb 25, 2021
29d0cc1
updated
Feb 25, 2021
c017a9b
finished login, completion, fixed settings
Feb 25, 2021
3581e0b
xxx
Feb 25, 2021
b55ef7a
fixed nav
Feb 25, 2021
7f8b535
add complete button
Feb 25, 2021
738e123
filtered
Feb 25, 2021
ea85aa9
filtered
Feb 25, 2021
4f9b46a
changed settings and timer
Feb 25, 2021
decf1ac
delete click
ndevanag Feb 25, 2021
68398b0
delete click
ndevanag Feb 25, 2021
b7c1b3c
complete debug
ndevanag Feb 25, 2021
e057ef9
some thing
Feb 25, 2021
c979e9f
accepting changes
Feb 25, 2021
54aa5c1
test share
Feb 25, 2021
991b2c6
delete package lock
Feb 25, 2021
d1c08a0
test button
Feb 26, 2021
c1f8169
test2
Feb 26, 2021
499c481
test3
Feb 26, 2021
f78acf9
test4
Feb 26, 2021
cd8b44d
test
Feb 26, 2021
df931e2
test n
Feb 26, 2021
52c0020
changing actlog
ndevanag Feb 26, 2021
d6ab3d4
Merge branch 'master' of https://github.com/LongAli/lacuna-matana
ndevanag Feb 26, 2021
d5a02d1
test
Feb 26, 2021
dd65ac4
actjson fixed
ndevanag Feb 26, 2021
cecbb0f
non
Feb 26, 2021
2f99602
nnn
Feb 26, 2021
d582f47
actdescription
ndevanag Feb 26, 2021
7a929df
Merge branch 'master' of https://github.com/LongAli/lacuna-matana
ndevanag Feb 26, 2021
ecc8b1b
notif for buttons
Feb 26, 2021
7473d0e
merge
Feb 26, 2021
ea72d49
button popup messages
Feb 26, 2021
85dcbdd
fix login
Feb 26, 2021
d026147
needs fix multiple objects
Feb 26, 2021
0b5ee2a
wip
Feb 26, 2021
de275d8
Merge branch 'master' of https://github.com/LongAli/ixd-skeleton
Feb 26, 2021
3fe8c1e
filterwip
Feb 26, 2021
4d4fcc7
hello
Feb 26, 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
  •  
  •  
  •  
Binary file added .DS_Store
Binary file not shown.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,7 @@ logs
results

npm-debug.log
#node_modules
# dependency
/node_modules
node_modules
keys.js
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
repo
Fluffy socks 120 app
====

Project Description
Team 4: app that reminds breaktime and offers breaktime ideas
34 changes: 34 additions & 0 deletions actLog.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"toLog": [
{
"ID": "1",
"Category": "exercise",
"Activity": "Yoga",
"minTime": 30,
"Tags": "indoor",
"Image": "https://source.unsplash.com/dkg-zps94uw/1600x900",
"Link": "https://www.youtube.com/embed/b1H3xO3x_Js",
"Description": "I'm new to yoga, so this was a bit harder than I thought. Still had a great time exercising and being more mindful!"
},
{
"ID": "2",
"Category": "kitchen fun",
"Activity": "Bake Cookies",
"minTime": 30,
"Tags": "indoor",
"Image": "https://source.unsplash.com/tDoHiqXl9b8/1600x900",
"Link": "https://www.youtube.com/embed/uJwekkbGPns",
"Description": "Made chocolate chip cookies today! Great recipe, and 10/10 recommend!"
},
{
"ID": "3",
"Category": "nature",
"Activity": "Plant A Seed",
"minTime": 10,
"Tags": "outdoor",
"Image": "https://source.unsplash.com/4PG6wLlVag4/1600x900",
"Link": "https://www.youtube.com/embed/w77zPAtVTuI",
"Description": "Started growing an apple tree in the backyard! I can't wait to see how much this seed grows."
}
]
}
Loading