fix: fixing weird vertical shift in event dashboard #3601

maze-runnar · 2019-11-04T06:41:02Z

Short description of what this resolves:

In event dashboard there was a weird vertical shift on clicking the publish button . I fixed this by adding an extrra condition to check is unverified-user-message is available or not .

Changes proposed in this pull request:

in http://localhost:4200/events/d48cc85c/export also -

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)

maze-runnar · 2019-11-04T09:47:14Z

@kushthedude sir please check it ?

kushthedude · 2019-11-04T15:10:09Z

app/templates/events/view.hbs

-          {{unverified-user-message}}
+{{#if unverified-user-message}}
+  {{#if (or (eq session.currentRouteName 'events.view.index') (eq session.currentRouteName 'events.view.export'))}}
+    {{#if (eq model.state 'draft')}}


Make the above if merge with this.

I am not understanding, what you are saying?can you please explain?

Make the above if merge with this.

Merge the top if with this if

maze-runnar · 2019-11-06T03:08:21Z

@kushthedude please check it ?

kushthedude · 2019-11-06T03:36:28Z

app/templates/events/view.hbs

@@ -1,5 +1,5 @@
 {{#if (or (eq session.currentRouteName 'events.view.index') (eq session.currentRouteName 'events.view.export'))}}
-  {{#if (eq model.state 'draft')}}
+  {{#if (and (eq model.state 'draft') (unverified-user-message))}}


Can you please provide a GIF showing this change?

Can you please provide a GIF showing this change?

it's working fine .

kushthedude · 2019-11-06T03:37:01Z

Also make ~~Fix~~ fix

maze-runnar · 2019-11-06T03:50:40Z

i have got a problem here. I don't know why local host is showing that there are no upcoming events and my login is showing invalid credentials . So i created a new account but did not recieve a verfication mail yet .
And that's why i am not able to open any event dashboard. Can you please suggest me anything ?

maze-runnar · 2019-11-06T03:51:07Z

kushthedude · 2019-11-06T03:59:00Z

Which server are you using?

maze-runnar · 2019-11-06T04:09:04Z

https://open-event-api-dev.herokuapp.com

kushthedude · 2019-11-06T04:21:15Z

@iamareebjamal would answer it better.

…

On Wed, 6 Nov, 2019, 09:39 Sundaram Dubey, ***@***.***> wrote: https://open-event-api-dev.herokuapp.com — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#3601?email_source=notifications&email_token=AKQMTLSWTZJAZ43FTU26XATQSI7ODA5CNFSM4JIPSPHKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEDFGEOI#issuecomment-550134329>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AKQMTLTA4LUTGT6HC526URTQSI7ODANCNFSM4JIPSPHA> .

iamareebjamal · 2019-11-06T06:23:31Z

Server was reset, so it doesn't have any data yet. Including the SMTP config. Will add credentials today

maze-runnar · 2019-11-06T06:43:30Z

Ok .

maze-runnar · 2019-11-07T09:14:24Z

@kushthedude i am still not able to login .

maze-runnar · 2019-11-07T09:40:50Z

it is not sending verification mail for localhost .

iamareebjamal · 2019-11-07T10:02:43Z

Try again

maze-runnar · 2019-11-07T17:25:21Z

it's working fine now .

maze-runnar · 2019-11-13T14:13:30Z

@kushthedude please review this .

kushthedude · 2019-11-20T08:04:07Z

it's working fine now .

Are you sure it was working fine ?

kushthedude · 2019-11-20T08:04:32Z

@maze-runnar Did you updated the GIF in your PR description after you made changes ?

This reverts commit 64f650d.

maze-runnar · 2019-11-20T09:13:57Z

@maze-runnar Did you updated the GIF in your PR description after you made changes ?

i did .

maze-runnar · 2019-11-20T09:17:35Z

it's working fine now .

Are you sure it was working fine ?

yes it was .

kushthedude · 2019-11-20T09:23:08Z

No it is not working.

…

On Wed, 20 Nov, 2019, 14:47 Sundaram Dubey, ***@***.***> wrote: it's working fine now . Are you sure it was working fine ? yes it was . — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#3601?email_source=notifications&email_token=AKQMTLVFGZVR27RX3SHIYVDQUT6DDA5CNFSM4JIPSPHKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEERJHDI#issuecomment-555914125>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AKQMTLU2MW5NCIFDAUZVSNLQUT6DDANCNFSM4JIPSPHA> .

maze-runnar · 2019-11-20T09:24:47Z

No it is not working.
…
On Wed, 20 Nov, 2019, 14:47 Sundaram Dubey, @.***> wrote: it's working fine now . Are you sure it was working fine ? yes it was . — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#3601?email_source=notifications&email_token=AKQMTLVFGZVR27RX3SHIYVDQUT6DDA5CNFSM4JIPSPHKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEERJHDI#issuecomment-555914125>, or unsubscribe https://github.com/notifications/unsubscribe-auth/AKQMTLU2MW5NCIFDAUZVSNLQUT6DDANCNFSM4JIPSPHA .

but i cheked properly 😕

kushthedude · 2019-11-20T09:40:21Z

Dont worry I have reverted the PR please file new one with proper testing. On Wed, 20 Nov, 2019, 14:54 Sundaram Dubey, <[email protected]> wrote:

…

No it is not working. … <#m_98648015836193756_> On Wed, 20 Nov, 2019, 14:47 Sundaram Dubey, *@*.***> wrote: it's working fine now . Are you sure it was working fine ? yes it was . — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#3601 <#3601>?email_source=notifications&email_token=AKQMTLVFGZVR27RX3SHIYVDQUT6DDA5CNFSM4JIPSPHKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEERJHDI#issuecomment-555914125>, or unsubscribe https://github.com/notifications/unsubscribe-auth/AKQMTLU2MW5NCIFDAUZVSNLQUT6DDANCNFSM4JIPSPHA . but i cheked properly 😕 — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#3601?email_source=notifications&email_token=AKQMTLU37QPJYC6HMNWSG63QUT66DA5CNFSM4JIPSPHKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEERJ46Y#issuecomment-555916923>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AKQMTLTDDJHC67NO6A3BIYDQUT66DANCNFSM4JIPSPHA> .

Fix: fixing weird vertical shift in event dashboard

58cf59f

kushthedude reviewed Nov 4, 2019

View reviewed changes

Merge branch 'development' into patch-6

c6a98f6

maze-runnar requested a review from kushthedude November 5, 2019 14:30

merging above if with this if

4f45e08

kushthedude reviewed Nov 6, 2019

View reviewed changes

maze-runnar changed the title ~~Fix: fixing weird vertical shift in event dashboard~~ fix: fixing weird vertical shift in event dashboard Nov 6, 2019

auto-label bot added the fix label Nov 6, 2019

kushthedude closed this Nov 6, 2019

kushthedude reopened this Nov 6, 2019

maze-runnar requested a review from kushthedude November 7, 2019 17:31

maze-runnar added 2 commits November 11, 2019 15:43

Merge branch 'development' into patch-6

36a664a

Merge branch 'development' into patch-6

903f951

Merge branch 'development' into patch-6

333ff6b

kushthedude approved these changes Nov 17, 2019

View reviewed changes

kushthedude requested review from iamareebjamal and uds5501 November 17, 2019 15:15

iamareebjamal approved these changes Nov 17, 2019

View reviewed changes

iamareebjamal merged commit 64f650d into fossasia:development Nov 17, 2019

kushthedude added a commit that referenced this pull request Nov 20, 2019

Revert "fix: fixing weird vertical shift in event dashboard (#3601)"

16daaea

This reverts commit 64f650d.

kushthedude mentioned this pull request Nov 20, 2019

Revert "fix: fixing weird vertical shift in event dashboard" #3643

Merged

maze-runnar deleted the patch-6 branch November 20, 2019 09:32

fix: fixing weird vertical shift in event dashboard #3601

fix: fixing weird vertical shift in event dashboard #3601

Uh oh!

Conversation

maze-runnar commented Nov 4, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Short description of what this resolves:

Changes proposed in this pull request:

Checklist

Uh oh!

maze-runnar commented Nov 4, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kushthedude Nov 4, 2019

Choose a reason for hiding this comment

Uh oh!

maze-runnar Nov 4, 2019

Choose a reason for hiding this comment

Uh oh!

kushthedude Nov 5, 2019

Choose a reason for hiding this comment

Uh oh!

maze-runnar Nov 6, 2019

Choose a reason for hiding this comment

Uh oh!

maze-runnar commented Nov 6, 2019

Uh oh!

kushthedude Nov 6, 2019

Choose a reason for hiding this comment

Uh oh!

maze-runnar Nov 7, 2019

Choose a reason for hiding this comment

Uh oh!

kushthedude commented Nov 6, 2019

Uh oh!

maze-runnar commented Nov 6, 2019

Uh oh!

maze-runnar commented Nov 6, 2019

Uh oh!

kushthedude commented Nov 6, 2019

Uh oh!

maze-runnar commented Nov 6, 2019

Uh oh!

kushthedude commented Nov 6, 2019 via email

Uh oh!

iamareebjamal commented Nov 6, 2019

Uh oh!

maze-runnar commented Nov 6, 2019

Uh oh!

maze-runnar commented Nov 7, 2019

Uh oh!

maze-runnar commented Nov 7, 2019

Uh oh!

iamareebjamal commented Nov 7, 2019

Uh oh!

maze-runnar commented Nov 7, 2019

Uh oh!

maze-runnar commented Nov 13, 2019

Uh oh!

kushthedude commented Nov 20, 2019

Uh oh!

kushthedude commented Nov 20, 2019

Uh oh!

maze-runnar commented Nov 20, 2019

Uh oh!

maze-runnar commented Nov 20, 2019

Uh oh!

kushthedude commented Nov 20, 2019 via email

Uh oh!

maze-runnar commented Nov 20, 2019

Uh oh!

kushthedude commented Nov 20, 2019 via email

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

maze-runnar commented Nov 4, 2019 •

edited

Loading

maze-runnar commented Nov 4, 2019 •

edited

Loading