Compare commits

...

7 Commits

50 changed files with 9267 additions and 48 deletions

4
.docker.env.example Normal file
View File

@@ -0,0 +1,4 @@
DB_ROOT_PASS=root
DB_USER=user
DB_PASS=password

2
.gitignore vendored Normal file
View File

@@ -0,0 +1,2 @@
.docker.env
mariadb/

59
api/.githooks/pre-push Executable file
View File

@@ -0,0 +1,59 @@
#!/bin/bash
# @link https://gist.github.com/mattscilipoti/8424018
#
# Called by "git push" after it has checked the remote status,
# but before anything has been pushed.
#
# If this script exits with a non-zero status nothing will be pushed.
#
# Steps to install, from the root directory of your repo...
# 1. Copy the file into your repo at `.git/hooks/pre-push`
# 2. Set executable permissions, run `chmod +x .git/hooks/pre-push`
# 3. Or, use `rake hooks:pre_push` to install
#
# Try a push to master, you should get a message `*** [Policy] Never push code directly to...`
#
# The commands below will not be allowed...
# `git push origin master`
# `git push --force origin master`
# `git push --delete origin master`
protected_branch='master'
policy="\n\n[Policy] Never push code directly to the "$protected_branch" branch! (Prevented with pre-push hook.)\n\n"
current_branch=$(git symbolic-ref HEAD | sed -e 's,.*/\(.*\),\1,')
push_command=$(ps -ocommand= -p $PPID)
is_destructive='force|delete|\-f'
will_remove_protected_branch=':'$protected_branch
do_exit(){
echo -e $policy
exit 1
}
if [[ $push_command =~ $is_destructive ]] && [ $current_branch = $protected_branch ]; then
do_exit
fi
if [[ $push_command =~ $is_destructive ]] && [[ $push_command =~ $protected_branch ]]; then
do_exit
fi
if [[ $push_command =~ $will_remove_protected_branch ]]; then
do_exit
fi
# Prevent ALL pushes to protected_branch
if [[ $push_command =~ $protected_branch ]] || [ $current_branch = $protected_branch ]; then
do_exit
fi
unset do_exit
exit 0

3
api/.gitignore vendored Normal file
View File

@@ -0,0 +1,3 @@
node_modules/
src/.env
*.log

15
api/.prettierrc Normal file
View File

@@ -0,0 +1,15 @@
{
"tabWidth": 4,
"useTabs": true,
"singleQuote": true,
"semi": false,
"trailingComma": "none",
"jsxSingleQuote": true,
"jsxBracketSameLine": true,
"printWidth": 200,
"bracketSpacing": true,
"vueIndentScriptAndStyle": true,
"arrowParens": "always",
"bracketSameLine": false,
"endOfLine": "lf"
}

1
api/README.md Normal file
View File

@@ -0,0 +1 @@
# New Project

12
api/norkconfig.json Normal file
View File

@@ -0,0 +1,12 @@
{
"project_name": "api",
"lang": "ts",
"author": "Filip Rojek",
"database": {
"db": "mysql",
"orm": "sequelize"
},
"website": "https://filiprojek.cz",
"email": "filip@filiprojek.cz",
"version": "3.0.5"
}

7812
api/package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff

75
api/package.json Normal file
View File

@@ -0,0 +1,75 @@
{
"name": "api",
"version": "1.0.0",
"description": "",
"main": "dist/server.js",
"private": "true",
"keywords": [],
"author": "Filip Rojek <filip@filiprojek.cz> (https://filiprojek.cz)",
"repository": "github:username/repo",
"license": "ISC",
"scripts": {
"start": "node dist/server.js",
"start:dev": "nodemon src/server.ts",
"test": "jest",
"clean": "rimraf dist/*",
"copy-assets": "npx ts-node src/utils/copyAssets",
"tsc": "tsc -p .",
"build": "npm-run-all clean tsc copy-assets",
"format": "npx prettier --write ."
},
"dependencies": {
"bcrypt": "^5.1.1",
"colors": "1.4.0",
"cookie-parser": "^1.4.5",
"cors": "^2.8.5",
"dotenv": "^8.2.0",
"ejs": "^3.1.6",
"express": "^4.17.1",
"express-validator": "^6.14.2",
"fs-extra": "^10.0.0",
"jsonwebtoken": "^9.0.2",
"mariadb": "^3.2.3",
"mongoose": "^8.0.3",
"sequelize": "^6.15.0"
},
"devDependencies": {
"@types/bcrypt": "^5.0.2",
"@types/cookie-parser": "^1.4.2",
"@types/cors": "^2.8.10",
"@types/ejs": "^3.0.6",
"@types/express": "^4.17.11",
"@types/fs-extra": "^9.0.12",
"@types/jest": "^27.5.2",
"@types/jsonwebtoken": "^8.5.8",
"@types/mongoose": "^5.11.97",
"@types/morgan": "^1.9.2",
"@types/node": "^14.14.41",
"@types/shelljs": "^0.8.9",
"jest": "^27.0.6",
"morgan": "^1.10.0",
"nodemon": "^3.0.2",
"npm-run-all": "^4.1.5",
"rimraf": "^3.0.2",
"shelljs": "^0.8.4",
"ts-jest": "^27.1.5",
"ts-node": "^10.8.1",
"typescript": "^4.2.4"
},
"jest": {
"preset": "ts-jest",
"testEnvironment": "node"
},
"nodemonConfig": {
"ignore": [
"**/*.test.ts",
"**/*.spec.ts",
".git",
"node_modules"
],
"watch": [
"src"
],
"ext": "ts, js"
}
}

