About Page #56

absternator · 2024-10-16T15:29:53Z

This PR creates About page...The text is still a WIP and is waiting updates

DO NOT merge until about text is updated

codecov · 2024-10-16T15:32:00Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 88.19%. Comparing base (156fded) to head (072a792).
Report is 27 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main      #56      +/-   ##
==========================================
+ Coverage   88.07%   88.19%   +0.11%     
==========================================
  Files          46       47       +1     
  Lines        2206     2227      +21     
  Branches      301      298       -3     
==========================================
+ Hits         1943     1964      +21     
  Misses        251      251              
  Partials       12       12

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

david-mears-2

Thanks, this is great. I left a lot of comments but most are suggested text changes that I hadn't seen before I went through with a fine-tooth comb.

pages/about.vue

david-mears-2 · 2024-10-16T15:55:40Z

pages/about.vue

+    </p>
+    <h4>Contact us:</h4>
+    <p>
+      If you have any queries regarding DAEDALUS Explore, please contact: TODO


Leaving a comment to make sure we resolve this before merging in

david-mears-2 · 2024-10-16T17:13:17Z

tests/unit/pages/About.spec.ts

+import About from "@/pages/about.vue";
+import { mount } from "@vue/test-utils";
+import { describe, expect, it } from "vitest";
+
+describe("about page", () => {
+  it("should render about page", () => {
+    const component = mount(About);
+
+    expect(component.text()).toContain("About");
+  });
+});


Here is the equivalent in the style of Nuxt test utils. It passes.

Suggested change

import About from "@/pages/about.vue";

import { mount } from "@vue/test-utils";

import { describe, expect, it } from "vitest";

describe("about page", () => {

it("should render about page", () => {

const component = mount(About);

expect(component.text()).toContain("About");

});

});

import About from "@/pages/about.vue";

import { mountSuspended } from "@nuxt/test-utils/runtime";

import { describe, expect, it } from "vitest";

describe("about page", () => {

it("should render about page", async () => {

const component = await mountSuspended(About);

expect(component.text()).toContain("About");

});

});

Of course if we do automate some of the about page text then that deserves a unit test.

sorry wondering what the mountSuspended does? because it passes with regular mount?

It doesn’t make an immediate difference in this case. It’s the standard way of mounting a component with Nuxt test utils. It wraps ‘mount’ from Vue test utils while “allowing access to injections from your Nuxt plugins“.

oh okay are we using plugins?

I think Pinia is a plugin.

@absternator Could you add to this unit test for the {{ numberOfPandemics }} and {{ numberOfCountries }} calculations?

pages/about.vue

david-mears-2 · 2024-10-16T17:34:06Z

pages/about.vue

+      <li>Prevalence</li>
+      <li>Hospital demand</li>
+      <li>Deaths</li>


Also, these three (but not 'economic losses' as that is separate from the time series) can be taken straight out of metadata: see mocks/responses/metadata.json under time_series to clue you into how to get that out of the appStore. As a result of doing that change, you'll already see that we've added a new time series that hadn't yet made it into the about page's text!

Since updates to time series, which you can see in the new version of the metadata.json file now on main, these now need to be drawn from appStore.metadata?.results.time_series_groups instead of appStore.metadata?.results.time_series

pages/about.vue

david-mears-2 · 2024-10-16T17:47:46Z

pages/about.vue

+
+    <p>
+      <strong>pictogrammersMaterialBacteria.svg</strong><br>
+      Icons by


Suggested change

Icons by

Icon by

This was missed out

assets/img/prepare-logo.png

pages/about.vue

…o about-page

david-mears-2 · 2024-10-17T10:20:39Z

~~Btw playwright visual testing is very brittle at the moment on all branches, partly because the model itself is constantly being updated so the data being displayed is changing!~~

…o about-page

This commit refactors the about page by adding the Jameel community logo and fixing optional chaining in the script setup section. The Jameel community logo is now displayed on the page, enhancing the visual appeal. Additionally, the optional chaining for retrieving the number of pandemics and countries from the app store metadata has been fixed to prevent potential errors.

pages/about.vue

Co-authored-by: David Mears <[email protected]>

… into about-page

david-mears-2 · 2024-10-23T09:33:34Z

When this is merged with the code for the globe, that will by default still be visible on this page. I suggest doing something like I did here for the sake of a demo.

david-mears-2 · 2024-10-23T09:52:54Z

On small screens the logos stack vertically in a suboptimal way - needs a little more space, and needs centering

…o about-page

EmmaLRussell · 2024-10-23T14:40:22Z

Just to keep track of everything in YT, I've added a ticket for this: https://mrc-ide.myjetbrains.com/youtrack/issue/JIDEA-172/About-page

EmmaLRussell

Since this and the globe ticket are likely to be merged separately, I've made a separate ticket for hiding globe on this page: https://mrc-ide.myjetbrains.com/youtrack/agiles/103-73/current

…o about-page

…ents

…o about-page

…d pathogen parameters

EmmaLRussell

Looks good!

