Bug fixes & fixing links

.changeset/508cb247/changes.md

@@ -1 +1 @@
-- Upgrade flow
+- Upgrade flow

.changeset/ab4c149e/changes.md

@@ -1 +1 @@
-- Remove recalcHeight prop from Filter props
+- Remove recalcHeight prop from Filter props

.circleci/config.yml

@@ -84,7 +84,7 @@ jobs:
 
   integration_tests_basic:
     environment:
-      PROJECT_DIRECTORY: projects/basic
+      PROJECT_DIRECTORY: test-projects/basic
       CLOUDINARY_CLOUD_NAME: $CLOUDINARY_CLOUD_NAME
       CLOUDINARY_KEY: $CLOUDINARY_KEY
       CLOUDINARY_SECRET: $CLOUDINARY_SECRET
@@ -94,22 +94,22 @@ jobs:
 
   integration_tests_login:
     environment:
-      PROJECT_DIRECTORY: projects/login
+      PROJECT_DIRECTORY: test-projects/login
       PORT: 3000
     <<: *job-setup
     <<: *integration-steps
 
   integration_tests_accesscontrol:
     environment:
-      PROJECT_DIRECTORY: projects/access-control
+      PROJECT_DIRECTORY: test-projects/access-control
       PROJECT_NAME: 'Cypress Test Project For Access Control'
       PORT: 3000
     <<: *job-setup
     <<: *integration-steps
 
   # integration_tests_twitterlogin:
   #   environment:
-  #     PROJECT_DIRECTORY: projects/twitter-login
+  #     PROJECT_DIRECTORY: test-projects/twitter-login
   #     PORT: 3000
   #   <<: *job-setup
   #   <<: *integration-steps

.eslintignore

@@ -3,5 +3,6 @@ coverage
 dist
 flow-typed
 reports
-projects/**/cypress
+test-projects/**/cypress
 website/.cache/**/*
+website/public/**/*

README.md

@@ -78,7 +78,7 @@ bolt
 bolt start {name of project folder}
 ```
 
-_(Running `bolt start` will start the project located in `projects/basic` by default)_
+_(Running `bolt start` will start the project located in `demo-projects/todo` by default)_
 
 ## Contributing
 
@@ -118,7 +118,7 @@ bolt coverage
 ### End-to-End Tests
 
 Keystone tests end-to-end functionality with the help of [Cypress](https://www.cypress.io).
-Each project (ie; `projects/basic`, `projects/login`, etc) have their own set of Cypress tests.
+Each project (ie; `test-projects/basic`, `test-projects/login`, etc) have their own set of Cypress tests.
 To run an individual project's tests, `cd` into that directory and run:
 
 ```sh
@@ -129,7 +129,7 @@ Cypress can be run in interactive mode from project directories with its built i
 which is useful when developing and debugging tests:
 
 ```sh
-cd projects/basic && bolt cypress:open
+cd test-projects/basic && bolt cypress:open
 ```
 
 End-to-end tests live in `project/**/cypress/integration/*spec.js`.
@@ -201,7 +201,7 @@ We're not ready to make promises about breaking changes, stability or feature co
 Having said that; we _are_ using Keystone 5 for a limited number of applications in production, and this is how:
 
 - Create a **private** fork of the repo
-- Make a copy of `./projects/basic` and use it as the basis for the project
+- Make a copy of `./test-projects/basic` and use it as the basis for the project
 - Update the `start` script to run your project
 - Pull upstream changes as needed
 

test-projects/README.md

@@ -10,7 +10,7 @@ easier/faster/better to add a new List to an existing test projectt if possible.
 
 ### Environment Variables
 
-Make sure that for each project (eg `projects/basic`), you setup the `.env` file
+Make sure that for each project (eg `test-projects/basic`), you setup the `.env` file
 with the necessary values filled out (see `.env.example` for what's required).
 
 ### Continuous Integration

test-projects/access-control/package.json

@@ -13,8 +13,8 @@
     "cypress:open:cmd": "node -r dotenv-safe/config `which cypress` open",
     "prepare-test-server": "NODE_ENV=test DISABLE_LOGGING=true node -r dotenv-safe/config -e 'require(`execa`)(`start-server-and-test`, [`start`, `http-get://localhost:${process.env.PORT}/admin`, process.argv[1]], { stdio: `inherit` }).catch(error => { console.error(error.toString()); process.exit(error.code) })'",
     "cypress:run:ci": "touch .env && yarn prepare-test-server cypress:run:cmd",
-    "cypress:run": "if [ -f .env ]; then yarn prepare-test-server cypress:run:cmd; else echo \"\nError: Must create a projects/access-control/.env file.\nSee projects/access-control/.env.example for values\n\"; exit 1; fi",
-    "cypress:open": "if [ -f .env ]; then yarn prepare-test-server cypress:open:cmd; else echo \"\nError: Must create a projects/access-control/.env file.\nSee projects/access-control/.env.example for values\n\"; exit 1; fi"
+    "cypress:run": "if [ -f .env ]; then yarn prepare-test-server cypress:run:cmd; else echo \"\nError: Must create a test-projects/access-control/.env file.\nSee test-projects/access-control/.env.example for values\n\"; exit 1; fi",
+    "cypress:open": "if [ -f .env ]; then yarn prepare-test-server cypress:open:cmd; else echo \"\nError: Must create a test-projects/access-control/.env file.\nSee test-projects/access-control/.env.example for values\n\"; exit 1; fi"
   },
   "dependencies": {
     "@voussoir/adapter-mongoose": "^1.0.0",
@@ -39,4 +39,4 @@
     "pino-colada": "^1.4.4",
     "start-server-and-test": "^1.7.11"
   }
-}
+}

test-projects/basic/package.json

@@ -13,8 +13,8 @@
     "cypress:open:cmd": "node -r dotenv-safe/config `which cypress` open",
     "prepare-test-server": "NODE_ENV=test DISABLE_LOGGING=true node -r dotenv-safe/config -e 'require(`execa`)(`start-server-and-test`, [`start`, `http-get://localhost:${process.env.PORT}/admin`, process.argv[1]], { stdio: `inherit` }).catch(error => { console.error(error.toString()); process.exit(error.code) })'",
     "cypress:run:ci": "touch .env && yarn prepare-test-server cypress:run:cmd",
-    "cypress:run": "if [ -f .env ]; then yarn prepare-test-server cypress:run:cmd; else echo \"\nError: Must create a projects/basic/.env file.\nSee projects/basic/.env.example for values\n\"; exit 1; fi",
-    "cypress:open": "if [ -f .env ]; then yarn prepare-test-server cypress:open:cmd; else echo \"\nError: Must create a projects/basic/.env file.\nSee projects/basic/.env.example for values\n\"; exit 1; fi"
+    "cypress:run": "if [ -f .env ]; then yarn prepare-test-server cypress:run:cmd; else echo \"\nError: Must create a test-projects/basic/.env file.\nSee test-projects/basic/.env.example for values\n\"; exit 1; fi",
+    "cypress:open": "if [ -f .env ]; then yarn prepare-test-server cypress:open:cmd; else echo \"\nError: Must create a test-projects/basic/.env file.\nSee test-projects/basic/.env.example for values\n\"; exit 1; fi"
   },
   "dependencies": {
     "@voussoir/adapter-mongoose": "^1.0.0",
@@ -45,4 +45,4 @@
     "supertest-light": "^1.0.2",
     "testcheck": "^1.0.0-rc.2"
   }
-}
+}

test-projects/login/package.json

@@ -13,8 +13,8 @@
     "cypress:open:cmd": "node -r dotenv-safe/config `which cypress` open",
     "prepare-test-server": "NODE_ENV=test DISABLE_LOGGING=true node -r dotenv-safe/config -e 'require(`execa`)(`start-server-and-test`, [`start`, `http-get://localhost:${process.env.PORT}/admin`, process.argv[1]], { stdio: `inherit` }).catch(error => { console.error(error.toString()); process.exit(error.code) })'",
     "cypress:run:ci": "touch .env && yarn prepare-test-server cypress:run:cmd",
-    "cypress:run": "if [ -f .env ]; then yarn prepare-test-server cypress:run:cmd; else echo \"\nError: Must create a projects/login/.env file.\nSee projects/login/.env.example for values\n\"; exit 1; fi",
-    "cypress:open": "if [ -f .env ]; then yarn prepare-test-server cypress:open:cmd; else echo \"\nError: Must create a projects/login/.env file.\nSee projects/login/.env.example for values\n\"; exit 1; fi"
+    "cypress:run": "if [ -f .env ]; then yarn prepare-test-server cypress:run:cmd; else echo \"\nError: Must create a test-projects/login/.env file.\nSee test-projects/login/.env.example for values\n\"; exit 1; fi",
+    "cypress:open": "if [ -f .env ]; then yarn prepare-test-server cypress:open:cmd; else echo \"\nError: Must create a test-projects/login/.env file.\nSee test-projects/login/.env.example for values\n\"; exit 1; fi"
   },
   "dependencies": {
     "@voussoir/adapter-mongoose": "^1.0.0",
@@ -41,4 +41,4 @@
     "start-server-and-test": "^1.7.11",
     "supertest-light": "^1.0.2"
   }
-}
+}