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

Cosmetic changes discussed by email #43

Merged
merged 17 commits into from
Sep 6, 2016

Conversation

guicoelho
Copy link
Contributor

  1. Add headline
  2. Add tmrow's favicon
  3. Add tmrow's watermark
  4. Attempt to simplify initial text/state & make screen cleaner by:
    4.1. Place contribute (exclusively) text under main panel
    4.2 Text changes on initial text

BTW: I've done all this changes without being able to load the map. It's possible that I've overlooked some layout issues since I couldn't test some of the states.

@corradio corradio self-assigned this Sep 4, 2016
@corradio
Copy link
Member

corradio commented Sep 4, 2016

I fixed the build steps so that it's easier to contribute: 1a22538
Can you rebase/merge upstream? Then you will be able to run your test, and I'll be able to test your version.

Command: git merge upstream/master. You can also rebase if you wish.

Thanks!!

@guicoelho
Copy link
Contributor Author

@corradio should be good to go

@@ -1,14 +1,15 @@
<!DOCTYPE html xmlns="http://www.w3.org/1999/xhtml" xmlns:fb="http://ogp.me/ns/fb#">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF8" />
<meta name="description" content="Electricity Map | Real-time visualisation of the climate footprint of electricity generation" />
<meta name="description" content="Electricity Map | Clean vs. dirty electricity production in Europe" />
Copy link
Member

Choose a reason for hiding this comment

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

I don't like clean vs. dirty.. What did you dislike about the original title?
I liked the fact it had "realtime visualisation" and "climate footprint" (for google searches mostly)

Copy link
Contributor Author

@guicoelho guicoelho Sep 5, 2016

Choose a reason for hiding this comment

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

My thoughts regarding the original were:

a) Main message that comes through is "This is real-time", while IMO it should be "different countries have different climate footprints related to energy production". Being real-time is a neat detail, definitely helps with PR and is a good show-off but for the average User it doesn't matter that much. In other words, it's important that we mention it but I don't think it has to be on the headline.

b) Felt a little too long. I think titles should be shorter whenever possible but, in this case, the long title also had some visual impact. When I added it on the map it was taking too much space.

Other suggestions could be:

  • Climate impact of electricity production in Europe
  • CO2 footprint of electricity production in Europe

In any case, I don't think this is something worth discussing further. Here's my opinion but I trust you to make a good judgment.

Let me know what I should change in the PR.

Cheers,
Gui

Copy link
Member

@corradio corradio Sep 5, 2016

Choose a reason for hiding this comment

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

OK makes sense. About real-time, I'd add one important aspect, which is that with wind and solar, I'd like to emphasise that the real-time component is important because of the fluctuating availability. Energy systems are conventionally thought to be "static", so the distinction was important. Maybe indeed we don't need it.

What about

  • Real-time climate impact of the European electricity production?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fine for me!

Copy link
Member

Choose a reason for hiding this comment

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

👍

Guilherme Coelho added 4 commits September 6, 2016 09:22
@guicoelho
Copy link
Contributor Author

@corradio ping

@corradio
Copy link
Member

corradio commented Sep 6, 2016

Nice! Almost there I think. I'll try not to go too much into details and be a perfectionist. That being I said, there's two issues still:

  1. I think the title is a bit too big. It makes the panel bigger than necessary (more than 1/3 of the width)
    image
  2. There's something unbalanced about the logo part
    image
  • There's an unwanted bottom margin, under the "yellow" part
    image
  • The logo is a bit too big
  • The top block with "an open source project from" having a white background is a bit hard to the eye. Maybe we could make the logo same width as that block, and remove the background?
  • The whole (logo + block + contribute) part lights up on hover. Maybe only hover (logo + block)?

Thanks so much!! Once we fix those small issues I'll merge!

@guicoelho
Copy link
Contributor Author

Hey Oli,

  1. No sure if the headline being big is a problem or plus. Anyway, we can easily reduce the font.
  • The margin is there to avoid this: image
  • Sure, let's make it a bit smaller
  • We can, be it becomes a little boring... I feel. There's no hierarchy between the text over "Tomorrow" and the one under it.
  • Sure, we can do that as well. But I honestly don't see it as an inconvenient atm - the bottom left is like the "Open-source section" that light's up when you hover.

@corradio
Copy link
Member

corradio commented Sep 6, 2016