5
api/setup-repo.sh Executable file
View File

@@ -0,0 +1,5 @@
#!/bin/bash
cp .githooks/* .git/hooks
echo "hooks have been copied"

26
api/src/.env.example Normal file
View File

@@ -0,0 +1,26 @@
# General
APP_PORT = 6060
APP_HOSTNAME = 'localhost'
APP_HOST = 'http://localhost:8080' # frontend url
# Timezone
TZ = 'Europe/Prague'
CORS_WHITELIST = http://172.15.46.21:8080;http://192.168.0.1:8080
JWT_SECRET = ''
# MongoDB
DB_URI = 'mongodb://username:password@localhost:27017/database?authSource=admin'
# PostgreSQL
DB_PORT = 5432
DB_HOST = '127.0.0.1'
DB_USERNAME = ''
DB_PASSWORD = ''
DB_DATABASE = ''
# SMTP
SMTP_HOST = ''
SMTP_USER = ''
SMTP_PASS = ''
SMTP_FROM = ''

42
api/src/app.ts Normal file
View File

@@ -0,0 +1,42 @@
import express from 'express'
import morgan from 'morgan'
import path from 'path'
import cors from 'cors'
import cookieParser from 'cookie-parser'
import { router as routes } from './routes'
import { router as middlewares } from './middlewares'
import env from './config/environment'
export let corsWhitelist: Array<string>
if (env.CORS_WHITELIST != 'undefined') {
corsWhitelist = [...['http://localhost:8080', 'http://localhost:6040'], ...env.CORS_WHITELIST.split(';')]
} else {
corsWhitelist = ['http://localhost:8080', 'http://localhost:6040']
}
const corsOptions = {
origin: function (origin: any, callback: any) {
if (!origin || corsWhitelist.indexOf(origin) !== -1) {
callback(null, true)
} else {
callback(new Error('Not allowed by CORS'))
}
},
optionsSuccessStatus: 200,
credentials: true
}
export const app = express()
// Middlewares
app.use(middlewares)
app.set('view engine', 'ejs')
app.set('views', path.join(__dirname, 'views'))
app.use(cors(corsOptions))
app.use(morgan('dev'))
app.use(express.urlencoded({ extended: true }))
app.use(express.json())
app.use(express.static(path.join(__dirname, 'public')))
app.use(cookieParser())
// Routes
app.use(routes)

View File

@@ -0,0 +1,36 @@
import env from './environment'
import { Err, Succ } from '../services/globalService'
import db from './sequelize.config'
import Client from '../models/Client'
import Project from '../models/Project'
import Task from '../models/Task'
import User from '../models/User'
async function connect() {
if (!env.NORK.database) {
new Err(500, 'no database is in norkcfg.json')
return false
}
if (env.NORK.database.orm == 'sequelize') {
await User.sync()
await Client.sync()
await Project.sync()
await Task.sync({ alter: true })
db.sync()
.then(() => {
new Succ(200, 'connected to db')
return true
})
.catch((err: any) => {
new Err(500, `Can't connect to db\n${err}`)
return false
})
}
//if (env.NORK.database.db.length > 0) {
// new Err(500, `unsupported database ${env.NORK.database.db}`)
// return false
//}
}
export default connect

View File

@@ -0,0 +1,59 @@
import path from 'path'
import fs from 'fs-extra'
import { Err } from '../services/globalService'
import dotenv from 'dotenv'
const env_path = process.env.NODE_ENV ? `../.env.${process.env.NODE_ENV}` : '../.env'
dotenv.config({ path: path.join(__dirname, env_path) })
const norkcfg = fs.readJSONSync(path.join(__dirname, '../../norkconfig.json'))
if (norkcfg.database) {
if (norkcfg.database.db == 'postgresql') {
if (!process.env.DB_PORT) {
process.env.DB_PORT = '5432'
}
if (!process.env.DB_HOST) {
process.env.DB_HOST = '127.0.0.1'
}
if (!process.env.DB_USERNAME || !process.env.DB_PASSWORD || !process.env.DB_DATABASE) {
new Err(500, 'missing DB parameters in .env file')
process.exit(1)
}
}
}
if (!fs.existsSync(path.join(__dirname, env_path))) {
console.log('$env_path = ', env_path)
console.log('$__dirname = ', __dirname)
new Err(500, `.env file for ${process.env.NODE_ENV ? process.env.NODE_ENV : ''} environment does not exists`)
process.exit()
}
if (process.env.JWT_SECRET === undefined || process.env.JWT_SECRET == '') {
new Err(500, 'JWT_SECRET is not set!')
process.exit()
}
export default {
// General
APP_PORT: Number(process.env.APP_PORT),
APP_HOST: String(process.env.APP_HOST),
APP_HOSTNAME: process.env.APP_HOSTNAME !== undefined ? String(process.env.APP_HOSTNAME) : null,
CORS_WHITELIST: String(process.env.CORS_WHITELIST),
JWT_SECRET: String(process.env.JWT_SECRET),
// MongoDB
DB_URI: String(process.env.DB_URI),
// PostgreSQL
DB_PORT: Number(process.env.DB_PORT),
DB_HOST: String(process.env.DB_HOST),
DB_USERNAME: String(process.env.DB_USERNAME),
DB_PASSWORD: String(process.env.DB_PASSWORD),
DB_DATABASE: String(process.env.DB_DATABASE),
// Nork
NORK: norkcfg,
// SMTP
SMTP_HOST: String(process.env.SMTP_HOST),
SMTP_USER: String(process.env.SMTP_USER),
SMTP_PASS: String(process.env.SMTP_PASS),
SMTP_FROM: String(process.env.SMTP_FROM)
}

View File

@@ -0,0 +1,10 @@
import { Sequelize } from 'sequelize'
import env from './environment'
const db = new Sequelize(env.DB_DATABASE, env.DB_USERNAME, env.DB_PASSWORD, {
host: env.DB_HOST,
dialect: 'mariadb',
logging: true
})
export default db

View File

@@ -0,0 +1,6 @@
import { Request, Response } from 'express'
export function root_get(req: Request, res: Response) {
res.render('home')
return true
}

View File

@@ -0,0 +1,45 @@
import { Request, Response } from 'express'
import Task from '../models/Task'
import { Err, Succ } from '../services/globalService'
export async function get(req: Request, res: Response) {
try {
const data = await Task.findAll()
res.json(data)
} catch (error) {
res.status(500).send(error)
}
}
export async function add(req: Request, res: Response) {
try {
const payload = req.body
payload.author_id = res.locals.user._id
console.log(payload)
const task = await Task.create(payload)
res.json(task)
} catch (error) {
res.status(500).send(error)
}
}
export async function edit(req: Request, res: Response) {
try {
const payload = req.body
payload.author_id = res.locals.user._id
const task: any = await Task.findByPk(payload._id)
if (!task) {
return res.status(400).json(new Err(400, 'Task not found'))
}
task.title = payload.title
task.timeEnd = payload.timeEnd
task.timeStart = payload.timeStart
await task.save()
return res.json(new Succ(200, 'Task updated succesfully'))
} catch (error) {
return res.status(500).json(new Err(400, 'something went wrong', error))
}
}

View File

@@ -0,0 +1,76 @@
import { Request, Response } from 'express'
import bcrypt from 'bcrypt'
import jwt from 'jsonwebtoken'
import env from '../config/environment'
import User from '../models/User'
import { Err, Succ } from '../services/globalService'
export async function login(req: Request, res: Response) {}
export async function signup(req: Request, res: Response) {
try {
const payload = req.body
payload.password = await bcrypt.hash(payload.password, 12)
const user = await User.create(payload)
res.status(201).json(new Succ(201, 'user was successfully signed up'))
} catch (err: any) {
new Err(500, err)
res.status(500).json(new Err(500, 'something went wrong'))
}
}
export async function signin(req: Request, res: Response) {
try {
const payload = req.body
const user: any = await User.findOne({ where: { email: payload.email } })
if (!user) {
res.cookie('jwt', '', { httpOnly: true, maxAge: 0 })
res.cookie('auth', false, { httpOnly: false, maxAge: 0 })
res.status(401).json(new Err(401, 'email or password is wrong'))
return
}
if (await bcrypt.compare(payload.password, user.password)) {
const maxAge = 3 * 24 * 60 * 60 // 3 days in seconds
const createToken = (id: any) => {
return jwt.sign({ id }, env.JWT_SECRET, {
expiresIn: maxAge
})
}
const token = createToken(user._id)
res.cookie('jwt', token, { httpOnly: true, maxAge: maxAge * 1000 })
res.cookie('auth', true, { httpOnly: false, maxAge: maxAge * 1000 })
res.json(new Succ(200, 'user is logged in'))
return
}
res.cookie('jwt', '', { httpOnly: true, maxAge: 0 })
res.cookie('auth', false, { httpOnly: false, maxAge: 0 })
res.status(401).json(new Err(401, 'email or password is wrong'))
} catch (err: any) {
new Err(500, err)
res.status(500).json(new Err(500, 'something went wrong'))
}
}
export function logout(req: Request, res: Response) {
res.cookie('jwt', '', { httpOnly: true, maxAge: 0 })
res.cookie('auth', false, { httpOnly: false, maxAge: 0 })
res.json(new Succ(200, 'user was logged out'))
}
export function status(req: Request, res: Response) {
try {
let userObject = res.locals.user
userObject.password = undefined
userObject.__v = undefined
res.status(200).json(new Succ(200, 'user is logged in', userObject))
} catch (error) {
res.status(500).json(new Err(500, 'somehting went wrong', error))
}
}

View File

@@ -0,0 +1,4 @@
export interface ErrType {
code: number
message: string
}

View File

@@ -0,0 +1,55 @@
import { Request, Response, NextFunction } from 'express'
import jwt from 'jsonwebtoken'
import env from '../config/environment'
import { Err, Succ } from '../services/globalService'
import User from '../models/User' // uncomment this
export function requireAuth(req: Request, res: Response, next: NextFunction) {
const token = req.cookies.jwt
//new Err(500, 'uncomment code in authMiddleware before using!')
if (token) {
jwt.verify(token, env.JWT_SECRET, async (err: any, decodedToken: any) => {
if (err) {
// console.error(err.message)
res.status(401).json(new Err(401, 'user is not authenticated'))
}
if (!err) {
const user = await User.findByPk(decodedToken.id)
console.log('TADY', user)
if (user === null) {
console.log('1')
res.status(401).json(new Err(401, 'user is not authenticated'))
return
}
res.locals.user = user
console.log('2')
new Succ(100, 'user is authenticated')
next()
}
})
}
if (!token) {
console.log('3')
res.status(401).json(new Err(401, 'user is not authenticated'))
}
}
export function requireVerified(req: Request, res: Response, next: NextFunction) {
if (res.locals.user._id) {
if (res.locals.user.verified) {
new Succ(100, 'user is verified')
next()
return
}
res.status(403).json(new Err(403, 'user is not verified'))
return
}
if (!res.locals.user._id) {
res.status(401).json(new Err(401, 'user is not authenticated'))
return
}
}

View File

@@ -0,0 +1,16 @@
import { Request, Response, NextFunction } from 'express'
import { validationResult } from 'express-validator'
import { Err } from '../services/globalService'
class Middleware {
handleValidationError(req: Request, res: Response, next: NextFunction) {
const error = validationResult(req)
if (!error.isEmpty()) {
new Err(400, error)
return res.status(400).json(new Err(400, 'validation error', error.array()[0]))
}
next()
}
}
export default new Middleware()

View File

@@ -0,0 +1,6 @@
import { Router } from 'express'
import { router as sayHiMiddleware } from '../middlewares/sayHiMiddleware'
export const router = Router()
// router.use(sayHiMiddleware)

View File

@@ -0,0 +1,9 @@
import { Router, Request, Response, NextFunction } from 'express'
export const router = Router()
router.use((req: Request, res: Response, next: NextFunction) => {
console.log('Hi :)')
next()
})

44
api/src/models/Client.ts Normal file
View File

@@ -0,0 +1,44 @@
import { DataTypes, Model } from 'sequelize'
import path from 'path'
import db from '../config/sequelize.config'
import User from './User'
class Instance extends Model {}
Instance.init(
{
_id: {
type: DataTypes.UUID,
defaultValue: DataTypes.UUIDV4,
primaryKey: true,
allowNull: false,
unique: true
},
name: {
type: DataTypes.STRING,
allowNull: false
},
hourlyRate: {
type: DataTypes.INTEGER,
allowNull: true
},
contact: {
type: DataTypes.STRING,
allowNull: true
},
author_id: {
type: DataTypes.UUID,
allowNull: false,
references: {
model: User,
key: '_id'
}
}
},
{
sequelize: db,
tableName: path.basename(__filename).split('.')[0].toLowerCase()
}
)
export default Instance

49
api/src/models/Project.ts Normal file
View File

@@ -0,0 +1,49 @@
import { DataTypes, Model } from 'sequelize'
import path from 'path'
import db from '../config/sequelize.config'
import User from './User'
import Client from './Client'
class Instance extends Model {}
Instance.init(
{
_id: {
type: DataTypes.UUID,
defaultValue: DataTypes.UUIDV4,
primaryKey: true,
allowNull: false,
unique: true
},
name: {
type: DataTypes.STRING,
allowNull: false
},
hourlyRate: {
type: DataTypes.INTEGER,
allowNull: true
},
client_id: {
type: DataTypes.UUID,
allowNull: false,
references: {
model: Client,
key: '_id'
}
},
author_id: {
type: DataTypes.UUID,
allowNull: false,
references: {
model: User,
key: '_id'
}
}
},
{
sequelize: db,
tableName: path.basename(__filename).split('.')[0].toLowerCase()
}
)
export default Instance

54
api/src/models/Task.ts Normal file
View File

@@ -0,0 +1,54 @@
import { DataTypes, Model } from 'sequelize'
import path from 'path'
import db from '../config/sequelize.config'
import User from './User'
import Client from './Client'
import Project from './Project'
class Instance extends Model {}
Instance.init(
{
_id: {
type: DataTypes.UUID,
defaultValue: DataTypes.UUIDV4,
primaryKey: true,
allowNull: false,
unique: true
},
title: {
type: DataTypes.STRING,
allowNull: true
},
timeStart: {
type: DataTypes.BIGINT,
allowNull: false
},
timeEnd: {
type: DataTypes.BIGINT,
allowNull: true
},
project_id: {
type: DataTypes.UUID,
allowNull: true,
references: {
model: Project,
key: '_id'
}
},
author_id: {
type: DataTypes.UUID,
allowNull: false,
references: {
model: User,
key: '_id'
}
}
},
{
sequelize: db,
tableName: path.basename(__filename).split('.')[0].toLowerCase()
}
)
export default Instance

36
api/src/models/User.ts Normal file
View File

@@ -0,0 +1,36 @@
import { DataTypes, Model } from 'sequelize'
import path from 'path'
import db from '../config/sequelize.config'
class Instance extends Model {}
Instance.init(
{
_id: {
type: DataTypes.UUID,
defaultValue: DataTypes.UUIDV4,
primaryKey: true,
allowNull: false,
unique: true
},
username: {
type: DataTypes.STRING,
allowNull: false
},
password: {
type: DataTypes.STRING,
allowNull: false
},
email: {
type: DataTypes.STRING,
allowNull: false,
unique: true
}
},
{
sequelize: db,
tableName: path.basename(__filename).split('.')[0].toLowerCase()
}
)
export default Instance

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 5.8 KiB

View File

@@ -0,0 +1,16 @@
import { Router } from 'express'
import * as taskController from '../controllers/taskController'
import * as userController from '../controllers/userController'
import { requireAuth } from '../middlewares/authMiddleware'
export const router = Router()
//const mws = [handleValidation.handleValidationError]
router.get('/task/get', requireAuth, taskController.get)
router.post('/task/add', requireAuth, taskController.add)
router.post('/task/edit', requireAuth, taskController.edit)
router.post('/auth/signup', userController.signup)
router.post('/auth/signin', userController.signin)
router.post('/auth/logout', requireAuth, userController.logout)
router.get('/auth/status', requireAuth, userController.status)

13
api/src/routes/index.ts Normal file
View File

@@ -0,0 +1,13 @@
import { Request, Response, Router } from 'express'
import { router as rootRoutes } from './rootRoutes'
import { router as apiRoutes } from './apiRoutes'
export const router = Router()
router.use(rootRoutes)
router.use("/api/v1", apiRoutes)
// 404
router.use((req: Request, res: Response) => {
res.status(404).send('E404')
})

View File

@@ -0,0 +1,9 @@
import { Router } from 'express'
import * as rootController from '../controllers/rootController'
import rootValidator from '../validators/rootValidator'
import handleValidation from '../middlewares/handleValidation'
export const router = Router()
const mws = [handleValidation.handleValidationError]
router.get('/', rootValidator.checkRootGet(), mws, rootController.root_get)

22
api/src/server.ts Normal file
View File

@@ -0,0 +1,22 @@
import http from 'http'
import { app } from './app'
import env from './config/environment'
import { Succ } from './services/globalService'
import database from './config/database'
const port: number = env.APP_PORT || 8080
const hostname: string = env.APP_HOSTNAME || 'localhost'
export const server = http.createServer(app)
// Server
export function runServer(): void {
server.listen(port, hostname, () => {
new Succ(200, `Server is listening on http://${hostname}:${port}`)
})
}
if (!env.NORK.database) {
runServer()
} else {
const db_connection = database()
runServer()
}

View File

@@ -0,0 +1,173 @@
import colors from 'colors'
import fs from 'fs'
import path from 'path'
export interface ErrType {
code: number
message: string
data?: any
}
export class Err implements ErrType {
code: number
message: string
data: any
constructor(code: number, message: string | object, data: any = null) {
this.code = code
typeof message === 'object' ? (this.message = JSON.stringify(message)) : (this.message = message)
data ? (this.data = data) : false
// typeof data === 'object' ? (this.data = JSON.stringify(data)) : (this.data = data)
this.drop()
}
drop() {
if (this.data) {
console.log(colors.bgRed(`${this.code}`) + colors.bgBlack.red(` ${this.message}`) + this.data)
Log.make('Err', this.code, this.message, this.data)
return {
code: this.code,
message: this.message,
data: this.data
}
}
console.log(colors.bgRed(`${this.code}`) + colors.bgBlack.red(` ${this.message}`))
Log.make('Err', this.code, this.message)
return {
code: this.code,
message: this.message
}
}
}
export class Succ {
code: number
message: string
data?: any
constructor(code: number, message: string, data: any = null) {
this.code = code
this.message = message
data ? (this.data = data) : false
this.drop()
}
drop() {
if (this.data) {
console.log(colors.bgGreen.black(`${this.code}`) + colors.green.bgBlack(` ${this.message}`) + this.data)
return {
code: this.code,
message: this.message,
data: this.data
}
}
console.log(colors.bgGreen.black(`${this.code}`) + colors.green.bgBlack(` ${this.message}`))
return {
code: this.code,
message: this.message
}
}
}
export interface LogType {
type: 'Err' | 'Succ' | 'Info'
code?: number
message?: string
data?: any
logFile?: string
}
export class Log implements LogType {
type: 'Err' | 'Succ' | 'Info'
code?: number
message?: string
data?: any
logFile?: string
/**
* @param type
* - Type of log
* - Err | Succ | Info
* @param code
* - not required
* - HTTP status code
* @param message
* - could be anything
* @param data
* - could be anything
* @param logFile
* - name of logFile
* - default is log type file
*/
constructor(type: 'Err' | 'Succ' | 'Info', code?: number, message?: string, data?: any, logFile?: string) {
this.type = type
this.code = code
this.message = message
this.data = data
this.logFile = logFile
if (!this.logFile) {
this.logFile = `${type}.global.log`
} else {
this.logFile = this.logFile + '.log'
}
this.logFile = path.join(__dirname, this.logFile)
}
static pathMake(type: string, name?: string) {
let logName
if (!name) {
logName = `${type}.global.log`
} else {
logName = name + '.log'
}
return path.join(__dirname, '../logs/' + logName)
}
/**
* returns current date in my custom format
*/
static dateNow(): string {
/**
* @param num: number
*
* receives number and returns two digits number
* example:
* input num = 9 => returns string 09
*/
function add0(num: number): string {
if (num.toString().length <= 1) {
return '0' + String(num)
}
return String(num)
}
const d = new Date()
return `${d.getFullYear()}-${add0(d.getMonth() + 1)}-${add0(d.getDate())} ${add0(d.getHours())}:${add0(d.getMinutes())}:${add0(d.getSeconds())}`
}
static make(type: 'Err' | 'Succ' | 'Info', code?: number, message?: string, data?: any, logFile?: string) {
let realPath = Log.pathMake(type, logFile)
let formattedData = `Date: "${Log.dateNow()}" Type: "${type}"`
code ? (formattedData += ` Code: "${code}"`) : false
message ? (formattedData += ` Message: "${message}"`) : false
if (data) {
if (typeof data === 'object') {
data = JSON.stringify(data)
}
formattedData += ` Data: "${data}"`
}
formattedData += '\n'
if (fs.existsSync(realPath)) {
fs.appendFileSync(realPath, formattedData)
} else {
fs.writeFileSync(realPath, formattedData)
}
}
}

