Merge remote-tracking branch 'core/fix-env-setup' into update-deploym…

…ent-section

* core/fix-env-setup:
  Fix environment setup in new structure

.env.example

@@ -1,8 +1,8 @@
 # Allow accessing a GitHub bearer token to avoid rate limits when doing HTTP fetches to the GitHub API.
 # This can be generated at https://github.com/settings/tokens?type=beta and needs read-only access to all public CYF GitHub repos.
-CYF_CURRICULUM_GITHUB_BEARER_TOKEN=""
+HUGO_CURRICULUM_GITHUB_BEARER_TOKEN=""
 # Client ID and secret for the GitHub OAuth app used to authenticate users.
 GITHUB_CLIENT_ID="clientid"
 GITHUB_CLIENT_SECRET="clientsecret"
 # The domain of the site, used for generating redirect URLs.
-DOMAIN="http://localhost:8888"
+DOMAIN="http://localhost:8888"

README.md

@@ -57,4 +57,4 @@ For each module you import, add a `replace` directive to your `go.mod` file - if
 
 ## To locally develop your site
 
-`cd` into the site you wish to develop, and run `hugo server` to get a live preview.
+Check [org-cyf/README.md](/org-cyf/README.md) on how to set up your local environment. Once that is done you can `cd` into the site you wish to develop, and run `npm run start:dev` to get a live preview.

org-cyf/README.md

@@ -38,7 +38,7 @@ The "Repository access" you need is "Public repositories (read-only)", and you d
 
 #### Set up `.env`
 
-Copy the `.env.example` file over and name it `.env`. Edit the file and then change the line that says `CYF_CURRICULUM_GITHUB_BEARER_TOKEN` to contain the token that you have generated earlier.
+Copy the `.env.example` file over and name it `.env`. Edit the file and then change the line that says `HUGO_CURRICULUM_GITHUB_BEARER_TOKEN` to contain the token that you have generated earlier.
 
 #### Run this command
 

org-cyf/package.json

@@ -5,7 +5,8 @@
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "start:dev": "dotenv -- hugo server -p 3000 -D"
+    "start:dev": "dotenv -e ../.env -- hugo server --environment issues-are-cached-and-incomplete",
+    "build:dev": "dotenv -e ../.env  -- hugo --environment issues-are-cached-and-incomplete"
   },
   "keywords": [],
   "author": "",

org-mcb/package.json

@@ -5,8 +5,8 @@
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "start:dev": "dotenv -- hugo server --environment issues-are-cached-and-incomplete",
-    "build:dev": "dotenv -- hugo --environment issues-are-cached-and-incomplete"
+    "start:dev": "dotenv -e ../.env -- hugo server --environment issues-are-cached-and-incomplete",
+    "build:dev": "dotenv -e ../.env  -- hugo --environment issues-are-cached-and-incomplete"
   },
   "keywords": [],
   "author": "",