Skip to content
This repository has been archived by the owner on Sep 18, 2022. It is now read-only.

Dev branch #73

Open
wants to merge 30 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
0d18511
front-end
auspham Jan 16, 2019
f71601c
front end finished.
auspham Jan 16, 2019
acd6cb2
front-end done
auspham Jan 16, 2019
7872595
oofff works?
auspham Jan 16, 2019
efb2fbb
ooooo it works
auspham Jan 16, 2019
5e0ed21
style update?
auspham Jan 16, 2019
fba09de
Merge pull request #67 from Mystr-Melbourne/square-select
MichaelDao Jan 16, 2019
25b488d
Merge pull request #68 from Mystr-Melbourne/dev_branch
auspham Jan 16, 2019
f767f2a
git ignore & environment
auspham Jan 16, 2019
65e8a52
node versin
auspham Jan 16, 2019
14c7abe
update package.json
auspham Jan 16, 2019
31b28c0
prevent sending sms
auspham Jan 16, 2019
4b4b283
rearranged assign shifts and export csv buttons
MichaelDao Jan 17, 2019
9301978
add DS_Store to gitignore
MichaelDao Jan 17, 2019
37ca993
Delete .DS_Store
MichaelDao Jan 17, 2019
f985ec5
for backup
auspham Jan 17, 2019
b53cfb6
function works
auspham Jan 17, 2019
1248ed2
Export feature floating
auspham Jan 17, 2019
e544763
change name to mass assign instead of assign shifts
auspham Jan 17, 2019
a989977
remove export.js
MichaelDao Jan 17, 2019
580950c
Merge pull request #69 from Mystr-Melbourne/buttonArrange
MichaelDao Jan 17, 2019
d409e59
Merge branch 'heroku-test' into dev_branch
auspham Jan 17, 2019
1becc70
Revert "Merge branch 'heroku-test' into dev_branch"
MichaelDao Jan 18, 2019
b91204a
Revert "Merge pull request #69 from Mystr-Melbourne/buttonArrange"
MichaelDao Jan 18, 2019
28a518e
responsive hotfix
MichaelDao Jan 22, 2019
da4a885
responsive hotfix
MichaelDao Jan 22, 2019
aa6b26f
Revert "Revert "Merge pull request #69 from Mystr-Melbourne/buttonArr…
MichaelDao Jan 22, 2019
0605dff
responsive hotfix
MichaelDao Jan 22, 2019
9baa8e6
Update .env
MichaelDao Jan 22, 2019
d8b1fbc
modifying .gitignore for AW2 deploy
Jan 22, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed .DS_Store
Binary file not shown.
7 changes: 3 additions & 4 deletions .env
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# twillio account authentication
TWILIO_ACCOUNT_SID=AC6af081c3edd84b8643891ee37d8d52aa
TWILIO_AUTH_TOKEN=50023fd3a227343b1748a2659fe2e1ea
TWILIO_ACCOUNT_SID=ACd799a34deaa327e6f3f06740751f878e
TWILIO_AUTH_TOKEN=def019c9b48673b9438f7a1c1347fe24

# phone numbers
TWILIO_PHONE_NUMBER=61488846787
CELL_PHONE_NUMBER=0402378689
TWILIO_PHONE_NUMBER=61488849249
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ node_modules
public/bundle.js
.env
ngrok
.DS_Store
10 changes: 5 additions & 5 deletions app/components/Manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ var Manager = React.createClass({
<a href="/" data-activates="slide-out" className="button-collapse"><i className="material-icons">menu</i></a>
<ul className="right hide-on-med-and-down">
<li><a className="black-text" href="/manager">Home<i className="material-icons right">group</i></a></li>
<li><a className="black-text" href="/manager/assignShift">Assign shifts<i className="material-icons right">calendar_today</i></a></li>
<li><a className="black-text" href="/manager/export">Export CSV<i className="material-icons right">cloud_download</i></a></li>
{/* <li><a className="black-text" href="/manager/assignShift">Assign shifts<i className="material-icons right">calendar_today</i></a></li> */}
{/* <li><a className="black-text" href="/manager/export">Export CSV<i className="material-icons right">cloud_download</i></a></li> */}
<li><a className="black-text" href="/manager/employeeAll">Edit Staff<i className="material-icons right">group</i></a></li>
{/* <li><a className="black-text" href="/manager/schedulesCreate">Edit Schedule<i className="material-icons right">access_time</i></a></li> */}
<li><a className="dropdown-button black-text" href="#" data-activates="dropdown1" data-beloworigin="true" data-hover="true">{this.state.username}<img className="circle circle-small" src={this.state.picture} /></a></li>
Expand All @@ -47,9 +47,9 @@ var Manager = React.createClass({
<a><span className="white-text name">{this.state.username}</span></a>
</div>
</li>
<li><a href="/manager" className=""><i className="material-icons">group</i>Home</a></li>
<li><a href="/manager/assignShift"><i className="material-icons">calendar_today</i>Assign shifts</a></li>
<li><a href="/manager/export"><i className="material-icons">cloud_download</i>Export CSV</a></li>
<li><a href="/manager" className=""><i className="material-icons">home</i>Home</a></li>
{/* <li><a href="/manager/assignShift"><i className="material-icons">calendar_today</i>Assign shifts</a></li> */}
{/* <li><a href="/manager/export"><i className="material-icons">cloud_download</i>Export CSV</a></li> */}
<li><a href="/manager/employeeAll" className=""><i className="material-icons">group</i>Edit Staff</a></li>

{/* <li><a href="/manager/schedulesCreate" className="black-text"><i className="material-icons">access_time</i>Edit Schedule</a></li> */}
Expand Down
118 changes: 0 additions & 118 deletions app/components/children/Export.js

This file was deleted.

Loading