dergeorg/SmartShopper
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Email Login

Browse Source
This commit is contained in:
Georg Reisinger
2019-02-24 19:27:42 +01:00
parent f853a2bf0f
commit 3baf79e8f6
39 changed files with 3246 additions and 2982 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
express-server/app.js
View File

@@ -15,7 +15,9 @@ app.set('view engine', 'ejs');
app.use(logger('dev'));
app.use(express.json());
app.use(express.urlencoded({ extended: false }));
app.use(express.urlencoded({
extended: false
}));
app.use(express.static(path.join(__dirname, 'public')));
app.use('/', indexRouter);
@@ -23,14 +25,14 @@ app.use(axios);
app.use('/users', usersRouter);
// catch 404 and forward to error handler
app.use(function(req, res, next) {
app.use(function (req, res, next) {
var err = new Error('Not Found');
err.status = 404;
next(err);
});
// error handler
app.use(function(err, req, res, next) {
app.use(function (err, req, res, next) {
// set locals, only providing error in development
res.locals.message = err.message;
res.locals.error = req.app.get('env') === 'development' ? err : {};

14
express-server/db-config/keys.js
View File

@@ -1,9 +1,9 @@
module.exports ={
postgresSQL:{
user:"smartshopper-user",
host:"188.166.124.80",
database:"smartshopperdb",
password:"jW^v#&LjNY_b3-k*jYj!U4Xz?T??m_D6249XAeWZ#7C^FRbKm!c_Dt+qj@4&a-Hs",
port:"5432"
module.exports = {
postgresSQL: {
user: "smartshopper-user",
host: "188.166.124.80",
database: "smartshopperdb",
password: "jW^v#&LjNY_b3-k*jYj!U4Xz?T??m_D6249XAeWZ#7C^FRbKm!c_Dt+qj@4&a-Hs",
port: "5432"
}
}

33
express-server/db-config/postgresql-common.js
View File

@@ -1,45 +1,44 @@
const { Client } = require ("pg");
const {postgresSQL} = require("./keys")
const {
Client
} = require("pg");
const {
postgresSQL
} = require("./keys")
const client = new Client(postgresSQL);
async function connect() {
try{
try {
await client.connect();
console.log("Database connected!");
}
catch(error)
{
} catch (error) {
console.error(error)
}
}
connect();
async function query(queryString,param)
{
async function query(queryString, param) {
try {
let result = await client.query(queryString,param);
let result = await client.query(queryString, param);
let resultarray = [];
for(let row of result.rows)
{
for (let row of result.rows) {
resultarray.push(row.obj);
}
return resultarray;
}
catch(error)
{
} catch (error) {
console.log(error)
}
}
async function nonQuery(queryString,param) {
async function nonQuery(queryString, param) {
try {
await client.query(queryString,param);
await client.query(queryString, param);
} catch (error) {
console.error(error)
}
}
module.exports = {
query, nonQuery
query,
nonQuery
}

205
express-server/db-connect/db-connect.js
View File

@@ -1,4 +1,7 @@
const { query, nonQuery } = require("../db-config/postgresql-common");
const {
query,
nonQuery
} = require("../db-config/postgresql-common");
const stringSimilarity = require('string-similarity');
@@ -10,9 +13,7 @@ async function updateUser(uid, mid, name, picture, email) {
try {
await nonQuery('INSERT INTO "User" (username, message_id, name, picture, email) VALUES ($1, $2, $3, $4, $5);', [uid, mid, name, picture, email]);
}
catch (error) {
} catch (error) {
console.error(error);
}
}
@@ -23,9 +24,7 @@ async function getmessageids(sl_id) {
let admin = query('SELECT * FROM "Shoppinglist_admin" WHERE sl_id = $1;', [sl_id]);
return users_to_array(admin, members);
}
catch(error) {
} catch (error) {
}
}
@@ -35,10 +34,10 @@ async function getmessageids(sl_id) {
async function searchUsers(searchstring) {
try {
let users = await query('SELECT row_to_json("User") AS obj FROM "User";');
return users.filter(function(obj) {return obj.name.toUpperCase().includes(searchstring.toUpperCase())});
}
catch(error) {
return users.filter(function (obj) {
return obj.name.toUpperCase().includes(searchstring.toUpperCase())
});
} catch (error) {
console.error(error);
}
@@ -54,9 +53,7 @@ async function getShoppinglistsAdmin(username) {
username = $1', [username]);
return result;
}
catch (error) {
} catch (error) {
console.error(error);
}
}
@@ -67,9 +64,7 @@ async function getShoppinglistsByLink(link) {
console.log("PPPPP LIIINK:", link)
let result = await query('SELECT row_to_json("Shoppinglist") AS obj FROM "Shoppinglist" WHERE invitelink = $1', [link]);
return result;
}
catch (error) {
} catch (error) {
console.error(error);
}
}
@@ -81,9 +76,7 @@ async function getShoppinglistsShared(username) {
let result = await query('SELECT row_to_json("Shoppinglist") AS obj FROM "Shoppinglist" JOIN "Shoppinglist_member" USING (sl_id) WHERE username = $1;', [username]);
console.log(result);
return result;
}
catch (error) {
} catch (error) {
console.error(error);
}
}
@@ -100,27 +93,21 @@ async function newShoppinglist(name, description, username, color) {
try {
await nonQuery('INSERT INTO "User" (username) VALUES ($1);', [username]);
}
catch (error) {
} catch (error) {
console.error(error);
}
//insert shoppinglist
try {
await nonQuery('INSERT INTO "Shoppinglist" (sl_id, name, description, color) VALUES ($1, $2, $3, $4);', [sl_id, name, description, color]);
}
catch (error) {
} catch (error) {
console.error(error);
}
//insert admin
try {
await nonQuery('INSERT INTO "Shoppinglist_admin" (username, sl_id) VALUES ($1, $2);', [username, sl_id]);
}
catch (error) {
} catch (error) {
console.error(error);
}
}
@@ -132,20 +119,18 @@ async function editShoppinglist(sl_id, newname, newdescription, newcolor) {
try {
let shoppinglist = await query('SELECT row_to_json("Shoppinglist") AS obj FROM "Shoppinglist" WHERE sl_id = $1;', [sl_id]);
if(shoppinglist.name != newname && newname != undefined) {
if (shoppinglist.name != newname && newname != undefined) {
await nonQuery('UPDATE "Shoppinglist" SET name = $1 WHERE sl_id = $2;', [newname, sl_id]);
}
if(shoppinglist.description != newdescription && newdescription != undefined) {
if (shoppinglist.description != newdescription && newdescription != undefined) {
await nonQuery('UPDATE "Shoppinglist" SET description = $1 WHERE sl_id = $2;', [newdescription, sl_id]);
}
if(shoppinglist.color != newcolor && newcolor != undefined) {
if (shoppinglist.color != newcolor && newcolor != undefined) {
await nonQuery('UPDATE "Shoppinglist" SET color = $1 WHERE sl_id = $2;', [newcolor, sl_id]);
}
}
catch (error) {
} catch (error) {
console.error(error);
}
}
@@ -173,9 +158,7 @@ async function displayShoppinglist(sl_id) {
let admin = await query('SELECT row_to_json("User") as obj FROM "User" JOIN "Shoppinglist_admin" USING (username) WHERE sl_id = $1', [sl_id]);
return items_in_groups(groups, items, sl_id, admin[0].username, admin[0].message_id, members, shoppinglist[0].name, shoppinglist[0].description);
}
catch (error) {
} catch (error) {
console.error(error);
}
}
@@ -188,9 +171,7 @@ async function deleteShoppinglist(sl_id) {
await nonQuery('DELETE FROM "Shoppinglist_admin" WHERE sl_id = $1', [sl_id]);
await nonQuery('DELETE FROM "Shoppinglist_member" WHERE sl_id = $1', [sl_id]);
await nonQuery('DELETE FROM "Shoppinglist" WHERE sl_id = $1', [sl_id]);
}
catch (error) {
} catch (error) {
console.error(error);
}
}
@@ -201,9 +182,7 @@ async function addGroup(sl_id, name, color, hidden) {
try {
let grid = generate_group_id();
await nonQuery('INSERT INTO "Group" (group_id, sl_id, name, color, hidden) VALUES ($1, $2, $3, $4, $5);', [grid, sl_id, name, color, hidden]);
}
catch (error) {
} catch (error) {
console.error(error);
}
}
@@ -214,9 +193,7 @@ async function addItem(group_id, sl_id, name, count) {
try {
let itid = generate_item_id();
await nonQuery('INSERT INTO "Item" VALUES ($1, $2, $3, $4, $5);', [itid, group_id, sl_id, name, count]);
}
catch (error) {
} catch (error) {
console.error(error);
}
}
@@ -226,21 +203,19 @@ async function editGroup(sl_id, group_id, name, color, hidden) {
try {
let group = await query('SELECT row_to_json("Group") AS obj FROM "Group" WHERE group_id = $1 AND sl_id = $2', [sl_id, group_id]);
if(group.name != name && name != undefined) {
if (group.name != name && name != undefined) {
await nonQuery('UPDATE "Group" SET name = $1 WHERE group_id = $2 AND sl_id = $3;', [name, group_id, sl_id]);
}
if(group.color != color && color != undefined) {
if (group.color != color && color != undefined) {
await nonQuery('UPDATE "Group" SET color = $1 WHERE group_id = $2 AND sl_id = $3;', [color, group_id, sl_id]);
}
if(group.hidden != hidden && hidden != undefined) {
if (group.hidden != hidden && hidden != undefined) {
await nonQuery('UPDATE "Group" SET hidden = $1 WHERE group_id = $2 AND sl_id = $3;', [hidden, group_id, sl_id]);
}
}
catch (error) {
} catch (error) {
console.error(error);
}
}
@@ -252,16 +227,14 @@ async function editItem(sl_id, group_id, item_id, name, count) {
try {
let item = query('SELECT row_to_json("Item") FROM "Item" WHERE item_id = $1 AND group_id = $2 AND sl_id = $3', [item_id, group_id, sl_id]);
if(item.name != name && name != undefined) {
if (item.name != name && name != undefined) {
await nonQuery('UPDATE "Item" SET name = $1 WHERE item_id = $2 AND group_id = $3 AND sl_id = $4', [name, item_id, group_id, sl_id]);
}
if(item.count != count && count != undefined) {
if (item.count != count && count != undefined) {
await nonQuery('UPDATE "Item" SET count = $1 WHERE item_id = $2 AND group_id = $3 AND sl_id = $4', [count, item_id, group_id, sl_id]);
}
}
catch (error) {
} catch (error) {
console.error(error);
}
}
@@ -275,9 +248,7 @@ async function deleteGroup(group_id, sl_id) {
//Leere Gruppe löschen
nonQuery('DELETE FROM "Group" WHERE group_id = $1 AND sl_id = $2', [group_id, sl_id]);
}
catch (error) {
} catch (error) {
console.error(error);
}
}
@@ -287,9 +258,7 @@ async function deleteGroup(group_id, sl_id) {
async function deleteItem(item_id, group_id, sl_id) {
try {
nonQuery('DELETE FROM "Item" WHERE item_id = $1 AND group_id = $2 AND sl_id = $3;', [item_id, group_id, sl_id]);
}
catch(error) {
} catch (error) {
console.error(error);
}
}
@@ -304,35 +273,33 @@ async function moveDoneItems(uid, sl_id, billcontent) {
var today = new Date();
var dd = today.getDate();
var mm = today.getMonth()+1;
var mm = today.getMonth() + 1;
var yyyy = today.getFullYear();
if(dd<10) {
dd = '0'+dd
if (dd < 10) {
dd = '0' + dd
}
if(mm<10) {
mm = '0'+mm
if (mm < 10) {
mm = '0' + mm
}
today = mm + '/' + dd + '/' + yyyy;
for(let item of removeableItems) {
for (let item of removeableItems) {
await nonQuery('INSERT INTO "Done_Purchase" (purchased_item_id, username, name, date, count) VALUES($1,$2,$3,$4,$5);',
[generate_item_id(), uid, item.name, today, 1]);
}
for(let item of removeableItems) {
for (let item of removeableItems) {
await nonQuery('DELETE FROM "Item" WHERE item_id = $1 AND group_id = $2 AND sl_id = $3;', [item.item_id, item.group_id, item.sl_id]);
console.log(item);
}
return "done"
}
catch(error) {
} catch (error) {
console.error(error);
}
}
@@ -343,9 +310,7 @@ async function getDonePurchases(uid) {
try {
let result = await query('SELECT row_to_json("Done_Purchase") AS obj FROM "Done_Purchase" WHERE username = $1;', [uid]);
return result;
}
catch(error) {
} catch (error) {
console.error(error);
}
}
@@ -366,9 +331,7 @@ async function verifyInvite(link, user_id) {
let sl_id = result[0].sl_id;
console.log("!!! SL ID: ", sl_id);
await nonQuery('INSERT INTO "Shoppinglist_member" (username, sl_id) VALUES ($1, $2);', [user_id, sl_id]);
}
catch (error) {
} catch (error) {
console.error(error);
}
}
@@ -377,9 +340,7 @@ async function createInvite(sl_id) {
try {
let link = generateInviteLink();
await nonQuery('UPDATE "Shoppinglist" SET invitelink = $1 WHERE sl_id = $2;', [link, sl_id]);
}
catch (error) {
} catch (error) {
console.error(error);
}
}
@@ -388,9 +349,7 @@ async function createInvite(sl_id) {
async function manInvite(sl_id, uid) {
try {
await nonQuery('INSERT INTO "Shoppinglist_member" (username, sl_id) VALUES ($1, $2);', [uid, sl_id]);
}
catch(error) {
} catch (error) {
console.error(error);
}
}
@@ -400,9 +359,7 @@ async function manInvite(sl_id, uid) {
async function removeMember(uid, sl_id) {
try {
await nonQuery('DELETE FROM "Shoppinglist_member" WHERE username = $1 AND sl_id = $2', [uid, sl_id]);
}
catch(error) {
} catch (error) {
console.error(error);
}
}
@@ -417,7 +374,7 @@ function generate_sl_id() {
var possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
var output = "";
for(let i = 0; i < 8; i++) {
for (let i = 0; i < 8; i++) {
output += possible.charAt(Math.floor(Math.random() * possible.length));
}
@@ -429,7 +386,7 @@ function generate_group_id() {
var possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
var output = "";
for(let i = 0; i < 8; i++) {
for (let i = 0; i < 8; i++) {
output += possible.charAt(Math.floor(Math.random() * possible.length));
}
@@ -441,7 +398,7 @@ function generate_item_id() {
var possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
var output = "";
for(let i = 0; i < 8; i++) {
for (let i = 0; i < 8; i++) {
output += possible.charAt(Math.floor(Math.random() * possible.length));
}
@@ -462,17 +419,19 @@ function items_in_groups(groups, items, sl_id, admin_uid, admin_mid, members, na
groups: []
};
for(let item of groups) {
for (let item of groups) {
result.groups.push({
group_id: item.group_id,
name: item.name,
color: item.color,
content: items.filter(function(obj) {return obj.group_id == item.group_id})
content: items.filter(function (obj) {
return obj.group_id == item.group_id
})
});
}
for(let item of members) {
for (let item of members) {
result.members.push({
uid: item.username,
@@ -488,7 +447,7 @@ function generateInviteLink() {
var possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
var output = "";
for(let i = 0; i < 50; i++) {
for (let i = 0; i < 50; i++) {
output += possible.charAt(Math.floor(Math.random() * possible.length));
}
@@ -500,7 +459,7 @@ function users_to_array(admin, members) {
users.push(admin.username);
for(let item of members) {
for (let item of members) {
users.push(item.username);
}
@@ -513,28 +472,18 @@ function compareData(listitems, doneitems) {
let output = [];
for(let item of listitems) {
if(doneitems.includes(item.name)) {
for (let item of listitems) {
if (doneitems.includes(item.name)) {
output.push(item);
}
else if(doneitems.toUpperCase().includes(item.name.toUpperCase())) {
} else if (doneitems.toUpperCase().includes(item.name.toUpperCase())) {
output.push(item);
}
else if(doneitems.toLowerCase().includes(item.name.toLowerCase())) {
} else if (doneitems.toLowerCase().includes(item.name.toLowerCase())) {
output.push(item);
}
else if(probability(item.name, doneitems) > 0.6) {
} else if (probability(item.name, doneitems) > 0.6) {
output.push(item);
}
else if(probability(item.name.toUpperCase(), doneitems.toUpperCase()) > 0.6) {
} else if (probability(item.name.toUpperCase(), doneitems.toUpperCase()) > 0.6) {
output.push(item);
}
else if(probability(item.name.toLowerCase(), doneitems.toLowerCase()) > 0.6) {
} else if (probability(item.name.toLowerCase(), doneitems.toLowerCase()) > 0.6) {
output.push(item);
}
}
@@ -546,11 +495,11 @@ function probability(cur_item, data) {
let best = 0;
for(let i = 0; i < data.length; i++) {
for (let i = 0; i < data.length; i++) {
let prob = stringSimilarity.compareTwoStrings(cur_item, data.slice(i, i + cur_item.length));
if(prob > best) {
if (prob > best) {
best = prob;
}
}
@@ -561,7 +510,25 @@ function probability(cur_item, data) {
module.exports = {
getShoppinglistsAdmin, getShoppinglistsShared, newShoppinglist, displayShoppinglist, deleteShoppinglist, addGroup,
addItem, verifyInvite, createInvite, editShoppinglist, editGroup, editItem, deleteGroup, deleteItem, manInvite, updateUser,
moveDoneItems, getDonePurchases, getShoppinglistsByLink, searchUsers, removeMember
getShoppinglistsAdmin,
getShoppinglistsShared,
newShoppinglist,
displayShoppinglist,
deleteShoppinglist,
addGroup,
addItem,
verifyInvite,
createInvite,
editShoppinglist,
editGroup,
editItem,
deleteGroup,
deleteItem,
manInvite,
updateUser,
moveDoneItems,
getDonePurchases,
getShoppinglistsByLink,
searchUsers,
removeMember
}

29
express-server/greenlock-https/demo.js
View File

@@ -10,28 +10,34 @@ var greenlock = Greenlock.create({
// Let's Encrypt v2 is ACME draft 11
version: 'draft-11'
, server: 'https://acme-v02.api.letsencrypt.org/directory'
,
server: 'https://acme-v02.api.letsencrypt.org/directory'
// Note: If at first you don't succeed, stop and switch to staging
// https://acme-staging-v02.api.letsencrypt.org/directory
// You MUST change this to a valid email address
, email: 'jon@example.com'
,
email: 'jon@example.com'
// You MUST NOT build clients that accept the ToS without asking the user
, agreeTos: true
,
agreeTos: true
// You MUST change these to valid domains
// NOTE: all domains will validated and listed on the certificate
, approvedDomains: [ 'example.com', 'www.example.com' ]
,
approvedDomains: ['example.com', 'www.example.com']
// You MUST have access to write to directory where certs are saved
// ex: /home/foouser/acme/etc
, configDir: '~/.config/acme/'
,
configDir: '~/.config/acme/'
// Get notified of important updates and help me make greenlock better
, communityMember: true
,
communityMember: true
//, debug: true
//, debug: true
});
@@ -45,8 +51,8 @@ var greenlock = Greenlock.create({
var redirectHttps = require('redirect-https')();
var acmeChallengeHandler = greenlock.middleware(function (req, res) {
res.setHeader('Content-Type', 'text/html; charset=utf-8');
res.end('<h1>Hello, ⚠️ Insecure World!</h1><a>Visit Secure Site</a>'
+ '<script>document.querySelector("a").href=window.location.href.replace(/^http/i, "https");</script>'
res.end('<h1>Hello, ⚠️ Insecure World!</h1><a>Visit Secure Site</a>' +
'<script>document.querySelector("a").href=window.location.href.replace(/^http/i, "https");</script>'
);
});
require('http').createServer(acmeChallengeHandler).listen(80, function () {
@@ -61,7 +67,10 @@ require('http').createServer(acmeChallengeHandler).listen(80, function () {
// spdy is a drop-in replacement for the https API
var spdyOptions = Object.assign({}, greenlock.tlsOptions);
spdyOptions.spdy = { protocols: [ 'h2', 'http/1.1' ], plain: false };
spdyOptions.spdy = {
protocols: ['h2', 'http/1.1'],
plain: false
};
var server = require('spdy').createServer(spdyOptions, require('express')().use('/', function (req, res) {
res.setHeader('Content-Type', 'text/html; charset=utf-8');
res.end('<h1>Hello, 🔐 Secure World!</h1>');

25
express-server/greenlock-https/force-renew.js
View File

@@ -6,24 +6,31 @@ require('../').create({
// Let's Encrypt v2 is ACME draft 11
version: 'draft-11'
, server: 'https://acme-v02.api.letsencrypt.org/directory'
,
server: 'https://acme-v02.api.letsencrypt.org/directory'
// Note: If at first you don't succeed, stop and switch to staging
// https://acme-staging-v02.api.letsencrypt.org/directory
, email: 'john.doe@example.com'
,
email: 'john.doe@example.com'
, agreeTos: true
,
agreeTos: true
, approvedDomains: [ 'example.com', 'www.example.com' ]
,
approvedDomains: ['example.com', 'www.example.com']
, app: require('express')().use('/', function (req, res) {
,
app: require('express')().use('/', function (req, res) {
res.end('Hello, World!');
})
, renewWithin: (91 * 24 * 60 * 60 * 1000)
, renewBy: (90 * 24 * 60 * 60 * 1000)
,
renewWithin: (91 * 24 * 60 * 60 * 1000),
renewBy: (90 * 24 * 60 * 60 * 1000)
// Get notified of important updates and help me make greenlock better
, communityMember: true
, debug: true
,
communityMember: true,
debug: true
}).listen(80, 443);

24
express-server/greenlock-https/http2.js
View File

@@ -8,28 +8,34 @@ var greenlock = Greenlock.create({
// Let's Encrypt v2 is ACME draft 11
version: 'draft-11'
, server: 'https://acme-v02.api.letsencrypt.org/directory'
,
server: 'https://acme-v02.api.letsencrypt.org/directory'
// Note: If at first you don't succeed, stop and switch to staging
// https://acme-staging-v02.api.letsencrypt.org/directory
// You MUST change this to a valid email address
, email: 'jon@example.com'
,
email: 'jon@example.com'
// You MUST NOT build clients that accept the ToS without asking the user
, agreeTos: true
,
agreeTos: true
// You MUST change these to valid domains
// NOTE: all domains will validated and listed on the certificate
, approvedDomains: [ 'example.com', 'www.example.com' ]
,
approvedDomains: ['example.com', 'www.example.com']
// You MUST have access to write to directory where certs are saved
// ex: /home/foouser/acme/etc
, configDir: '~/.config/acme/'
,
configDir: '~/.config/acme/'
// Get notified of important updates and help me make greenlock better
, communityMember: true
,
communityMember: true
//, debug: true
//, debug: true
});
@@ -63,8 +69,8 @@ server.on('error', function (err) {
server.on('stream', function (stream, headers) {
console.log(headers);
stream.respond({
'content-type': 'text/html'
, ':status': 200
'content-type': 'text/html',
':status': 200
});
stream.end('Hello, HTTP2 World!');
});

4
express-server/greenlock-https/my-express-app.js
View File

@@ -9,7 +9,9 @@ app.use('/', function (req, res) {
});
// DO NOT DO app.listen() unless we're testing this directly
if (require.main === module) { app.listen(3000); }
if (require.main === module) {
app.listen(3000);
}
// Instead do export the app:
module.exports = app;

38
express-server/greenlock-https/production.js
View File

@@ -9,26 +9,30 @@ var greenlock = require('../').create({
// Let's Encrypt v2 is ACME draft 11
// Note: If at first you don't succeed, stop and switch to staging
// https://acme-staging-v02.api.letsencrypt.org/directory
server: 'https://acme-v02.api.letsencrypt.org/directory'
, version: 'draft-11'
server: 'https://acme-v02.api.letsencrypt.org/directory',
version: 'draft-11'
// You MUST have write access to save certs
, configDir: '~/.config/acme/'
,
configDir: '~/.config/acme/'
// The previous 'simple' example set these values statically,
// but this example uses approveDomains() to set them dynamically
//, email: 'none@see.note.above'
//, agreeTos: false
// The previous 'simple' example set these values statically,
// but this example uses approveDomains() to set them dynamically
//, email: 'none@see.note.above'
//, agreeTos: false
// approveDomains is the right place to check a database for
// email addresses with domains and agreements and such
, approveDomains: approveDomains
,
approveDomains: approveDomains
, app: require('./my-express-app.js')
,
app: require('./my-express-app.js')
// Get notified of important updates and help me make greenlock better
, communityMember: true
,
communityMember: true
//, debug: true
//, debug: true
});
@@ -52,7 +56,10 @@ function approveDomains(opts, certs, cb) {
}
fooCheckDb(opts.domains, function (err, agree, email) {
if (err) { cb(err); return; }
if (err) {
cb(err);
return;
}
// Services SHOULD automatically accept the ToS and use YOUR email
// Clients MUST NOT accept the ToS without asking the user
@@ -64,7 +71,10 @@ function approveDomains(opts, certs, cb) {
// opts.challengeType = 'http-01';
// opts.challenge = require('le-challenge-fs').create({});
cb(null, { options: opts, certs: certs });
cb(null, {
options: opts,
certs: certs
});
});
}
@@ -75,7 +85,7 @@ function approveDomains(opts, certs, cb) {
function fooCheckDb(domains, cb) {
// This is an oversimplified example of how we might implement a check in
// our database if we have different rules for different users and domains
var domains = [ 'example.com', 'www.example.com' ];
var domains = ['example.com', 'www.example.com'];
var userEmail = 'john.doe@example.com';
var userAgrees = true;
var passCheck = opts.domains.every(function (domain) {

23
express-server/greenlock-https/quickstart.js
View File

@@ -8,29 +8,36 @@ require('../greenlock.js').create({
// Let's Encrypt v2 is ACME draft 11
version: 'draft-11'
, server: 'https://acme-v02.api.letsencrypt.org/directory'
,
server: 'https://acme-v02.api.letsencrypt.org/directory'
// Note: If at first you don't succeed, stop and switch to staging
// https://acme-staging-v02.api.letsencrypt.org/directory
// You MUST change this to a valid email address
, email: 'lukas.n912@gmail.com'
,
email: 'lukas.n912@gmail.com'
// You MUST NOT build clients that accept the ToS without asking the user
, agreeTos: true
,
agreeTos: true
// You MUST change these to valid domains
// NOTE: all domains will validated and listed on the certificate
, approvedDomains: [ 'www.smartshopper.cf', 'smartshopper.cf']
,
approvedDomains: ['www.smartshopper.cf', 'smartshopper.cf']
// You MUST have access to write to directory where certs are saved
// ex: /home/foouser/acme/etc
, configDir: '~/.config/acme/'
,
configDir: '~/.config/acme/'
, app: app
,
app: app
// Get notified of important updates and help me make greenlock better
, communityMember: true
,
communityMember: true
//, debug: true
//, debug: true
}).listen(7000, 443);

76
express-server/greenlock-https/remote-access.js
View File

@@ -10,7 +10,7 @@
//
var email = 'john.doe@gmail.com';
var domains = [ 'example.com' ];
var domains = ['example.com'];
var agreeLeTos = true;
//var secret = "My Little Brony";
var secret = require('crypto').randomBytes(16).toString('hex');
@@ -18,18 +18,21 @@ var secret = require('crypto').randomBytes(16).toString('hex');
require('../').create({
version: 'draft-11'
, server: 'https://acme-v02.api.letsencrypt.org/directory'
,
server: 'https://acme-v02.api.letsencrypt.org/directory'
// Note: If at first you don't succeed, stop and switch to staging
// https://acme-staging-v02.api.letsencrypt.org/directory
, email: email
, agreeTos: agreeLeTos
, approveDomains: domains
, configDir: '~/.config/acme/'
, app: remoteAccess(secret)
,
email: email,
agreeTos: agreeLeTos,
approveDomains: domains,
configDir: '~/.config/acme/',
app: remoteAccess(secret)
// Get notified of important updates and help me make greenlock better
, communityMember: true
//, debug: true
,
communityMember: true
//, debug: true
}).listen(3000, 8443);
@@ -38,20 +41,39 @@ function remoteAccess(secret) {
var basicAuth = require('express-basic-auth');
var serveIndex = require('serve-index');
var rootIndex = serveIndex('/', { hidden: true, icons: true, view: 'details' });
var rootFs = express.static('/', { dotfiles: 'allow', redirect: true, index: false });
var rootIndex = serveIndex('/', {
hidden: true,
icons: true,
view: 'details'
});
var rootFs = express.static('/', {
dotfiles: 'allow',
redirect: true,
index: false
});
var userIndex = serveIndex(require('os').homedir(), { hidden: true, icons: true, view: 'details' });
var userFs = express.static(require('os').homedir(), { dotfiles: 'allow', redirect: true, index: false });
var userIndex = serveIndex(require('os').homedir(), {
hidden: true,
icons: true,
view: 'details'
});
var userFs = express.static(require('os').homedir(), {
dotfiles: 'allow',
redirect: true,
index: false
});
var app = express();
var realm = 'Login Required';
var myAuth = basicAuth({
users: { 'root': secret, 'user': secret }
, challenge: true
, realm: realm
, unauthorizedResponse: function (/*req*/) {
users: {
'root': secret,
'user': secret
},
challenge: true,
realm: realm,
unauthorizedResponse: function ( /*req*/ ) {
return 'Unauthorized <a href="/">Home</a>';
}
});
@@ -59,9 +81,9 @@ function remoteAccess(secret) {
app.get('/', function (req, res) {
res.setHeader('Content-Type', 'text/html; charset=utf-8');
res.end(
'<a href="/browse/">View Files</a>'
+ '&nbsp; | &nbsp;'
+ '<a href="/logout/">Logout</a>'
'<a href="/browse/">View Files</a>' +
'&nbsp; | &nbsp;' +
'<a href="/logout/">Logout</a>'
);
});
app.use('/logout', function (req, res) {
@@ -73,8 +95,18 @@ function remoteAccess(secret) {
});
app.use('/browse', myAuth);
app.use('/browse', function (req, res, next) {
if ('root' === req.auth.user) { rootFs(req, res, function () { rootIndex(req, res, next); }); return; }
if ('user' === req.auth.user) { userFs(req, res, function () { userIndex(req, res, next); }); return; }
if ('root' === req.auth.user) {
rootFs(req, res, function () {
rootIndex(req, res, next);
});
return;
}
if ('user' === req.auth.user) {
userFs(req, res, function () {
userIndex(req, res, next);
});
return;
}
res.end('Sad Panda');
});

25
express-server/greenlock-https/spdy.js
View File

@@ -10,28 +10,34 @@ var greenlock = Greenlock.create({
// Let's Encrypt v2 is ACME draft 11
version: 'draft-11'
, server: 'https://acme-v02.api.letsencrypt.org/directory'
,
server: 'https://acme-v02.api.letsencrypt.org/directory'
// Note: If at first you don't succeed, stop and switch to staging
// https://acme-staging-v02.api.letsencrypt.org/directory
// You MUST change this to a valid email address
, email: 'jon@example.com'
,
email: 'jon@example.com'
// You MUST NOT build clients that accept the ToS without asking the user
, agreeTos: true
,
agreeTos: true
// You MUST change these to valid domains
// NOTE: all domains will validated and listed on the certificate
, approvedDomains: [ 'example.com', 'www.example.com' ]
,
approvedDomains: ['example.com', 'www.example.com']
// You MUST have access to write to directory where certs are saved
// ex: /home/foouser/acme/etc
, configDir: '~/.config/acme/' // MUST have write access
,
configDir: '~/.config/acme/' // MUST have write access
// Get notified of important updates and help me make greenlock better
, communityMember: true
,
communityMember: true
//, debug: true
//, debug: true
});
@@ -56,7 +62,10 @@ require('http').createServer(acmeChallengeHandler).listen(80, function () {
// spdy is a drop-in replacement for the https API
var spdyOptions = Object.assign({}, greenlock.tlsOptions);
spdyOptions.spdy = { protocols: [ 'h2', 'http/1.1' ], plain: false };
spdyOptions.spdy = {
protocols: ['h2', 'http/1.1'],
plain: false
};
var myApp = require('./my-express-app.js');
var server = require('spdy').createServer(spdyOptions, myApp);
server.on('error', function (err) {

36
express-server/greenlock-https/vhost.js
View File

@@ -1,4 +1,5 @@
#!/usr/bin/env node
'use strict';
///////////////////
@@ -23,23 +24,30 @@ var glx = require('../').create({
version: 'draft-11' // Let's Encrypt v2 is ACME draft 11
, server: 'https://acme-v02.api.letsencrypt.org/directory' // If at first you don't succeed, stop and switch to staging
,
server: 'https://acme-v02.api.letsencrypt.org/directory' // If at first you don't succeed, stop and switch to staging
// https://acme-staging-v02.api.letsencrypt.org/directory
, configDir: '~/.config/acme/' // You MUST have access to write to directory where certs
,
configDir: '~/.config/acme/' // You MUST have access to write to directory where certs
// are saved. ex: /home/foouser/.config/acme
, approveDomains: myApproveDomains // Greenlock's wraps around tls.SNICallback. Check the
,
approveDomains: myApproveDomains // Greenlock's wraps around tls.SNICallback. Check the
// domain name here and reject invalid ones
, app: myVhostApp // Any node-style http app (i.e. express, koa, hapi, rill)
,
app: myVhostApp // Any node-style http app (i.e. express, koa, hapi, rill)
/* CHANGE TO A VALID EMAIL */
, email:'jon@example.com' // Email for Let's Encrypt account and Greenlock Security
, agreeTos: true // Accept Let's Encrypt ToS
, communityMember: true // Join Greenlock to get important updates, no spam
,
email: 'jon@example.com' // Email for Let's Encrypt account and Greenlock Security
,
agreeTos: true // Accept Let's Encrypt ToS
,
communityMember: true // Join Greenlock to get important updates, no spam
//, debug: true
//, debug: true
});
@@ -84,7 +92,10 @@ function myApproveDomains(opts, certs, cb) {
// opts.agreeTos = true;
// opts.challengeType = 'http-01';
// opts.challenge = require('le-challenge-fs').create({});
cb(null, { options: opts, certs: certs });
cb(null, {
options: opts,
certs: certs
});
});
}
@@ -96,6 +107,7 @@ function myApproveDomains(opts, certs, cb) {
// It will also make them lowercase and protect against "domain fronting".
// However, it's up to you to make sure you actually have a domain to serve :)
var servers = {};
function myVhostApp(req, res) {
var hostname = req.headers.host;
var srvpath = path.join(srv, hostname);
@@ -104,8 +116,10 @@ function myVhostApp(req, res) {
if (!servers[hostname]) {
try {
fs.accessSync(srvpath);
servers[hostname] = serveStatic(srvpath, { redirect: true });
} catch(e) {
servers[hostname] = serveStatic(srvpath, {
redirect: true
});
} catch (e) {
finalhandler(req, res);
}
}

34
express-server/greenlock-https/websockets.js
View File

@@ -12,29 +12,35 @@ var greenlock = Greenlock.create({
// Let's Encrypt v2 is ACME draft 11
// Note: If at first you don't succeed, stop and switch to staging
// https://acme-staging-v02.api.letsencrypt.org/directory
server: 'https://acme-v02.api.letsencrypt.org/directory'
, version: 'draft-11'
, configDir: '~/.config/acme/'
, app: require('./my-express-app.js')
server: 'https://acme-v02.api.letsencrypt.org/directory',
version: 'draft-11',
configDir: '~/.config/acme/',
app: require('./my-express-app.js')
// You MUST change these to a valid email and domains
, email: 'john.doe@example.com'
, approvedDomains: [ 'example.com', 'www.example.com' ]
, agreeTos: true
,
email: 'john.doe@example.com',
approvedDomains: ['example.com', 'www.example.com'],
agreeTos: true
// Get notified of important updates and help me make greenlock better
, communityMember: true
, telemetry: true
//, debug: true
,
communityMember: true,
telemetry: true
//, debug: true
});
var server = greenlock.listen(80, 443);
var WebSocket = require('ws');
var ws = new WebSocket.Server({ server: server });
var ws = new WebSocket.Server({
server: server
});
ws.on('connection', function (ws, req) {
// inspect req.headers.authorization (or cookies) for session info
ws.send("[Secure Echo Server] Hello!\nAuth: '" + (req.headers.authorization || 'none') + "'\n"
+ "Cookie: '" + (req.headers.cookie || 'none') + "'\n");
ws.on('message', function (data) { ws.send(data); });
ws.send("[Secure Echo Server] Hello!\nAuth: '" + (req.headers.authorization || 'none') + "'\n" +
"Cookie: '" + (req.headers.cookie || 'none') + "'\n");
ws.on('message', function (data) {
ws.send(data);
});
});

38
express-server/greenlock.js
View File

@@ -3,7 +3,7 @@
var PromiseA;
try {
PromiseA = require('bluebird');
} catch(e) {
} catch (e) {
PromiseA = global.Promise;
}
@@ -31,7 +31,9 @@ module.exports.create = function (opts) {
}
function _listen(plainPort, plain) {
if (!plainPort) { plainPort = 80; }
if (!plainPort) {
plainPort = 80;
}
var parts = String(plainPort).split(':');
var p = parts.pop();
@@ -52,24 +54,26 @@ module.exports.create = function (opts) {
var https;
try {
https = require('spdy');
greenlock.tlsOptions.spdy = { protocols: [ 'h2', 'http/1.1' ], plain: false };
greenlock.tlsOptions.spdy = {
protocols: ['h2', 'http/1.1'],
plain: false
};
httpType = 'http2 (spdy/h2)';
} catch(e) {
} catch (e) {
https = require('https');
httpType = 'https';
}
server = https.createServer(
greenlock.tlsOptions
, greenlock.middleware.sanitizeHost(function (req, res) {
greenlock.tlsOptions, greenlock.middleware.sanitizeHost(function (req, res) {
try {
greenlock.app(req, res);
} catch(e) {
} catch (e) {
console.error("[error] [greenlock.app] Your HTTP handler had an uncaught error:");
console.error(e);
try {
res.statusCode = 500;
res.end("Internal Server Error: [Greenlock] HTTP exception logged for user-provided handler.");
} catch(e) {
} catch (e) {
// ignore
// (headers may have already been sent, etc)
}
@@ -79,15 +83,23 @@ module.exports.create = function (opts) {
server.type = httpType;
}
if (addr) { args[1] = addr; }
if (addr) {
args[1] = addr;
}
if (!validHttpPort && !/(\/)|(\\\\)/.test(p)) {
console.warn("'" + p + "' doesn't seem to be a valid port number, socket path, or pipe");
}
if (plain) { tryPlain(); } else { trySecure(); }
if (plain) {
tryPlain();
} else {
trySecure();
}
var promise = new PromiseA(function (resolve) {
args[0] = p;
args.push(function () { resolve(server); });
args.push(function () {
resolve(server);
});
server.listen.apply(server, args).on('error', function (e) {
if (server.listenerCount('error') < 2) {
console.warn("Did not successfully create http server and bind to port '" + p + "':");
@@ -133,8 +145,8 @@ module.exports.create = function (opts) {
if ('function' === typeof fnPlain) {
fnPlain.apply(plainServer);
} else if (!fn && !plainServer.listenerCount('listening') && !server.listenerCount('listening')) {
console.info('[:' + (plainServer.address().port || plainServer.address())
+ "] Handling ACME challenges and redirecting to " + server.type);
console.info('[:' + (plainServer.address().port || plainServer.address()) +
"] Handling ACME challenges and redirecting to " + server.type);
}
// Report h2/https status

38
express-server/https.js
View File

@@ -3,7 +3,7 @@
var PromiseA;
try {
PromiseA = require('bluebird');
} catch(e) {
} catch (e) {
PromiseA = global.Promise;
}
@@ -31,7 +31,9 @@ module.exports.create = function (opts) {
}
function _listen(plainPort, plain) {
if (!plainPort) { plainPort = 80; }
if (!plainPort) {
plainPort = 80;
}
var parts = String(plainPort).split(':');
var p = parts.pop();
@@ -52,24 +54,26 @@ module.exports.create = function (opts) {
var https;
try {
https = require('spdy');
greenlock.tlsOptions.spdy = { protocols: [ 'h2', 'http/1.1' ], plain: false };
greenlock.tlsOptions.spdy = {
protocols: ['h2', 'http/1.1'],
plain: false
};
httpType = 'http2 (spdy/h2)';
} catch(e) {
} catch (e) {
https = require('https');
httpType = 'https';
}
server = https.createServer(
greenlock.tlsOptions
, greenlock.middleware.sanitizeHost(function (req, res) {
greenlock.tlsOptions, greenlock.middleware.sanitizeHost(function (req, res) {
try {
greenlock.app(req, res);
} catch(e) {
} catch (e) {
console.error("[error] [greenlock.app] Your HTTP handler had an uncaught error:");
console.error(e);
try {
res.statusCode = 500;
res.end("Internal Server Error: [Greenlock] HTTP exception logged for user-provided handler.");
} catch(e) {
} catch (e) {
// ignore
// (headers may have already been sent, etc)
}
@@ -79,15 +83,23 @@ module.exports.create = function (opts) {
server.type = httpType;
}
if (addr) { args[1] = addr; }
if (addr) {
args[1] = addr;
}
if (!validHttpPort && !/(\/)|(\\\\)/.test(p)) {
console.warn("'" + p + "' doesn't seem to be a valid port number, socket path, or pipe");
}
if (plain) { tryPlain(); } else { trySecure(); }
if (plain) {
tryPlain();
} else {
trySecure();
}
var promise = new PromiseA(function (resolve) {
args[0] = p;
args.push(function () { resolve(server); });
args.push(function () {
resolve(server);
});
server.listen.apply(server, args).on('error', function (e) {
if (server.listenerCount('error') < 2) {
console.warn("Did not successfully create http server and bind to port '" + p + "':");
@@ -133,8 +145,8 @@ module.exports.create = function (opts) {
if ('function' === typeof fnPlain) {
fnPlain.apply(plainServer);
} else if (!fn && !plainServer.listenerCount('listening') && !server.listenerCount('listening')) {
console.info('[:' + (plainServer.address().port || plainServer.address())
+ "] Handling ACME challenges and redirecting to " + server.type);
console.info('[:' + (plainServer.address().port || plainServer.address()) +
"] Handling ACME challenges and redirecting to " + server.type);
}
// Report h2/https status

4
express-server/public/firebase-messaging-sw.js
View File

@@ -23,5 +23,7 @@ messaging.setBackgroundMessageHandler(payload => {
// }
// return self.registration.showNotification(title, options)
const title = payload.data.title
new Notification(title, { body: payload.data.text});
new Notification(title, {
body: payload.data.text
});
})

53
express-server/public/invite/inv.js
View File

@@ -1,9 +1,9 @@
$(document).ready(function() {
$(document).ready(function () {
// Initialize Firebase
var config = {
// Initialize Firebase
var config = {
apiKey: "AIzaSyCuvwf78cmSDoZ2yS4XxHZhnjUn7yIHYfw",
authDomain: "test-667ca.firebaseapp.com",
databaseURL: "https://test-667ca.firebaseio.com",
@@ -16,7 +16,7 @@ var config = {
var segment_str = window.location.pathname;
var segment_array = segment_str.split( '/' );
var segment_array = segment_str.split('/');
var last_segment = segment_array.pop();
//verifyInvite(last_segment);
@@ -26,7 +26,9 @@ var config = {
function verifyInvite(link) {
//alert("Ore Link", link)
firebase.auth().onAuthStateChanged(function(user){if(user){firebase.auth().currentUser.getIdToken(/* forceRefresh */ true).then(function(idtoken) {
firebase.auth().onAuthStateChanged(function (user) {
if (user) {
firebase.auth().currentUser.getIdToken( /* forceRefresh */ true).then(function (idtoken) {
$.ajax({
type: "POST",
url: "/invitemember",
@@ -34,48 +36,63 @@ var config = {
idtoken: idtoken,
link: link
},
success(){
success() {
window.location.href = "/dash/" + idtoken
//alert("Success");
},
error(err){
error(err) {
console.error("Error: " + err);
//alert("Error");
window.location.href = "/dash/" + idtoken
}
});
}).catch((error) => console.error("Get id token client error: ", error));}else{console.log("Check Auth error", user)}});
}).catch((error) => console.error("Get id token client error: ", error));
} else {
console.log("Check Auth error", user)
}
});
}
function getList(link) {
firebase.auth().onAuthStateChanged(function(user){if(user){firebase.auth().currentUser.getIdToken(/* forceRefresh */ true).then(function(idtoken) {
firebase.auth().onAuthStateChanged(function (user) {
if (user) {
firebase.auth().currentUser.getIdToken( /* forceRefresh */ true).then(function (idtoken) {
$.ajax({
type: "GET",
url: "/shoppinglistsbylink?link=" + link,
data: {
idtoken: idtoken
},
success(data){
success(data) {
console.log(data);
$(".s_name").append(data.find(function(obj) {return obj.invitelink == link}).name);
$(".s_desc").append(data.find(function(obj) {return obj.invitelink == link}).description);
$(".s_link").append(data.find(function(obj) {return obj.invitelink == link}).invitelink);
$(".s_name").append(data.find(function (obj) {
return obj.invitelink == link
}).name);
$(".s_desc").append(data.find(function (obj) {
return obj.invitelink == link
}).description);
$(".s_link").append(data.find(function (obj) {
return obj.invitelink == link
}).invitelink);
},
error(err){
error(err) {
console.error("Error: " + err);
}
});
}).catch((error) => console.error("Get id token client error: ", error));}else{console.log("Check Auth error", user)}});
}).catch((error) => console.error("Get id token client error: ", error));
} else {
console.log("Check Auth error", user)
}
});
}
$(".btn_verify").click(function() {
$(".btn_verify").click(function () {
var segment_str = window.location.pathname;
var segment_array = segment_str.split( '/' );
var segment_array = segment_str.split('/');
var last_segment = segment_array.pop();
verifyInvite(last_segment);
})
});

2
express-server/public/invite/style.css
View File

@@ -1,6 +1,6 @@
body {
background-color: #121212;
display:none;
display: none;
}
.cont {

190
express-server/public/javascripts/ajax.js
View File

@@ -6,41 +6,49 @@ var config = {
projectId: "test-667ca",
storageBucket: "test-667ca.appspot.com",
messagingSenderId: "221332577314"
};
};
firebase.initializeApp(config);
$(document).ready(function() {
firebase.auth().onAuthStateChanged(async function(user){if(user){firebase.auth().currentUser.getIdToken(/* forceRefresh */ true).then(function(idtoken) {
$(document).ready(function () {
firebase.auth().onAuthStateChanged(async function (user) {
if (user) {
firebase.auth().currentUser.getIdToken( /* forceRefresh */ true).then(function (idtoken) {
console.log("/shoppinglistx idtoken:", idtoken);
var url = "/dash/" + idtoken
console.log("URL: ", url)
$('#dashurl').attr("href", url);
}).catch((error) => console.error("/shoppinglist Get id token client error: ", error));}else{console.log("Check Auth error", user)}});
}).catch((error) => console.error("/shoppinglist Get id token client error: ", error));
} else {
console.log("Check Auth error", user)
}
});
eigeneEinkaufslisten();
geteilteEinkaufslisten();
$(".detailcardausgabe").hide();
$(".logout").click(function(){
$(".logout").click(function () {
console.log("click logout")
firebase.auth().signOut().then(function() {
firebase.auth().signOut().then(function () {
document.location.replace('/');
}).catch(function(error) {
}).catch(function (error) {
console.error("Logout Error: ", error)
});
});
$('.add').click(function(){
$('.add').click(function () {
console.log("click add");
// let name = $("#einkaufslistenname").val();
firebase.auth().onAuthStateChanged(async function(user){if(user){firebase.auth().currentUser.getIdToken(/* forceRefresh */ true).then(function(idtoken) {
firebase.auth().onAuthStateChanged(async function (user) {
if (user) {
firebase.auth().currentUser.getIdToken( /* forceRefresh */ true).then(function (idtoken) {
console.log("/shoppinglistx idtoken:", idtoken);
$.ajax({
type: "POST",
@@ -48,25 +56,29 @@ $(document).ready(function() {
data: {
name: $("#einkaufslistenname").val(),
description: $("#einkaufslistenbeschreibung").val(),
color: $( "input:checked" ).val(),
color: $("input:checked").val(),
idtoken: idtoken
},
success(res){
success(res) {
console.log("add funktioniert");
$(".listen-ausgabe").html("");
eigeneEinkaufslisten();
geteilteEinkaufslisten();
$("#EigeneListeAdd").modal("hide");
},
error(err){
error(err) {
console.log("/shoppinglist error", err);
}
});
}).catch((error) => console.error("/shoppinglist Get id token client error: ", error));}else{console.log("Check Auth error", user)}});
}).catch((error) => console.error("/shoppinglist Get id token client error: ", error));
} else {
console.log("Check Auth error", user)
}
});
});
$(".gruppenadd").click(function(){
$(".gruppenadd").click(function () {
// let name = $("#groupname").val();
// let color = $("#groupfarbe").val();
@@ -78,19 +90,19 @@ $(document).ready(function() {
data: {
sl_id: globaleAddZwischenID,
name: $("#groupname").val(),
color: $( "input:checked" ).val()
color: $("input:checked").val()
},
success(res){
success(res) {
console.log("groupadd funktioniert");
},
error(err){
error(err) {
console.log("error");
}
});
});
$(".sl_add").click(function(){
$(".sl_add").click(function () {
$('#EigeneListeAdd').modal('show');
});
@@ -102,29 +114,33 @@ $(document).ready(function() {
var globaleAddZwischenID = "";
// var globaleGetZwischenID = "";
function eigeneEinkaufslisten(){
firebase.auth().onAuthStateChanged(async function(user){if(user){firebase.auth().currentUser.getIdToken(/* forceRefresh */ true).then(function(idtoken) {
function eigeneEinkaufslisten() {
firebase.auth().onAuthStateChanged(async function (user) {
if (user) {
firebase.auth().currentUser.getIdToken( /* forceRefresh */ true).then(function (idtoken) {
console.log("/myshoppinglists idtoke: ", idtoken);
$.ajax({
type: "GET",
url: "/myshoppinglists",
data:{
data: {
idtoken: idtoken
},
success(res){
firebase.auth().onAuthStateChanged(async function(user){if(user){firebase.auth().currentUser.getIdToken(/* forceRefresh */ true).then(function(idtoken) {
console.log("/userinfo_json idtoken: ",idtoken)
success(res) {
firebase.auth().onAuthStateChanged(async function (user) {
if (user) {
firebase.auth().currentUser.getIdToken( /* forceRefresh */ true).then(function (idtoken) {
console.log("/userinfo_json idtoken: ", idtoken)
$.ajax({
type: "GET",
url: "/userinfo_json",
data: {
idtoken: idtoken
},
success(data){
success(data) {
const userinfo = data.name;
const picture = data.picture;
console.log(data)
for(let i = 0; i < res.length; i++){
for (let i = 0; i < res.length; i++) {
const el = res[i];
$(".listen-ausgabe").append(`<div class="col-md-12 karten">
@@ -142,8 +158,7 @@ function eigeneEinkaufslisten(){
<h5 class="card-title">${el.name}</h5>
<p class="card-text">${el.description}</p>
</div>
</div></div>`
)
</div></div>`)
}
console.log("Eigene Einkaufslisten");
loeschen();
@@ -151,21 +166,31 @@ function eigeneEinkaufslisten(){
Detail();
// groupHinzufügen()
},
error(err){
error(err) {
console.error("userinfo_json error: ", err)
}
})
}).catch((error) => console.error("Get id token client error: ", error));}else{console.log("Check Auth error", user)}});
}).catch((error) => console.error("Get id token client error: ", error));
} else {
console.log("Check Auth error", user)
}
});
},
error(err){
error(err) {
console.error("/myshoppinglists ajax error: ", err);
}
});
}).catch((error) => console.error("Get id token client error: ", error));}else{console.log("Check Auth error", user)}});
}).catch((error) => console.error("Get id token client error: ", error));
} else {
console.log("Check Auth error", user)
}
});
};
function geteilteEinkaufslisten(){
firebase.auth().onAuthStateChanged(async function(user){if(user){firebase.auth().currentUser.getIdToken(/* forceRefresh */ true).then(function(idtoken) {
function geteilteEinkaufslisten() {
firebase.auth().onAuthStateChanged(async function (user) {
if (user) {
firebase.auth().currentUser.getIdToken( /* forceRefresh */ true).then(function (idtoken) {
console.log("/sharedshoppinglists idtoke: ", idtoken)
$.ajax({
data: "GET",
@@ -173,18 +198,22 @@ function geteilteEinkaufslisten(){
data: {
idtoken: idtoken
},
success(res){
success(res) {
console.log("Geteilte Einkaufslisten");
},
error(err){
error(err) {
console.error("/sharedshoppinglists error:", err);
}
});
}).catch((error) => console.error("Get id token client error: ", error));}else{console.log("Check Auth error", user)}});
}).catch((error) => console.error("Get id token client error: ", error));
} else {
console.log("Check Auth error", user)
}
});
};
function loeschen(){
$(".trash").click(function(){
function loeschen() {
$(".trash").click(function () {
let card = $(this).closest(".card");
let id = card.attr("id");
@@ -195,12 +224,13 @@ function loeschen(){
type: "DELETE",
url: "/shoppinglist",
data: {
sl_id: id},
success(res){
sl_id: id
},
success(res) {
console.log("card gelöscht");
card.remove();
},
error(err){
error(err) {
console.log("error");
}
});
@@ -208,8 +238,8 @@ function loeschen(){
});
};
function lala(){
$(".groupadd").click(function(){
function lala() {
$(".groupadd").click(function () {
let card = $(this).closest(".card");
let id = card.attr("id");
globaleAddZwischenID = id;
@@ -217,22 +247,24 @@ function lala(){
});
}
function Detail(){
$(".edit").click(function(){
function Detail() {
$(".edit").click(function () {
$(".cardausgabe").hide();
$(".detailcardausgabe").show();
let card = $(this).closest(".card");
let id = card.attr("id");
firebase.auth().onAuthStateChanged(async function(user){if(user){firebase.auth().currentUser.getIdToken(/* forceRefresh */ true).then(function(idtoken) {
firebase.auth().onAuthStateChanged(async function (user) {
if (user) {
firebase.auth().currentUser.getIdToken( /* forceRefresh */ true).then(function (idtoken) {
$.ajax({
type: "GET",
url: "/shoppinglist_json/" + id,
data: {
idtoken: idtoken
},
success(res){
success(res) {
console.log(res)
console.log("/myshoppinglists inside idtoken: ", idtoken)
$.ajax({
@@ -241,23 +273,23 @@ function Detail(){
data: {
idtoken: idtoken
},
success(result){
success(result) {
// var idtoken = getIdTokenGoogle()
$.ajax({
type: "GET",
url: "/userinfo_json",
data:{
data: {
idtoken: idtoken
},
success(data){
success(data) {
let userinfo = "some info"
console.log(userinfo);
const neu = result.filter(obj => obj.sl_id === id);
var link = "/dash/"+idtoken;
var link = "/dash/" + idtoken;
$(".kopf").attr("style",`background-color:#${neu[0].color}`);
$(".kopf").attr("style", `background-color:#${neu[0].color}`);
console.log(neu[0].color);
@@ -284,7 +316,7 @@ function Detail(){
</div></div>
`);
for(let x = 0; x < el.content.length; x++){
for (let x = 0; x < el.content.length; x++) {
const el2 = el.content[x]
$(`.${el.name}`).append(`<div class="collapse" id="${el.name}"><ul><li>${el2.count}x ${el2.name}</li></ul></div>`);
}
@@ -292,26 +324,30 @@ function Detail(){
ItemAdden();
groupdelete();
},
error(err){
error(err) {
console.log("Detail error userinfo_json: ", err);
}
})
},
error(err){
error(err) {
console.log("Detail error myshoppinglists: ", err);
}
});
},
error(err){
console.log("Detail error shoppinglist_json: " , err);
error(err) {
console.log("Detail error shoppinglist_json: ", err);
}
});
}).catch((error) => console.error("Get id token client error: ", error));
} else {
console.log("Check Auth error", user)
}
});
}).catch((error) => console.error("Get id token client error: ", error));}else{console.log("Check Auth error", user)}});
});
};
function ItemAdden(){
$(".itemadd").click(function(){
function ItemAdden() {
$(".itemadd").click(function () {
let getid = $(this).closest('.shoplistid');
let id = getid.attr('id');
@@ -321,14 +357,16 @@ function ItemAdden(){
$('.GroupItemAdd').modal('show');
firebase.auth().onAuthStateChanged(async function(user){if(user){firebase.auth().currentUser.getIdToken(/* forceRefresh */ true).then(function(idtoken) {
firebase.auth().onAuthStateChanged(async function (user) {
if (user) {
firebase.auth().currentUser.getIdToken( /* forceRefresh */ true).then(function (idtoken) {
$.ajax({
type: "GET",
url: "/shoppinglist_json/" + id,
data: {
idtoken: idtoken
},
success(result){
success(result) {
console.log(result.groups);
@@ -340,15 +378,19 @@ function ItemAdden(){
}
},
error(err){
error(err) {
console.log(err);
}
});
}).catch((error) => console.error("Get id token client error: ", error));}else{console.log("Check Auth error", user)}});
}).catch((error) => console.error("Get id token client error: ", error));
} else {
console.log("Check Auth error", user)
}
});
});
}
$(".itemhinzu").click(function(){
$(".itemhinzu").click(function () {
var name = $('#itemname').val();
var zahl = $('#inputGroupSelect01').val();
@@ -366,9 +408,10 @@ $(".itemhinzu").click(function(){
name: $('#itemname').val(),
count: $('#inputGroupSelect01').val()
},
success(result){
success(result) {
console.log("post item");
},error(err){
},
error(err) {
}
});
@@ -377,8 +420,8 @@ $(".itemhinzu").click(function(){
});
function groupdelete(){
$('.trashgroup').click(function(){
function groupdelete() {
$('.trashgroup').click(function () {
let getid = $(this).closest('.shoplisteid');
let shoplistid = getid.attr('id');
@@ -393,12 +436,13 @@ function groupdelete(){
url: "/group",
data: {
sl_id: shoplistid,
group_id: groupid},
success(res){
group_id: groupid
},
success(res) {
console.log("card gelöscht");
$(`.${groupid}`).remove();
},
error(err){
error(err) {
console.log("error");
}
});

362
express-server/public/javascripts/axios.js
View File

@@ -1,65 +1,87 @@
/* axios v0.18.0 | (c) 2018 by Matt Zabriskie */
(function webpackUniversalModuleDefinition(root, factory) {
if(typeof exports === 'object' && typeof module === 'object')
if (typeof exports === 'object' && typeof module === 'object')
module.exports = factory();
else if(typeof define === 'function' && define.amd)
else if (typeof define === 'function' && define.amd)
define([], factory);
else if(typeof exports === 'object')
else if (typeof exports === 'object')
exports["axios"] = factory();
else
root["axios"] = factory();
})(this, function() {
return /******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
/******/
/******/ // The require function
/******/ function __webpack_require__(moduleId) {
/******/
/******/ // Check if module is in cache
/******/ if(installedModules[moduleId])
/******/ return installedModules[moduleId].exports;
/******/
/******/ // Create a new module (and put it into the cache)
/******/ var module = installedModules[moduleId] = {
/******/ exports: {},
/******/ id: moduleId,
/******/ loaded: false
/******/ };
/******/
/******/ // Execute the module function
/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
/******/
/******/ // Flag the module as loaded
/******/ module.loaded = true;
/******/
/******/ // Return the exports of the module
/******/ return module.exports;
/******/ }
/******/
/******/
/******/ // expose the modules object (__webpack_modules__)
/******/ __webpack_require__.m = modules;
/******/
/******/ // expose the module cache
/******/ __webpack_require__.c = installedModules;
/******/
/******/ // __webpack_public_path__
/******/ __webpack_require__.p = "";
/******/
/******/ // Load entry module and return exports
/******/ return __webpack_require__(0);
/******/ })
/************************************************************************/
/******/ ([
/* 0 */
/***/ (function(module, exports, __webpack_require__) {
})(this, function () {
return /******/ (function (modules) { // webpackBootstrap
/******/ // The module cache
/******/
var installedModules = {};
/******/
/******/ // The require function
/******/
function __webpack_require__(moduleId) {
/******/
/******/ // Check if module is in cache
/******/
if (installedModules[moduleId])
/******/
return installedModules[moduleId].exports;
/******/
/******/ // Create a new module (and put it into the cache)
/******/
var module = installedModules[moduleId] = {
/******/
exports: {},
/******/
id: moduleId,
/******/
loaded: false
/******/
};
/******/
/******/ // Execute the module function
/******/
modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
/******/
/******/ // Flag the module as loaded
/******/
module.loaded = true;
/******/
/******/ // Return the exports of the module
/******/
return module.exports;
/******/
}
/******/
/******/
/******/ // expose the modules object (__webpack_modules__)
/******/
__webpack_require__.m = modules;
/******/
/******/ // expose the module cache
/******/
__webpack_require__.c = installedModules;
/******/
/******/ // __webpack_public_path__
/******/
__webpack_require__.p = "";
/******/
/******/ // Load entry module and return exports
/******/
return __webpack_require__(0);
/******/
})
/************************************************************************/
/******/
([
/* 0 */
/***/
(function (module, exports, __webpack_require__) {
module.exports = __webpack_require__(1);
/***/ }),
/* 1 */
/***/ (function(module, exports, __webpack_require__) {
/***/
}),
/* 1 */
/***/
(function (module, exports, __webpack_require__) {
'use strict';
@@ -115,9 +137,11 @@ return /******/ (function(modules) { // webpackBootstrap
module.exports.default = axios;
/***/ }),
/* 2 */
/***/ (function(module, exports, __webpack_require__) {
/***/
}),
/* 2 */
/***/
(function (module, exports, __webpack_require__) {
'use strict';
@@ -365,8 +389,9 @@ return /******/ (function(modules) { // webpackBootstrap
* @param {Object} obj1 Object to merge
* @returns {Object} Result of all merge properties
*/
function merge(/* obj1, obj2, obj3, ... */) {
function merge( /* obj1, obj2, obj3, ... */ ) {
var result = {};
function assignValue(val, key) {
if (typeof result[key] === 'object' && typeof val === 'object') {
result[key] = merge(result[key], val);
@@ -424,9 +449,11 @@ return /******/ (function(modules) { // webpackBootstrap
};
/***/ }),
/* 3 */
/***/ (function(module, exports) {
/***/
}),
/* 3 */
/***/
(function (module, exports) {
'use strict';
@@ -441,9 +468,11 @@ return /******/ (function(modules) { // webpackBootstrap
};
/***/ }),
/* 4 */
/***/ (function(module, exports) {
/***/
}),
/* 4 */
/***/
(function (module, exports) {
/*!
* Determine if an object is a Buffer
@@ -458,19 +487,21 @@ return /******/ (function(modules) { // webpackBootstrap
return obj != null && (isBuffer(obj) || isSlowBuffer(obj) || !!obj._isBuffer)
}
function isBuffer (obj) {
function isBuffer(obj) {
return !!obj.constructor && typeof obj.constructor.isBuffer === 'function' && obj.constructor.isBuffer(obj)
}
// For Node v0.10 support. Remove this eventually.
function isSlowBuffer (obj) {
function isSlowBuffer(obj) {
return typeof obj.readFloatLE === 'function' && typeof obj.slice === 'function' && isBuffer(obj.slice(0, 0))
}
/***/ }),
/* 5 */
/***/ (function(module, exports, __webpack_require__) {
/***/
}),
/* 5 */
/***/
(function (module, exports, __webpack_require__) {
'use strict';
@@ -506,7 +537,9 @@ return /******/ (function(modules) { // webpackBootstrap
}, arguments[1]);
}
config = utils.merge(defaults, {method: 'get'}, this.defaults, config);
config = utils.merge(defaults, {
method: 'get'
}, this.defaults, config);
config.method = config.method.toLowerCase();
// Hook up interceptors middleware
@@ -531,7 +564,7 @@ return /******/ (function(modules) { // webpackBootstrap
// Provide aliases for supported request methods
utils.forEach(['delete', 'get', 'head', 'options'], function forEachMethodNoData(method) {
/*eslint func-names:0*/
Axios.prototype[method] = function(url, config) {
Axios.prototype[method] = function (url, config) {
return this.request(utils.merge(config || {}, {
method: method,
url: url
@@ -541,7 +574,7 @@ return /******/ (function(modules) { // webpackBootstrap
utils.forEach(['post', 'put', 'patch'], function forEachMethodWithData(method) {
/*eslint func-names:0*/
Axios.prototype[method] = function(url, data, config) {
Axios.prototype[method] = function (url, data, config) {
return this.request(utils.merge(config || {}, {
method: method,
url: url,
@@ -553,9 +586,11 @@ return /******/ (function(modules) { // webpackBootstrap
module.exports = Axios;
/***/ }),
/* 6 */
/***/ (function(module, exports, __webpack_require__) {
/***/
}),
/* 6 */
/***/
(function (module, exports, __webpack_require__) {
'use strict';
@@ -617,7 +652,8 @@ return /******/ (function(modules) { // webpackBootstrap
if (typeof data === 'string') {
try {
data = JSON.parse(data);
} catch (e) { /* Ignore */ }
} catch (e) {
/* Ignore */ }
}
return data;
}],
@@ -655,9 +691,11 @@ return /******/ (function(modules) { // webpackBootstrap
module.exports = defaults;
/***/ }),
/* 7 */
/***/ (function(module, exports, __webpack_require__) {
/***/
}),
/* 7 */
/***/
(function (module, exports, __webpack_require__) {
'use strict';
@@ -673,9 +711,11 @@ return /******/ (function(modules) { // webpackBootstrap
};
/***/ }),
/* 8 */
/***/ (function(module, exports, __webpack_require__) {
/***/
}),
/* 8 */
/***/
(function (module, exports, __webpack_require__) {
'use strict';
@@ -859,9 +899,11 @@ return /******/ (function(modules) { // webpackBootstrap
};
/***/ }),
/* 9 */
/***/ (function(module, exports, __webpack_require__) {
/***/
}),
/* 9 */
/***/
(function (module, exports, __webpack_require__) {
'use strict';
@@ -891,9 +933,11 @@ return /******/ (function(modules) { // webpackBootstrap
};
/***/ }),
/* 10 */
/***/ (function(module, exports, __webpack_require__) {
/***/
}),
/* 10 */
/***/
(function (module, exports, __webpack_require__) {
'use strict';
@@ -915,9 +959,11 @@ return /******/ (function(modules) { // webpackBootstrap
};
/***/ }),
/* 11 */
/***/ (function(module, exports) {
/***/
}),
/* 11 */
/***/
(function (module, exports) {
'use strict';
@@ -942,9 +988,11 @@ return /******/ (function(modules) { // webpackBootstrap
};
/***/ }),
/* 12 */
/***/ (function(module, exports, __webpack_require__) {
/***/
}),
/* 12 */
/***/
(function (module, exports, __webpack_require__) {
'use strict';
@@ -1014,9 +1062,11 @@ return /******/ (function(modules) { // webpackBootstrap
};
/***/ }),
/* 13 */
/***/ (function(module, exports, __webpack_require__) {
/***/
}),
/* 13 */
/***/
(function (module, exports, __webpack_require__) {
'use strict';
@@ -1050,7 +1100,9 @@ return /******/ (function(modules) { // webpackBootstrap
var val;
var i;
if (!headers) { return parsed; }
if (!headers) {
return parsed;
}
utils.forEach(headers.split('\n'), function parser(line) {
i = line.indexOf(':');
@@ -1073,9 +1125,11 @@ return /******/ (function(modules) { // webpackBootstrap
};
/***/ }),
/* 14 */
/***/ (function(module, exports, __webpack_require__) {
/***/
}),
/* 14 */
/***/
(function (module, exports, __webpack_require__) {
'use strict';
@@ -1118,8 +1172,7 @@ return /******/ (function(modules) { // webpackBootstrap
hostname: urlParsingNode.hostname,
port: urlParsingNode.port,
pathname: (urlParsingNode.pathname.charAt(0) === '/') ?
urlParsingNode.pathname :
'/' + urlParsingNode.pathname
urlParsingNode.pathname : '/' + urlParsingNode.pathname
};
}
@@ -1147,9 +1200,11 @@ return /******/ (function(modules) { // webpackBootstrap
);
/***/ }),
/* 15 */
/***/ (function(module, exports) {
/***/
}),
/* 15 */
/***/
(function (module, exports) {
'use strict';
@@ -1189,9 +1244,11 @@ return /******/ (function(modules) { // webpackBootstrap
module.exports = btoa;
/***/ }),
/* 16 */
/***/ (function(module, exports, __webpack_require__) {
/***/
}),
/* 16 */
/***/
(function (module, exports, __webpack_require__) {
'use strict';
@@ -1241,16 +1298,20 @@ return /******/ (function(modules) { // webpackBootstrap
(function nonStandardBrowserEnv() {
return {
write: function write() {},
read: function read() { return null; },
read: function read() {
return null;
},
remove: function remove() {}
};
})()
);
/***/ }),
/* 17 */
/***/ (function(module, exports, __webpack_require__) {
/***/
}),
/* 17 */
/***/
(function (module, exports, __webpack_require__) {
'use strict';
@@ -1306,9 +1367,11 @@ return /******/ (function(modules) { // webpackBootstrap
module.exports = InterceptorManager;
/***/ }),
/* 18 */
/***/ (function(module, exports, __webpack_require__) {
/***/
}),
/* 18 */
/***/
(function (module, exports, __webpack_require__) {
'use strict';
@@ -1398,9 +1461,11 @@ return /******/ (function(modules) { // webpackBootstrap
};
/***/ }),
/* 19 */
/***/ (function(module, exports, __webpack_require__) {
/***/
}),
/* 19 */
/***/
(function (module, exports, __webpack_require__) {
'use strict';
@@ -1424,9 +1489,11 @@ return /******/ (function(modules) { // webpackBootstrap
};
/***/ }),
/* 20 */
/***/ (function(module, exports) {
/***/
}),
/* 20 */
/***/
(function (module, exports) {
'use strict';
@@ -1435,9 +1502,11 @@ return /******/ (function(modules) { // webpackBootstrap
};
/***/ }),
/* 21 */
/***/ (function(module, exports) {
/***/
}),
/* 21 */
/***/
(function (module, exports) {
'use strict';
@@ -1455,9 +1524,11 @@ return /******/ (function(modules) { // webpackBootstrap
};
/***/ }),
/* 22 */
/***/ (function(module, exports) {
/***/
}),
/* 22 */
/***/
(function (module, exports) {
'use strict';
@@ -1469,15 +1540,17 @@ return /******/ (function(modules) { // webpackBootstrap
* @returns {string} The combined URL
*/
module.exports = function combineURLs(baseURL, relativeURL) {
return relativeURL
? baseURL.replace(/\/+$/, '') + '/' + relativeURL.replace(/^\/+/, '')
: baseURL;
return relativeURL ?
baseURL.replace(/\/+$/, '') + '/' + relativeURL.replace(/^\/+/, '') :
baseURL;
};
/***/ }),
/* 23 */
/***/ (function(module, exports) {
/***/
}),
/* 23 */
/***/
(function (module, exports) {
'use strict';
@@ -1500,9 +1573,11 @@ return /******/ (function(modules) { // webpackBootstrap
module.exports = Cancel;
/***/ }),
/* 24 */
/***/ (function(module, exports, __webpack_require__) {
/***/
}),
/* 24 */
/***/
(function (module, exports, __webpack_require__) {
'use strict';
@@ -1563,9 +1638,11 @@ return /******/ (function(modules) { // webpackBootstrap
module.exports = CancelToken;
/***/ }),
/* 25 */
/***/ (function(module, exports) {
/***/
}),
/* 25 */
/***/
(function (module, exports) {
'use strict';
@@ -1596,8 +1673,9 @@ return /******/ (function(modules) { // webpackBootstrap
};
/***/ })
/******/ ])
});
;
/***/
})
/******/
])
});;
//# sourceMappingURL=axios.map

45
express-server/public/javascripts/firebase-app.js
View File

@@ -1,50 +1,47 @@
// var admin = require("firebase-admin");
// var serviceAccount = require("firebaseAdminKey.json");
// admin.initializeApp({
// credential: admin.credential.cert(serviceAccount),
// databaseURL: "https://test-667ca.firebaseio.com"
// });
var msg = firebase.messaging();
msg.requestPermission()
.then(function(){
.then(function () {
return msg.getToken();
})
.then(token => {
})
.then(token => {
console.log("Zugriff auf msg", token);
updateUser(token);
})
.catch(err => {
})
.catch(err => {
console.error("Msg Error: ", err);
})
})
function updateUser(token) {
firebase.auth().onAuthStateChanged(function(user){if(user){firebase.auth().currentUser.getIdToken(/* forceRefresh */ true).then(function(idtoken) {
firebase.auth().onAuthStateChanged(function (user) {
if (user) {
firebase.auth().currentUser.getIdToken( /* forceRefresh */ true).then(function (idtoken) {
$.ajax({
type: "POST",
url: "/user",
data:{
data: {
idtoken: idtoken,
message_id: token
},
success(){
success() {
console.log("User updated");
},
error(err){
error(err) {
console.error("Error: " + err);
}
});
}).catch((error) => console.error("Get id token client error: ", error));}else{console.log("Check Auth error", user)}});
}).catch((error) => console.error("Get id token client error: ", error));
} else {
console.log("Check Auth error", user)
}
});
}
msg.onMessage(payload => {
const title = payload.data.title
new Notification(title, { body: payload.data.body});
})
new Notification(title, {
body: payload.data.body
});
})

41
express-server/public/javascripts/login.js
View File

@@ -1,5 +1,3 @@
// Initialize Firebase
var config = {
apiKey: "AIzaSyCuvwf78cmSDoZ2yS4XxHZhnjUn7yIHYfw",
@@ -12,31 +10,31 @@ var config = {
firebase.initializeApp(config);
function checkAuth(){
firebase.auth().onAuthStateChanged(async function(user){
if(user){
try{
firebase.auth().currentUser.getIdToken(/* forceRefresh */ true).then(function(idToken) {
function checkAuth() {
firebase.auth().onAuthStateChanged(async function (user) {
if (user) {
try {
firebase.auth().currentUser.getIdToken( /* forceRefresh */ true).then(function (idToken) {
console.log("Vor Replace");
window.location.replace("/dash/" + idToken);
}).catch(function(error) {
}).catch(function (error) {
console.error("Get id token client error: ", error)
});
}catch{
} catch {
console.error("checkAuth error: ")
}
// document.getElementById("loginbutton").style.display = "none";
//
}else{
} else {
// document.getElementById("loginbutton").style.display = "block";
console.log("Check Auth error", user)
}
})
var user = firebase.auth().currentUser;
}
window.onload = function(){
window.onload = function () {
checkAuth();
}
@@ -44,15 +42,16 @@ window.onload = function(){
var vue = new Vue({
el: '#vue-app',
data:{
data: {
email: "",
password: ""
},
methods: {
login(){
login() {
var provider = new firebase.auth.GoogleAuthProvider();
provider.addScope('profile');
provider.addScope('email');
firebase.auth().signInWithPopup(provider).then(function(result) {
firebase.auth().signInWithPopup(provider).then(function (result) {
// This gives you a Google Access Token. You can use it to access the Google API.
var token = result.credential.accessToken;
var idToken = result.credential.idToken;
@@ -60,7 +59,7 @@ var vue = new Vue({
var user = result.user;
console.log("Eingelogt");
checkAuth();
}).catch(function(error) {
}).catch(function (error) {
// Handle Errors here.
var errorCode = error.code;
var errorMessage = error.message;
@@ -70,6 +69,16 @@ var vue = new Vue({
var credential = error.credential;
});
},
loginemail(){
firebase.auth().signInWithEmailAndPassword(this.email, this.password).then(result =>{
checkAuth();
}).catch(function(error) {
// Handle Errors here.
var errorCode = error.code;
var errorMessage = error.message;
// ...
});
}
},

28
express-server/public/javascripts/test.js
View File

@@ -1,4 +1,4 @@
$(document).ready(function() {
$(document).ready(function () {
refresh();
userinfo();
@@ -14,7 +14,7 @@ $(document).ready(function() {
}
});
$(".btn_invite").click(function() {
$(".btn_invite").click(function () {
$.ajax({
type: "POST",
url: "/invite",
@@ -25,11 +25,11 @@ $(document).ready(function() {
});
$(document).on("click", ".btn_detail", function() {
$(document).on("click", ".btn_detail", function () {
window.location.replace("/shoppinglist_json/" + $(this).closest("tr").attr("id"));
});
$(".btn_add").click(function() {
$(".btn_add").click(function () {
$.ajax({
type: "POST",
url: "/shoppinglist",
@@ -37,19 +37,21 @@ $(document).ready(function() {
name: $(".name").val(),
description: $(".description").val(),
color: "red"
}, success(result) {
},
success(result) {
refresh();
}
});
});
$(document).on("click", ".btn_delete", function() {
$(document).on("click", ".btn_delete", function () {
$.ajax({
type: "DELETE",
url: "/shoppinglist",
data: {
sl_id: $(this).closest("tr").attr("id")
}, success(result) {
},
success(result) {
refresh();
}
});
@@ -64,10 +66,10 @@ function refresh() {
type: "GET",
url: "/myshoppinglists",
success(data) {
for(let item of data) {
$(".tb_myshoppinglists").append("<tr id='" + item.sl_id +"'><td>" + item.name + "</td><td>" + item.description +
"</td><td> <a class='btn-floating btn-large waves-effect waves-light red btn_detail'><i class='material-icons'>forward</i></a></td>"
+ "<td><a class='btn-floating btn-large waves-effect waves-light red btn_delete'><i class='material-icons'>clear</i></a></td></tr>");
for (let item of data) {
$(".tb_myshoppinglists").append("<tr id='" + item.sl_id + "'><td>" + item.name + "</td><td>" + item.description +
"</td><td> <a class='btn-floating btn-large waves-effect waves-light red btn_detail'><i class='material-icons'>forward</i></a></td>" +
"<td><a class='btn-floating btn-large waves-effect waves-light red btn_delete'><i class='material-icons'>clear</i></a></td></tr>");
}
}
});
@@ -76,8 +78,8 @@ function refresh() {
type: "GET",
url: "/sharedshoppinglists",
success(data) {
for(let item of data) {
$(".tb_sharedshoppinglists").append("<tr id='" + item.sl_id +"'><td>" + item.name + "</td><td>" + item.description +
for (let item of data) {
$(".tb_sharedshoppinglists").append("<tr id='" + item.sl_id + "'><td>" + item.name + "</td><td>" + item.description +
"</td><td> <a class='btn-floating btn-large waves-effect waves-light red btn_detail'><i class='material-icons'>forward</i></a></td></tr>");
}
}

6
express-server/public/ocrscan/cam.js
View File

@@ -10,10 +10,12 @@ $(document).ready(function () {
navigator.getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.oGetUserMedia || navigator.msGetUserMedia;
if (navigator.getUserMedia) {
navigator.getUserMedia({ video: true }, streamWebcam, throwError);
navigator.getUserMedia({
video: true
}, streamWebcam, throwError);
}
$(".btnsnap").click(function() {
$(".btnsnap").click(function () {
snap();
});

66
express-server/public/ocrscan/dropzone.js
View File

@@ -1,12 +1,49 @@
"use strict";
var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
var _createClass = function () {
function defineProperties(target, props) {
for (var i = 0; i < props.length; i++) {
var descriptor = props[i];
descriptor.enumerable = descriptor.enumerable || false;
descriptor.configurable = true;
if ("value" in descriptor) descriptor.writable = true;
Object.defineProperty(target, descriptor.key, descriptor);
}
}
return function (Constructor, protoProps, staticProps) {
if (protoProps) defineProperties(Constructor.prototype, protoProps);
if (staticProps) defineProperties(Constructor, staticProps);
return Constructor;
};
}();
function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
function _possibleConstructorReturn(self, call) {
if (!self) {
throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
}
return call && (typeof call === "object" || typeof call === "function") ? call : self;
}
function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
function _inherits(subClass, superClass) {
if (typeof superClass !== "function" && superClass !== null) {
throw new TypeError("Super expression must either be null or a function, not " + typeof superClass);
}
subClass.prototype = Object.create(superClass && superClass.prototype, {
constructor: {
value: subClass,
enumerable: false,
writable: true,
configurable: true
}
});
if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass;
}
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
function _classCallCheck(instance, Constructor) {
if (!(instance instanceof Constructor)) {
throw new TypeError("Cannot call a class as a function");
}
}
/*
*
@@ -487,7 +524,13 @@ var Dropzone = function (_Emitter) {
* Allows you to translate the different units. Starting with `tb` for terabytes and going down to
* `b` for bytes.
*/
dictFileSizeUnits: { tb: "TB", gb: "GB", mb: "MB", kb: "KB", b: "b" },
dictFileSizeUnits: {
tb: "TB",
gb: "GB",
mb: "MB",
kb: "KB",
b: "b"
},
/**
* Called when dropzone initialized
* You can add event listeners here
@@ -1345,7 +1388,8 @@ var Dropzone = function (_Emitter) {
// "paste": (e) =>
// noPropagation e
// @paste e
} }];
}
}];
this.clickableElements.forEach(function (clickableElement) {
return _this3.listeners.push({
@@ -2986,8 +3030,9 @@ Dropzone.discover = function () {
// incorrectly **
//
Dropzone.blacklistedBrowsers = [
// The mac os and windows phone version of opera 12 seems to have a problem with the File drag'n'drop API.
/opera.*(Macintosh|Windows Phone).*version\/12/i];
// The mac os and windows phone version of opera 12 seems to have a problem with the File drag'n'drop API.
/opera.*(Macintosh|Windows Phone).*version\/12/i
];
// Checks if the browser is supported
Dropzone.isBrowserSupported = function () {
@@ -3041,7 +3086,9 @@ Dropzone.dataURItoBlob = function (dataURI) {
}
// write the ArrayBuffer to a blob
return new Blob([ab], { type: mimeString });
return new Blob([ab], {
type: mimeString
});
};
// Returns an array without the rejected item
@@ -3521,6 +3568,7 @@ contentLoaded(window, Dropzone._autoDiscoverFunction);
function __guard__(value, transform) {
return typeof value !== 'undefined' && value !== null ? transform(value) : undefined;
}
function __guardMethod__(obj, methodName, transform) {
if (typeof obj !== 'undefined' && obj !== null && typeof obj[methodName] === 'function') {
return transform(obj, methodName);

150
express-server/public/ocrscan/ocrscan.js
View File

@@ -1,6 +1,6 @@
var id;
$(document).ready(function() {
$(document).ready(function () {
M.AutoInit();
//initialize all modals
@@ -16,8 +16,7 @@ $(document).ready(function() {
if ($(window).width() > 600) {
//large
$(".col").css("height", "100%");
}
else {
} else {
//small
$(".col").css("height", "50%");
}
@@ -25,14 +24,14 @@ $(document).ready(function() {
$("#modal1").modal("open");
$(".btn-analyze").click(function() {
$(".btn-analyze").click(function () {
analyzeUploaded();
});
//AJAX
//AJAX
// Initialize Firebase
var config = {
// Initialize Firebase
var config = {
apiKey: "AIzaSyCuvwf78cmSDoZ2yS4XxHZhnjUn7yIHYfw",
authDomain: "test-667ca.firebaseapp.com",
databaseURL: "https://test-667ca.firebaseio.com",
@@ -50,39 +49,51 @@ var config = {
function movePurchases(text) {
firebase.auth().onAuthStateChanged(function(user){if(user){firebase.auth().currentUser.getIdToken(/* forceRefresh */ true).then(function(idtoken) {
function movePurchases(text) {
firebase.auth().onAuthStateChanged(function (user) {
if (user) {
firebase.auth().currentUser.getIdToken( /* forceRefresh */ true).then(function (idtoken) {
$.ajax({
type: "POST",
url: "/dones",
data:{
data: {
idtoken: idtoken,
sl_id: id,
billcontent: text
},
success(result){
success(result) {
console.log(result);
window.location.href = "/dash/" + idtoken
},
error(err){
error(err) {
console.error("Error: " + err);
}
});
}).catch((error) => console.error("Get id token client error: ", error));}else{console.log("Check Auth error", user)}});
}
}).catch((error) => console.error("Get id token client error: ", error));
} else {
console.log("Check Auth error", user)
}
});
}
$(".test").click(function() {
$(".test").click(function () {
//movePurchases();
getAllShoppinglists();
});
});
$(document).on("click", ".btndash", function() {
firebase.auth().onAuthStateChanged(function(user){if(user){firebase.auth().currentUser.getIdToken(/* forceRefresh */ true).then(function(idtoken) {
$(document).on("click", ".btndash", function () {
firebase.auth().onAuthStateChanged(function (user) {
if (user) {
firebase.auth().currentUser.getIdToken( /* forceRefresh */ true).then(function (idtoken) {
window.location.href = "/dash/" + idtoken
}).catch((error) => console.error("Get id token client error: ", error));}else{console.log("Check Auth error", user)}});
});
}).catch((error) => console.error("Get id token client error: ", error));
} else {
console.log("Check Auth error", user)
}
});
});
function analyzeUploaded() {
function analyzeUploaded() {
$("#modalEND").modal("open");
@@ -99,37 +110,43 @@ function analyzeUploaded() {
movePurchases(result.text);
$(".determinate").css("width", "0%");
});
}
}
setInterval(updateProgress(), 500);
setInterval(updateProgress(), 500);
function updateProgress(percent) {
if(loading == true) {
function updateProgress(percent) {
if (loading == true) {
$(".determinate").css("width", progress.progress * 100 + "%");
}
}
}
function updateUser() {
firebase.auth().onAuthStateChanged(function(user){if(user){firebase.auth().currentUser.getIdToken(/* forceRefresh */ true).then(function(idtoken) {
function updateUser() {
firebase.auth().onAuthStateChanged(function (user) {
if (user) {
firebase.auth().currentUser.getIdToken( /* forceRefresh */ true).then(function (idtoken) {
$.ajax({
type: "POST",
url: "/user",
data:{
data: {
idtoken: idtoken,
message_id: "msgtest"
},
success(){
success() {
console.log("USer updated");
},
error(err){
error(err) {
console.error("Error: " + err);
}
});
}).catch((error) => console.error("Get id token client error: ", error));}else{console.log("Check Auth error", user)}});
}
}).catch((error) => console.error("Get id token client error: ", error));
} else {
console.log("Check Auth error", user)
}
});
}
function testSearch() {
function testSearch() {
console.log("dpne");
$.ajax({
type: "DELETE",
@@ -145,68 +162,86 @@ function testSearch() {
console.error(err);
}
});
}
}
function getAllShoppinglists() {
firebase.auth().onAuthStateChanged(function(user){if(user){firebase.auth().currentUser.getIdToken(/* forceRefresh */ true).then(function(idtoken) {
function getAllShoppinglists() {
firebase.auth().onAuthStateChanged(function (user) {
if (user) {
firebase.auth().currentUser.getIdToken( /* forceRefresh */ true).then(function (idtoken) {
$.ajax({
type: "GET",
url: "/myshoppinglists",
data:{
data: {
idtoken: idtoken,
},
success(data){
success(data) {
$(".preloader-wrapper").css("display", "none");
for(let item of data) {
$(".output").append("<a id='" + item.sl_id +"' class='collection-item'>" + item.name + "</a>")
for (let item of data) {
$(".output").append("<a id='" + item.sl_id + "' class='collection-item'>" + item.name + "</a>")
}
},
error(err){
error(err) {
console.error("Error: " + err);
}
});
}).catch((error) => console.error("Get id token client error: ", error));}else{console.log("Check Auth error", user)}});
}
}).catch((error) => console.error("Get id token client error: ", error));
} else {
console.log("Check Auth error", user)
}
});
}
$(document).on("click", ".collection-item", function() {
$(document).on("click", ".collection-item", function () {
id = $(this).closest("a").attr("id");
$(".active").removeClass("active");
$(this).addClass("active");
});
});
$(".btncont").click(function() {
run([{y:100}, {y:0}], $(".r1"));
});
$(".btncont").click(function () {
run([{
y: 100
}, {
y: 0
}], $(".r1"));
});
function run(v, elem){
function run(v, elem) {
//Reverse the array
var reversed = JSON.parse(JSON.stringify(v)).reverse();
$(v[0]).animate(v[1], {
//The speed the element moves - lower is faster
duration: 500,
step: function(val) {
step: function (val) {
//Adding the transform to your element
elem.css("transform", `translateY(${val}%)`);
}
})
};
$(".opt1").click(function() {
run([{y:0}, {y:-100}], $(".r1"))
$(".opt1").click(function () {
run([{
y: 0
}, {
y: -100
}], $(".r1"))
run([{y:0}, {y:-100}], $(".r2"));
run([{
y: 0
}, {
y: -100
}], $(".r2"));
//$("#modal2").modal("open");
});
});
$(".opt2").click(function() {
$(".opt2").click(function () {
// $('.row').animate({'margin-top': '-100%'}, 1000);
});
});
});
@@ -229,4 +264,3 @@ var loading = false;
});
}
*/

7
express-server/push/push.js
View File

@@ -1,9 +1,4 @@
var admin = require('firebase-admin');
var serviceAccount = require('../login/firebaseAdminKey.json');
var firebaseAdmin = admin.initializeApp({
credential: admin.credential.cert(serviceAccount),
databaseURL: 'https://test-667ca.firebaseio.com'
});
function sendPush(msgtoken, title, text){
var message = {

187
express-server/routes/index.js
View File

@@ -8,24 +8,12 @@ var push = require("./../push/push");
var postgres = require("./../db-connect/db-connect");
// Initialize Firebase
// const config = {
// apiKey: "AIzaSyCuvwf78cmSDoZ2yS4XxHZhnjUn7yIHYfw",
// authDomain: "test-667ca.firebaseapp.com",
// databaseURL: "https://test-667ca.firebaseio.com",
// projectId: "test-667ca",
// storageBucket: "test-667ca.appspot.com",
// messagingSenderId: "221332577314"
// };
// firebase.initializeApp(config);
var admin = require('firebase-admin');
var serviceAccount = require('../login/firebaseAdminKey.json');
var firebaseAdmin = admin.initializeApp({
credential: admin.credential.cert(serviceAccount),
databaseURL: 'https://test-667ca.firebaseio.com'
});
//Push
router.get('/push/:msgtoken/:message/:title', function (req, res, next) {
@@ -36,23 +24,23 @@ router.get('/push/:msgtoken/:message/:title', function (req, res, next) {
// Login und Dash
router.get('/', function(req, res, next) {
router.get('/', function (req, res, next) {
res.render('index');
});
router.get('/dash/:idtoken', function(req, res, next) {
router.get('/dash/:idtoken', function (req, res, next) {
// const msgtoken = req.params.msgtoken;
const token = req.params.idtoken;
var uid;
firebaseAdmin.auth().verifyIdToken(token)
.then(function(decodedToken) {
.then(function (decodedToken) {
uid = decodedToken.uid;
// HIER WEITER MACHEN
// uid ist nur hier drinen verfügbar
}).catch(function(error) {
}).catch(function (error) {
console.log(error)
});
@@ -67,23 +55,21 @@ router.get('/dash/:idtoken', function(req, res, next) {
//GET Own shoppinglists as JSON
router.get("/myshoppinglists",async function(req, res, next) {
router.get("/myshoppinglists", async function (req, res, next) {
var token = req.query.idtoken;
console.log("/myshoppinglists idtoken: ", token)
firebaseAdmin.auth().verifyIdToken(token)
.then(async function(decodedToken) {
.then(async function (decodedToken) {
uid = decodedToken.uid;
console.log("uid", uid)
try {
//Get user id: req.session.passport.user.profile.id
res.status(200).send(await postgres.getShoppinglistsAdmin(uid));
}
catch(err) {
} catch (err) {
res.status(400).send(await err);
}
}).catch(function(error) {
}).catch(function (error) {
console.log(error)
});
@@ -108,22 +94,20 @@ router.get("/myshoppinglists",async function(req, res, next) {
//GET Shared shoppinglists as JSON
router.get("/sharedshoppinglists", async function(req, res, next) {
router.get("/sharedshoppinglists", async function (req, res, next) {
var token = req.query.idtoken;
firebaseAdmin.auth().verifyIdToken(token)
.then(async function(decodedToken) {
.then(async function (decodedToken) {
uid = decodedToken.uid;
console.log("uid", uid)
try {
//Get user id: req.session.passport.user.profile.id
res.status(200).send(await postgres.getShoppinglistsShared(uid));
}
catch(err) {
} catch (err) {
res.status(400).send(await err);
}
}).catch(function(error) {
}).catch(function (error) {
console.log(error)
});
@@ -132,22 +116,20 @@ router.get("/sharedshoppinglists", async function(req, res, next) {
//GET ALL SHOPPINGLISTS
router.get("/shoppinglistsbylink", async function(req, res, next) {
router.get("/shoppinglistsbylink", async function (req, res, next) {
var token = req.query.idtoken;
firebaseAdmin.auth().verifyIdToken(token)
.then(async function(decodedToken) {
.then(async function (decodedToken) {
uid = decodedToken.uid;
console.log("uid", uid)
try {
//Get user id: req.session.passport.user.profile.id
res.status(200).send(await postgres.getShoppinglistsByLink(req.query.link));
}
catch(err) {
} catch (err) {
res.status(400).send(await err);
}
}).catch(function(error) {
}).catch(function (error) {
console.log(error)
});
@@ -156,13 +138,13 @@ router.get("/shoppinglistsbylink", async function(req, res, next) {
//POST new shoppinglist
router.post("/shoppinglist", async function(req, res, next) {
router.post("/shoppinglist", async function (req, res, next) {
console.log("/shoppinglist idtoken: ", req.body.idtoken)
var token = req.body.idtoken;
var uid;
firebaseAdmin.auth().verifyIdToken(token)
.then(async function(decodedToken) {
.then(async function (decodedToken) {
uid = decodedToken.uid;
console.log("UID: ", uid);
console.log("So andere sachen: ", req.body.name, req.body.description);
@@ -170,32 +152,28 @@ router.post("/shoppinglist", async function(req, res, next) {
res.status(200).send(await postgres.newShoppinglist(req.body.name, req.body.description, uid, req.body.color));
sendPush("enG4tJ6LyyU:APA91bEYjUEs7Sdzvu2ivgfqtpzlg42BZLlujDSRg0WLBvfZ_oD4V7cTx2o6MVr4oAdeHaK0wttPMQ85GMMOkgM7xvbHFcwXUG4MCr8JXX16S-OV2CS4ikQ286DOHPtBotbM7pqFTvIM", "Einkaufsliste " + req.body.name + " wurde erstellt!", req.body.description)
}
catch(err) {
} catch (err) {
res.status(400).send(await err);
}
}).catch(function(error) {
}).catch(function (error) {
console.log(error)
});
});
});
//GET Shoppinglist detail
router.get("/shoppinglist_json/:sl_id", async (req, res) => {
var token = req.query.idtoken;
var uid;
firebaseAdmin.auth().verifyIdToken(token)
.then(async function(decodedToken) {
.then(async function (decodedToken) {
uid = decodedToken.uid;
console.log("UID: ", uid);
try {
res.status(200).send(await postgres.displayShoppinglist(req.params.sl_id));
}
catch(err) {
} catch (err) {
res.status(400).send(await err);
}
}).catch(function(error) {
}).catch(function (error) {
console.log(error)
});
@@ -210,10 +188,7 @@ postgres.displayShoppinglist("4tezJYMK");
router.delete("/shoppinglist", async (req, res) => {
try {
res.status(200).send(await postgres.deleteShoppinglist(req.body.sl_id));
sendPush("enG4tJ6LyyU:APA91bEYjUEs7Sdzvu2ivgfqtpzlg42BZLlujDSRg0WLBvfZ_oD4V7cTx2o6MVr4oAdeHaK0wttPMQ85GMMOkgM7xvbHFcwXUG4MCr8JXX16S-OV2CS4ikQ286DOHPtBotbM7pqFTvIM", "Die Einkaufsliste " + req.body.sl_id + " wurde gelöscht!", "Einkaufsliste wurde geändert")
}
catch(err) {
} catch (err) {
res.status(400).send(await err);
}
});
@@ -223,9 +198,7 @@ router.delete("/shoppinglist", async (req, res) => {
router.post("/group", async (req, res) => {
try {
res.status(200).send(await postgres.addGroup(req.body.sl_id, req.body.name, req.body.color, req.body.hidden));
}
catch(err) {
} catch (err) {
res.status(400).send(await err);
}
@@ -236,9 +209,7 @@ router.post("/group", async (req, res) => {
router.post("/item", async (req, res) => {
try {
res.status(200).send(await postgres.addItem(req.body.group_id, req.body.sl_id, req.body.name, req.body.count));
}
catch (err) {
} catch (err) {
res.status(400).send(await err);
}
});
@@ -252,9 +223,9 @@ router.get("/userinfo_json", (req, res) => {
console.log("/userinfo_json idtoken: ", token)
firebaseAdmin.auth().verifyIdToken(token)
.then(function(decodedToken) {
.then(function (decodedToken) {
res.send(decodedToken);
}).catch(function(error) {
}).catch(function (error) {
console.log(error)
});
});
@@ -263,9 +234,7 @@ router.get("/userinfo_json", (req, res) => {
router.put("/shoppinglist", async (req, res) => {
try {
res.status(200).send(await postgres.editShoppinglist(req.body.sl_id, req.body.name, req.body.description, req.body.color));
}
catch(err) {
} catch (err) {
res.status(400).send(await err);
}
});
@@ -275,9 +244,7 @@ router.put("/shoppinglist", async (req, res) => {
router.put("/group", async (req, res) => {
try {
res.status(200).send(await postgres.editGroup(req.body.sl_id, req.body.group_id, req.body.name, req.body.color, req.body.hidden));
}
catch(err) {
} catch (err) {
res.status(400).send(await err);
}
});
@@ -285,29 +252,23 @@ router.put("/group", async (req, res) => {
router.put("/item", async (req, res) => {
try {
res.status(200).send(await postgres.editItem(req.body.sl_id, req.body.group_id, req.body.item_id, req.body.name, req.body.count));
}
catch(err) {
} catch (err) {
res.status(400).send(await err);
}
});
router.delete("/group", async(req, res) => {
router.delete("/group", async (req, res) => {
try {
res.status(200).send(await postgres.deleteGroup(req.body.group_id, req.body.sl_id));
}
catch(err) {
} catch (err) {
res.status(400).send(await err);
}
});
router.delete("/item", async(req, res) => {
router.delete("/item", async (req, res) => {
try {
res.status(200).send(await postgres.deleteItem(req.body.item_id, req.body.group.id, req.body.sl_id));
}
catch(err) {
} catch (err) {
res.status(400).send(await err);
}
});
@@ -317,9 +278,7 @@ router.delete("/item", async(req, res) => {
router.post("/invite", async (req, res) => {
try {
res.status(200).send(await postgres.createInvite(req.body.sl_id));
}
catch(err) {
} catch (err) {
res.status(400).send(await err);
}
});
@@ -327,9 +286,7 @@ router.post("/invite", async (req, res) => {
router.post("/maninvite", async (req, res) => {
try {
res.status(200).send(await postgres.manInvite(req.body.sl_id, req.body.uid));
}
catch(err) {
} catch (err) {
res.status(400).send(err);
}
@@ -339,9 +296,7 @@ router.post("/maninvite", async (req, res) => {
router.delete("/member", (req, res) => {
try {
postgres.removeMember(req.body.uid, req.body.sl_id)
}
catch(err) {
} catch (err) {
return err;
}
});
@@ -355,43 +310,39 @@ router.post("/invitemember", (req, res) => {
var token = req.body.idtoken;
var uid;
firebaseAdmin.auth().verifyIdToken(token)
.then(async function(decodedToken) {
.then(async function (decodedToken) {
uid = decodedToken.uid;
try {
console.log("Route LInk inv", req.body.link);
res.status(200).send(await postgres.verifyInvite(req.body.link, uid));
}
catch(err) {
} catch (err) {
res.status(400).send(await err);
}
}).catch(function(error) {
}).catch(function (error) {
console.log(error)
});
});
//Update User
router.post("/user", async function(req, res, next) {
router.post("/user", async function (req, res, next) {
console.log("/shoppinglist idtoken: ", req.body.idtoken)
var token = req.body.idtoken;
var uid;
firebaseAdmin.auth().verifyIdToken(token)
.then(async function(decodedToken) {
.then(async function (decodedToken) {
uid = decodedToken.uid;
console.log("UID: ", uid);
console.log("So andere sachen: ", req.body.name, req.body.description);
try {
res.status(200).send(await postgres.updateUser(uid, req.body.message_id, decodedToken.name, decodedToken.picture, decodedToken.email));
}
catch(err) {
} catch (err) {
res.status(400).send(await err);
}
}).catch(function(error) {
}).catch(function (error) {
console.log(error)
});
});
@@ -399,9 +350,7 @@ router.post("/user", async function(req, res, next) {
router.get("/users", async (req, res) => {
try {
res.status(200).send(await postgres.searchUsers(req.query.search));
}
catch(err) {
} catch (err) {
res.status(400).send(err);
}
@@ -417,16 +366,14 @@ router.post("/donepurchases", (req, res) => {
var token = req.query.idtoken;
var uid;
firebaseAdmin.auth().verifyIdToken(token)
.then(async function(decodedToken) {
.then(async function (decodedToken) {
uid = decodedToken.uid;
try {
console.log("test");
}
catch(err) {
} catch (err) {
console.error(error);
}
}).catch( async function(error) {
}).catch(async function (error) {
console.log(error)
});
@@ -438,16 +385,14 @@ router.get("/donepurchases", (req, res) => {
var token = req.query.idtoken;
var uid;
firebaseAdmin.auth().verifyIdToken(token)
.then(async function(decodedToken) {
.then(async function (decodedToken) {
uid = decodedToken.uid;
try {
res.status(200).send(await postgres.getDonePurchases(uid));
}
catch(err) {
} catch (err) {
res.status(400).send(await err);
}
}).catch( async function(error) {
}).catch(async function (error) {
console.log(error)
});
@@ -457,33 +402,31 @@ router.get("/donepurchases", (req, res) => {
//OCR Scan
router.get("/scan/", async (req, res,) => {
router.get("/scan/", async (req, res, ) => {
res.render("ocrscan");
});
router.post("/dones", async function(req, res, next) {
router.post("/dones", async function (req, res, next) {
console.log("/shoppinglist idtoken: ", req.body.idtoken)
var token = req.body.idtoken;
var uid;
firebaseAdmin.auth().verifyIdToken(token)
.then(async function(decodedToken) {
.then(async function (decodedToken) {
uid = decodedToken.uid;
console.log("UID: ", uid);
console.log("So andere sachen: ", req.body.name, req.body.description);
try {
res.status(200).send(await postgres.moveDoneItems(uid, req.body.sl_id, req.body.billcontent));
}
catch(err) {
} catch (err) {
res.status(400).send(await err);
}
}).catch(function(error) {
}).catch(function (error) {
console.log(error)
});
});
});

2
express-server/routes/users.js
View File

@@ -2,7 +2,7 @@ var express = require('express');
var router = express.Router();
/* GET users listing. */
router.get('/', function(req, res, next) {
router.get('/', function (req, res, next) {
res.send('respond with a resource');
});

14
express-server/test/greenlock.js
View File

@@ -1,13 +1,15 @@
#!/usr/bin/env node
var Greenlock = require('../');
var greenlock = Greenlock.create({
version: 'draft-11'
, server: 'https://acme-staging-v02.api.letsencrypt.org/directory'
, agreeTos: true
, approvedDomains: [ 'example.com', 'www.example.com' ]
, configDir: require('path').join(require('os').tmpdir(), 'acme')
version: 'draft-11',
server: 'https://acme-staging-v02.api.letsencrypt.org/directory',
agreeTos: true,
approvedDomains: ['example.com', 'www.example.com'],
configDir: require('path').join(require('os').tmpdir(), 'acme')
, app: require('express')().use('/', function (req, res) {
,
app: require('express')().use('/', function (req, res) {
res.setHeader('Content-Type', 'text/html; charset=utf-8');
res.end('Hello, World!\n\n💚 🔒.js');
})

36
express-server/views/androidlogin.ejs
View File

@@ -1,36 +0,0 @@
<script src="https://www.gstatic.com/firebasejs/5.7.0/firebase.js"></script>
<script >
// Initialize Firebase
var config = {
apiKey: "AIzaSyCuvwf78cmSDoZ2yS4XxHZhnjUn7yIHYfw",
authDomain: "test-667ca.firebaseapp.com",
databaseURL: "https://test-667ca.firebaseio.com",
projectId: "test-667ca",
storageBucket: "test-667ca.appspot.com",
messagingSenderId: "221332577314"
};
firebase.initializeApp(config);
console.log("EJS TEst: ", "<%= customtoken%>")
firebase.auth().signInWithCustomToken("<%= customtoken%>").then(function(response){
firebase.auth().getIdToken(/* forceRefresh */ ).then(function(idToken) {
console.log("IDTOKEN: ", idToken)
window.location.replace('/dash/'+ idToken);
}).catch(function(error) {
console.error("token error: ", error)
});
}).catch(function(error) {
// Handle Errors here.
var errorCode = error.code;
var errorMessage = error.message;
console.error("Custom token error: ", error.message)
});
</script>

38
express-server/views/dash.ejs
View File

@@ -1,16 +1,19 @@
<!DOCTYPE html>
<html>
<head>
<head>
<title></title>
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link rel='stylesheet' href='/stylesheets/style.css'>
<link rel='stylesheet' href='/stylesheets/colorpicker-style.css'>
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.5.0/css/all.css" integrity="sha384-B4dIYHKNBt8Bc12p+WXckhzcICo0wtJAoU8YZTY5qE0Id1GSseTk6S+L3BlXeVIU" crossorigin="anonymous">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.5.0/css/all.css" integrity="sha384-B4dIYHKNBt8Bc12p+WXckhzcICo0wtJAoU8YZTY5qE0Id1GSseTk6S+L3BlXeVIU"
crossorigin="anonymous">
<link rel='stylesheet' href='/bootstrap/dist/css/bootstrap.min.css'>
<script src="https://www.gstatic.com/firebasejs/5.7.0/firebase.js"></script>
</head>
<body id="vue-app">
</head>
<body id="vue-app">
<!-- Navbar -->
<nav class="navbar sticky-top navbar-light bg-light" style="background-color:rgb(200, 200, 201)">
@@ -22,7 +25,8 @@
<ul class="nav justify-content-end liste">
<li class="nav-item">
<!-- <a class="nav-link active" href="#">Add</a> -->
<button class="btn btn-outline-light border-secondary sl_add" style="color: black">Shoppingliste Hinzufügen</button>
<button class="btn btn-outline-light border-secondary sl_add" style="color: black">Shoppingliste
Hinzufügen</button>
</li>
</ul>
<!-- <a href="/logout"> -->
@@ -56,15 +60,18 @@
<!-- Modal Group Hinzufügen -->
<div class="modal fade bd-example-modal-sm ListenDetailAdd" tabindex="-1" role="dialog" aria-labelledby="mySmallModalLabel" aria-hidden="true">
<div class="modal fade bd-example-modal-sm ListenDetailAdd" tabindex="-1" role="dialog" aria-labelledby="mySmallModalLabel"
aria-hidden="true">
<div class="modal-dialog modal-sm">
<div class="modal-content">
<div>
<center><p class="layout ueberschrift">Group hinzufügen</p></center>
<center>
<p class="layout ueberschrift">Group hinzufügen</p>
</center>
<div class="form-group layout">
<label for="exampleInputEmail1">Name</label>
<input type="text" class="form-control" id="groupname"placeholder="zB: Getränke">
<input type="text" class="form-control" id="groupname" placeholder="zB: Getränke">
</div>
<div class="form-group layout">
@@ -122,12 +129,15 @@
<!-- Modal Item Hinzufügen -->
<div class="modal fade bd-example-modal-sm GroupItemAdd" tabindex="-1" role="dialog" aria-labelledby="mySmallModalLabel" aria-hidden="true">
<div class="modal fade bd-example-modal-sm GroupItemAdd" tabindex="-1" role="dialog" aria-labelledby="mySmallModalLabel"
aria-hidden="true">
<div class="modal-dialog modal-sm">
<div class="modal-content">
<div class="inhalt">
<center><p class="layout ueberschrift">Item hinzufügen</p></center>
<center>
<p class="layout ueberschrift">Item hinzufügen</p>
</center>
<div class="form-group layout">
<label for="exampleInputEmail1">Gegenstand</label>
<input type="text" class="form-control" id="itemname" placeholder="zB: Coca Cola">
@@ -158,14 +168,15 @@
<!-- Modal Shoppingliste Hinzufügen -->
<div class="modal fade bd-example-modal-sm EigeneListeAdd" tabindex="-1" id="EigeneListeAdd" role="dialog" aria-labelledby="EigeneListeAdd" aria-hidden="true">
<div class="modal fade bd-example-modal-sm EigeneListeAdd" tabindex="-1" id="EigeneListeAdd" role="dialog"
aria-labelledby="EigeneListeAdd" aria-hidden="true">
<div class="modal-dialog modal-sm">
<div class="modal-content">
<div>
<div class="form-group layout">
<label for="exampleInputEmail1">Name</label>
<input type="text" class="form-control" id="einkaufslistenname"placeholder="zB: Billa">
<input type="text" class="form-control" id="einkaufslistenname" placeholder="zB: Billa">
</div>
<div class="form-group layout">
@@ -240,5 +251,6 @@
<script src="https://unpkg.com/ionicons@4.4.8/dist/ionicons.js"></script>
<script src="/javascripts/test.js"></script>
<script src="/javascripts/firebase-app.js"></script>
</body>
</body>
</html>

8
express-server/views/error.ejs
View File

@@ -1,3 +1,7 @@
<h1><%= message %></h1>
<h2><%= error.status %></h2>
<h1>
<%= message %>
</h1>
<h2>
<%= error.status %>
</h2>
<pre><%= error.stack %></pre>

19
express-server/views/index.ejs
View File

@@ -1,16 +1,24 @@
<!DOCTYPE html>
<html>
<head>
<head>
<link rel='stylesheet' href='/stylesheets/style.css' />
<script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
<script src="https://www.gstatic.com/firebasejs/5.7.0/firebase.js"></script>
</head>
<body>
</head>
<div id='vue-app'>
<body>
<div id='vue-app'>
<input v-model="email" id="email" type="email">
<input v-model="password" id="password" type="password">
<button id="loginemailbutton" @click="loginemail()">Login with Email</button>
{{email}}
<button id="loginbutton" @click="login()">Login with google</button>
@@ -18,5 +26,6 @@
<script src="javascripts/login.js"></script>
</body>
</body>
</html>

3
express-server/views/invite.ejs
View File

@@ -1,5 +1,6 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -29,6 +30,7 @@
<!-- Compiled and minified JavaScript -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js"></script>
</head>
<body>
@@ -54,4 +56,5 @@
</div>
</body>
</html>

21
express-server/views/ocrscan.ejs
View File

@@ -35,8 +35,8 @@
<body>
<div class="row r1">
<div class="col s12 m6 l6 opt1 waves-effect waves-dark" >
<center><i class="material-icons ico" >file_upload</i></center>
<div class="col s12 m6 l6 opt1 waves-effect waves-dark">
<center><i class="material-icons ico">file_upload</i></center>
</div>
<div class="col s12 m6 l6 opt2 waves-effect waves-dark" onclick="M.toast({html: 'Not yet available'})">
@@ -58,13 +58,14 @@
<center><img id="blah" src="#" alt="" /></center>
</div>
<center><button class="btn waves-effect waves-light deep-orange darken-1 disabled btn-analyze " type="submit" name="action">Continue<i class="material-icons right">send</i></button></center>
<center><button class="btn waves-effect waves-light deep-orange darken-1 disabled btn-analyze " type="submit" name="action">Continue<i
class="material-icons right">send</i></button></center>
</div>
<div class="fixed-action-btn">
<div class="fixed-action-btn">
<a class="btn-floating btn-large btndash">
<i class="large material-icons blue-grey darken-4">arrow_back</i>
</a>
@@ -76,13 +77,16 @@
<div id="modal1" class="modal">
<div class="modal-content">
<h4>Choose Shoppinglist</h4>
<center> <div class="preloader-wrapper big active">
<center>
<div class="preloader-wrapper big active">
<div class="spinner-layer spinner-blue-only">
<div class="circle-clipper left">
<div class="circle"></div>
</div><div class="gap-patch">
</div>
<div class="gap-patch">
<div class="circle"></div>
</div><div class="circle-clipper right">
</div>
<div class="circle-clipper right">
<div class="circle"></div>
</div>
</div>
@@ -126,7 +130,8 @@
<!-- Modal Structure PRELOADER END-->
<div id="modalEND" class="modal">
<div class="modal-content">
<center> <div class="progress">
<center>
<div class="progress">
<div class="indeterminate"></div>
</div>