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.

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

Jump to bottom

#409 see more buttton for upcoming events with no registration #461

Merged
merged 10 commits into from
Jun 22, 2021
Merged

#409 see more buttton for upcoming events with no registration #461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b15399e
Merge pull request #421 from hackjunction/dev
Jussii Apr 20, 2021
f356bd8
Merge pull request #422 from hackjunction/dev
Jussii Apr 21, 2021
37e0f0f
Merge pull request #423 from hackjunction/dev
Jussii Apr 22, 2021
5614bb7
Merge pull request #425 from hackjunction/dev
Jussii May 6, 2021
9509554
Merge pull request #436 from hackjunction/dev
Jussii May 17, 2021
33a993a
Merge pull request #439 from hackjunction/dev
Jussii May 26, 2021
c893716
Merge pull request #442 from hackjunction/dev
Jussii May 27, 2021
029ec2f
Merge pull request #451 from hackjunction/dev
Jussii Jun 10, 2021
7df2c76
Merge pull request #458 from hackjunction/dev
Jussii Jun 15, 2021
c69bd5b
Fix button text for see more
Earlo Jun 21, 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
1 change: 0 additions & 1 deletion frontend/src/pages/_events/slug/context.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,6 @@ export const EventDetailProvider = ({ children }) => {
const registration = registrationData?.myRegistration
const isRegistrationOpen =
event?._eventStatus === EventStatuses.REGISTRATION_OPEN.id
console.log('regidata', registrationData)
return (
<EventDetailContext.Provider
value={{
Expand Down
2 changes: 0 additions & 2 deletions frontend/src/pages/_events/slug/default/EventButtons/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import React from 'react'
import { useDispatch, useSelector } from 'react-redux'
import { push } from 'connected-react-router'
import { useRouteMatch } from 'react-router'
import moment from 'moment-timezone'
import { EventStatuses } from '@hackjunction/shared'
import { Typography, Grid } from '@material-ui/core'

Expand All @@ -16,7 +15,6 @@ export default ({ event, registration }) => {
const dispatch = useDispatch()
const match = useRouteMatch()
const isAuthenticated = useSelector(AuthSelectors.isAuthenticated)
console.log('regi', registration)
const hasRegistration = registration
? registration.status != 'incomplete'
: false
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/_index/EventsGrid/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export default ({ events, loading = false, title }) => {
dispatch(push('/events/' + event.slug))
}
>
{t('Register_now_')}
{t('See_more_')}
</Button>
),
canApply && !event.galleryOpen && (
Expand Down