Skip to content

My new feature #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iotkitdemo wants to merge 2 commits into
base: main
Choose a base branch
from
Open

My new feature #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
599e10a
Made some changes
Mar 8, 2023
66feb0f
Some changes in my branch
Mar 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions fork/branch/another-new-file.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
More
1 change: 1 addition & 0 deletions fork/new-file.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Here is some new content to commit.
122 changes: 75 additions & 47 deletions labs/web-app/src/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,55 +1,83 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Bulletin Board</title>
<link rel="stylesheet" href="node_modules/bootstrap/dist/css/bootstrap.min.css">
<link rel="stylesheet" href="site.css">
<style>
.form-control {
margin-bottom: 10px;
}
.btn-danger {
margin-top: 8px;
}
</style>
</head>
<body>

<div class="jumbotron">
<h1>Welcome to the Event Calendar!</h1>
</div>
<head>
<meta charset="UTF-8" />
<title>Bulletin Board</title>
<link
rel="stylesheet"
href="node_modules/bootstrap/dist/css/bootstrap.min.css"
/>
<link rel="stylesheet" href="site.css" />
<style>
.form-control {
margin-bottom: 10px;
}
.btn-danger {
margin-top: 8px;
}
</style>
</head>
<body>
<div class="jumbotron">
<h1>Hi, here's the Event Calendar!</h1>
</div>

<div class="container" id="events">
<div class="col-sm-7">
<div class="panel panel-default">
<div class="panel-heading">
<h3>Add an Event</h3>
</div>
<div class="panel-body">
<div>
<input class="form-control" placeholder="Title" v-model="event.title">
<textarea class="form-control" placeholder="Detail" v-model="event.detail"></textarea>
<input type="date" class="form-control" placeholder="Date" v-model="event.date">
<button class="btn btn-primary" v-on:click="addEvent">Submit</button>
<div class="container" id="events">
<div class="col-sm-7">
<div class="panel panel-default">
<div class="panel-heading">
<h3>Add an Event</h3>
</div>
<div class="panel-body">
<div>
<input
class="form-control"
placeholder="Title"
v-model="event.title"
/>
<textarea
class="form-control"
placeholder="Detail"
v-model="event.detail"
></textarea>
<input
type="date"
class="form-control"
placeholder="Date"
v-model="event.date"
/>
<button class="btn btn-primary" v-on:click="addEvent">
Submit
</button>
</div>
</div>
</div>
</div>
</div>
<div class="col-sm-5">
<div class="list-group">
<a href="#" class="list-group-item" v-for="event in events">
<h4 class="list-group-item-heading"><i class="glyphicon glyphicon-bullhorn"></i> {{ event.title }}</h4>
<h5><i class="glyphicon glyphicon-calendar" v-if="event.date"></i> {{ event.date }}</h5>
<p class="list-group-item-text" v-if="event.detail">{{ event.detail }}</p>
<button class="btn btn-xs btn-danger" v-on:click="deleteEvent(event.id)">Delete</button>
</a>
<div class="col-sm-5">
<div class="list-group">
<a href="#" class="list-group-item" v-for="event in events">
<h4 class="list-group-item-heading">
<i class="glyphicon glyphicon-bullhorn"></i> {{ event.title }}
</h4>
<h5>
<i class="glyphicon glyphicon-calendar" v-if="event.date"></i> {{
event.date }}
</h5>
<p class="list-group-item-text" v-if="event.detail">
{{ event.detail }}
</p>
<button
class="btn btn-xs btn-danger"
v-on:click="deleteEvent(event.id)"
>
Delete
</button>
</a>
</div>
</div>
</div>
</div>

</body>
<script src="node_modules/vue/dist/vue.min.js"></script>
<script src="node_modules/vue-resource/dist/vue-resource.min.js"></script>
<script src="app.js"></script>
</html>
</body>
<script src="node_modules/vue/dist/vue.min.js"></script>
<script src="node_modules/vue-resource/dist/vue-resource.min.js"></script>
<script src="app.js"></script>
</html>
21 changes: 13 additions & 8 deletions labs/web-app/src/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

50 changes: 26 additions & 24 deletions labs/web-app/src/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 **');
console.log("** Server listening on port 8080 **");