Hey Gui,

  1. ok, so let's reduce it a bit.
    2a) Good catch with the link overlay! Let's then add the same margin left and right so they are equal.
    2b,2c,2d) If you don't see any problems with it, I suggest we make the logo smaller so that it has the same width as the "An open-source project from" text. No need to remove the background. Also I'd be happy if we made the hover change. That way we have one independant block which we can re-use, and it will feel like a separate entity.

I won't bother you more :) We can always change it later if needed.

@guicoelho
Copy link
Contributor Author

guicoelho commented Sep 6, 2016

Made some changes - to make the bottom left corner more balanced, it's maybe better to go back to the solution you had initially. I've reverted it.

Regarding changing the "open source project" block, it looks huge if I make it as large as the Tomorrow word:
image

I like the previous style better, looks more like a "tag", it's a bit more subtle:
image

EDIT: To be clear, I don't think any of these options are particularly good. We definitely have to revisit this later and come up with a proper identity and branding. This is something done in 5min, which is enough for now. That being said, full-width or not, I'm really neutral.. fine with both

@corradio
Copy link
Member

corradio commented Sep 6, 2016

Roger that.

All sizes are perfect now - except the "tag" which is too small and hard to read.

image

My final suggestion is that we use "A project by" and increase a bit the size so it's readable when it's shown on the page. No strong opinion however if you prefer "An open source project by" (instead of from). I'm not sure I understood which version you preferred?

Also we need a target="_blank" for the logo link, but I can add that.

@corradio corradio merged commit 67b35a9 into electricitymaps:master Sep 6, 2016
@corradio
Copy link
Member

corradio commented Sep 6, 2016

Superb! Merging 🎉 !!

Pantkowsky pushed a commit to Pantkowsky/electricitymap that referenced this pull request Mar 10, 2017
* add favicon

* add headline

* add Tomorrow watermark

* move contribute instructions to main panel

* simplify panel and initial text

* Make watermark smaller

* fix header margin

* Fix build steps for @guicoelho

* change headline

* map on the right -> this map

* improve Tomrrow watermark

* move contribute text to watermark. Which puts it in the context of Tomorrow Open-Source and also gives it more prominence because the Tomorrow logo is eye catching

* smaller headline

* smaller watermark

* revert to previous contribute-text style

* update logo

* increase size of block + target blank
madsnedergaard added a commit that referenced this pull request Jan 30, 2023
* Adds .vscode files and a symlink

* Adds temporary dev-easement-rule-disablements

* Makes magic-numbers rule more chill

* fixes magic number

* Removes unused disable-comments

* Moves testing utils and setup to separate folder

* Groups utils in one folder

* Restructures app

* Fixes imports

* capacitor scripts

* Moves files around

* Fixes paths to get tests passing

* Fixes linting paths after renaming tests

* Updates VSCode settings to include file nesting

