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.

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

Feature/chat mentors #6963

Merged
merged 39 commits into from
Aug 12, 2020
Merged

Feature/chat mentors #6963

merged 39 commits into from
Aug 12, 2020

Conversation

androolloyd
Copy link
Contributor

@androolloyd androolloyd commented Jun 23, 2020

Description

Chat has moved into a flyout sidebar.

Sponsors can now set chat mentors for their bounties through the hackathon integrated view.

Refers/Fixes
Testing

@codecov
Copy link

codecov bot commented Jun 25, 2020

Codecov Report

Merging #6963 into master will decrease coverage by 0.50%.
The diff coverage is 30.53%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #6963      +/-   ##
==========================================
- Coverage   26.66%   26.15%   -0.51%     
==========================================
  Files         294      296       +2     
  Lines       28118    29330    +1212     
  Branches     4135     4345     +210     
==========================================
+ Hits         7498     7672     +174     
- Misses      20349    21387    +1038     
  Partials      271      271              
Impacted Files Coverage Δ
app/app/context.py 0.00% <ø> (ø)
app/app/urls.py 85.96% <ø> (-0.25%) ⬇️
app/app/utils.py 24.62% <ø> (+0.07%) ⬆️
app/chat/management/commands/get_user_presence.py 0.00% <0.00%> (ø)
.../management/commands/setup_hackathon_event_chat.py 0.00% <0.00%> (ø)
...management/commands/sync_event_bounties_to_chat.py 0.00% <0.00%> (ø)
app/chat/management/commands/sync_users_to_chat.py 0.00% <0.00%> (ø)
...p/dashboard/management/commands/activity_report.py 0.00% <0.00%> (ø)
.../dashboard/management/commands/cleanup_db_space.py 0.00% <ø> (ø)
...oard/management/commands/grant_txn_failed_email.py 0.00% <0.00%> (ø)
... and 97 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 477275e...15682d8. Read the comment docs.

@androolloyd androolloyd changed the base branch from master to stable June 29, 2020 12:13
@androolloyd androolloyd marked this pull request as ready for review June 29, 2020 12:13
Copy link
Contributor

@PixelantDesign PixelantDesign left a comment

Choose a reason for hiding this comment

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

Hey Andrew! Could you post a video? Thanks!

@danlipert
Copy link
Contributor

@androolloyd looks like there are some conflicts, can you fix and rebase? thanks!

@danlipert
Copy link
Contributor

oh also please put against master

Copy link
Contributor

@octavioamu octavioamu left a comment

Choose a reason for hiding this comment

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

some config urls are pointing to androolloyd.com

chatdata/config/config.json Outdated Show resolved Hide resolved
@danlipert danlipert marked this pull request as draft July 9, 2020 12:06
@androolloyd androolloyd changed the base branch from stable to master July 14, 2020 15:15
fix for infinite scrolling on project directory
… on the dom, and lazy load the sidebar/iframe,

in conjunction with a new notification approach for the main app, doesn't use postMessage and uses the websocket to the chat instead
- sidebar is full width for mobile now, and has a header(needs styling)
- login flow is improved for mobile apps.
… and content document of hte iframe through cross origin setup.
@androolloyd androolloyd force-pushed the feature/chat-mentors branch from 69f696d to 1cf752a Compare July 14, 2020 15:33
@androolloyd androolloyd marked this pull request as ready for review July 20, 2020 14:08
app/retail/templates/shared/head.html Outdated Show resolved Hide resolved
app/dashboard/views.py Outdated Show resolved Hide resolved
@owocki
Copy link
Contributor

owocki commented Jul 29, 2020

what is the ticket associated with this? is this still an active PR?

app/dashboard/templates/dashboard/index-vue.html Outdated Show resolved Hide resolved
app/dashboard/views.py Show resolved Hide resolved
app/retail/views.py Outdated Show resolved Hide resolved
chatdata/config/config.json Outdated Show resolved Hide resolved
@danlipert
Copy link
Contributor

@octavioamu this look good to you? other than the conflicts?

@thelostone-mc thelostone-mc merged commit 8401a49 into master Aug 12, 2020
@PixelantDesign
Copy link
Contributor

yayyyyy

@thelostone-mc thelostone-mc deleted the feature/chat-mentors branch October 6, 2020 05:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants