Merge remote-tracking branch 'origin/main'

Author: db-cloudflare

challenge-files/d1-challenge/index.ts renamed to challenge_files/d1_challenge/index.ts

@@ -1,7 +1,7 @@
-DROP TABLE IF EXISTS Companies;
-CREATE TABLE IF NOT EXISTS Companies (CompanyID INTEGER PRIMARY KEY, CompanyName TEXT);
-INSERT INTO Companies (CompanyID, CompanyName) VALUES (1, 'Soda Co.'), (2, 'TV Media'), (3,'Software Co.');
-
-DROP TABLE IF EXISTS Employees;
-CREATE TABLE IF NOT EXISTS Employees (EmployeeID INTEGER PRIMARY KEY, EmployeeName TEXT, CompanyID INTEGER, FOREIGN KEY (CompanyID) REFERENCES Companies(CompanyID));
-INSERT INTO Employees (EmployeeID, EmployeeName, CompanyID) VALUES (1, 'Olivia Johnson', 2), (2, 'Noah Jones', 3), (3, 'James Smith', 1), (4, 'Sophia Martinez', 2);
+DROP TABLE IF EXISTS Companies;
+CREATE TABLE IF NOT EXISTS Companies (CompanyID INTEGER PRIMARY KEY, CompanyName TEXT);
+INSERT INTO Companies (CompanyID, CompanyName) VALUES (1, 'Soda Co.'), (2, 'TV Media'), (3,'Software Co.');
+
+DROP TABLE IF EXISTS Employees;
+CREATE TABLE IF NOT EXISTS Employees (EmployeeID INTEGER PRIMARY KEY, EmployeeName TEXT, CompanyID INTEGER, FOREIGN KEY (CompanyID) REFERENCES Companies(CompanyID));
+INSERT INTO Employees (EmployeeID, EmployeeName, CompanyID) VALUES (1, 'Olivia Johnson', 2), (2, 'Noah Jones', 3), (3, 'James Smith', 1), (4, 'Sophia Martinez', 2);

challenge-files/d1-challenge/schema.sql renamed to challenge_files/d1_challenge/schema.sql

@@ -2,12 +2,21 @@
   "name": "cf-tutor",
   "version": "1.1.0",
   "description": "",
-  "main": "index.js",
+  "main": "src/index.js",
   "type": "module",
   "scripts": {
     "start": "tsx src/index.ts",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
+  "files": [
+    "challenge_files/",
+    "media/",
+    "node_modules/",
+    "progress/",
+    "scaffolding/",
+    "src/",
+    "tsconfig.json"
+  ],
   "keywords": [],
   "author": "",
   "license": "ISC",

challenge-files/worker-challenge/index.js renamed to challenge_files/worker_challenge/index.js

@@ -22,7 +22,7 @@ export const d1Challenge: Quiz = {
     category: 'Create a Worker that can join two D1 database tables',
     questions: [
         {
-            question: `\n${intro}\n\n For this challenge, please open up the folder cf-tutor/challenge-files/d1-challenge. The files required to complete this challenge are located there.\n\nPress Enter to continue\n\n`,
+            question: `\n${intro}\n\n For this challenge, please open up the folder cf-tutor/challenge_files/d1_challenge. The files required to complete this challenge are located there.\n\nPress Enter to continue\n\n`,
             type: 'text',
             correctAnswer: '',
         }

package.json

@@ -14,7 +14,7 @@ export const challenge: Quiz = {
     category: 'Create a basic Worker',
     questions: [
         {
-            question: `\n${intro}\n\nFor this challenge, please open up the folder cf-tutor/challenge-files/worker-challenge. The files required to complete this challenge are located there.\n\n Create a JavaScript Worker and replace the index.js file of the Worker with the file located in the worker-challenge folder. This file is incomplete and contains errors such as missing if/else statements that need to be fixed. Once fixed, deploy the worker and enter the following curl command into this terminal. Be sure to replace *your-worker-name* with the name of your Worker.\n\ncurl https://*your-worker-name*.workers.dev/success\n\nYou will be able to use this terminal to interact with C3 and Wrangler, change directory and enter the CURL command to recieve responses from your Worker. Press Enter to start the challenge.`,
+            question: `\n${intro}\n\nFor this challenge, please open up the folder cf-tutor/challenge_files/worker_challenge. The files required to complete this challenge are located there.\n\n Create a JavaScript Worker and replace the index.js file of the Worker with the file located in the worker-challenge folder. This file is incomplete and contains errors such as missing if/else statements that need to be fixed. Once fixed, deploy the worker and enter the following curl command into this terminal. Be sure to replace *your-worker-name* with the name of your Worker.\n\ncurl https://*your-worker-name*.workers.dev/success\n\nYou will be able to use this terminal to interact with C3 and Wrangler, change directory and enter the CURL command to recieve responses from your Worker. Press Enter to start the challenge.`,
             type: 'text',
             correctAnswer: '',