From 599e10ad9014d0cc8bf762b26675b43c03499fc0 Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 8 Mar 2023 15:37:25 +0000 Subject: [PATCH 1/2] Made some changes --- fork/new-file.txt | 1 + labs/web-app/src/index.html | 122 ++++++++++++++++++----------- labs/web-app/src/package-lock.json | 21 +++-- labs/web-app/src/server.js | 50 ++++++------ 4 files changed, 115 insertions(+), 79 deletions(-) create mode 100644 fork/new-file.txt diff --git a/fork/new-file.txt b/fork/new-file.txt new file mode 100644 index 0000000..36ba120 --- /dev/null +++ b/fork/new-file.txt @@ -0,0 +1 @@ +Here is some new content to commit. \ No newline at end of file diff --git a/labs/web-app/src/index.html b/labs/web-app/src/index.html index 1a9b65e..9e62aa8 100644 --- a/labs/web-app/src/index.html +++ b/labs/web-app/src/index.html @@ -1,55 +1,83 @@ - - - Bulletin Board - - - - - - -
-

Welcome to the Event Calendar!

-
+ + + Bulletin Board + + + + + +
+

Hi, here's the Event Calendar!

+
-
-
-
-
-

Add an Event

-
-
-
- - - - +
+
+
+
+

Add an Event

+
+
+
+ + + + +
-
-
-
- -

{{ event.title }}

-
{{ event.date }}
-

{{ event.detail }}

- - +
+
+ +

+ {{ event.title }} +

+
+ {{ + event.date }} +
+

+ {{ event.detail }} +

+ + +
-
- - - - - - \ No newline at end of file + + + + + diff --git a/labs/web-app/src/package-lock.json b/labs/web-app/src/package-lock.json index 930b19a..87cd022 100644 --- a/labs/web-app/src/package-lock.json +++ b/labs/web-app/src/package-lock.json @@ -304,6 +304,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz", "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==", + "dev": true, "dependencies": { "safe-buffer": "5.1.2" }, @@ -314,7 +315,8 @@ "node_modules/basic-auth/node_modules/safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true }, "node_modules/bluebird": { "version": "3.7.2", @@ -1352,7 +1354,6 @@ "integrity": "sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==", "optional": true, "dependencies": { - "encoding": "^0.1.12", "minipass": "^3.1.0", "minipass-sized": "^1.0.3", "minizlib": "^2.0.0" @@ -1446,6 +1447,7 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz", "integrity": "sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==", + "dev": true, "dependencies": { "basic-auth": "~2.0.1", "debug": "2.6.9", @@ -1461,6 +1463,7 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==", + "dev": true, "dependencies": { "ee-first": "1.1.1" }, @@ -1647,6 +1650,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==", + "dev": true, "engines": { "node": ">= 0.8" } @@ -2083,7 +2087,6 @@ "dependencies": { "@mapbox/node-pre-gyp": "^1.0.0", "node-addon-api": "^4.2.0", - "node-gyp": "8.x", "tar": "^6.1.11" }, "optionalDependencies": { @@ -2179,9 +2182,6 @@ "resolved": "https://registry.npmjs.org/terraformer/-/terraformer-1.0.12.tgz", "integrity": "sha512-MokUp0+MFal4CmJDVL6VAO1bKegeXcBM2RnPVfqcFIp2IIv8EbPAjG0j/vEy/vuKB8NVMMSF2vfpVS/QLe4DBg==", "deprecated": "terraformer is deprecated and no longer supported. Please use @terraformer/arcgis.", - "dependencies": { - "@types/geojson": "^7946.0.0 || ^1.0.0" - }, "engines": { "node": ">=4.2.6" }, @@ -2584,6 +2584,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz", "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==", + "dev": true, "requires": { "safe-buffer": "5.1.2" }, @@ -2591,7 +2592,8 @@ "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true } } }, @@ -3465,6 +3467,7 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz", "integrity": "sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==", + "dev": true, "requires": { "basic-auth": "~2.0.1", "debug": "2.6.9", @@ -3477,6 +3480,7 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==", + "dev": true, "requires": { "ee-first": "1.1.1" } @@ -3613,7 +3617,8 @@ "on-headers": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", - "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==" + "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==", + "dev": true }, "once": { "version": "1.4.0", diff --git a/labs/web-app/src/server.js b/labs/web-app/src/server.js index 41038d7..d8940dc 100644 --- a/labs/web-app/src/server.js +++ b/labs/web-app/src/server.js @@ -1,38 +1,40 @@ -var express = require('express'), - bodyParser = require('body-parser'), - methodOverride = require('method-override'), - errorHandler = require('errorhandler'), - morgan = require('morgan'), - routes = require('./backend'), - api = require('./backend/api'); +var express = require("express"), + bodyParser = require("body-parser"), + methodOverride = require("method-override"), + errorHandler = require("errorhandler"), + morgan = require("morgan"), + routes = require("./backend"), + api = require("./backend/api"); -var app = module.exports = express(); +var app = (module.exports = express()); -app.engine('html', require('ejs').renderFile); -app.set('view engine', 'html'); -app.use(morgan('dev')); +app.engine("html", require("ejs").renderFile); +app.set("view engine", "html"); +app.use(morgan("dev")); app.use(bodyParser.urlencoded({ extended: false })); app.use(bodyParser.json()); app.use(methodOverride()); -app.use(express.static(__dirname + '/')); -app.use('/build', express.static('public')); +app.use(express.static(__dirname + "/")); +app.use("/build", express.static("public")); var env = process.env.NODE_ENV; -if ('development' == env) { - app.use(errorHandler({ - dumpExceptions: true, - showStack: true - })); +if ("development" == env) { + app.use( + errorHandler({ + dumpExceptions: true, + showStack: true, + }) + ); } -if ('production' == app.get('env')) { +if ("production" == app.get("env")) { app.use(errorHandler()); } -app.get('/', routes.index); -app.get('/api/events', api.events); -app.post('/api/events', api.event); -app.delete('/api/events/:eventId', api.event); +app.get("/", routes.index); +app.get("/api/events", api.events); +app.post("/api/events", api.event); +app.delete("/api/events/:eventId", api.event); app.listen(8080); -console.log('** Server listening on port 8080 **'); \ No newline at end of file +console.log("** Server listening on port 8080 **"); From 66feb0f77e7e8bbe081f601b18ccc7b74b33fac4 Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 8 Mar 2023 16:10:15 +0000 Subject: [PATCH 2/2] Some changes in my branch --- fork/branch/another-new-file.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 fork/branch/another-new-file.txt diff --git a/fork/branch/another-new-file.txt b/fork/branch/another-new-file.txt new file mode 100644 index 0000000..32a1823 --- /dev/null +++ b/fork/branch/another-new-file.txt @@ -0,0 +1 @@ +More \ No newline at end of file