View File

@@ -0,0 +1,3 @@
export const helloWorld = () => {
console.log('hello world')
}

View File

@@ -0,0 +1,7 @@
import * as shell from 'shelljs'
// Copy all the view templates
shell.cp('-R', 'src/views', 'dist/')
shell.cp('-R', 'src/public', 'dist/')
shell.cp('-R', 'src/models', 'dist/')
shell.cp('-u', 'src/.env', 'dist/')

View File

@@ -0,0 +1,9 @@
import { body, param, query } from 'express-validator'
class rootValidator {
checkRootGet() {
return []
}
}
export default new rootValidator()

69
api/src/views/home.ejs Normal file
View File

@@ -0,0 +1,69 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>New Project</title>
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Open+Sans&display=swap" rel="stylesheet">
<style>
* {
box-sizing: border-box;
margin: 0;
padding: 0;
}
body {
font-family: 'Open Sans', sans-serif;
}
.content {
width: 100vw;
height: 100vh;
display: flex;
justify-content: space-between;
padding-top: 5rem;
flex-direction: column;
}
footer, .welcome {
display: flex;
justify-content: center;
}
.welcome {
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
}
img {
width: 200px;
padding-top: 2rem;
}
footer {
padding-bottom: 2rem;
text-align: center;
}
.logos {
display: flex;
align-items: center;
gap: 1rem;
}
</style>
</head>
<body>
<div class="content">
<div class="welcome">
<h1>Let's make something amazing!</h1>
<div class="logos">
<img src="/nodejs_logo.svg" alt="node.js logo">
<img src="/expressjs.png" alt="express.js logo">
</div>
</div>
<footer>
<div class="author">
<p>Made by </p><a href="http://www.filiprojek.cz">filiprojek.cz</a>
</div>
</footer>
</div>
</body>
</html>

