Skip to content
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

home ve about us yapıldı #3

Open
wants to merge 1 commit into
base: mts
Choose a base branch
from
Open

home ve about us yapıldı #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions CitySecurity/app_server/controller/homeController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
var path = require('path');
module.exports.index=function(req,res){
res.render('home');
}

module.exports.aboutUs=function(req,res){
res.render('aboutUs');
}
1 change: 1 addition & 0 deletions CitySecurity/app_server/controller/loginController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ module.exports.indexPost = function (req, res) {

if (req.body.password == userResult[0].password) {
res.render('home');

}
else {
res.render('login',{
Expand Down
89 changes: 66 additions & 23 deletions CitySecurity/app_server/controller/monitoringController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,54 @@

var user = require('../models/dbIslemleri.js');
var path = require('path');
var ejsLayouts=require('express-ejs-layouts');
var db = require('../models/database.js');
// var path = require('path');
// var ejsLayouts = require('express-ejs-layouts');
//const { Storage } = require('@google-cloud/storage');
var arrayDanger = [];
// var sayac = 0;
var danger = 'danger';
var notDanger = 'not danger';
module.exports.monGet = function (req, res) {

res.render('newMonitoring', {
jsonArray: "null"
});
}
var dangerLabelDetect = function video() {

var queryList = "SELECT * FROM dangerlabel";
db.query(queryList, function (err, results, fields) {
results.forEach(element => {
arrayDanger.push(element.labelName);

module.exports.monGet=function(req,res) {

res.render('newMonitoring',{
jsonArray:"null"
});
});

}

module.exports.monList = function (req, res) {
res.render('listMonitoring', {
jsonArray:"null"


})
dangerLabelDetect();
var queryList = "SELECT * FROM returnlabel";
db.query(queryList, function (err, results, fields) {
if (err) throw err.message
else {
res.render('listMonitoring', {
jsonArray: results

})
}
});

}
module.exports.monNew = function (req, res) {
dangerLabelDetect();

var video_isle = async function Video() {
var jsonArray;
const video = require('@google-cloud/video-intelligence').v1;
var jsonArrayTextex;
var jsonArrayTextex;
const client = new video.VideoIntelligenceServiceClient();
const gcsUri = 'gs://mts-bucket/cat.mp4';
const videoName = 'cat';
const gcsUri = 'gs://mts-bucket/' + videoName + '.mp4';

const request = {
inputUri: gcsUri,
Expand All @@ -35,12 +59,21 @@ module.exports.monNew = function (req, res) {
const [operationResult] = await operation.promise();
const annotations = operationResult.annotationResults[0];

var jsonArrayText ='{"labels":[';
var jsonArrayText = '{"labels":[';

const labels = annotations.segmentLabelAnnotations;
labels.forEach(label => {

console.log(`Label ${label.entity.description} occurs at:`);
jsonArrayText += '{ "LabelName":' +'"'+label.entity.description+'"'+',';
jsonArrayText += '{ "LabelName":' + '"' + label.entity.description + '"' + ',';
if (arrayDanger.includes(String(label.entity.description))) {

jsonArrayText += '"danger":' + '"' + danger + '"' + ',';
console.log("selam");
}
else {
jsonArrayText += '"danger":' + '"' + notDanger + '"' + ',';
}

label.segments.forEach(segment => {
const time = segment.segment;
Expand All @@ -65,7 +98,8 @@ module.exports.monNew = function (req, res) {
`${(time.endTimeOffset.nanos / 1e6).toFixed(0)}s`
);
console.log(`\tConfidence: ${segment.confidence}`);
jsonArrayText +='"confidence":'+'"'+segment.confidence+'" },';
jsonArrayText += '"confidence":' + '"' + segment.confidence +'" },';




Expand All @@ -74,19 +108,28 @@ module.exports.monNew = function (req, res) {
//jsonArrayText -=',';
var n = jsonArrayText.length;

jsonArrayText = jsonArrayText.substr(0,n-1);
jsonArrayText = jsonArrayText.substr(0, n - 1);

jsonArrayText += ']}';

jsonArrayText +=']}';


jsonArray = JSON.parse(jsonArrayText);
res.render('newMonitoring', {
jsonArray:jsonArray
jsonArray: jsonArray,


})
sayac++;
for (var i = 0; i < Object.keys(jsonArray.labels).length; i++) {
var queryInsert = "INSERT INTO returnlabel VALUES(' ','" + jsonArray.labels[i].LabelName + "','" + jsonArray.labels[i].confidence + "',NOW(),1,'" + videoName + "')";
db.query(queryInsert, function (err, results, fields) {//ekleme işlemi
if (err) throw err.message;


});

}
}
// console.log(labels.length);
// console.log(labels.length);
console.log("Got a GET request for the homepage");
console.log("video işleniyor");
video_isle();
Expand Down
5 changes: 0 additions & 5 deletions CitySecurity/app_server/models/dbIslemleri.js
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions CitySecurity/app_server/route/homeRoute.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ var router=express.Router();
var ctrlHome=require('../controller/homeController');

router.get('/',ctrlHome.index);
router.get('/aboutUs',ctrlHome.aboutUs);
module.exports=router;
1 change: 1 addition & 0 deletions CitySecurity/app_server/route/routeManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ module.exports = function (app) {
app.use('/home', routeHome);
app.use('/monitoring', routeMon);


}
200 changes: 200 additions & 0 deletions CitySecurity/app_server/view/aboutUs.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,200 @@
<%- include('header') -%>


<!-- Content -->
<div class="container-fluid flex-grow-1 container-p-y bg-light">

<h2 class="aboutBaslik py-3 mb-4 text-center">
Teams
</h2>
<!-- Layout wrapper -->
<!-- <div class="layout-wrapper layout-2">
<div class="layout-inner"> -->
<div class="layout-container">
<!-- Layout content -->
<div class="layout-content">
<!-- Set `.contacts-col-view` or '.contacts-row-view' to control view mode -->
<div class="row">
<div class="col-md-6 text-center">
<div class="card mb-4">
<div class="card-body">
<div class="contact-content">
<img src="/public/assets/resim/avatars/Meral.jpeg" class="rounded" alt="">
<div class="contact-content-about">
<h5 class="contact-content-name mb-1"><a href="javascript:void(0)"
class="text-body">Meral
Taşdemir</a></h5>
<div class="contact-content-user text-muted small mb-2">meraltaşdemir
</div>

<div>
<a href="" class="text-secondary"><span class="zmdi zmdi-email"></span></a>
&nbsp;&nbsp;
<span class="text-lighter">|</span> &nbsp;&nbsp;
<a href=""><span class="zmdi zmdi-linkedin"></span></a> &nbsp;&nbsp;
<a href="" class="text-twitter"><span class="zmdi zmdi-twitter"></span></a>
&nbsp;&nbsp;
<a href="" class="text-facebook"><span class="zmdi zmdi-facebook"></span></a>
&nbsp;&nbsp;
<a href="" class="text-instagram"><span class="zmdi zmdi-instagram"></span></a>
</div>
<hr class="border-light">
</div>
</div>

</div>
</div>

</div>
<div class="col-md-6 text-center">
<div class="card mb-4">
<div class="card-body">
<div class="contact-content">
<img src="/public/assets/resim/avatars/Zisan.jpeg" class="rounded-circle" alt="">
<div class="contact-content-about">
<h5 class="contact-content-name mb-1"><a href="javascript:void(0)"
class="text-body">Zişan
Karsatar</a></h5>
<div class="contact-content-user text-muted small mb-2">zisankarsatar
</div>

<div>
<a href="" class="text-secondary"><span class="zmdi zmdi-email"></span></a>
&nbsp;&nbsp;
<span class="text-lighter">|</span> &nbsp;&nbsp;
<a href=""><span class="zmdi zmdi-linkedin"></span></a> &nbsp;&nbsp;
<a href="" class="text-twitter"><span class="zmdi zmdi-twitter"></span></a>
&nbsp;&nbsp;
<a href="" class="text-facebook"><span class="zmdi zmdi-facebook"></span></a>
&nbsp;&nbsp;
<a href="" class="text-instagram"><span class="zmdi zmdi-instagram"></span></a>
</div>
<hr class="border-light">
</div>
</div>

</div>
</div>

</div>
<div class="row">
<div class="col-md-6 text-center">

<div class="card mb-4">
<div class="card-body">
<div class="contact-content">
<img src="/public/assets/resim/avatars/Taha.jpeg" class="rounded-circle" alt="">
<div class="contact-content-about">
<h5 class="contact-content-name mb-1"><a href="javascript:void(0)"
class="text-body">M. Taha
Soydan</a></h5>
<div class="contact-content-user text-muted small mb-2">mts</div>


<div>
<a href="" class="text-secondary"><span class="zmdi zmdi-email"></span></a>
&nbsp;&nbsp;
<span class="text-lighter">|</span> &nbsp;&nbsp;
<a href=""><span class="zmdi zmdi-linkedin"></span></a> &nbsp;&nbsp;
<a href="" class="text-twitter"><span class="zmdi zmdi-twitter"></span></a>
&nbsp;&nbsp;
<a href="" class="text-facebook"><span
class="zmdi zmdi-facebook"></span></a> &nbsp;&nbsp;
<a href="" class="text-instagram"><span
class="zmdi zmdi-instagram"></span></a>
</div>
<hr class="border-light">
</div>
</div>
</div>
</div>
</div>
<div class="col-md-6 text-center">
<div class="card mb-4">
<div class="card-body">
<div class="contact-content">
<img src="/public/assets/resim/avatars/Bahar.jpeg" class="rounded-circle" alt="">
<div class="contact-content-about">
<h5 class="contact-content-name mb-1"><a href="javascript:void(0)"
class="text-body">Bahar
Yılmaz</a></h5>
<div class="contact-content-user text-muted small mb-2">baharyilmaz
</div>

<div>
<h6>
[email protected]</h6>
&nbsp;&nbsp;
<a href="#" class="text-secondary"><span class="zmdi zmdi-email"></span></a>
&nbsp;&nbsp;
<span class="text-lighter">|</span> &nbsp;&nbsp;
<a href="https://www.linkedin.com/in/bahar-y%C4%B1lmaz-09b218151/"><span class="zmdi zmdi-linkedin"></span></a> &nbsp;&nbsp;
<a href="https://github.com/BaharYilmaz"><span
class="zmdi zmdi-github-alt"></span></a> &nbsp;&nbsp;


</div>

<hr class="border-light">
</div>
</div>
</div>
</div>
</div>
</div>
<div class="contacts-col col-6 text-center">
<div class="card mb-4">
<div class="card-body">
<div class="contact-content">
<img src="/public/assets/resim/avatars/Berkan.jpeg" class="rounded-circle" alt="">
<div class="contact-content-about">
<h5 class="contact-content-name mb-1"><a href="javascript:void(0)"
class="text-body">Berkan
Şaşmaz</a></h5>
<div class="contact-content-user text-muted small mb-2">berkansasmaz
</div>


<div>
<a href="" class="text-secondary"><span class="zmdi zmdi-email"></span></a>
&nbsp;&nbsp;
<span class="text-lighter">|</span> &nbsp;&nbsp;
<a href=""><span class="zmdi zmdi-linkedin"></span></a> &nbsp;&nbsp;
<a href="" class="text-twitter"><span class="zmdi zmdi-twitter"></span></a>
&nbsp;&nbsp;
<a href="" class="text-facebook"><span class="zmdi zmdi-facebook"></span></a>
&nbsp;&nbsp;
<a href="" class="text-instagram"><span class="zmdi zmdi-instagram"></span></a>
</div>
<hr class="border-light">
<!-- <div>
<a href="[email protected]" class="text-secondary"><span
class="ion ion-md-mail"></span></a> &nbsp;&nbsp;
<span class="text-lighter">|</span> &nbsp;&nbsp;
<a href="https://www.linkedin.com/in/berkansasmaz/"
class="text-twitter"><span
class="ion ion-logo-linkedin"></span></a> &nbsp;&nbsp;
<a href="https://twitter.com/berkansasmazz"
class="text-twitter"><span
class="ion ion-logo-twitter"></span></a> &nbsp;&nbsp;
<a href="https://github.com/berkansasmaz"
class="text-facebook"><span
class="ion ion-logo-github"></span></a> &nbsp;&nbsp;
<a href="https://www.instagram.com/berkansasmazz/"
class="text-instagram"><span
class="ion ion-logo-instagram"></span></a>
</div> -->
</div>
</div>
</div>
</div>
</div>

</div><!-- / .row -->
</div>
</div>
<!-- </div>
</div>
-->

<%- include('footer') -%>
Loading