feat: Integrate web app generator with event dashboard #5529

dhruvjain99 · 2020-11-08T15:05:41Z

Fixes #5476

Short description of what this resolves:

Earlier generate web app button was not working
Redirect to web app generator in a new tab and fill and submit the form automatically by fetching details from the event dashboard

Changes proposed in this pull request:

Create redirection web app generator URL, pass it to views for the button to work
Include the redirection host for development and production environment in the environment config file
Update readme of local setup

Checklist

I have read the Contribution & Best practices Guide.
My branch is up-to-date with the Upstream development branch.
The acceptance, integration, unit tests and linter pass locally with my changes
I have added tests that prove my fix is effective or that my feature works
I have added necessary documentation (if appropriate)

vercel · 2020-11-08T15:05:46Z

This pull request is being automatically deployed with Vercel (learn more).
To see the status of your deployment, click below or on the icon next to each commit.

🔍 Inspect: https://vercel.com/eventyay/open-event-frontend/8mdkb0648
✅ Preview: https://open-event-frontend-git-ftr-intgerate-wsgen.eventyay.vercel.app

codecov · 2020-11-08T16:07:13Z

Codecov Report

Merging #5529 (17ae6d1) into development (84027ee) will increase coverage by 0.63%.
The diff coverage is 100.00%.

@@               Coverage Diff               @@
##           development    #5529      +/-   ##
===============================================
+ Coverage        23.07%   23.71%   +0.63%     
===============================================
  Files              494      498       +4     
  Lines             5210     5255      +45     
  Branches            38       44       +6     
===============================================
+ Hits              1202     1246      +44     
  Misses            4003     4003              
- Partials             5        6       +1

Impacted Files	Coverage Δ
app/components/events/view/overview/event-apps.js	`100.00% <100.00%> (ø)`
app/utils/computed-helpers.js	`19.56% <0.00%> (-1.72%)`	⬇️
app/models/social-link.js	`0.00% <0.00%> (ø)`
app/components/forms/wizard/other-details-step.js	`0.00% <0.00%> (ø)`
app/components/public/sponsor-list.js
app/utils/dictionary/social-media.ts	`100.00% <0.00%> (ø)`
app/components/public/sponsor-list.ts	`89.47% <0.00%> (ø)`
app/components/widgets/forms/social-link-field.ts	`75.00% <0.00%> (ø)`
app/components/widgets/forms/link-field.ts	`75.00% <0.00%> (ø)`
... and 1 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 84027ee...17ae6d1. Read the comment docs.

- Earlier generate web app button was not working - Redirect to web app generator in a new tab and fill and submit form automatically by fetching details from the event dashboard - Create redirection web app generator url, pass it to views for button to work - Include the redirection host for development and production environment in environment config file - Update readme of local setup

dhruvjain99 · 2020-11-08T16:11:55Z

@iamareebjamal can you please review this PR?

iamareebjamal · 2020-11-08T22:56:07Z

app/components/events/view/overview/event-apps.js

