Skip to content

Ticket 001 filter bug #48

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.

Sign up for GitHub

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

Closed
wants to merge 13 commits into from
Closed

Ticket 001 filter bug #48

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7591fc5
added material ui and most of the base components and navigation
Jun 24, 2021
c425d56
New Activity firebase connection
Jul 17, 2021
4c0b3ef
finalizing new activity, updating dependencies
Jul 20, 2021
a74064b
finalizing my activity, fixed dependencies... fingers crossed
Jul 21, 2021
c04bda4
some dependency edits and new activity pulling live user list, edited…
Jul 21, 2021
3399b9a
testing new repo name
Jul 21, 2021
c309613
finished admin table and sortable my activity table, added attendance
Aug 17, 2021
dfe2e7f
redirects
Aug 17, 2021
aa817cf
fixed Attendance bug and routing bug
Aug 17, 2021
ad83ac3
added authorization and converted sign in to hooks
Aug 17, 2021
3151d59
updated sign in menu style, fixed menu bug
Aug 17, 2021
ece15ab
added business given to admin and my activity, one to one, new activi…
Aug 18, 2021
47092a9
fixed filter bug
Aug 25, 2021
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
Prev Previous commit
Next Next commit
fixed Attendance bug and routing bug
  • Loading branch information
Carl Corsini committed Aug 17, 2021
commit aa817cf9e1ca4f25045bc3480bcc723124f5037d
6 changes: 6 additions & 0 deletions src/components/Admin/AdminTable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,12 @@ const columns = [
width: 150,
hide: true,
},
{
field: 'num_guests',
headerName: '# of Guests',
width: 150,
hide: true,
},
{
field: 'date',
headerName: 'Date',
Expand Down
2 changes: 1 addition & 1 deletion src/components/App/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const App = () => (
<div>
<Navigation />
<Route exact path="/">
{<Redirect to={ROUTES.MY_ACTIVITY} />}
{<Redirect to={ROUTES.HOME} />}
</Route>
<Route exact path={ROUTES.LANDING} component={LandingPage} />
<Route path={ROUTES.SIGN_UP} component={SignUpPage} />
Expand Down
6 changes: 6 additions & 0 deletions src/components/MyActivity/ActivityTable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,12 @@ const columns = [
width: 150,
// hide: true,
},
{
field: 'num_guests',
headerName: '# of Guests',
width: 150,
hide: true,
},
{
field: 'member_id',
headerName: 'Member ID',
Expand Down
2 changes: 1 addition & 1 deletion src/components/NewActivity/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ const NewActivity = ({ firebase }) => {
};

useEffect(() => {
if (today.getDay() === 4) {
if (today.getDay() == 4) {
setThursday(true);
options.unshift('Attendance');
} else {
Expand Down