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

fix: Wrong event URL is being shared #1862

Merged
merged 1 commit into from
May 30, 2019
Merged

fix: Wrong event URL is being shared #1862

merged 1 commit into from
May 30, 2019

Conversation

liveHarshit
Copy link
Member

Fixes #1832

@auto-label auto-label bot added the fix label May 30, 2019
iamareebjamal
iamareebjamal reviewed May 30, 2019
View reviewed changes
app/src/main/java/org/fossasia/openevent/general/event/EventUtils.kt Outdated
@@ -33,7 +33,7 @@ object EventUtils {

private val timeFormat: DateTimeFormatter = DateTimeFormatter.ofPattern("hh:mm a")
private val dateFormat: DateTimeFormatter = DateTimeFormatter.ofPattern("dd MMM yyyy")
private const val frontendUrl = "https://open-event-frontend-dev.herokuapp.com/e/"
private const val frontendUrl = "https://eventyay.com/e/"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Make this a build config

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated

iamareebjamal
iamareebjamal reviewed May 30, 2019
View reviewed changes
app/build.gradle Outdated
buildConfigField "String", "MAPBOX_KEY", '"'+MAPBOX_KEY+'"'
buildConfigField "String", "STRIPE_API_KEY", '"'+STRIPE_API_TOKEN+'"'
}
debug {
buildConfigField "String", "DEFAULT_BASE_URL", '"https://open-event-api-dev.herokuapp.com/v1/"'
buildConfigField "String", "FRONTEND_URL", '"https://open-event-fe.netlify.com/e/"'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's fossasia.github.io/open-event-frontend

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I take it from the frontend documentation. Will update it. 👍

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

iamareebjamal
iamareebjamal reviewed May 30, 2019
View reviewed changes
app/build.gradle Outdated
@@ -37,11 +37,13 @@ android {
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
buildConfigField "String", "DEFAULT_BASE_URL", '"https://api.eventyay.com/v1/"'
buildConfigField "String", "FRONTEND_URL", '"https://eventyay.com/e/"'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

e/ shouldn't be there

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed

@anhanh11001
Copy link
Contributor

Build is failing

@liveHarshit
Copy link
Member Author

liveHarshit commented May 30, 2019 •
edited
Loading

Build is failing

Build successful.

@iamareebjamal iamareebjamal merged commit 1529844 into fossasia:development May 30, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@iamareebjamal iamareebjamal iamareebjamal approved these changes

Assignees
No one assigned
Labels
fix
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Wrong Event URL is being shared
3 participants
@liveHarshit @anhanh11001 @iamareebjamal