Skip to content
This repository has been archived by the owner on Aug 7, 2024. It is now read-only.

fix: Use Freshdesk widget in load screen #1546

Merged
merged 16 commits into from
Jul 6, 2021
Merged

Conversation

faucomte97
Copy link
Contributor

@faucomte97 faucomte97 commented Jun 29, 2021

This change is Reviewable

@faucomte97 faucomte97 self-assigned this Jun 29, 2021
Copy link
Collaborator

@razvan-pro razvan-pro left a comment

Choose a reason for hiding this comment

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

Reviewed 3 of 3 files at r1.
Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @faucomte97)


game_frontend/public/handlebars_template.html, line 144 at r1 (raw file):

      FreshworksWidget('open');
    });
  </script>

Should we move the freshdesk section to common and import it here and in portal to avoid duplicate code?


game_frontend/src/components/GameView/index.js, line 101 at r1 (raw file):

        </LoadingText>
        <LoadingText variant='body1' color='inherit'>
          If the game doesn’t load after 60 seconds, please <a href="#" className="freshdesk__contact-us">contact us</a>.

Minor, I'd suggest changing the # in href to javascript:; so that the URL in the browser top bar doesn't change 🙂

Copy link
Contributor Author

@faucomte97 faucomte97 left a comment

Choose a reason for hiding this comment

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

Reviewable status: 0 of 4 files reviewed, 1 unresolved discussion (waiting on @faucomte97 and @razvan-pro)


game_frontend/public/handlebars_template.html, line 144 at r1 (raw file):

Previously, razvan-pro (Razvan Mahu) wrote…

Should we move the freshdesk section to common and import it here and in portal to avoid duplicate code?

Done.

Copy link
Collaborator

@razvan-pro razvan-pro left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewed 2 of 3 files at r7, 1 of 1 files at r8, 1 of 1 files at r9.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @faucomte97)

Copy link
Collaborator

@razvan-pro razvan-pro left a comment

Choose a reason for hiding this comment

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

Reviewed 1 of 2 files at r10, 2 of 2 files at r11.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @faucomte97)

Copy link
Collaborator

@razvan-pro razvan-pro left a comment

Choose a reason for hiding this comment

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

Reviewed 2 of 2 files at r12.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @faucomte97)


game_frontend/src/components/GameView/index.js, line 105 at r12 (raw file):

        <LoadingText variant='body1' color='inherit'>
          We are building your game... ⏱<br />
          If the game doesn’t load after 60 seconds, please <a className="freshdesk__contact-us" onClick={() => {this.openFreshworksWidget();}} style={{"cursor": "pointer", "textDecoration": "underline",}}>contact us</a>.

Does onClick work like onClick={this.openFreshworksWidget}? It would be easier to read if so 🙂

Copy link
Contributor Author

@faucomte97 faucomte97 left a comment

Choose a reason for hiding this comment

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

Reviewable status: 4 of 5 files reviewed, 1 unresolved discussion (waiting on @razvan-pro)


game_frontend/src/components/GameView/index.js, line 105 at r12 (raw file):

Previously, razvan-pro (Razvan Mahu) wrote…

Does onClick work like onClick={this.openFreshworksWidget}? It would be easier to read if so 🙂

Done.

Copy link
Collaborator

@razvan-pro razvan-pro left a comment

Choose a reason for hiding this comment

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

Reviewed 1 of 1 files at r13.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @faucomte97)

@codecov
Copy link

codecov bot commented Jul 6, 2021

Codecov Report

Merging #1546 (85c93a1) into development (2f98e80) will increase coverage by 0.04%.
The diff coverage is 100.00%.

Impacted file tree graph

@@               Coverage Diff               @@
##           development    #1546      +/-   ##
===============================================
+ Coverage        67.17%   67.21%   +0.04%     
===============================================
  Files              160      160              
  Lines             3266     3267       +1     
  Branches           232      231       -1     
===============================================
+ Hits              2194     2196       +2     
+ Misses            1044     1043       -1     
  Partials            28       28              
Impacted Files Coverage Δ
game_frontend/src/components/GameView/index.js 90.24% <100.00%> (+2.74%) ⬆️

