Skip to content

Commit

Permalink
feat: our migration to NextJS and Typescript
Browse files Browse the repository at this point in the history 
Squashed commit of the following:

commit 5c1e14f
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Thu Apr 21 02:41:35 2022 +0100

    fix: add timeout to let the map settle

commit c3adb6c
Author: Oliver Barnwell <ob6160@users.noreply.github.com>
Date:   Thu Apr 21 02:36:47 2022 +0100

    Set up Cypress runner + starting suite (#1320)

    * fix: selection of loos

    * fix: loo selection problems

    * fix: login and map loading in a more sustainable way

    * fix: check in env production file with mapping for auth0

    * feat: add cypress base files and first working test

    * feat: write lotsa tests

    * feat: finish first suite

    * feat: add gh action for cypress

commit 61e5c99
Author: Oliver Barnwell <ob6160@users.noreply.github.com>
Date:   Tue Apr 19 01:14:32 2022 +0100

    Ob/prefetch (#1319)

    * feat: improve prefetch technique

    * chore: check vals

    * fix: try and get a better baseurl

    * chore: ugprade and fix leaflet problem

commit c9e99ef
Author: Oliver Barnwell <ob6160@users.noreply.github.com>
Date:   Sun Apr 17 01:39:49 2022 +0100

    Upgrades and improvements to caching for the accessibility tool (#1318)

    * chore: package upgrade

    * feat: start the switch to use the apollo client cache instead of constructing our own list

    * feat: load only loos in the viewport and fix endless loop in effect

    * fix: typings for marker cluster group not imported correctly from @types

    * fix: fix layout of about and contact pages

    * fix: the build

    * feat: improve LOD selection

    * feat: make the LOD better by ungrouping at higher zoomlevels

    * fix: verification support submit

    * feat: get filters working properly with accessibility layer

    * feat: add toilet checklist and volunteer guide back

    * fix: load fa css early, add icon to priority

    * feat: prefetch on mouseover

commit 89bd6e4
Author: Oliver Barnwell <ob6160@users.noreply.github.com>
Date:   Fri Apr 15 14:10:38 2022 +0100

    fix: only run chromatic on review for PRs to save our quota (#1317)

commit e89f35c
Author: Oliver Barnwell <ob6160@users.noreply.github.com>
Date:   Wed Apr 13 02:19:51 2022 +0100

    chore: upgrade deps, also handle opening times error (#1316)

    * chore: upgrade deps, also handle opening times error

    * fix: deoptimise images for storybook builds

    * chore: add ^

    * chore: add ^

commit e30ab5c
Author: Oliver Barnwell <ob6160@users.noreply.github.com>
Date:   Tue Apr 12 22:06:23 2022 +0100

    feat: set up chromatic (#1311)

    * feat: set up chromatic

    * feat: include github token

commit e4c5719
Author: Oliver Barnwell <ob6160@users.noreply.github.com>
Date:   Wed Apr 6 12:30:17 2022 +0100

    Storybook (#1310)

    * feat: initial sb init run

    * feat: working storybook install

    * fix: upgrade storybook to latest alpha for emotion support

    * feat: render about,contact,privacy and index page in Storybook

    * feat: get the index story fully working

    * feat: get the index story fully working

    * feat: add more stories and mock userprovider for login edit page

    * feat: add stories for add and remove

    * feat: finish stories for core pages

    * feat: tidy page stories, add button and drawer stories

    * fix: build by ignoring stories and using .page.tsx for next pages

    * fix: rename rest of the pagess

    * fix: add page.ts

    * feat: add a few new stories and multiple for loo map

    * feat: build storybook as part of standard build

    * fix: build storybook as part of the wider app build step

    * chore: disable experimental runtime

    * refactor: story layout and unneeded story files

commit 46b5f96
Author: Oliver Barnwell <ob6160@users.noreply.github.com>
Date:   Sat Apr 2 12:59:55 2022 +0100

    fix: clearing search when toilet preview panel is closed (#1309)

commit 3e106bb
Author: Oliver Barnwell <ob6160@users.noreply.github.com>
Date:   Tue Mar 29 22:02:04 2022 +0100

    Upgrades, SSR fixes, refactors (#1308)

    * feat: move next conf to mjs

    * refactor: remove old tool conf

    * chore: upgrade deps

    * chore: try upgrade to react 18

    * chore: remove hooks eslint as its provided by another lib

    * fix: fresnel so that it runs with react 18

    * feat: try out server components and edge

commit dceb767
Author: Oliver Barnwell <ob6160@users.noreply.github.com>
Date:   Tue Mar 29 20:45:43 2022 +0100

    Improve zoom, geolocate buttons and add esc key exit to toilet details panel (#1307)

    * fix: zoom button and geolocation controls so they display correctly

    * fix: move the buttons to the top when a loo is in focus and buttons are occluded by the panel

    * feat: close details panel with esc

commit a52fad8
Author: Oliver Barnwell <ob6160@users.noreply.github.com>
Date:   Tue Mar 29 19:52:46 2022 +0100

    Ob/improve form accessibility (#1306)

    * feat: add visual and audio affordance for users when they forget to submit the opening/closing time

    * fix: assign htmlFor to the rest of the labels, types

commit bb8e935
Author: Oliver Barnwell <ob6160@users.noreply.github.com>
Date:   Tue Mar 29 18:32:09 2022 +0100

    Set up eslint rules and generally refactor (#1304)

    * feat: switch to modules, run through let to const

    * feat: set up some coding standards for the project in eslint

    * fix: linting on next config

    * fix: start acting on linter errors

    * refactor: fix eslint errors

    * fix: revert db files after attempted refactor failed, fix form

    * feat: use graphql loader instead of reading in file with fs

    * fix: disable lint for unlabeled  for inputs for now

commit 5e06c3b
Author: Oliver Barnwell <ob6160@users.noreply.github.com>
Date:   Sun Mar 27 22:40:30 2022 +0100

    General tidyup, enable SWC (#1303)

    * fix: types on accessibilityintersection

    * fix: more typing improvements

    * feat: switch to modules, run through let to const

    * refactor: tidy schema.ts

    * feat: turn on swc to replace our emotion babel transform hooray

commit cb8e7be
Author: Oliver Barnwell <ob6160@users.noreply.github.com>
Date:   Sun Mar 27 21:40:02 2022 +0100

    Fix add/edit forms (#1301)

    * feat: start work on error messages

    * fix: continue with form validation fixes

    * fix: allow opening times to be submitted if a sub-toggle is toggled but the parent is turned off

commit 0caa93a
Author: Oliver Barnwell <ob6160@users.noreply.github.com>
Date:   Sun Mar 27 19:38:50 2022 +0100

    fix: use-form version 7 API changes (#1300)

commit 4c09c42
Author: Oliver Barnwell <ob6160@users.noreply.github.com>
Date:   Sun Mar 27 19:28:08 2022 +0100

     "@typescript-eslint/eslint-plugin" (#1298)

    * tidy: replace any

    * fix: resolve typescript eslint rule warnings

commit e2cb8c2
Author: Oliver Barnwell <ob6160@users.noreply.github.com>
Date:   Sun Mar 27 18:29:43 2022 +0100

    fix: clicking a loo after performing a search (#1296)

    application due to conflict btwn search and loo lat/lng. fx inf loop on search

commit dc6456a
Author: Oliver Barnwell <ob6160@users.noreply.github.com>
Date:   Sun Mar 27 17:44:08 2022 +0100

    fix: the import of the api schema in withApollo and pages.api.index after module upgrade (#1295)

commit b674730
Author: Oliver Barnwell <ob6160@users.noreply.github.com>
Date:   Sun Mar 27 15:45:27 2022 +0100

    test (#1294)

    * fix: try catching

    * docs: add comment about why try /catch is added

commit 6f98d35
Author: Oliver Barnwell <ob6160@users.noreply.github.com>
Date:   Sun Mar 27 14:13:58 2022 +0100

    chore: upgrade gql to latest working version (#1292)

commit 627be51
Author: Oliver Barnwell <ob6160@users.noreply.github.com>
Date:   Sun Mar 27 13:49:30 2022 +0100

    Upgrade all deps apart from gql (coming separately) (#1291)

    * chore: upgrade deps pt1

    * chore: upgrade deps pt2

    * chore: upgrade deps pt3

    * chore: upgrade deps pt4

    * chore: upgrade deps pt5

    * chore: upgrade deps pt6

commit ed329c6
Author: Rupert Redington <rupert@lola.tech>
Date:   Sun Mar 27 13:30:44 2022 +0100

    fix: bad dependency arry (#1290)

commit d44d496
Merge: bb58ef6 6071ba4
Author: Rupert Redington <rupert@lola.tech>
Date:   Mon Mar 14 16:55:08 2022 +0000

    Merge pull request #1289 from neontribe/ob/fix-accessiblity-overlay

    Fix accessiblity overlay

commit 6071ba4
Merge: 8fd315b bb58ef6
Author: Rupert Redington <rupert@lola.tech>
Date:   Mon Mar 14 16:48:59 2022 +0000

    Merge branch 'next' into ob/fix-accessiblity-overlay

commit bb58ef6
Merge: 5ba77e0 582fbf8
Author: Rupert Redington <rupert@lola.tech>
Date:   Sun Feb 20 12:23:27 2022 +0000

    Merge pull request #1286 from neontribe/ob/close-button

    Proposal: Close button

commit 582fbf8
Merge: 493f31d 5ba77e0
Author: Rupert Redington <rupert@lola.tech>
Date:   Sun Feb 20 12:16:27 2022 +0000

    Merge branch 'next' into ob/close-button

commit 8fd315b
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sun Feb 13 01:50:23 2022 +0000

    fix: avoid flash of unfiltered content

commit 456e04c
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sun Feb 13 01:41:37 2022 +0000

    feat: correctly display accessibility overlay when tabbed to

commit cf8c7cf
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sun Feb 13 01:00:00 2022 +0000

    fix: rename

commit 4910dc3
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sat Feb 12 23:06:28 2022 +0000

    fix: add gql def

commit ec58d1c
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sat Feb 12 22:27:26 2022 +0000

    feat: fetch loo names

commit c883c2e
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sat Feb 12 21:33:11 2022 +0000

    feat: accessibility, reenable selection using keyboard

commit 29282bb
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sat Feb 12 21:24:27 2022 +0000

    fix: start adding back accessibility, panning using arrow keys and loo selection rectangle

commit 5ba77e0
Author: Oliver Barnwell <ob6160@users.noreply.github.com>
Date:   Sat Feb 12 17:24:43 2022 +0000

    Fix find location sidebar (#1287)

    * fix: allow users to once again geolocate using the 'find a toilet near me' cta in the sidebar

    * fix: remove rogue log

commit 493f31d
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sat Feb 12 00:25:29 2022 +0000

    feat: add a close button so that users can exit from the toilet details panel

    fix: add correct aria desc

commit c7b16a7
Merge: 19f2191 17ff4dc
Author: Oliver Barnwell <ob6160@users.noreply.github.com>
Date:   Sat Feb 12 00:02:59 2022 +0000

    Merge pull request #1283 from neontribe/ob/fix-location-search

    Fix location search (WIP)

commit 17ff4dc
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Fri Feb 11 23:58:52 2022 +0000

    fix: location search and centering map around the search location

commit 928adc7
Author: Oliver Barnwell <oliver.barnwell@guardian.co.uk>
Date:   Sun Jan 16 14:42:09 2022 +0000

    chore(deps): upgrade deps

commit ba9bce8
Author: Oliver Barnwell <oliver.barnwell@guardian.co.uk>
Date:   Sun Jan 16 14:24:23 2022 +0000

    fix: infinite loop during debounce search. memoise the function remains the same between re-renders

commit dd64b72
Author: Oliver Barnwell <oliver.barnwell@guardian.co.uk>
Date:   Tue Jan 11 18:34:04 2022 +0000

    feat: fix Control component

commit 0160bc6
Author: Oliver Barnwell <oliver.barnwell@guardian.co.uk>
Date:   Sun Jan 9 18:33:13 2022 +0000

    fix: map control and use custom Control component

commit 19f2191
Author: Oliver Barnwell <oliver.barnwell@guardian.co.uk>
Date:   Sun Jan 9 17:58:32 2022 +0000

    feat: finish up work by disabling the debug bounding box|

commit 958e3b9
Author: Oliver Barnwell <oliver.barnwell@guardian.co.uk>
Date:   Fri Dec 17 17:09:50 2021 +0000

    fix: lat/lng removed from compressed loo meaning filter access index was off

commit 47b0498
Author: Oliver Barnwell <oliver.barnwell@guardian.co.uk>
Date:   Fri Dec 17 16:08:31 2021 +0000

    feat: chunk loading so that tiles can be loaded in one at a time using geohash neighbours

commit f9ed9df
Author: Oliver Barnwell <oliver.barnwell@guardian.co.uk>
Date:   Mon Dec 13 00:46:25 2021 +0000

    fix: remove pck lock

commit bf3e607
Author: Oliver Barnwell <oliver.barnwell@guardian.co.uk>
Date:   Mon Dec 13 00:44:54 2021 +0000

    feat: experiment using chunked loading with adjacent neighbours

commit 4fa2193
Author: Oliver Barnwell <oliver.barnwell@guardian.co.uk>
Date:   Mon Dec 13 00:24:28 2021 +0000

    wip

commit 545e46d
Author: Oliver Barnwell <oliver.barnwell@guardian.co.uk>
Date:   Sat Dec 11 18:37:42 2021 +0000

    feat: encode latlng over the wire as geohash

commit bc4729d
Author: Oliver Barnwell <oliver.barnwell@guardian.co.uk>
Date:   Sat Dec 11 18:23:17 2021 +0000

    feat: add ngeohash dep

commit 1617e46
Author: Oliver Barnwell <oliver.barnwell@guardian.co.uk>
Date:   Sat Dec 11 18:17:35 2021 +0000

    refactor: tidyup

commit 9c7769a
Author: Oliver Barnwell <oliver.barnwell@guardian.co.uk>
Date:   Sat Dec 11 17:54:25 2021 +0000

    feat: install types for markercluster and fix load of markers

commit ccb957b
Author: Oliver Barnwell <oliver.barnwell@guardian.co.uk>
Date:   Sat Dec 11 16:24:54 2021 +0000

    feat: lifts the currently focused loo up to the map state

    removes the focused loo from the leaflet loo group so that the marker overlap issue is avoided

commit 5291148
Author: Rupert Redington <rupert@pirateutopia.org>
Date:   Tue Jan 4 18:09:42 2022 +0000

    fix: off by one in opening days highlighting

commit deacf1d
Author: Oliver Barnwell <ob6160@users.noreply.github.com>
Date:   Fri Dec 17 16:22:23 2021 +0000

    feat: lifts the currently focused loo up to the map state (#1275)

    * feat: lifts the currently focused loo up to the map state

    removes the focused loo from the leaflet loo group so that the marker overlap issue is avoided

    * feat: install types for markercluster and fix load of markers

    * refactor: tidyup

commit da05157
Author: Rupert Redington <rupert@lola.tech>
Date:   Mon Dec 6 22:13:40 2021 +0000

    refactor: move openingTimes

commit 5bfeff3
Author: Rupert Redington <rupert@lola.tech>
Date:   Mon Dec 6 22:10:26 2021 +0000

    refactor: divider is no longer used

commit 2bde344
Author: Rupert Redington <rupert@lola.tech>
Date:   Mon Dec 6 22:09:42 2021 +0000

    refactor: conditonalwrap is no longer used

commit a450d00
Author: Rupert Redington <rupert@lola.tech>
Date:   Mon Dec 6 22:07:19 2021 +0000

    refactor: ignore generated files

commit 174f4c9
Author: Rupert Redington <rupert@lola.tech>
Date:   Mon Dec 6 22:06:35 2021 +0000

    refactor: remove generated files

commit 31a6b6e
Author: Rupert Redington <rupert@lola.tech>
Date:   Mon Dec 6 21:59:52 2021 +0000

    refactor: move withAPollo to api-client

commit 451526a
Author: Rupert Redington <rupert@lola.tech>
Date:   Mon Dec 6 21:54:16 2021 +0000

    perf: persistent layout

commit 75fc146
Author: Rupert Redington <rupert@lola.tech>
Date:   Mon Dec 6 20:20:50 2021 +0000

    fix: update styling deps

commit 3de18ff
Author: Rupert Redington <rupert@lola.tech>
Date:   Mon Dec 6 20:11:04 2021 +0000

    fix: update apollo-client

commit ea049cb
Author: Rupert Redington <rupert@lola.tech>
Date:   Mon Dec 6 19:59:37 2021 +0000

    fix: update gql tools

commit b49cc40
Author: Rupert Redington <rupert@lola.tech>
Date:   Mon Dec 6 19:57:31 2021 +0000

    fix: date-fns

commit 3369a11
Author: Rupert Redington <rupert@lola.tech>
Date:   Mon Dec 6 19:54:22 2021 +0000

    fix: update apollo-server

commit 36fda2a
Author: Rupert Redington <rupert@lola.tech>
Date:   Mon Dec 6 19:52:47 2021 +0000

    fix: minor server updates

commit 1c4fd79
Author: Rupert Redington <rupert@lola.tech>
Date:   Mon Dec 6 19:50:17 2021 +0000

    chore: upgrade codegen

commit d871da3
Author: Rupert Redington <rupert@lola.tech>
Date:   Mon Dec 6 19:46:56 2021 +0000

    chore: upgrade lint and test

commit a528fb5
Author: Rupert Redington <rupert@lola.tech>
Date:   Mon Dec 6 19:41:06 2021 +0000

    chore: update types

commit beaa97b
Author: Rupert Redington <rupert@lola.tech>
Date:   Mon Dec 6 19:37:40 2021 +0000

    chore: update some quality tools

commit 86d643d
Author: Rupert Redington <rupert@lola.tech>
Date:   Mon Dec 6 19:33:29 2021 +0000

    chore: update node version

commit 4a80c37
Author: Rupert Redington <rupert@lola.tech>
Date:   Mon Dec 6 19:27:13 2021 +0000

    fix: area map page

commit 844cf32
Author: Rupert Redington <rupert@neontribe.co.uk>
Date:   Sun Dec 5 18:02:09 2021 +0000

    fix: looPage centering

commit 40796a0
Author: Rupert Redington <rupert@lola.tech>
Date:   Wed Nov 24 19:08:38 2021 +0000

    fix: use mapState

    This tries to track the current map state into a context so that it can
    be consumed by newly initialised maps on differnt views. Fixes #1248
    todo:
    - [ ] use this in the edit form for updating loo position
    - [ ] fix fresh loads of individual loo pages so thay are centered

commit 8f88da8
Author: Oliver Barnwell <ob6160@users.noreply.github.com>
Date:   Sat Dec 4 21:28:41 2021 +0000

    feat: refactor core loo compression and filtering methods into their own library files (#1259)

    Also fix the method of reducing down the loos array according to the enabled filters

commit de6f629
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sat Dec 4 19:17:58 2021 +0000

    fix: remove hooks dep as it's already added by the next core web vitals esliny plugiin

commit 4c98b80
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sat Dec 4 19:12:48 2021 +0000

    feat: refactors loo filter information so that it is stored in the general MapState context

    This allows us to use the useMapState hook to access filters whereever needed

    instead of having to rely upon prop drilling to pass them down to the level that we would like.

commit 4947363
Author: Rupert Redington <rupert@lola.tech>
Date:   Wed Nov 24 15:17:46 2021 +0000

    fix: clean up /map/lat/lng and sidebar

commit 57808d5
Author: Rupert Redington <rupert@lola.tech>
Date:   Wed Nov 24 15:17:46 2021 +0000

    fix: clean up /map/lat/lng and sidebar

commit 04029cc
Author: Rupert Redington <rupert@lola.tech>
Date:   Tue Nov 23 23:45:16 2021 +0000

    feat: switch to Apollo Studio

commit a6bf23c
Author: Rupert Redington <rupert@lola.tech>
Date:   Tue Nov 23 23:34:47 2021 +0000

    refactor: extract LooMapLoader

commit fcee021
Author: Rupert Redington <rupert@lola.tech>
Date:   Tue Nov 23 20:53:49 2021 +0000

    fix: rebuild edit page

commit 1d762e7
Author: Rupert Redington <rupert@lola.tech>
Date:   Tue Nov 23 18:05:56 2021 +0000

    fix: improve plausible setup

commit 9d09db2
Author: Rupert Redington <rupert@lola.tech>
Date:   Mon Nov 22 17:51:20 2021 +0000

    fix: apollo client update

commit 53f2bdc
Author: Rupert Redington <rupert@lola.tech>
Date:   Mon Nov 22 17:50:11 2021 +0000

    build: update linter

commit 047cf1d
Author: Rupert Redington <rupert@lola.tech>
Date:   Wed Nov 17 20:42:41 2021 +0000

    feat: use APQ for cacheability

commit 2f2de2b
Author: Rupert Redington <rupert@lola.tech>
Date:   Wed Nov 17 09:11:31 2021 +0000

    fix: remove use-our-loos campaign

commit 24e7d9a
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sun Nov 7 17:34:42 2021 +0000

    chore: simplify timout

commit 6d47244
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sun Nov 7 17:31:39 2021 +0000

    feat: make toggle action smooth by delaying actual filter for half a second

commit 8a5530f
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sun Nov 7 17:29:14 2021 +0000

    fix: calculation of the toilet filter mask by checking for undefined, not null on toilet properties

commit b3b78cb
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sun Nov 7 17:08:31 2021 +0000

    feat: allow loos to be filtered using bitmasks

commit 4611372
Author: Rupert Redington <rupert@lola.tech>
Date:   Wed Nov 3 22:02:12 2021 +0000

    fix: preserve clients-side apollo cache between pages

commit d5e7222
Author: Rupert Redington <rupert@lola.tech>
Date:   Wed Nov 3 20:45:31 2021 +0000

    refactor: separate current loo from marker cluster

commit e11552a
Author: Rupert Redington <rupert@lola.tech>
Date:   Wed Nov 3 20:15:23 2021 +0000

    fix: reunify apollo setup

commit fa4ce93
Author: Rupert Redington <rupert@lola.tech>
Date:   Tue Nov 2 17:21:32 2021 +0000

    fix: cache markers response and tidy up logging

commit 991a6a3
Author: Rupert Redington <rupert@lola.tech>
Date:   Mon Nov 1 18:58:23 2021 +0000

    fix: restore loo page + load compressed marker data

commit 202524c
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sun Oct 31 23:39:27 2021 +0000

    feat: always show the marker that the user has selected

commit 09b05f0
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sun Oct 31 22:51:32 2021 +0000

    feat: allow users to once again click on individual loo markers

commit eecf5c0
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sun Oct 31 02:25:53 2021 +0000

    feat: remove dep on react marker cluster and ship working cluster system with filtering

commit a12650b
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sun Oct 31 02:04:35 2021 +0000

    feat: hooray, filtering works

commit 9684b92
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sun Oct 31 01:54:08 2021 +0100

    feat: really bad attempt

commit e2f38af
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sat Oct 30 21:09:10 2021 +0100

    feat: send a lot less data

commit 50f6a78
Author: Oliver Barnwell <ob6160@users.noreply.github.com>
Date:   Fri Oct 29 16:52:37 2021 +0100

    feat: cluster loads of markers

    * feat: use clustering library for more performant marker rendering

    * fix: tidyup cluster impl

    * feat: performance optimisation

    * feat: ssg for static loo props gen

    * feat: ssg using SchemaLink connecting to db

    * fix: config

commit 0cf3266
Author: Rupert Redington <rupert@neontribe.co.uk>
Date:   Thu Oct 14 19:49:06 2021 +0100

    refactor: move marker fetching to map

commit 689609c
Author: Rupert Redington <rupert@neontribe.co.uk>
Date:   Tue Oct 12 21:52:28 2021 +0100

    fix: react-leaflet

commit 8567fed
Author: Oliver Barnwell <ob6160@users.noreply.github.com>
Date:   Wed Oct 27 15:33:03 2021 +0100

    feat: upgrades next to version 12 (#1222)

commit f7d7efc
Merge: 1ad4b74 2f0cfe9
Author: Rupert Redington <rupert@pirateutopia.org>
Date:   Thu Oct 14 17:42:40 2021 +0100

    Merge pull request #1204 from neontribe/updeps2

    fix: minor dependency updates

commit 2f0cfe9
Author: Rupert Redington <rupert@neontribe.co.uk>
Date:   Thu Oct 14 17:29:54 2021 +0100

    fix: minor dependency updates

commit 1ad4b74
Author: Oliver Barnwell <ob6160@users.noreply.github.com>
Date:   Thu Oct 14 14:52:44 2021 +0100

    fix: allow the user to remove loos once again (#1200)

commit be82297
Author: Oliver Barnwell <ob6160@users.noreply.github.com>
Date:   Thu Oct 14 14:52:36 2021 +0100

    Cookies Page, Small layout fix (#1201)

    * feat: restore the cookies page to its former glory

    * fix: height of __next page wrapper and underlining of some lnks

commit 28dc3a4
Author: Rupert Redington <rupert@neontribe.co.uk>
Date:   Wed Oct 6 21:09:59 2021 +0100

    fix: relocate crosshair

commit 022e476
Author: Rupert Redington <rupert@neontribe.co.uk>
Date:   Wed Oct 6 20:23:07 2021 +0100

    fix: efficiency and error supression

commit dde54e3
Author: Rupert Redington <rupert@neontribe.co.uk>
Date:   Wed Oct 6 19:27:29 2021 +0100

    fix: add interstitial screen for protected routes

commit 0041204
Author: Rupert Redington <rupert@neontribe.co.uk>
Date:   Wed Oct 6 18:48:43 2021 +0100

    fix: update framer

commit 778e67a
Merge: 60ce84d 11f47a3
Author: Rupert Redington <rupert@pirateutopia.org>
Date:   Wed Oct 6 18:43:15 2021 +0100

    Merge pull request #1197 from neontribe/updeps

    fix: update dependencies

commit 11f47a3
Author: Rupert Redington <rupert@neontribe.co.uk>
Date:   Wed Oct 6 18:31:54 2021 +0100

    fix: update dependencies

commit 60ce84d
Merge: 2f3f1b1 0ca71cf
Author: Rupert Redington <rupert@neontribe.co.uk>
Date:   Sun Oct 3 17:08:28 2021 +0100

    Merge pull request #1192 from neontribe/ob/next-edit-page

    Ob/next edit page

commit 0ca71cf
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sun Oct 3 14:54:34 2021 +0100

    fix: unnecessary import

commit 4b3a89b
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sun Oct 3 14:51:10 2021 +0100

    chore: remove log

commit 8448589
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sun Oct 3 14:43:01 2021 +0100

    chore: update lockfile

commit 2219b6b
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sun Oct 3 14:40:42 2021 +0100

    fix: export and import HomePage

commit 1d3e4bb
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sun Sep 26 15:44:22 2021 +0100

    feat: add types for leaflet

commit 1079ad2
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sun Sep 26 15:43:12 2021 +0100

    fix: tidyup

commit 37a161f
Merge: 40e08ef 9a9041e
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sun Sep 26 15:19:18 2021 +0100

    Merge remote-tracking branch 'origin/react-leaflet3' into ob/next-edit-page

commit 40e08ef
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sun Sep 26 15:18:23 2021 +0100

    fix: add jest back, sidebar fixes

commit cd05b3d
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sat Sep 25 19:35:09 2021 +0100

    feat: further progress getting the edit page to work

commit 9a9041e
Author: Rupert Redington <rupert@neontribe.co.uk>
Date:   Wed Sep 15 08:35:38 2021 +0100

    feat: first ISSG

commit 56c401f
Author: Rupert Redington <rupert@neontribe.co.uk>
Date:   Mon Sep 13 22:08:31 2021 +0100

    fix: clean up map pages

commit a9620d5
Author: Rupert Redington <rupert@neontribe.co.uk>
Date:   Mon Sep 13 19:57:54 2021 +0100

    fix: minor update

commit 2f3f1b1
Merge: aa2ea7b 59f5a1c
Author: Rupert Redington <rupert@neontribe.co.uk>
Date:   Mon Sep 13 19:48:53 2021 +0100

    Merge pull request #1181 from neontribe/testing

    more gardening

commit 59f5a1c
Author: Rupert Redington <rupert@neontribe.co.uk>
Date:   Mon Sep 13 19:41:44 2021 +0100

    chore: clean more deps

commit a7e6185
Author: Rupert Redington <rupert@neontribe.co.uk>
Date:   Mon Sep 13 19:05:38 2021 +0100

    feat: reintroduce graphql-voyager, strip old explorer code

commit 4ae9152
Author: Rupert Redington <rupert@neontribe.co.uk>
Date:   Sun Sep 12 17:17:08 2021 +0100

    fix: update mongoose

commit 09e5199
Author: Rupert Redington <rupert@neontribe.co.uk>
Date:   Sun Sep 12 12:58:41 2021 +0100

    chore: strip old testing support

commit aa2ea7b
Author: Rupert Redington <rupert@neontribe.co.uk>
Date:   Sun Sep 12 12:04:21 2021 +0100

    test: cut back to what works for now

commit 6baeae4
Author: Rupert Redington <rupert@neontribe.co.uk>
Date:   Sun Sep 12 11:51:23 2021 +0100

    fix: use experimental file support to help lambdas read the schema

commit c18fdcf
Author: Rupert Redington <rupert@neontribe.co.uk>
Date:   Sun Sep 12 11:38:15 2021 +0100

    style: ignore generated files during prettification

commit d974a4a
Merge: 222ec7e 29f31a7
Author: Rupert Redington <rupert@neontribe.co.uk>
Date:   Sun Sep 12 11:36:16 2021 +0100

    Merge pull request #1175 from neontribe/linters

    style: lint and format

commit 29f31a7
Author: Rupert Redington <rupert@neontribe.co.uk>
Date:   Sat Sep 11 18:51:19 2021 +0100

    style: lint and format

commit 222ec7e
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sat Sep 11 18:30:33 2021 +0100

    feat: let the user add loos once again

commit e87d8a7
Author: Rupert Redington <rupert@neontribe.co.uk>
Date:   Sat Sep 11 17:17:27 2021 +0100

    fix: generate mutation hooks

commit eaf38fd
Merge: 38de258 9d4ad24
Author: Rupert Redington <rupert@neontribe.co.uk>
Date:   Sat Sep 11 17:02:36 2021 +0100

    Merge branch 'feature/nextjs-migrate' into gardening

commit 38de258
Author: Rupert Redington <rupert@neontribe.co.uk>
Date:   Sat Sep 11 16:48:33 2021 +0100

    refactor: use next conformance for linting

commit 9d4ad24
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sat Sep 11 16:44:31 2021 +0100

    fix: gql codegen

commit 1843dd1
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sat Sep 11 16:38:56 2021 +0100

    chore: regen gql

commit 96d7cdf
Author: Rupert Redington <rupert@neontribe.co.uk>
Date:   Sat Sep 11 15:49:41 2021 +0100

    fix: remove old styelint

commit 0993877
Author: Rupert Redington <rupert@neontribe.co.uk>
Date:   Sat Sep 11 15:47:46 2021 +0100

    fix: remove old analyticsId

commit 1be2b1a
Author: Rupert Redington <rupert@neontribe.co.uk>
Date:   Sat Sep 11 15:46:07 2021 +0100

    fix: update deps

commit 10c49a1
Author: Rupert Redington <rupert@neontribe.co.uk>
Date:   Sat Sep 11 15:40:12 2021 +0100

    fix: use Head not Helmet

commit 6eadd16
Author: Rupert Redington <rupert@neontribe.co.uk>
Date:   Sat Sep 11 15:34:21 2021 +0100

    fix: remove unused deps

commit 02b4fcf
Author: Rupert Redington <rupert@neontribe.co.uk>
Date:   Mon Sep 6 19:03:36 2021 +0100

    chore: fix lint-staged

commit 5562c2e
Author: Rupert Redington <rupert@neontribe.co.uk>
Date:   Mon Sep 6 19:00:17 2021 +0100

    fix: update to latest apollo and graphql

commit 1091e82
Author: Rupert Redington <rupert@neontribe.co.uk>
Date:   Mon Sep 6 14:57:08 2021 +0100

    chore: update codegen tools et al

commit 607115d
Author: Rupert Redington <rupert@neontribe.co.uk>
Date:   Sat Aug 28 17:15:26 2021 +0100

    feat: auth with nextjs-auth0 (#1150)

    Install some handlers, protect some pages, wire up the header logout
    button

    Also a lot of pretty brutal cleanup. Sorry for the mixed commit. Carried
    away.

commit a2af6c3
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Tue Aug 3 18:02:12 2021 +0100

    fix so we use one typedef file for both api impls

commit 1ac2d79
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Tue Aug 3 17:38:27 2021 +0100

    fix chicken and egg problem with codegen for nextjs client depending on the project running correctly.. the project depends on the generated files!

commit 8825fa6
Author: Rupert Redington <rupert@neontribe.co.uk>
Date:   Tue Aug 3 15:57:03 2021 +0100

    api gardening (#1147)

    * refactor: ramshackle move of api to next.js proper

    * refactor: minor updeps and config cleaning

commit 048687f
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Mon Aug 2 18:56:23 2021 +0100

    sketch a plan

commit df64c19
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Mon Aug 2 18:31:41 2021 +0100

    put back, wait on vercel config check

commit 34940cf
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Mon Aug 2 18:28:20 2021 +0100

    messing with build dir

commit d8de1b4
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Mon Aug 2 18:22:50 2021 +0100

    put build output back

commit 47bca8e
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Mon Aug 2 18:17:12 2021 +0100

    remove index from public

commit 55975bc
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Mon Aug 2 18:07:04 2021 +0100

    change build out dir

commit e7789f7
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Mon Aug 2 17:55:56 2021 +0100

    put names back for package json

commit 669bdd4
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Mon Aug 2 17:47:20 2021 +0100

    undo

commit e5e024c
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Mon Aug 2 17:44:49 2021 +0100

    no idea how this workflow works haha

commit 4b19112
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Mon Aug 2 17:37:39 2021 +0100

    messing around getting the build to pass, skipping type checking and eslint for now, but it passes.. hooray!!

commit ecddc47
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sun Aug 1 15:28:53 2021 +0100

    fix info panels for individual toilets

commit 58bf0ad
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sun Aug 1 15:13:41 2021 +0100

    fix dynamic loading of toilets so that they load successfully on initial page render

commit 69ca739
Merge: 0bc946a f956301
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sun Aug 1 13:13:32 2021 +0100

    Merge branch 'main' of github.com:neontribe/gbptm into feature/nextjs-migrate

commit 0bc946a
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sat Jul 31 13:28:20 2021 +0100

    improve codegen command so it spins up api for code generation to work

commit 2a19b38
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sat Jul 31 13:20:09 2021 +0100

    tidyup

commit 71fe013
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sat Jul 31 13:18:53 2021 +0100

    get gen client hook to work properly

commit 3b430d7
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sat Jul 31 12:51:54 2021 +0100

    prove out new codegen is working for loos by proximity on the index page.

commit f810a2d
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sat Jul 31 12:15:15 2021 +0100

    ship nearby loos query out to its own file for codegen

commit f1efc12
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sat Jul 31 12:09:10 2021 +0100

    disable gql wp loader, break ALL the things

commit 91898ee
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sat Jul 31 12:06:48 2021 +0100

    codegen on graphql

commit 0bba49a
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Wed Jul 28 14:32:16 2021 +0100

    install gql apollo codegen

commit f2ab022
Merge: 3e7a67f 4fa5fa5
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Wed Jul 28 14:22:28 2021 +0100

    conflict resolution

commit 3e7a67f
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Mon Jul 26 16:52:01 2021 +0100

    get the other pages to route correctly, still a few more to fix

commit d61cb49
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Mon Jul 26 16:38:34 2021 +0100

    remove page

commit 4a32ca0
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Mon Jul 26 16:20:59 2021 +0100

    edit page working I think maybe perhaps

commit e26bf4e
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Mon Jul 26 15:48:55 2021 +0100

    fix routing for shallow loading of individual loo pages

commit 3e932f3
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Mon Jul 26 15:15:50 2021 +0100

    add next config for proxying api reqs

commit 50f7661
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Fri Jul 23 15:26:03 2021 +0100

    u turn on esbuild for now

commit 8c56ce4
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Fri Jul 23 15:13:06 2021 +0100

    feat: switch to esbuild

commit d96276b
Author: Oliver Barnwell <oliver.barnwell@investec.co.uk>
Date:   Sat Jul 10 13:31:43 2021 +0100

    fix: typefest

commit 5fbd03c
Author: Oliver Barnwell <oliver.barnwell@investec.co.uk>
Date:   Sat Jul 10 13:24:14 2021 +0100

    feat: graphql webpack loader

commit e41cb44
Author: Oliver Barnwell <oliver.barnwell@investec.co.uk>
Date:   Sat Jul 10 13:21:07 2021 +0100

    feat: onwards

commit c08b760
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sun Jun 27 18:42:26 2021 +0100

    fix: edit loo page

commit 5d37b55
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sun Jun 27 18:33:22 2021 +0100

    feat: render loo map without markers

commit cb0e267
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sun Jun 27 18:13:04 2021 +0100

    feat: render images better

commit 06febda
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sun Jun 27 17:09:33 2021 +0100

    chore: codemode anon

commit be38f8b
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sun Jun 27 17:07:59 2021 +0100

    wip

commit d7daf2c
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sun Jun 27 16:49:47 2021 +0100

    feat: IT RENDERS

commit 806bfe7
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sun Jun 27 14:07:52 2021 +0100

    chore: typing

commit 999b08f
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sun Jun 27 03:46:16 2021 +0100

    feat: do some auth typing

commit 34912dc
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sun Jun 27 03:26:24 2021 +0100

    fix: emotion css prop

commit 1fd8662
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sun Jun 27 02:36:37 2021 +0100

    fix: start upgrade to emotion 11

commit 4631451
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sun Jun 27 02:27:22 2021 +0100

    fix: types for emotion

commit a0a0481
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sun Jun 27 01:50:39 2021 +0100

    feat: typescript

commit 04a7cb3
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sun Jun 27 01:49:30 2021 +0100

    feat: typescript

commit 0c2084e
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sun Jun 27 01:46:42 2021 +0100

    feat: typescript

commit dd091bb
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sun Jun 27 01:44:45 2021 +0100

    feat: typescript

commit 53fafc9
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sun Jun 27 01:44:34 2021 +0100

    feat: typescript

commit 6444f07
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sun Jun 27 01:42:09 2021 +0100

    feat: typescript

commit d668669
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sun Jun 27 01:36:46 2021 +0100

    feat: typescript

commit 5cc2085
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sun Jun 27 01:36:40 2021 +0100

    feat: typescript

commit abc64e2
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sun Jun 27 01:34:09 2021 +0100

    feat: typescript

commit dfb7dbb
Author: Oliver Barnwell <barnwelloliver@gmail.com>
Date:   Sun Jun 27 00:46:10 2021 +0100

    feat: begin migration
  • Loading branch information
@ob6160
ob6160 committed Apr 21, 2022
1 parent 8f594c6 commit 2439f48
Show file tree
Hide file tree
Showing 273 changed files with 17,197 additions and 15,298 deletions.
10 changes: 0 additions & 10 deletions .babelrc
View file

This file was deleted.

6 changes: 6 additions & 0 deletions .editorconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ trim_trailing_whitespace = true
[*.js]
indent_size = 2
indent_style = space
[*.ts]
indent_size = 2
indent_style = space
[*.tsx]
indent_size = 2
indent_style = space
[*.css]
indent_size = 2
indent_style = space
Expand Down
1 change: 1 addition & 0 deletions .env.local
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
AUTH0_BASE_URL="http://localhost:3000"
2 changes: 2 additions & 0 deletions .env.production
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Map the AUTH0_BASE_URL to the VERCEL_URL
AUTH0_BASE_URL=${VERCEL_URL}
1 change: 1 addition & 0 deletions .env.test
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
AUTH0_BASE_URL="http://localhost:3000"
7 changes: 2 additions & 5 deletions .eslintignore
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
node_modules
build
adobe-digital-data.js
adobe-digital-data-stage.js
public
explorer-old
!.storybook
20 changes: 0 additions & 20 deletions .eslintrc.js
View file

This file was deleted.

45 changes: 45 additions & 0 deletions .eslintrc.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"parser": "@typescript-eslint/parser",
"extends": [
"plugin:@typescript-eslint/recommended",
"plugin:jsx-a11y/recommended",
"plugin:functional/no-mutations",
"next"
],
"parserOptions": {
"ecmaFeatures": {
"jsx": true
}
},
"plugins": ["functional"],
"rules": {
"react/prop-types": 0,
"@typescript-eslint/explicit-function-return-type": 0,
"@typescript-eslint/explicit-module-boundary-types": 0,
"functional/no-let": 0,
"functional/prefer-readonly-type": 0,
"functional/no-method-signature": 0,
"functional/immutable-data": [
"error",
{
"ignoreImmediateMutation": true
}
],
"no-var": "error",
"no-param-reassign": "error",
"prefer-const": "error"
},
"overrides": [
{
"files": ["*.stories.tsx"],
"rules": {
"functional/immutable-data": 0
}
}
],
"settings": {
"react": {
"version": "detect"
}
}
}
22 changes: 16 additions & 6 deletions .example.env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,19 @@ MONGODB_URI=mongodb://127.0.0.1:27017/toiletmap
# Use this database in migration scripts
DATABASE_NAME=toiletmap

# UI
# If you wish to avoid running a local API you can proxy to a remote
# PROXY=https://some.remote.api

# Connect to GA in prod
REACT_APP_GOOGLE_MAPS_API_KEY=
# A long, secret value used to encrypt the session cookie
AUTH0_SECRET='A REALLY LONG STRING'
# The base url of your application
AUTH0_BASE_URL='http://localhost:3000'
# The url of your Auth0 tenant domain
AUTH0_ISSUER_BASE_URL='https://gbptm.eu.auth0.com'
# Your Auth0 application's Client ID
AUTH0_CLIENT_ID='ASK FOR THIS'
# Your Auth0 application's Client Secret
AUTH0_CLIENT_SECRET='ASK FOR THIS'
# Our API's audience setting
AUTH0_AUDIENCE='https://www.toiletmap.org.uk/graphql'
# The key in the session or token where we keep user permissions
AUTH0_PERMISSIONS_KEY='https://toiletmap.org.uk/permissions'
#The key in the session or token where we keep profile info
AUTH0_PROFILE_KEY='https://toiletmap.org.uk/profile'
26 changes: 13 additions & 13 deletions .github/CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ This repo uses a commit convention.

The first part of this is the commit "type". The most common types are "feat" for new features, and "fix" for bugfixes. Using these commit types helps us correctly manage our version numbers and changelogs. Since our release process calculates new version numbers from our commits it is very important to get this right.

* `feat` is for introducing a new feature
* `fix` is for bug fixes
* `docs` for documentation only changes
* `style` is for code formatting only
* `refactor` is for changes to code which should not be detectable by users or testers
* `test` is for changes which only touch test files or related tooling
* `build` is for changes which only touch our develop/release tools
- `feat` is for introducing a new feature
- `fix` is for bug fixes
- `docs` for documentation only changes
- `style` is for code formatting only
- `refactor` is for changes to code which should not be detectable by users or testers
- `test` is for changes which only touch test files or related tooling
- `build` is for changes which only touch our develop/release tools

Please ask questions if you're in doubt about the right prefix to use.
Please ask questions if you're in doubt about the right prefix to use.

After the type and scope there should be a colon.

Expand All @@ -44,11 +44,11 @@ Please take care to give good details about the changes in your PR to help revie

Once you've submitted the request a few different things will happen. Right away our CI :robot: will go to work on your branch. It will:

* Check out your branch
* Merge master into it if necessary
* Run our linters over the whole codebase
* Run the entire test suite
* Deploy a preview environment on now.sh
- Check out your branch
- Merge master into it if necessary
- Run our linters over the whole codebase
- Run the entire test suite
- Deploy a preview environment on now.sh

If all that goes well it'll mark your PR with a nice green tick. If a check fails it'll place a red cross and a link where you can find out what went wrong.

Expand Down
18 changes: 10 additions & 8 deletions .github/ISSUE_TEMPLATE/bug_report.md
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
---
name: Bug report
about: Create a report to help us improve

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:

1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
Expand All @@ -21,15 +21,17 @@ A clear and concise description of what you expected to happen.
If applicable, add screenshots to help explain your problem.

**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

**Smartphone (please complete the following information):**
- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]

- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]

**Additional context**
Add any other context about the problem here.
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
name: Feature request
about: Suggest an idea for toiletmap.org.uk

---

**Is your feature request related to a problem? Please describe.**
Expand Down
31 changes: 31 additions & 0 deletions .github/workflows/chromatic.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: 'Chromatic'

# Event for the workflow
on:
push:
branches: [next]
pull_request:
types: ['review_requested']

# List of jobs
jobs:
chromatic-deployment:
# Operating System
runs-on: ubuntu-latest
# Job steps
steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v2
with:
node-version-file: '.nvmrc'
cache: 'yarn'
- name: Install dependencies
run: yarn
# 👇 Adds Chromatic as a step in the workflow
- name: Publish to Chromatic
uses: chromaui/action@v1
# Chromatic GitHub Action options
with:
token: ${{ secrets.GITHUB_TOKEN }}
# 👇 Chromatic projectToken, refer to the manage page to obtain it.
projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
18 changes: 10 additions & 8 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: CI

on:
pull_request:
branches: [ main ]
branches: [main, next]

jobs:
test:
Expand All @@ -14,10 +14,12 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Yarn install (with caching)
uses: bahmutov/npm-install@v1.7.7
- name: Build Test Client
run: yarn build:testable
- name: Test
run: yarn test
- uses: actions/checkout@v2
- name: Yarn install (with caching)
uses: bahmutov/npm-install@v1.7.7
- name: Lint
run: yarn lint
# - name: Typecheck
# run: yarn check
# - name: Test
# run: yarn test
72 changes: 36 additions & 36 deletions .github/workflows/codeql-analysis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
name: "CodeQL"
name: 'CodeQL'

on:
push:
branches: [main, heroku]
branches: [main, next]
pull_request:
# The branches below must be a subset of the branches above
branches: [main]
branches: [next]
schedule:
- cron: '0 16 * * 4'

Expand All @@ -29,43 +29,43 @@ jobs:
# https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection

steps:
- name: Checkout repository
uses: actions/checkout@v2
with:
# We must fetch at least the immediate parents so that if this is
# a pull request then we can checkout the head.
fetch-depth: 2
- name: Checkout repository
uses: actions/checkout@v2
with:
# We must fetch at least the immediate parents so that if this is
# a pull request then we can checkout the head.
fetch-depth: 2

# If this run was triggered by a pull request event, then checkout
# the head of the pull request instead of the merge commit.
- run: git checkout HEAD^2
if: ${{ github.event_name == 'pull_request' }}
# If this run was triggered by a pull request event, then checkout
# the head of the pull request instead of the merge commit.
- run: git checkout HEAD^2
if: ${{ github.event_name == 'pull_request' }}

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release
#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1

0 comments on commit 2439f48

Please sign in to comment.