I think this comment from David still needs to be done (it's a change requested on a change already made)

About Page #56 (comment)

EmmaLRussell · 2024-10-25T11:59:38Z

tests/unit/components/ParameterForm.spec.ts

+    const vueSelects = component.findAllComponents(VueSelect).slice(0, 2);
    expect(vueSelects.length).toBe(2);


What's the idea with this change? Are there more vue selects than there were? It seems odd to slice an array, and then check its length that you've just modified!

i had initially done something else but reverted this now

EmmaLRussell

Still don't think that R&D line is quite there, but go ahead and merge when that is updated.

pages/about.vue

Co-authored-by: Emma Russell <[email protected]>

Add about page

7d6ec91

absternator assigned david-mears-2 Oct 16, 2024

absternator requested a review from david-mears-2 October 16, 2024 15:30

absternator unassigned david-mears-2 Oct 16, 2024

Refactor about page content and add new pandemic impact scenarios

3fca5f2

david-mears-2 requested changes Oct 16, 2024

View reviewed changes

david-mears-2 reviewed Oct 16, 2024

View reviewed changes

pages/about.vue Show resolved Hide resolved

absternator added 4 commits October 17, 2024 10:40

PR fixes

8cafaf7

Refactor about page test to use async mount

3702664

Refactor about page layout and update logos

5ee0a3d

Merge branch 'main' of https://github.com/j-idea/daedalus-web-app int…

9e19bf4

…o about-page

absternator added 4 commits October 18, 2024 14:07

Merge branch 'main' of https://github.com/j-idea/daedalus-web-app int…

34a8e50

…o about-page

Update EPPI Initiative website link in about.vue

f408719

Merge branch 'main' of https://github.com/j-idea/daedalus-web-app int…

870e496

…o about-page

david-mears-2 reviewed Oct 22, 2024

View reviewed changes

pages/about.vue Outdated Show resolved Hide resolved

absternator and others added 3 commits October 22, 2024 12:05

Update pages/about.vue

8463eb8

Co-authored-by: David Mears <[email protected]>

Refactor about page: Fix typo in GitHub link

9dd8870

Merge branch 'about-page' of https://github.com/j-idea/daedalus-web-app…

ed829f1

… into about-page

Merge branch 'main' of https://github.com/j-idea/daedalus-web-app int…

c2b4a15

…o about-page

justify logos center

d9832d2

absternator requested a review from EmmaLRussell October 23, 2024 14:48

EmmaLRussell reviewed Oct 24, 2024

View reviewed changes

absternator added 2 commits October 25, 2024 09:10

Merge branch 'main' of https://github.com/j-idea/daedalus-web-app int…

e666313

…o about-page

Refactor about page to use updated metadata structure

bdd0b52

absternator requested a review from EmmaLRussell October 25, 2024 08:29

absternator added 4 commits October 25, 2024 09:57

Refactor about page to include contact email

73e72d3

Refactor ParameterForm.spec.ts to test only the first two select elem…

a2b5346

…ents

Merge branch 'main' of https://github.com/j-idea/daedalus-web-app int…

0e849c6

…o about-page

Refactor about page to remove extra parameters and include country an…

6dcebc8

…d pathogen parameters

EmmaLRussell reviewed Oct 25, 2024

View reviewed changes

Refactor about page to include country and pathogen parameters

cfbfb82

EmmaLRussell approved these changes Oct 25, 2024

View reviewed changes

pages/about.vue Outdated Show resolved Hide resolved

Update pages/about.vue

072a792

Co-authored-by: Emma Russell <[email protected]>

absternator merged commit de34cd7 into main Oct 25, 2024
6 checks passed

absternator deleted the about-page branch October 25, 2024 13:09

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

About Page #56

About Page #56

absternator commented Oct 16, 2024 •

edited

Loading

codecov bot commented Oct 16, 2024 •

edited

Loading

david-mears-2 left a comment

david-mears-2 Oct 16, 2024

david-mears-2 Oct 16, 2024

david-mears-2 Oct 16, 2024

absternator Oct 17, 2024

david-mears-2 Oct 17, 2024

absternator Oct 17, 2024

david-mears-2 Oct 17, 2024

david-mears-2 Oct 23, 2024

david-mears-2 Oct 16, 2024

david-mears-2 Oct 23, 2024

david-mears-2 Oct 16, 2024

david-mears-2 Oct 23, 2024

david-mears-2 commented Oct 17, 2024 •

edited

Loading

david-mears-2 commented Oct 23, 2024

david-mears-2 commented Oct 23, 2024

EmmaLRussell commented Oct 23, 2024

EmmaLRussell left a comment

EmmaLRussell left a comment

EmmaLRussell Oct 25, 2024

absternator Oct 25, 2024

EmmaLRussell left a comment

		const vueSelects = component.findAllComponents(VueSelect).slice(0, 2);
		expect(vueSelects.length).toBe(2);

About Page #56

About Page #56

Conversation

absternator commented Oct 16, 2024 • edited Loading

codecov bot commented Oct 16, 2024 • edited Loading

Codecov Report

david-mears-2 left a 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

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

david-mears-2 commented Oct 17, 2024 • edited Loading

david-mears-2 commented Oct 23, 2024

david-mears-2 commented Oct 23, 2024

EmmaLRussell commented Oct 23, 2024

EmmaLRussell left a comment

Choose a reason for hiding this comment

EmmaLRussell left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

EmmaLRussell left a comment

Choose a reason for hiding this comment

absternator commented Oct 16, 2024 •

edited

Loading

codecov bot commented Oct 16, 2024 •

edited

Loading

david-mears-2 commented Oct 17, 2024 •

edited

Loading