Tasks: able to get and print tasks

api/src/config/sequelize.config.ts

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

api/src/controllers/taskController.ts

@@ -0,0 +1,19 @@
+import { Request, Response } from 'express'
+import Task from '../models/Task'
+
+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 task = await Task.create(req.body)
+		res.json(task)
+	} catch (error) {
+		res.status(500).send(error)
+	}
+}

api/src/models/Task.ts

@@ -0,0 +1,43 @@
+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
+		},
+		title: {
+			type: DataTypes.STRING,
+			allowNull: false
+		},
+		client: {
+			type: DataTypes.STRING,
+			allowNull: true
+		},
+		project: {
+			type: DataTypes.STRING,
+			allowNull: true
+		},
+		timeStart: {
+			type: DataTypes.BIGINT,
+			allowNull: false
+		},
+		timeEnd: {
+			type: DataTypes.BIGINT,
+			allowNull: true
+		}
+	},
+	{
+		sequelize: db,
+		tableName: path.basename(__filename).split('.')[0].toLowerCase()
+	}
+)
+
+export default Instance

api/src/models/User.ts

@@ -1,6 +1,6 @@
 import { DataTypes, Model } from 'sequelize'
 import path from 'path'
-import db from '../config/sequelize.config.ts'
+import db from '../config/sequelize.config'
 
 class Instance extends Model {}
 

api/src/routes/apiRoutes.ts

@@ -0,0 +1,8 @@
+import { Router } from 'express'
+import * as taskController from "../controllers/taskController"
+
+export const router = Router()
+//const mws = [handleValidation.handleValidationError]
+
+router.get("/task/get", taskController.get)
+router.post("/task/add", taskController.add)

api/src/routes/index.ts

@@ -1,9 +1,11 @@
 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) => {

frontend/src/App.vue

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

frontend/src/components/TaskRecord.vue

@@ -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>

frontend/src/stores/AppStore.js

@@ -1,4 +1,5 @@
 export default {
+  api_url: 'http://localhost:6060/api/v1',
   data: {
     user: {
       _id: '1234',
@@ -7,26 +8,28 @@ export default {
     },
     newTask: {},
     fetchedTasks: [
-      {
+      //{
-        _id: 1,
+      //  _id: 1,
-        title: 'frontend',
+      //  title: 'Loading',
-        project: 'TiM',
+      //  project: 'Loading',
-        client: 'Filip Rojek',
+      //  client: 'Loading',
-        timeStart: 1703960133061,
+      //  timeStart: 1703960133061,
-        timeEnd: 1703960141414
+      //  timeEnd: 1703960141414
-      },
+      //}
-      {
-        _id: 2,
-        title: 'setting up',
-        project: 'l2tp vpn',
-        client: 'IS Media',
-        timeStart: 1703960133061,
-        timeEnd: 1703960141414
-      }
     ]
   },
-  // Methods that you need, for e.g fetching data from server etc.
+  async fetchData() {
-  fetchData() {
+    try {
-    // fetch logic
+      const response = await fetch(this.api_url + '/task/get')
+      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)
+    }
   }
 }

frontend/src/views/TrackerView.vue

@@ -25,6 +25,10 @@ export default {
     return {
       tasks: AppStore.data.fetchedTasks
     }
+  },
+  async mounted() {
+    await AppStore.fetchData()
+    this.tasks = AppStore.data.fetchedTasks
   }
 }
 </script>