63
api/tsconfig.json Normal file
View File

@@ -0,0 +1,63 @@
{
"compilerOptions": {
/* Visit https://aka.ms/tsconfig.json to read more about this file */
/* Basic Options */
// "incremental": true, /* Enable incremental compilation */
"target": "es6",
/* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */
"module": "commonjs",
/* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
// "lib": [], /* Specify library files to be included in the compilation. */
// "allowJs": true, /* Allow javascript files to be compiled. */
// "checkJs": true, /* Report errors in .js files. */
// "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', 'react', 'react-jsx' or 'react-jsxdev'. */
// "declaration": true, /* Generates corresponding '.d.ts' file. */
// "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */
// "sourceMap": true, /* Generates corresponding '.map' file. */
// "outFile": "./", /* Concatenate and emit output to single file. */
"outDir": "./dist",
/* Redirect output structure to the directory. */
"rootDir": "./src",
/* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
// "composite": true, /* Enable project compilation */
// "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */
// "removeComments": true, /* Do not emit comments to output. */
// "noEmit": true, /* Do not emit outputs. */
// "importHelpers": true, /* Import emit helpers from 'tslib'. */
// "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
// "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
/* Strict Type-Checking Options */
"strict": true,
/* Enable all strict type-checking options. */
// "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */
// "strictNullChecks": true, /* Enable strict null checks. */
// "strictFunctionTypes": true, /* Enable strict checking of function types. */
// "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
// "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */
// "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */
// "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */
"baseUrl": "./",
"esModuleInterop": true,
/* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
"resolveJsonModule": true,
// "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
/* Experimental Options */
"experimentalDecorators": true,
/* Enables experimental support for ES7 decorators. */
"emitDecoratorMetadata": true,
/* Enables experimental support for emitting type metadata for decorators. */
/* Advanced Options */
"skipLibCheck": true,
/* Skip type checking of declaration files. */
"forceConsistentCasingInFileNames": true
/* Disallow inconsistently-cased references to the same file. */
},
"exclude": ["src/tests"]
}

32
docker-compose.yaml Normal file
View File

@@ -0,0 +1,32 @@
version: '3'
networks:
db:
driver: bridge
services:
mariadb:
image: mariadb:10.6
restart: always
env_file: .docker.env
environment:
MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASS}
MYSQL_USER: ${DB_USER}
MYSQL_PASSWORD: ${DB_PASS}
ports:
- "3306:3306"
volumes:
- ./mariadb:/var/lib/mysql
networks:
db:
phpmyadmin:
image: phpmyadmin
restart: always
ports:
- "8080:80"
environment:
- PMA_HOST=mariadb
- PMA_PORT=3306
networks:
db:

View File

@@ -27,6 +27,8 @@ export default {
return {
username: AppStore.data.user.username
}
}
},
methods: {},
async created() {}
}
</script>

47
frontend/src/api/user.js Normal file
View File

@@ -0,0 +1,47 @@
const api_url = 'http://localhost:6060'
const userAPIS = {
async getUserStatus() {
const res = await fetch(`${api_url}/api/v1/auth/status`, {
credentials: 'include'
})
return res.json()
},
async loginUser(formState) {
const res = await fetch(`${api_url}/api/v1/auth/signin`, {
method: 'POST',
credentials: 'include',
headers: {
'Content-Type': 'application/json'
},
body: JSON.stringify(formState)
})
return await res.json()
},
async logoutUser() {
const res = await fetch(`${api_url}/api/v1/auth/logout`, {
method: 'POST',
credentials: 'include',
headers: {
'Content-Type': 'application/json'
},
body: JSON.stringify({})
})
return await res.json()
},
async registerUser(formState) {
const res = await fetch(`${api_url}/api/v1/auth/signup`, {
method: 'POST',
credentials: 'include',
headers: {
'Content-Type': 'application/json'
},
body: JSON.stringify(formState)
})
return res.json()
}
}
export default userAPIS

View File

@@ -0,0 +1,37 @@
<script setup>
defineProps(['btn-txt', 'api-endpoint'])
</script>
<template>
<form>
<slot></slot>
<button @click="formAction">{{ btnTxt }}</button>
</form>
</template>
<script>
import AppStore from '@/stores/AppStore'
export default {
data() {
return {
d: {
email: undefined,
password: undefined,
username: undefined
}
}
},
methods: {
formAction() {
console.log(this.d)
//AppStore.sendAdd(null, this.$props.apiEndpoint)
}
}
}
</script>
<style scoped>
form {
display: flex;
flex-direction: column;
align-items: center;
}
</style>

View File

@@ -29,7 +29,6 @@ const durationInSeconds = computed(() =>
Math.floor((props.task.timeEnd - props.task.timeStart) / 1000)
)
const normalizedDuration = computed(() => formatDuration(durationInSeconds.value))
console.log(props.task.title)
</script>
<template>
@@ -40,7 +39,6 @@ console.log(props.task.title)
class="title"
placeholder="What are you working on?"
:value="props.task.title"
:size="props.task.title.length + 1"
/>
</span>
<span>

View File

@@ -30,37 +30,78 @@ export default {
timer: undefined,
timerState: 'Start',
task: {
startTime: 0,
stopTime: 0,
timeStart: 0,
timeEnd: 0,
title: ''
}
},
restore: false
}
},
computed: {
formattedElapsedTime() {
const date = new Date(this.timeNow - this.task.startTime)
const date = new Date(this.timeNow - this.task.timeStart)
const utc = date.toUTCString()
return utc.substr(utc.indexOf(':') - 2, 8)
}
},
methods: {
startStopTimer() {
async startStopTimer() {
if (this.timerState == 'Start') {
this.timerState = 'Stop'
this.task.startTime = Date.now()
console.log('TADY', this.restore)
if (this.restore == false) {
console.log('TADY')
this.task.timeStart = Date.now()
}
this.timeNow = Date.now()
console.log('timer started')
this.timer = setInterval(() => {
this.timeNow = Date.now()
}, 1000)
if (!this.task._id) {
AppStore.data.newTask = {
title: this.task.title,
timeStart: this.task.timeStart
}
await AppStore.sendAdd(AppStore.data.newTask, '/task/add')
}
} else {
this.task.timeEnd = Date.now()
this.timerState = 'Start'
this.task.stopTime = Date.now()
clearInterval(this.timer)
this.timer = undefined
AppStore.data.newTask = this.task
console.log(AppStore.data.newTask)
this.timeNow = 0
AppStore.data.newTask = {
title: this.task.title,
timeStart: this.task.timeStart,
timeEnd: this.task.timeEnd
}
if (this.task._id) {
AppStore.data.newTask._id = this.task._id
await AppStore.sendAdd(AppStore.data.newTask, '/task/edit')
} else {
await AppStore.sendAdd(AppStore.data.newTask, '/task/add')
}
this.task = {
timeStart: 0,
timeEnd: 0,
title: ''
}
this.restore = false
this.$emit('get-tasks')
}
}
},
async mounted() {
await AppStore.fetchData()
const task = AppStore.data.fetchedTasks.filter((task) => task.timeEnd === null)
if (task.length > 0) {
this.task = task[0]
this.restore = true
this.startStopTimer()
}
}
}
</script>

View File

@@ -2,6 +2,14 @@ import { createRouter, createWebHistory } from 'vue-router'
import TrackerView from '../views/TrackerView.vue'
import SignupView from '../views/SignupView.vue'
import LoginView from '../views/LoginView.vue'
import userAPIS from '../api/user'
const authGuard = async () => {
const data = await userAPIS.getUserStatus()
if (!data.data) {
throw router.push('/')
}
}
const router = createRouter({
history: createWebHistory(import.meta.env.BASE_URL),
@@ -10,7 +18,7 @@ const router = createRouter({
path: '/',
name: 'home',
//component: HomeView
redirect: '/tracker'
redirect: '/tracker'
},
{
path: '/login',
@@ -26,7 +34,10 @@ const router = createRouter({
path: '/tracker',
name: 'tracker',
component: TrackerView,
alias: '/'
alias: '/',
meta: {
requiresAuth: true
}
},
{
path: '/about',
@@ -39,4 +50,20 @@ const router = createRouter({
]
})
router.beforeEach(async (to, from, next) => {
const requiresAuth = to.matched.some((x) => x.meta.requiresAuth)
const requiresGuest = to.matched.some((x) => x.meta.requiresGuest)
if (requiresAuth) {
const userStatus = await userAPIS.getUserStatus()
if (!userStatus.data) {
router.replace('/login')
next()
return
}
}
next()
})
export default router

View File

@@ -1,4 +1,5 @@
export default {
api_url: 'http://localhost:6060/api/v1',
data: {
user: {
_id: '1234',
@@ -7,26 +8,48 @@ export default {
},
newTask: {},
fetchedTasks: [
{
_id: 1,
title: 'frontend',
project: 'TiM',
client: 'Filip Rojek',
timeStart: 1703960133061,
timeEnd: 1703960141414
},
{
_id: 2,
title: 'setting up',
project: 'l2tp vpn',
client: 'IS Media',
timeStart: 1703960133061,
timeEnd: 1703960141414
}
//{
// _id: 1,
// title: 'Loading',
// project: 'Loading',
// client: 'Loading',
// timeStart: 1703960133061,
// timeEnd: 1703960141414
//}
]
},
// Methods that you need, for e.g fetching data from server etc.
fetchData() {
// fetch logic
async fetchData() {
try {
const response = await fetch(this.api_url + '/task/get', {
credentials: 'include'
})
if (!response.ok) {
throw new Error(`HTTP error! Status: ${response.status}`)
}
const data = await response.json()
this.data.fetchedTasks = data
console.log('Received data:', data)
} catch (error) {
console.error('Error fetching data:', error)
}
},
async sendAdd(data, url) {
try {
const response = await fetch(this.api_url + url, {
method: 'POST',
credentials: 'include',
headers: {
'Content-Type': 'application/json'
},
body: JSON.stringify(data)
})
if (!response.ok) {
throw new Error(`HTTP error! Status: ${response.status}`)
}
} catch (error) {
console.error('Error sending data:', error)
}
}
}

View File

@@ -1,15 +1,33 @@
<script setup>
import router from '@/router'
</script>
<template>
<form>
<input type="email" placeholder="Email">
<input type="password" placeholder="Password">
<button>Log in</button>
</form>
<form>
<label for="email">Email:</label>
<input type="email" id="email" v-model="email" placeholder="Email" />
<label for="password">Password:</label>
<input type="password" id="password" v-model="password" placeholder="Password" />
<button @click.prevent="formAction">Log in</button>
</form>
</template>
<style>
form {
display: flex;
flex-direction: column;
align-items: center;
<script>
import User from '@/api/user'
export default {
data() {
return {
email: '',
password: ''
}
</style>
},
methods: {
async formAction() {
const status = await User.loginUser({ email: this.email, password: this.password })
if (status.code == 200) {
throw router.push('/')
}
}
}
}
</script>

View File

@@ -1,3 +1,36 @@
<script setup>
import router from '@/router'
</script>
<template>
<b>signup</b>
</template>
<form>
<label for="username">Username:</label>
<input type="text" id="username" v-model="username" placeholder="Username" />
<label for="email">Email:</label>
<input type="email" id="email" v-model="email" placeholder="Email" />
<label for="password">Password:</label>
<input type="password" id="password" v-model="password" placeholder="Password" />
<button @click.prevent="formAction">Sign up</button>
</form>
</template>
<script>
import User from '@/api/user'
export default {
data() {
return {
username: '',
email: '',
password: ''
}
},
methods: {
async formAction() {
const status = await User.registerUser({ username: this.username, email: this.email, password: this.password })
if (status.code == 201) {
throw router.push('/')
}
}
}
}
</script>

View File

@@ -6,11 +6,11 @@ import TaskRecord from '@/components/TaskRecord.vue'
<template>
<main>
<TrackerTimer />
<TrackerTimer @get-tasks="getTasks" />
<div class="task-day-wrapper">
<TaskHeader />
<div class="task-wrapper" v-for="task in tasks" :key="task._id">
<div class="task-wrapper" v-for="task in sortedData" :key="task._id">
<TaskRecord :task="task" />
</div>
</div>
@@ -25,6 +25,21 @@ export default {
return {
tasks: AppStore.data.fetchedTasks
}
},
methods: {
async getTasks() {
await AppStore.fetchData()
this.tasks = AppStore.data.fetchedTasks
}
},
computed: {
sortedData() {
return this.tasks.slice().sort((a, b) => new Date(b.createdAt) - new Date(a.createdAt))
}
},
async mounted() {
await AppStore.fetchData()
this.tasks = AppStore.data.fetchedTasks
}
}
</script>