Closed catherinet1 closed 9 months ago
@rufuspollock one thing I'm not sure about is whether I put the image in correctly into the frontmatter field.
@rufuspollock would you like to review again before we merge ?
No, let's ship it 🚢
@catherinet1 i note the build is failing though ...
@matthewmccarthy11 can you review this and see if good to go ...
@rufuspollock this pull request now has merge conflict on the template file as well as build failing. i've tried to fix it but am getting myself in knots... can we look at this together in next meeting, please? quite a lot of work in here so prefer not to delete and start again... (learning lesson to push changes small and often)
@catherinet1 first question is why is the build failing ...?
Answer:
15:32:19.887 | Unexpected character `@` (U+0040) in name, expected a name character such as letters, digits, `$`, or `_`; whitespace before attributes; or the end of the tag (note: to create a link in MDX, use `[text](url)`)
-- | --
15:32:19.888 | Â
15:32:19.888 | 47 \| \|ended\|\|End date (year)\|\|2020\|\|\|\|\|\|\|\|0\|
15:32:19.888 | 48 \| \|active\|\|Active (Y/N)\|\|Y\|\|\|\|\|\|\|\|114\|
15:32:19.888 | > 49 \| \|people\|\|List of people\|Comma separated list of associated people. A person has the format `Name [<email>]` where [ ] indicates it is optional ...\|Joe Bloggs <joe@bloggsbettersociety.org>\|\|array[Person]\|\|\|\|\|\|72\|
15:32:19.888 | \|
But i fixed this in main
end of last week so i suspect this is fine and just that you have not merged in main to your branch ...
@catherinet1 ok i fixed your conflict (you can do this yourself now in the editor).
I will merge this now for you for speed's sake. I note there are still some things to likely resolve in the template and especially the question of template vs documentation of the template ...
Added one org - 1000 landscapes for 1 billion people- from Index. Filled in frontmatter (except sector and activity) and connections -- created stub pages in stubs folder for connections