#104 Fix duplicate buttons
Closed 5 years ago by feisal. Opened 5 years ago by feisal.
Unknown source fix-duplicate-buttons  into  master

removed duplicate button
feysal-Ibrahim • 5 years ago  
setting up dev environment
feysal-Ibrahim • 5 years ago  
@@ -49,7 +49,11 @@

  )

  

  SELENIUM_SCREENSHOT_DIR = PROJECT_DIR.child('selenium-screenshots')

+ DEBUG_TOOLBAR_CONFIG = {

+     'SHOW_TOOLBAR_CALLBACK': lambda x: True

+ }

  

+ DEBUG_TOOLBAR_PATCH_SETTINGS = False

  

  # Uses a separate Docker container to act as the Redis server

  CELERY_BROKER_URL = 'redis://redis:6379/0'

@@ -4,11 +4,17 @@

  from django.conf import settings

  from django.conf.urls import include, url

  from django.contrib import admin

+ from django.conf.urls.static import static

  

  urlpatterns = [

      url(r'^oidc/', include('mozilla_django_oidc.urls')),

      url(r'^', include('happinesspackets.messaging.urls', namespace="messaging")),

  ]

+ if settings.DEBUG:

+     import debug_toolbar

+     urlpatterns += [

+         url(r'^__debug__/', include(debug_toolbar.urls)),

+     ]

  

  if settings.ADMIN_ENABLED or settings.DEBUG:

      urlpatterns.append(url(r'^drunken-octo-lama/', include(admin.site.urls)))

@@ -18,11 +18,6 @@

          you work with are happy to work with you, is an awesome feeling. With Fedora Happiness Packets, we're

          trying to spread that feeling.

      </p>

- 

-     <p class="text-center">

-         <a class="btn btn-primary btn-lg btn-responsive" href="{% url 'messaging:send' %}" role="button">Send some happiness now! <img class="emoji" src="static/images/emoji/loveletter.png" alt="💌" title="Love letter" aria-label="Emoji: Love letter"></a>

-     </p>

- 

      <h2>How does it work?</h2>

      <p>

          Openly expressing appreciation, gratitude, or happiness to other people can be difficult. This is especially

Removed one of the duplicate of send me happiness buttons. this change would prettify the user interface giving the user the needed experience to use the webapp. While the two had urls, one of them was lacking logic behind which the url can return the request needed hence the removal.

@jflory7 as you have also said ,I have sent this change also to the upstream project, mxsasha/happinesspackets. with screenshot of the images. To be a considerate downstream project, If upstream accepts it, we can apply the patch downstream to our project.

@jflory7 @jonatoni kindly review it. am still working on other issues related to the emails being not sent. Kindly if you have questions about this PR. You can contact me through my email feisalibrahim19@gmail.com

@feisal Thanks. We'll hold on this pull request until mxsasha/happinesspackets#46 is reviewed. If upstream accepts, I can apply the patch from upstream so the changes are mirrored to our downstream fork.

However, your pull request changes more than the button, it also adds debug toolbars and settings. Can you explain why you are making this change in this pull request? I do not see why this is necessary for the pull request.

Metadata Update from @jflory7:
- Pull-request tagged with: blocked, improvement, type - frontend, type - summer coding
- Request assigned

5 years ago

Metadata Update from @jflory7:
- Pull-request tagged with: needs changes

5 years ago

@feisal Thanks. We'll hold on this pull request until mxsasha/happinesspackets#46 is reviewed. If upstream accepts, I can apply the patch from upstream so the changes are mirrored to our downstream fork.
However, your pull request changes more than the button, it also adds debug toolbars and settings. Can you explain why you are making this change in this pull request? I do not see why this is necessary for the pull request

.@jflory7 I am so sorry for this changes. i don't understand but i see that whenever i checkout from one branch to another, git is adding the other files for the other branch that is why instead of showing one edited file with one branch it shows you all the edited files in all branches i created. I will make sure to resolve this issue and to recreate another pull request with only the file needed to change.

WHY THAT CHANGES
@jflory7 i have been getting some errors until i applied some changes in the setting file and i allowed the setting to use dev environment, after running again i got another error saying ( 'djdt' is not a registered namespace). so i had to refigure out the debug toolbar and the app run however am still getting some error when it come logging in and creating happiness packet(I KINDLY WANT YOUR ASSISTANCE IN THIS ISSUE)..Hence the changes you see

i don't understand but i see that whenever i checkout from one branch to another, git is adding the other files for the other branch that is why instead of showing one edited file with one branch it shows you all the edited files in all branches i created.

No problem. This is a common task when working with git. I recommend reading about the git feature branch workflow. This workflow is used widely across the industry / real-world for working on changes to git projects.

I'm not sure what tool you are using for git, but always start on the master branch before creating a new branch. Otherwise, every branch you make keeps changes from your last branch.

i have been getting some errors until i applied some changes in the setting file and i allowed the setting to use dev environment, after running again i got another error saying ( 'djdt' is not a registered namespace). so i had to refigure out the debug toolbar and the app run however am still getting some error when it come logging in and creating happiness packet

I see. We should review that in a separate pull request. This pull request, and the one sent to upstream, should only change the button.

@jflory7 you can close this PR as i now have configure my git branch well and things are going good now. i have create PR for updated readme with one file (only needed file)

Pull-Request has been closed by feisal

5 years ago