+export default class EventApps extends Component {
+    @computed('eventId')
+  get webAppGeneratorUrl() {
+    if (this.authManager.currentUser) {


No need for this check

@iamareebjamal, otherwise one test will fail in travis ci as it doesn't sign in to test this feature. I included this only after I found that failing case.

Travis CI build - https://travis-ci.com/github/fossasia/open-event-frontend/builds/199132180

You need to set the email of the user in the test. Not checking the case is even worse. It may pass the test and break in production

iamareebjamal · 2020-11-08T22:56:19Z

app/components/events/view/overview/event-apps.js

+    if (this.authManager.currentUser) {
+      return `${ENV.appGenerator.webHost}/?email=${this.authManager.currentUser.email}&apiendpoint=${ENV.APP.apiHost}/${ENV.APP.apiNamespace}/events/${this.eventId}`;
+    }
+    return '#';


Why would you return a

Shall we return ${ENV.appGenerator.webHost}/?

When the check is removed, it won't be needed

iamareebjamal · 2020-11-08T22:56:57Z

app/components/events/view/overview/event-apps.js

-export default class EventApps extends Component {}
+export default class EventApps extends Component {
+    @computed('eventId')
+  get webAppGeneratorUrl() {


Indention error

@iamareebjamal I think it is fine because it got automatically indented like this when I did git commit. Let me know how many spaces need to be included.

iamareebjamal · 2020-11-08T22:58:13Z

app/templates/components/events/view/overview/event-apps.hbs

@@ -7,7 +7,7 @@
      <button class="ui button">{{t 'Generate Android App'}}</button>
    </div>
    <div class="column eight wide center aligned">
-      <button class="ui button">{{t 'Generate Web App'}}</button>
+      <a href="{{this.webAppGeneratorUrl}}" target="_blank" class="ui button" rel="noopener">{{t 'Generate Web App'}}</a>


Suggested change

<a href="{{this.webAppGeneratorUrl}}" target="_blank" class="ui button" rel="noopener">{{t 'Generate Web App'}}</a>

<a href="{{this.webAppGeneratorUrl}}" target="_blank" class="ui button" rel="noopener noreferrer">{{t 'Generate Web App'}}</a>

iamareebjamal · 2020-11-08T22:59:06Z

config/environment.js

-    torii: {}
+    torii: {},
+
+    appGenerator: {


This is not appGenerator, it's webAppGenerator

iamareebjamal · 2020-11-08T22:59:34Z

config/environment.js

+    torii: {},
+
+    appGenerator: {
+      webHost: process.env.WEB_APP_GENERATOR_HOST || (environment === 'production' ? 'https://open-event-wsgen.herokuapp.com' : 'https://open-event-wsgen-dev.herokuapp.com')


No need for a nested field, just write it as webAppGeneratorUrl

I made it nested because we have another button for the android app generator as well. Let me know if I need to make it flat. @iamareebjamal

That will be another field

iamareebjamal · 2020-11-08T23:00:12Z

docs/installation/local.md

@@ -34,6 +34,8 @@ brew link --force gettext
 ```

 - By default, the `.env.example` file specifies the `API_HOST` as `https://open-event-api-dev.herokuapp.com` which is a test deployment of the open-event-server. If you intend to work on just the frontend, this is sufficient. **If however, you intend to work on issues which involve both the frontend and the backend, you must have the [open-event-server](https://github.com/fossasia/open-event-server) already up and running. Please install and set it up first before changing the URL for `API_HOST` to `http://localhost:5000` and proceeding to run the frontend.**
+
+- By default, the `.env.example` file specifies the `WEB_APP_GENERATOR_HOST` as `https://open-event-wsgen-dev.herokuapp.com` which is a test deployment of the open-event-wsgen. If you intend to work on just the frontend, this is sufficient. **If however, you intend to work on issues which involve both the frontend and the website generator, you must have the [open-event-wsgen](https://github.com/fossasia/open-event-wsgen) already up and running. Please install and set it up first before changing the URL for `WEB_APP_GENERATOR_HOST` to `http://localhost:5000` and proceeding to run the frontend.**


localhost:5000 is server URL, it'll conflict

Do I need to change the port for wsgen? Shall I change to 3000? Let me know I'll include in the current PR for this feature in the wsgen.

docs/installation/local.md

iamareebjamal · 2020-11-08T23:01:16Z

.env.example

@@ -2,3 +2,4 @@ GOOGLE_API_KEY="Sample Key"
 API_HOST=https://open-event-api-dev.herokuapp.com
 MAP_DISPLAY=embed
 FASTBOOT_DISABLED=true
+WEB_APP_GENERATOR_HOST=https://open-event-wsgen-dev.herokuapp.com


Since the default one is already specified in env and this is not a major component, please remove it from here

iamareebjamal · 2020-11-10T07:03:45Z

.env.example

Suggested change

FASTBOOT_DISABLED=true

FASTBOOT_DISABLED=true

iamareebjamal · 2020-11-10T07:04:08Z

app/templates/components/events/view/overview/event-apps.hbs

@@ -7,7 +7,7 @@
      <button class="ui button">{{t 'Generate Android App'}}</button>
    </div>
    <div class="column eight wide center aligned">
-      <a href="{{this.webAppGeneratorUrl}}" target="_blank" class="ui button" rel="noopener">{{t 'Generate Web App'}}</a>
+      <a href="{{this.webAppGeneratorUrl}}" target="_blank" class="ui button" rel="noreferrer">{{t 'Generate Web App'}}</a>


Suggested change

<a href="{{this.webAppGeneratorUrl}}" target="_blank" class="ui button" rel="noreferrer">{{t 'Generate Web App'}}</a>

<a href="{{this.webAppGeneratorUrl}}" target="_blank" class="ui button" rel="noopener noreferrer">{{t 'Generate Web App'}}</a>

…nerator env variable flat instead of nested, replace noopener with noreferrer in rel, update local docs for changes in env variables, remove webAppGenerator from env.example as it is not a major integration

…readme to use port 3000 for wsgen

vercel bot deployed to Preview November 8, 2020 15:05 View deployment

dhruvjain99 force-pushed the ftr-intgerate-wsgen branch from 817e36a to 18b233d Compare November 8, 2020 15:26

vercel bot deployed to Preview November 8, 2020 15:26 View deployment

dhruvjain99 force-pushed the ftr-intgerate-wsgen branch from 18b233d to 53ecdf4 Compare November 8, 2020 15:55

vercel bot deployed to Preview November 8, 2020 15:55 View deployment

dhruvjain99 force-pushed the ftr-intgerate-wsgen branch from 53ecdf4 to 001ed94 Compare November 8, 2020 16:08

vercel bot deployed to Preview November 8, 2020 16:08 View deployment

iamareebjamal changed the title ~~ftr: Integrate web app generator with event dashboard~~ feat: Integrate web app generator with event dashboard Nov 8, 2020

auto-label bot added the feature label Nov 8, 2020

iamareebjamal reviewed Nov 8, 2020

View reviewed changes

config/environment.js Outdated

torii: {}

torii: {},

appGenerator: {

Copy link

Member

iamareebjamal Nov 8, 2020

Choose a reason for hiding this comment

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

This is not appGenerator, it's webAppGenerator

iamareebjamal reviewed Nov 8, 2020

View reviewed changes

docs/installation/local.md Show resolved Hide resolved

iamareebjamal reviewed Nov 8, 2020

View reviewed changes

vercel bot deployed to Preview November 10, 2020 07:02 View deployment

iamareebjamal reviewed Nov 10, 2020

View reviewed changes

.env.example Outdated

FASTBOOT_DISABLED=true

Copy link

Member

iamareebjamal Nov 10, 2020

Choose a reason for hiding this comment

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

Suggested change

FASTBOOT_DISABLED=true

FASTBOOT_DISABLED=true

iamareebjamal reviewed Nov 10, 2020

View reviewed changes

ref: Indentation, pass authManager and eventId in test, make webAppGe…

b3794b8

…nerator env variable flat instead of nested, replace noopener with noreferrer in rel, update local docs for changes in env variables, remove webAppGenerator from env.example as it is not a major integration

dhruvjain99 force-pushed the ftr-intgerate-wsgen branch from 4d6886b to b3794b8 Compare November 10, 2020 07:04

ref: Add noopener as rel value in anchor tag for Generate Web App button

6de3285

vercel bot deployed to Preview November 10, 2020 07:07 View deployment

vercel bot deployed to Preview November 10, 2020 07:12 View deployment

iamareebjamal previously approved these changes Nov 10, 2020

View reviewed changes

dhruvjain99 dismissed iamareebjamal’s stale review via d159d76 November 10, 2020 07:25

ref: Use 'api' as query param instead of 'apiendpoint', update local …

17ae6d1

…readme to use port 3000 for wsgen

dhruvjain99 force-pushed the ftr-intgerate-wsgen branch from d159d76 to 17ae6d1 Compare November 10, 2020 07:27

vercel bot deployed to Preview November 10, 2020 07:32 View deployment

dhruvjain99 requested a review from iamareebjamal November 10, 2020 07:42

iamareebjamal merged commit a5ee487 into fossasia:development Nov 10, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Integrate web app generator with event dashboard #5529

feat: Integrate web app generator with event dashboard #5529

dhruvjain99 commented Nov 8, 2020 •

edited

Loading

vercel bot commented Nov 8, 2020 •

edited

Loading

codecov bot commented Nov 8, 2020 •

edited

Loading

dhruvjain99 commented Nov 8, 2020

iamareebjamal Nov 8, 2020

dhruvjain99 Nov 9, 2020

iamareebjamal Nov 9, 2020 •

edited

Loading

iamareebjamal Nov 8, 2020

dhruvjain99 Nov 9, 2020

iamareebjamal Nov 9, 2020

iamareebjamal Nov 8, 2020

dhruvjain99 Nov 9, 2020

iamareebjamal Nov 9, 2020

iamareebjamal Nov 8, 2020

iamareebjamal Nov 8, 2020

iamareebjamal Nov 8, 2020

dhruvjain99 Nov 9, 2020 •

edited

Loading

iamareebjamal Nov 9, 2020

iamareebjamal Nov 8, 2020

dhruvjain99 Nov 9, 2020

iamareebjamal Nov 9, 2020

iamareebjamal Nov 8, 2020

iamareebjamal Nov 10, 2020

iamareebjamal Nov 10, 2020

	<a href="{{this.webAppGeneratorUrl}}" target="_blank" class="ui button" rel="noopener">{{t 'Generate Web App'}}</a>
	<a href="{{this.webAppGeneratorUrl}}" target="_blank" class="ui button" rel="noopener noreferrer">{{t 'Generate Web App'}}</a>

feat: Integrate web app generator with event dashboard #5529

feat: Integrate web app generator with event dashboard #5529

Conversation

dhruvjain99 commented Nov 8, 2020 • edited Loading

Short description of what this resolves:

Changes proposed in this pull request:

Checklist

vercel bot commented Nov 8, 2020 • edited Loading

codecov bot commented Nov 8, 2020 • edited Loading

Codecov Report

dhruvjain99 commented Nov 8, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

iamareebjamal Nov 9, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dhruvjain99 Nov 9, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dhruvjain99 commented Nov 8, 2020 •

edited

Loading

vercel bot commented Nov 8, 2020 •

edited

Loading

codecov bot commented Nov 8, 2020 •

edited

Loading

iamareebjamal Nov 9, 2020 •

edited

Loading

dhruvjain99 Nov 9, 2020 •

edited

Loading