diff --git a/frontend/index.html b/frontend/index.html index c54ef6b..3dc143e 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -2,7 +2,7 @@ - + TiM diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 772abf1..3df0e8d 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -4,21 +4,29 @@ import { RouterLink, RouterView } from 'vue-router' - +export default { + data() { + return { + username: AppStore.data.user.username + } + } +} + diff --git a/frontend/src/assets/css/base.css b/frontend/src/assets/css/base.css index df1c8ee..83d692a 100644 --- a/frontend/src/assets/css/base.css +++ b/frontend/src/assets/css/base.css @@ -12,4 +12,14 @@ body { a, p { color: white; text-decoration: none; +} + +.f-col { + display: flex; + flex-direction: column; +} + +.f-row { + display: flex; + flex-direction: row; } \ No newline at end of file diff --git a/frontend/src/assets/css/main.css b/frontend/src/assets/css/main.css index 1a91039..1627734 100644 --- a/frontend/src/assets/css/main.css +++ b/frontend/src/assets/css/main.css @@ -1,5 +1,5 @@ @import './base.css'; @import './nav.css'; @import './vars.css'; -@import './taskview.css'; +@import './tracker.css'; @import url('https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300;0,400;0,500;0,700;0,800;1,400;1,700&display=swap'); diff --git a/frontend/src/assets/css/taskview.css b/frontend/src/assets/css/tracker.css similarity index 91% rename from frontend/src/assets/css/taskview.css rename to frontend/src/assets/css/tracker.css index 01c92f5..2f66d68 100644 --- a/frontend/src/assets/css/taskview.css +++ b/frontend/src/assets/css/tracker.css @@ -28,6 +28,10 @@ main { background-color: var(--clr-2); } +.task-new-wrapper .f-row { + gap: 1rem; +} + img { cursor: pointer; } \ No newline at end of file diff --git a/frontend/src/assets/svg/tim.svg b/frontend/src/assets/svg/tim.svg new file mode 100644 index 0000000..6a03e21 --- /dev/null +++ b/frontend/src/assets/svg/tim.svg @@ -0,0 +1,136 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/frontend/src/components/HelloWorld.vue b/frontend/src/components/HelloWorld.vue deleted file mode 100644 index 5fb372c..0000000 --- a/frontend/src/components/HelloWorld.vue +++ /dev/null @@ -1,44 +0,0 @@ - - - - - diff --git a/frontend/src/components/TaskHeader.vue b/frontend/src/components/TaskHeader.vue new file mode 100644 index 0000000..a8bed4f --- /dev/null +++ b/frontend/src/components/TaskHeader.vue @@ -0,0 +1,21 @@ + + + diff --git a/frontend/src/components/TaskRecord.vue b/frontend/src/components/TaskRecord.vue new file mode 100644 index 0000000..921eea4 --- /dev/null +++ b/frontend/src/components/TaskRecord.vue @@ -0,0 +1,72 @@ + + + diff --git a/frontend/src/components/TheWelcome.vue b/frontend/src/components/TheWelcome.vue deleted file mode 100644 index dab9536..0000000 --- a/frontend/src/components/TheWelcome.vue +++ /dev/null @@ -1,88 +0,0 @@ - - - diff --git a/frontend/src/components/TrackerTask.vue b/frontend/src/components/TrackerTask.vue new file mode 100644 index 0000000..d35e64b --- /dev/null +++ b/frontend/src/components/TrackerTask.vue @@ -0,0 +1,19 @@ + + + diff --git a/frontend/src/components/TrackerTimer.vue b/frontend/src/components/TrackerTimer.vue new file mode 100644 index 0000000..3ab943b --- /dev/null +++ b/frontend/src/components/TrackerTimer.vue @@ -0,0 +1,66 @@ + + + diff --git a/frontend/src/components/WelcomeItem.vue b/frontend/src/components/WelcomeItem.vue deleted file mode 100644 index ac366d0..0000000 --- a/frontend/src/components/WelcomeItem.vue +++ /dev/null @@ -1,86 +0,0 @@ - - - diff --git a/frontend/src/components/icons/IconCommunity.vue b/frontend/src/components/icons/IconCommunity.vue deleted file mode 100644 index 2dc8b05..0000000 --- a/frontend/src/components/icons/IconCommunity.vue +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/frontend/src/components/icons/IconDocumentation.vue b/frontend/src/components/icons/IconDocumentation.vue deleted file mode 100644 index 6d4791c..0000000 --- a/frontend/src/components/icons/IconDocumentation.vue +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/frontend/src/components/icons/IconEcosystem.vue b/frontend/src/components/icons/IconEcosystem.vue deleted file mode 100644 index c3a4f07..0000000 --- a/frontend/src/components/icons/IconEcosystem.vue +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/frontend/src/components/icons/IconSupport.vue b/frontend/src/components/icons/IconSupport.vue deleted file mode 100644 index 7452834..0000000 --- a/frontend/src/components/icons/IconSupport.vue +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/frontend/src/components/icons/IconTooling.vue b/frontend/src/components/icons/IconTooling.vue deleted file mode 100644 index 660598d..0000000 --- a/frontend/src/components/icons/IconTooling.vue +++ /dev/null @@ -1,19 +0,0 @@ - - diff --git a/frontend/src/stores/AppStore.js b/frontend/src/stores/AppStore.js new file mode 100644 index 0000000..bd8b91b --- /dev/null +++ b/frontend/src/stores/AppStore.js @@ -0,0 +1,30 @@ +export default { + data: { + user: { + _id: '1234', + username: 'Example User', + email: 'test@example.com' + }, + newTask: {}, + fetchedTasks: [ + { + title: 'frontend', + project: 'TiM', + client: 'Filip Rojek', + timeStart: 1703960133061, + timeEnd: 1703960141414 + }, + { + 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. + fetchData() { + // fetch logic + } +} diff --git a/frontend/src/views/TrackerView.vue b/frontend/src/views/TrackerView.vue index 51f0c63..1854490 100644 --- a/frontend/src/views/TrackerView.vue +++ b/frontend/src/views/TrackerView.vue @@ -1,135 +1,18 @@ + +