@faucomte97 faucomte97 merged commit b2ad721 into development Jul 6, 2021
@faucomte97 faucomte97 deleted the load_text_link branch July 6, 2021 15:46
adamkirchberger pushed a commit to adamkirchberger/aimmo that referenced this pull request Sep 12, 2021
* fix: Use Freshdesk widget for contact us link instead

* Update snapshot test

* Use Freshdesk widget template

* Update snapshot

* Use styles instead of href

* Update snapshot

* Fix linting errors

* Fix spacing

* Handle widget opening in React

* Declare widget

* Update snapshot

* Add missing snapshot test

* Merge branch 'development' into load_text_link

* Refactor loading text

* Add unit test

* Simplify onClick
dionizh pushed a commit that referenced this pull request Oct 25, 2021
* replace os type with enum

* move banner to single print statement

* update setup to use factory

* refactor cmd to allow comment and raise correctly

* update setup methods to use task lists

* set cmd default comment to caller func name

* fix: update setup script to match manual steps

* Merge remote-tracking branch 'upstream/development' into akirchberger/fix_aimmo_setup

* fix: set setup output to utf-8

* fix: update setup steps for linux

* add missing doc param

* Merge branch 'development' into akirchberger/fix_aimmo_setup

* fix: improve game load time (#1547)

* fix: delete only running games in game manager

* get only running games in game_manager

* delete unkown games in game manager

* fix game manager tests

* test list running games

* Merge branch 'development' into razvan-pro/issue1496

* remove remove_stopped_games

* 0.69.13b486

Automatically generated by python-semantic-release

* fix: Use Freshdesk widget in load screen (#1546)

* fix: Use Freshdesk widget for contact us link instead

* Update snapshot test

* Use Freshdesk widget template

* Update snapshot

* Use styles instead of href

* Update snapshot

* Fix linting errors

* Fix spacing

* Handle widget opening in React

* Declare widget

* Update snapshot

* Add missing snapshot test

* Merge branch 'development' into load_text_link

* Refactor loading text

* Add unit test

* Simplify onClick

* 0.69.14b492

Automatically generated by python-semantic-release

* build(deps): bump ws from 5.2.2 to 5.2.3 in /game_frontend (#1549)

* build(deps): bump ws from 5.2.2 to 5.2.3 in /game_frontend

Bumps [ws](https://github.com/websockets/ws) from 5.2.2 to 5.2.3.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](websockets/ws@5.2.2...5.2.3)

---
updated-dependencies:
- dependency-name: ws
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* Merge branch 'development' into dependabot/npm_and_yarn/game_frontend/ws-5.2.3

* 0.69.14b496

Automatically generated by python-semantic-release

* 0.69.14

Automatically generated by python-semantic-release

* fix: Fix empty name bug in Game (#1550)

* fix: Fix empty name bug in Game model

* Merge branch 'development' into fix_admin_pages

* Merge branch 'development' into fix_admin_pages

* 0.69.15b504

Automatically generated by python-semantic-release

* ci: update cicd test step, remove unused files (#1556)

* ci: update cicd test step, remove unused files

* fix: possibly don't need this

* ci: install codecov dependencies

* ci: fix pytest run, revert installs

* 0.69.15b511

Automatically generated by python-semantic-release

* fix: Fix admin pages for old games without classes too (#1555)

* fix: Cater for old games without classes

* Merge branch 'development' into fix_admin_pages_pt2

* 0.69.16b514

Automatically generated by python-semantic-release

* fix: set setup output to utf-8

* fix: update setup steps for linux

* add missing doc param

* add missing doc param

* fix: cmd stdout empty result

* fix: set minikube and kubectl to latest versions

* refactor: split result to read better

* fix: add banner notice for mac and linux support only.

* fix: add sqlite3 update task

* fix: rename pipenv run task to build pipenv venv

* fix: remove unnecessary tasks from prev code

* Merge remote-tracking branch 'upstream/development' into akirchberger/fix_aimmo_setup

* Merge remote-tracking branch 'upstream/development' into akirchberger/fix_aimmo_setup

* Merge branch 'akirchberger/fix_aimmo_setup' of github.com:adamkirchberger/aimmo into akirchberger/fix_aimmo_setup

* fix: remove snap install

* fix: decode stdout bytes

* Merge branch 'development' into akirchberger/fix_aimmo_setup
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants