Merge branch 'dev'

.env.production

@@ -1,5 +1,5 @@
 # override .env
-REACT_APP_REDIRECT_URL =https://anyway-infographics.web.app
+REACT_APP_REDIRECT_URL =https://anyway-infographics.web.app/login-popup-redirect
 
 # Keys
 REACT_APP_GOOGLE_MAP_KEY ='AIzaSyDUIWsBLkvIUwzLHMHos9qFebyJ63hEG2M'
@@ -9,4 +9,6 @@ REACT_APP_SHOW_META_TAGS=false
 REACT_APP_SHOW_DEMO_CARDS=false
 REACT_APP_SHOW_ONLY_OPER_CARDS=true
 
+# === Feature flags (use for hiding features until ready for production) ===
+REACT_APP_LOGIN_READY_FOR_PROD=false
 

.env.staging

@@ -1,5 +1,5 @@
 # override .env, .env.production
-REACT_APP_REDIRECT_URL =https://anyway-infographics-staging.web.app
+REACT_APP_REDIRECT_URL=https://anyway-infographics-staging.web.app/login-popup-redirect
 
 # Behaviour
 REACT_APP_SHOW_META_TAGS=true

README.md

@@ -179,11 +179,11 @@ We have app server (written in [express](https://expressjs.com/), a node.js-base
 
 See [API document](https://docs.google.com/document/d/1Hv5ItvwM3z9nn95LjlsYHL-o18V8PgWrrQOKIPiPymU)
 
-### CICD And Environmnets<a id="cicd"></a>
+### CICD And Environments<a id="cicd"></a>
 
 Active Environments:
 
-- Staging - to be used internannly by Anyway teams
+- Staging - to be used internally by Anyway teams
 - Production - Contains ready cards
 - Demo - Contains ready cards & Demo Cards
 
@@ -193,9 +193,9 @@ Each environment has a specific environment file which can be used to override `
 We use [github actions](https://github.com/marketplace?type=actions) for the following flows:
 
 1. [on-push CI](https://github.com/hasadna/anyway-newsflash-infographics/actions?query=workflow%3ACI) - provide per-PR CI testing
-1. [deploy-dev](https://github.com/hasadna/anyway-newsflash-infographics/actions?query=workflow%3Adeploy-development): continous deployment of `dev` branch to Staging Environmnet - https://anyway-infographics-staging.web.app/
-1. [deploy-master](https://github.com/hasadna/anyway-newsflash-infographics/actions?query=workflow%3Adeploy-development): continous deployment of `master` branch to Production Environmnet - https://anyway-infographics.web.app/
-1. [deploy-demo](https://github.com/hasadna/anyway-newsflash-infographics/actions?query=workflow%3Adeploy-development): continous deployment of `demo` branch to Demo Environmnet - https://anyway-infographics-demo.web.app/
+1. [deploy-dev](https://github.com/hasadna/anyway-newsflash-infographics/actions?query=workflow%3Adeploy-development): continuous deployment of `dev` branch to Staging Environment - https://anyway-infographics-staging.web.app/
+1. [deploy-master](https://github.com/hasadna/anyway-newsflash-infographics/actions?query=workflow%3Adeploy-development): continuous deployment of `master` branch to Production Environment - https://anyway-infographics.web.app/
+1. [deploy-demo](https://github.com/hasadna/anyway-newsflash-infographics/actions?query=workflow%3Adeploy-development): continuous deployment of `demo` branch to Demo Environment - https://anyway-infographics-demo.web.app/
 
 Note: see the flows status badge at the top of this file
 

docs/Release.md

@@ -1,6 +1,10 @@
 # ANYWAY: Newsflash InfoGraphics - Releasing
 
-Updating all environments (Production & Demo) are prefeable, although per-envronment release is possible.
+TL;DR
+
+1. Update version in `package.json`
+2. Update `dev` and `master` branches
+3. [Creating a release](https://help.github.com/en/github/administering-a-repository/managing-releases-in-a-repository#creating-a-release) based on `master`
 
 ### Create a Release
 
@@ -9,7 +13,7 @@ Updating all environments (Production & Demo) are prefeable, although per-envron
 1. Checkout `dev` branch and `git pull`
 1. Make sure you update `version` field in `package.json` for `dev` branch
 
-#### Step 1: Updating target branch (`master` / `demo` etc)
+#### Step 1: Updating target branch (`master`)
 
 Assuming release is for production (`master` branch)
 create PR to update `master` (`master` is base, `dev` should be selected to compare)
@@ -19,7 +23,7 @@ _PR name_ format should be: `v0.2.0` - replace with the new version number.
 We follow the [semver](https://semver.org/) standard, release considered as a `minor` change,
 so if last release was `v0.2.0`, next release should be `v0.3.0`.
 
-#### Step 2: Publish a Release on `dev` branch ( / `demo` etc)
+#### Step 2: Publish a Release on `master` branch
 
 Go to [create a new release](https://github.com/hasadna/anyway-newsflash-infographics/releases/new) and create a release with the version number and `Target:master`.
 
@@ -28,4 +32,4 @@ If you're new to github releases, follow [Creating a release](https://help.githu
 If you want to add changes to your release after creation, You may either:
 
 - Create a new `patch` release (change only the `patch` version number), like: `v0.3.1`
-- [Delete the release](https://help.github.com/en/github/administering-a-repository/managing-releases-in-a-repository#deleting-a-release), update `master` and re-create the release with the same verion number
+- [Delete the release](https://help.github.com/en/github/administering-a-repository/managing-releases-in-a-repository#deleting-a-release), update `master` and re-create the release with the same version number

docs/Vision.md

@@ -1,17 +1,21 @@
 # ANYWAY: Newsflash InfoGraphics - vision
+
 ## About ANYWAY
-ANYWAY give interactive map, Database engaine, and information on Traffic accidents in israel. the data originating from the Central Bureau of Statistics and United Hazalah’s, as well as traffic violations as reported by road vigilantes. 
+
+ANYWAY give interactive map, Database engine, and information on Traffic accidents in israel. the data originating from the Central Bureau of Statistics and United Hazalah’s, as well as traffic violations as reported by road vigilantes.
 
 The goal of the project is to primarily raise public awareness for Road Hazard and about available
-soultions to improve road safety. This is used to create pressure on decision makers to perform necessary infrastructural repairs as well as create discourse regarding solutions.  
+solution's to improve road safety. This is used to create pressure on decision makers to perform necessary infrastructural repairs as well as create discourse regarding solutions.
 
-importent concept is vision zero - 
+important concept is vision zero -
 [Vision Zero](https://en.wikipedia.org/wiki/Vision_Zero) is a multi-national road traffic safety project that aims to achieve a highway system with no fatalities or serious injuries involving road traffic. It started in Sweden in October 1997. Key idea is to vision zero is [Systematic Safety](https://www.youtube.com/watch?v=5aNtsWvNYKE) . similar projects are [EuroRAP](https://en.wikipedia.org/wiki/EuroRAP) in Europe , and [NACTO guides](https://nacto.org/) in USA.
 
 ## About Newsflash InfoGraphics project
-The aim of Newsflash InfoGraphics is providing usefull inforamtion for reporters about accidnts and road safty. 
 
-to do this we combine data , knoladge and InfoGraphics from vearuis sources:
-* news flashes about accidents, 
-* historty and statistics about similar accidnts, (in this reagion, with simialr viaalce, etc)
-* knolagde about best-pratice prevantion methods from vioin zero, and simialr safty programs from the world and israel.
+The aim of Newsflash InfoGraphics is providing useful information for reporters about accidents and road safety.
+
+To do so we combine data, knowledge and InfoGraphics from various sources:
+
+- news flashes about accidents,
+- history and statistics about similar accident's, (in this region, with similar vehicle, etc)
+- knowledge about best-practice prevention methods from vision zero, and similar safety programs from the world and israel.