* block all crawlers (#11)

* block all crawlers

* add no index meta

* initial map setup (#13)

* remove cz (#12)

* add tailwind classname package (#10)

* update pnpm lock

* Adds error overlay to display runtime errors (#16)

* Moves integration tests over and makes them work again (#15)

Co-authored-by: Tony <[email protected]>

* Adds basic layout (#17)

* Adds deploy script (#14)

* Tonyvanswet/ele 1338 UI header component (#20)

* Adds some mockdata with new structure (#22)

* add mockdata

* fix

* LeftPanel UI (#18)

* Replaces tailwindcss-classnames with clsx.
See https://linear.app/electricitymaps/issue/ELE-1331#comment-5816d8f5

* Ensures tailwind autocomplete stil lworks

* Adds missing dependency

* Updates outer wrapper styles

* Adds initial work on the left panel container

* Fixes shadows

* Adds fixed to main

* Uses proper HTML tags

* Removes clsx usage

* Adds state with atom and initial timecontroller UI (#21)

* Adds libraries

* atom logic

* change line width to 80

* Update api calls

* adds initial ui for timecontroller

* Jotai usage documentation

* Readme

* incorporate feedback

* Update .prettierrc.json

* lint

* Update README.md

Co-authored-by: Tony <[email protected]>

* Tonyvanswet/ele 1371 map UI basic geometries and colors (#19)

* initial map setup

* get map rendering

* crop antartica with very magical numbers

* gray map and many eslint errors

* add mockdata

* fix

* map with types

* use v6 api

* basic map

* Update web/src/hooks/theme.ts

Co-authored-by: Mads Nedergaard <[email protected]>

* Update web/src/api/getState.ts

Co-authored-by: Mads Nedergaard <[email protected]>

* Update web/src/features/map/map-utils/generateTopos.ts

Co-authored-by: Mads Nedergaard <[email protected]>

Co-authored-by: Markus Killendahl <[email protected]>
Co-authored-by: Mads Nedergaard <[email protected]>

* add all the flags (#24)

* Zone Details: Header part 1 (#23)

* add all the flags

* Add zoneFlag with hardcoded return

* Change leftpanel styling

* Add initial zoneHeader

* Works for countries

* Disable eslint

* Disables the annoying import-organize

* Lints everything with 90 char line-width (#29)

* Updates prettierignore

* Removes unused overwrite

* Ensures script uses prettierignore lisr

* Disable the horrible "auto-removing imports"

* Ignores config json files

* Formats everything with printwidth 90

* Updated map logic (#27)

* WIP

* WIP 2

* setup types

* Fix test

* Remove unused things

* Disables the annoying import-organize

* Split theme types

* Color on all effects

Co-authored-by: Mads Nedergaard <[email protected]>

* Zone Details Header: Part 2 (#25)

Co-authored-by: Mads Nedergaard <[email protected]>

* Sets up basics for dark-mode (#28)

* Adds translations (#31)

* add locales

* add translation logic

* use translation hook in timecontroller

* Adds v6 to mockserver (#30)

* Updates script to create paths and use v6

* Removes mock data for v4 and v5

* Adds mock data for v6

* Updates mockserver to work with v6

* Style toggle group

* inject dependencies in toggle

* style and refactor timeslider

* Change header to be fixed positioned

* Remove error and loading handling on map. It should ideally always be drawn.

* Close left panel

* Add timeaxis

* refactor timecontroller

* add helpers

* remove magic number rule

* add clock icon in html file

* install react spinners

* change tailwind config. Should confirm best practice.

* add slider thumb custom icon

* Basic map interactivity: Hover (#33)

* Ensure atom returns typed value

* Timeslider (#35)

* remove unused config

* change tailwind config

* use brand green

* remove ternary operator

* incorporate feedback

* Fixed layout problems with Header (#36)

* Makes header not-fixed and adjusts link font size

* Makes time controller fixed (instead of absolute)

* Basic map interactivity II: Click & Selected (#34)

* Ranking panel (#32)

* add locales

* add translation logic

* use translation hook in timecontroller

* Copied files from #26

* working prototype

* ensure timecontroller is on top

* ranking rows

* refined ranking panel

* remmove undefined

* Adds onClick handler

* Applies curly rule

* Update web/src/features/panels/ranking-panel/ZoneList.tsx

Co-authored-by: Mads Nedergaard <[email protected]>

* Creates and uses an InternalLink component that preserves state

* remove ref and update hover

Co-authored-by: tonypls <[email protected]>
Co-authored-by: Mads Nedergaard <[email protected]>

* add arrows (#41)

* Set up icons and replaces existing usage (#37)

* Documents icon usage

* Adds react-icon and documents usage

* Replaces icons with new approach

* Tonyvanswet/ele 1375 UI set up prodcon and aggregate toggle (#38)

* start toggle

* reusable toggle

* toggle with translations

* update enums

* Exchanges: map rendering (#40)

* add arrows

* add exchange types

* added key

* add scales helper

* add custom layer

* add exchange logic

* add to map

* Update web/src/features/exchanges/ExchangeArrow.tsx

Co-authored-by: Viktor Andersson <[email protected]>

* Update web/src/features/map/Map.tsx

Co-authored-by: Viktor Andersson <[email protected]>

* Update web/src/features/map/Map.tsx

Co-authored-by: Viktor Andersson <[email protected]>

Co-authored-by: Viktor Andersson <[email protected]>

* Fixes locales path

* start on buttons and tooltips (#39)

* start toggle

* reusable toggle

* toggle with translations

* update enums

* start on buttons and tooltips

* darkmode + zoom controls

* add zoom toggles

* zoom darkmode

* map controls ready for review

* Remove theme check

* Update web/src/features/map/Map.tsx

Co-authored-by: Mads Nedergaard <[email protected]>

Co-authored-by: Mads Nedergaard <[email protected]>

* Adds translation scripts (#43)

* Tonyvanswet/ele 1378 UI basic tooltip component (#44)

* start toggle

* reusable toggle

* toggle with translations

* update enums

* start on buttons and tooltips

* darkmode + zoom controls

* add zoom toggles

* zoom darkmode

* map controls ready for review

* tooltip follows cursor in country

* empty tooltip

* tidy

* A bunch of minor improvements (#46)

* Adds LoadingOverlay (#47)

* Add initial area charts (#48)

* install d3

* modify types

* tweak timeaxis

* set up helpers

* add chart components

* install currency lib

* add two additional graphs

* Charts v2: Refactor with hooks (#49)

* install d3

* modify types

* tweak timeaxis

* set up helpers

* add chart components

* install currency lib

* add two additional graphs

* change usegetzone hook to no params

* refactor pricechart

* refactor carbonchart

* refactor breakdown chart

* extend types

* change areagraph data format

* set it up

* feedback

* Allows ts-ignore comments with descriptions

Co-authored-by: Mads Nedergaard <[email protected]>

* Adds new Flag component (#50)

* some theme colors and improve darkmode (#52)

* no user select for buttons / controllers (#56)

* less fruits, more clickable map (#55)

* Tonyvanswet/zone tooltip data (#51)

Co-authored-by: Mads Nedergaard <[email protected]>

* Changes title component to incapsulate logic and use real data (#54)

* Adds new Flag component

* Updates flag props

* Changes title component to incapsulate logic

* Changes gauges to use 0-1 scale instead of 1-100.
As our data comes in this way and the charts needs it like this anyway.

* Changes CountryTag to only show on subzone

* Adds new TimeDisplay that uses atom directly

* Adds comment (and waits with implementation)

* Hooks ZoneHeader up with more data

* Sets default selected datetime as latest

* Bumps version

* Removes flags

* Charts v3: Emission mode (#53)

* install d3

* modify types

* tweak timeaxis

* set up helpers

* add chart components

* install currency lib

* add two additional graphs

* change usegetzone hook to no params

* refactor pricechart

* refactor carbonchart

* refactor breakdown chart

* extend types

* change areagraph data format

* set it up

* feedback

* Adds emission chart

* Set up display by emissions

* fix typos

* incorporate feedback

* fixes Markus' fix

* Fixes merge conflict mistake

* Fixes merge conflict issue

* bump

* tidy up and some branch feedback (#58)

* Tonyvanswet/ele 1479 make language selector work (#57)

* start on language selector

* language select

* Refactor charts further and adds storybook (#59)

* Adds basic setup

* Adds default sample stories

* Adds example MDX

* install d3

* modify types

* tweak timeaxis

* set up helpers

* add chart components

* install currency lib

* add two additional graphs

* change usegetzone hook to no params

* refactor pricechart

* refactor carbonchart

* refactor breakdown chart

* extend types

* change areagraph data format

* set it up

* feedback

* Adds emission chart

* Set up display by emissions

* fix typos

* WIP

* WIP 2

* WIP

* Fix merge conflicts probably

* Remove timeaverage as param

* Add on hover effect to breakdown chart

* Support storage

* Add storage story

* Fix import

* reset datetimes correctly

* Incorporate feedback

Co-authored-by: Mads Nedergaard <[email protected]>

* onboarding modal (#60)

* onboarding modal

* remove dialog package

* use local storage atom

* Update web/src/components/modals/OnboardingModal.tsx

Co-authored-by: Viktor Andersson <[email protected]>

* Update web/src/components/modals/OnboardingModal.tsx

Co-authored-by: Viktor Andersson <[email protected]>

* Update web/src/components/modals/OnboardingModal.tsx

Co-authored-by: Viktor Andersson <[email protected]>

* Update web/src/components/modals/OnboardingModal.tsx

Co-authored-by: Viktor Andersson <[email protected]>

* updates from merge

Co-authored-by: Viktor Andersson <[email protected]>

* Tonyvanswet/fix easy todos (#62)

* some TODO tidying

* get exchanges working again

* Update Map.tsx

* Tonyvanswet/fix todos part2 (#63)

* some TODO tidying

* get exchanges working again

* small fixes

* update theme type

* Get e2e tests working (#64)

* Ensure maptooltip does not remount and call api

* stash

* test passes

* Restructure mockserver

* remove stories

* remove

* Bar Breakdown Chart (#65)

Co-authored-by: Markus Killendahl <[email protected]>

* Fixes tooltip issue + broken bar breakdown chart (#69)

* Fixes tooltip issue

* Reverts change in data from hook

* FAQ Panel (#68)

* Tonyvanswet/ele 1370 set up new version logic (#61)

* start on toast

* new version toast

* new version with longer toast and descriptive refetch intervals

* check if prod before displaying new version toast

* prettier

* Tonyvanswet/update ranking panel style (#71)

* Adds outer panel

* Adds FAQ content

* Adds Tailwind plugins and animations

* Adds Poppins font

* Updates panel styling to handle scrolling and fixed containers

* Accepts FAQ in filename

* update styles based on feedback

* update after merge

* update scroll bar style and finish ranknig panel

* Adds dark mode hover styling

Co-authored-by: Mads Nedergaard <[email protected]>

* Dark-mode of bar-breakdown + chart titles + minor adjustments (#70)

Co-authored-by: Tony <[email protected]>

* Updates to handle new v6 data structure (#72)

* Updates to handle new v6 data structure

* Updates mock data

* Adds correct steps in CO2 scale (#73)

I assume the stuff was done to avoid magic numbers, but we removed that rule

* Small screen tweaks (#75)

* Tonyvanswet/ele 1508 carbon intensity legend (#74)

* start legend

* legendary

* move styling to legend container

* move styling to legend container actually saved this time

* rename legend container

* Adds areagraph tooltips (#67)

* Add shared tooltip component

* store zonedetails in meta

* share function from maptooltip

* add simple tooltips to charts

* Update locales

* Remove boiler story

* add keys to zonedetails

* add helper components

* add helper methods

* add breakdown tooltip

* add stories

* add other tooltips

* fix some bugs

* set up emission chart tooltip

* handle different size of tooltip placement

* log statement

* make tooltip more responsive

* style fixes

* Remove duplicate question mark

* add a debug file

* add a unit test

* clean up

* Sets Vite up to build index.html using a template (#77)

* Finalise Ranking Panel (#78)

* Tonyvanswet/ele 1368 set up solar and wind layer (#80)

* borked wind layer

* sort of works

* add todo on moment

* removed moment, kinda working

* remove moment from packages

* Removes cleanup function which is not allowed on useCallback

* Fixes hour offset (no clue why though...)

* Removes unused import

* Deletes unused hooks

* Removes react-transition-group

* Removes another cleanup-function

* Replaces fade-in transition with tailwind

* Updates data-fetching logic:
- use correct dates
- type data response
- retry with prev. timestamp if it 404s

* Uses data type

* Uses singleton pattern for Windy instance + types

* Update web/src/api/getWeatherData.ts

* Removes commented-out code

* Moves scales to different files

Co-authored-by: Markus Killendahl <[email protected]>
Co-authored-by: Mads Nedergaard <[email protected]>

* Set up mobile tooltips (#83)

* update spring bottom sheet

* add mobile styling

* remove comment

* use tailwind numbers

* Add zone detail states (#79)

* Add empty bar breakdown chart

* add more states and refactor

* add contributor list and source

* ensure graphs are not rendered when no data

* remove boilerplate story

* feedback

* Merge conflict and remove warning

* Refactors Map to avoid excessive rendering (#81)

* Changes tooltip to read from global state

* Creates new MapWrapper to split components out

* Moves map-related atoms inside feature-folder

* Moves shared map types to its own file

* Moves state to global atoms

* Refactor the onMouseMove handler for readability

* Reads isMoving from atom

* Makes panel open when clicking a country

* Reemoves types that can now be inferred + minor tweaks

* Hides tooltip when dragging map (like before)

* handle conflicts

Co-authored-by: Markus Killendahl <[email protected]>

* Fix SE-SE4 not being hoverable (#84)

* add empty zone to geometries

* add comment

* use zoneid as featureid

* format

Co-authored-by: Markus Killendahl <[email protected]>

* starting to work through errors and warnings (#86)

* Add geometry and zone-config scripts (#85)

* WIP

* executable through ts-node

* Update script

* reintroduce eslint rules

* add eslint rules back

* use current config folder

* use current config

* Add tooltip to barbreakdown chart and style zonedetails a bit (#87)

* Add tooltip functionality

* style zonedetails

* rename variable

* Adds solar layer 🌞 (#90)

Co-authored-by: tonypls <[email protected]>

* Adds loading indicators on weather buttons (#89)

* fixes atom name usage

* Changes layer orders

* Removes vite-plugin-html and uses a plain index HTML (#94)

* Removes variable usage from index file.
Also stops Prettier from breaking long lines

* Removes package

* Switches to variable font for Inter

* BreakdownChartTooltip bugfixes (#93)

* Disable test coverage

* test passes

* returns 0 instead of ? for existing zero production

* fix darkmode and positioning

* refactor tooltip calculations

* tidy left panel (#88)

* Tonyvanswet/ele 1366 set up proper sentry process (#91)

* add sentry

* further sentry updates

* sentry routes

* add sentry auth

* Update index.html

* Update main.tsx

* update project name

* Adds colorblind-mode (#92)

* excludes subzones (#95)

* fix style (#96)

* extra space (#97)

* add tooltips (#99)

* add dark mode bg for overlay (#100)

* 🎁 Update bottom sheet snap points (#102)

* reduce snapsshots

* align text and datedisplay

* solar and wind legends (#103)

* solar and wind legends

* hide legends on small screens

* tidy legends

* 🎁 Display estimated and aggregated badges (#98)

* display badges

* add height

* 🎁 Improve tooltip interactivity on mobile (#101)

* add x button on areagraphtooltip

* remove hover layer effect on mobile

* add a bit more styling

* works on larger devices

* change top padding to come from styles and add z index to go above timecontroller

* ensure overlay above timecontroller

* add none pointer events to prevent flickering

* close tooltip when zoneclicked

Co-authored-by: tonypls <[email protected]>

* Adds custom events (#108)

* Mobile modals part I: The base (#104)

* Mobile modals part II: Settings (#105)

* Mobile modals part III: Info (#106)

* use latest inter (#109)

* Updates Sentry project name + check for env vars

* Tonyvanswet/add alaska translation (#110)

* add zone name for Alaska

* add alaska and prevent long zone overflow

* onboarding modal for mobile (#113)

* onboarding modal for mobile

* Adds padding below titles and switches font

* Adds shadow to modal buttons

* Makes modal buttons overlap modal on mobile.
This gives more space for content

* Positions modal closer to middle of screen on desktop

* Makes modal less high on mobile + increases shadow

* Constraints logo size on first slide

* Ensures TimeController is always rendered.
Otherwise the loading spinner shows again.

* Adds comment to timecontroller

Co-authored-by: Mads Nedergaard <[email protected]>

* Fix broken refresh on app (#115)

* Fixes tooltip crash (#118)

* Fixes issue when adblocker is used + adds types (#117)

* Disables ts-checking on Windy and .stories.*

* Rearranges and updates images and icons (#114)

* fly to places (#116)

* fly to places

* Update web/src/features/map/Map.tsx

* update from feedback

* update initial view

Co-authored-by: Mads Nedergaard <[email protected]>

* disclaimer (#111)

* disclaimer

* update disclaimer

* change title width for difference screen sizes

* Adds a tiny bit of padding on mobile

Co-authored-by: Mads Nedergaard <[email protected]>

* Updates scripts (#112)

* Mobile modals part IV: FAQ (#107)

* Changes atoms to only use localStorage (#119)

* Tonyvanswet/ele 1538 enable center on callerlocation (#120)

Co-authored-by: Mads Nedergaard <[email protected]>

* allow toggle between production and consumption (#121)

* Fixes skip-onboarding

* Disables PWA and unregister SW temporarily

* touchable tooltips for toggle component (#122)

* Renames web

* Renames web-old to web while merging

* Reverts web folder renaming

* Merges locales

* Updates generated config files

* Adds scripts to ensure we generate new zone config

* co2 scale ++ (#126)

* co2 scale ++

* testing gray map

* remove test code, prevent rotate and tilt

* Update web/src/hooks/colors.ts

Co-authored-by: Viktor Andersson <[email protected]>

Co-authored-by: Viktor Andersson <[email protected]>

* capitalize tooltip (#127)

* add get our data link (#123)

* add get our data link

* update from feedback, remove message css

* Update web/src/features/charts/ChartTitle.tsx

Co-authored-by: Viktor Andersson <[email protected]>

Co-authored-by: Mads Nedergaard <[email protected]>
Co-authored-by: Viktor Andersson <[email protected]>

* unhover zone when clicked

* fix jobs link (#132)

* filter breakdown chart exchanges for selected aggregate (#133)

* feedback from Rasmus (#124)

* correct emmsions tooltip (#130)

* hardcode center location for FJ US-AK and RU-FE, and Offset center (#136)

* Updates error boundary message (#128)

* time controller german translation (#131)

* Generates index files for all paths! (#135)

* Tonyvanswet/ele 1572 fly on zone click either get it to move (#137)

* hardcode center location for FJ US-AK and RU-FE, and Offset center

* update world json

* Ensures index-generating script runs on deploy

* Fixes bug

* Bumps version

* Fixes minor design feedback

* Use manual chunking to split large chunks (#139)

* show production / consumption in carbon tooltip (#134)

* show production / consumption in carbon tooltip

* Update web/src/features/charts/tooltips/CarbonChartTooltip.tsx

Co-authored-by: Mads Nedergaard <[email protected]>

* more readable conditional

Co-authored-by: Mads Nedergaard <[email protected]>

* check for zonedata before getting exchanges (#142)

* Tonyvanswet/ele 1581 exchanges are still shown when in (#143)

* Tonyvanswet/ele 1579 better message for no data tooltip (#141)

* add spacing for units (#140)

Co-authored-by: Mads Nedergaard <[email protected]>

* Styling tweaks + Deselect zone when going back to map on mobile (#138)

Co-authored-by: Tony <[email protected]>

* Adds tooltip to LowCarbon Gauge in panel (#144)

Co-authored-by: tonypls <[email protected]>

* Improves no-data tooltip (#147)

Co-authored-by: tonypls <[email protected]>

* Adds overlay to breakdown chart (#148)

* Round map to 4 decimals (#151)

* Use @turf/helpers (#150)

* Tvs rj/ux peerprogramming (#152)

* UX feedback merged with master

* use same font size for gauges in zoneheader and maptooltip

* merge classnames

* feedback + max width

* make things no selectable on mobile + enable touch zoom but disable r… (#153)

* make things no selectable on mobile + enable touch zoom but disable rotation

* tap hightlight comment

* Deployment improvements (#149)

* unhover other zones on click (#154)

* Adds comment about missing info in type

* Fixes incorrect script

* version bump

* fix fully renewable header (#159)

* Minor fixes (#158)

* Allows robots in

* Bumps version

* Adds missing translation

* version bump

* Tonyvanswet/ele 1621 deploy mobile apps (#156)

* make things no selectable on mobile + enable touch zoom but disable rotation

* tap hightlight comment

* unhover other zones on click

* app icons + android / ios specific changes

* disable pitch

* safe area time controlloer

* safe area left panel

* bump versions

* Moves all Storybook stories next to their components (#145)

* Unifies CO2 Intensity display (#146)

* Squares and gauges now uses translations (#161)

* Fixes /zone/WHATEVZ breaking the app + disables chunking for now (#160)

* TimeController improvements (#162)

Co-authored-by: Tony <[email protected]>

* Fixes multiple bugs (#164)

* Jl/license (#155)

Co-authored-by: Viktor Andersson <[email protected]>
Co-authored-by: Mads Nedergaard <[email protected]>

* Change div to picture to fix webp exchange arrows (#169)

* Tvs/i os build (#170)

* Disables transition of numbers (#171)

* Tvs/fixcharts ios 14 (#172)

* Fixes New Version Available + Reduces Sentry transaction amount (#173)

Co-authored-by: Tony <[email protected]>

* Removes console log

* More minor tweaks (#165)

* Updates configs after master merge

* Fixes search params

* Temporarily disables IN-NO

* Sets correct theme color

* Enables CI again (#163)

* Bumps version

* Tvs/sensible bounds (#174)

* adjust view bounds

* disable pitch and rotate even when no data

* Tvs/release candidate (#176)

* adjust view bounds

* disable pitch and rotate even when no data

* prepare for mobile app release

* prettify

* bump version

* stop replace all errors (#177)

* Remove unneeded fields from config files (#167)

* Replaces map with a fallback shown for users on old ios versions (#175)

* comment out atom dev tools (#178)

* Fix invalid href lang + add preconnects (#180)

* include new tracking events (#179)

* delete web-old

* Fixes link

* Removes new workflows for new

* Updates ignores

* Removes clsx

* Removes license from boilerplate

* Ignores vscode

* Removes vscode symlink

* Deletes deploy script

* Removes boilerplate leftover

* bring back site links to mobile app

* prettify

---------

Co-authored-by: tonypls <[email protected]>
Co-authored-by: Markus Killendahl <[email protected]>
Co-authored-by: Viktor Andersson <[email protected]>
Co-authored-by: lav-julien <[email protected]>
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.

2 participants