diff --git a/api/src/Kurs.Platform.Application/AiBots/AiBotAppService.cs b/api/src/Kurs.Platform.Application/AiBots/AiBotAppService.cs
index fa50979f..67c9661d 100644
--- a/api/src/Kurs.Platform.Application/AiBots/AiBotAppService.cs
+++ b/api/src/Kurs.Platform.Application/AiBots/AiBotAppService.cs
@@ -1,12 +1,11 @@
using System;
-using Kurs.Platform.AiBots;
using Kurs.Platform.Entities;
using Microsoft.AspNetCore.Authorization;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Application.Services;
using Volo.Abp.Domain.Repositories;
-namespace Kurs.Platform.DataSources;
+namespace Kurs.Platform.AiBots;
[Authorize]
public class AiBotAppService : CrudAppService<
diff --git a/api/src/Kurs.Platform.Application/AiBots/AiBotAutoMapperProfile.cs b/api/src/Kurs.Platform.Application/AiBots/AiBotAutoMapperProfile.cs
index 3b33a7f3..c1cdd0c9 100644
--- a/api/src/Kurs.Platform.Application/AiBots/AiBotAutoMapperProfile.cs
+++ b/api/src/Kurs.Platform.Application/AiBots/AiBotAutoMapperProfile.cs
@@ -1,8 +1,7 @@
using AutoMapper;
-using Kurs.Platform.AiBots;
using Kurs.Platform.Entities;
-namespace Kurs.Platform.DataSources;
+namespace Kurs.Platform.AiBots;
public class AiBotAutoMapperProfile : Profile
{
diff --git a/api/src/Kurs.Platform.EntityFrameworkCore/Tenants/Seeds/TenantData.json b/api/src/Kurs.Platform.EntityFrameworkCore/Tenants/Seeds/TenantData.json
index 85273de5..dbafb3e2 100644
--- a/api/src/Kurs.Platform.EntityFrameworkCore/Tenants/Seeds/TenantData.json
+++ b/api/src/Kurs.Platform.EntityFrameworkCore/Tenants/Seeds/TenantData.json
@@ -645,22 +645,19 @@
"Name": "Demir Çelik"
},
{
- "Name": "Diğer",
- "FullName": ""
+ "Name": "Diğer"
},
{
"Name": "Eğitim"
},
{
- "Name": "Elektrik ve Elektronik",
- "FullName": ""
+ "Name": "Elektrik ve Elektronik"
},
{
"Name": "Enerji"
},
{
- "Name": "Finans",
- "FullName": ""
+ "Name": "Finans"
},
{
"Name": "Gıda"
@@ -672,15 +669,13 @@
"Name": "Güvenlik"
},
{
- "Name": "Hizmet-servis",
- "FullName": ""
+ "Name": "Hizmet-servis"
},
{
"Name": "Hırdavat ve Nalburiye"
},
{
- "Name": "Isıtma, Soğutma ve Havalandırma",
- "FullName": ""
+ "Name": "Isıtma, Soğutma ve Havalandırma"
},
{
"Name": "İnşaat"
@@ -689,15 +684,13 @@
"Name": "İş ve Yönetim"
},
{
- "Name": "Kantar",
- "FullName": ""
+ "Name": "Kantar"
},
{
"Name": "Kimya, Petrol, Lastik ve Plastik"
},
{
- "Name": "Kimyasal",
- "FullName": ""
+ "Name": "Kimyasal"
},
{
"Name": "Kırtasiye"
@@ -706,8 +699,7 @@
"Name": "Kültür, Sanat ve Tasarım"
},
{
- "Name": "Laboratuar ve Test Ürünleri",
- "FullName": ""
+ "Name": "Laboratuar ve Test Ürünleri"
},
{
"Name": "Maden"
@@ -716,12 +708,10 @@
"Name": "Makine"
},
{
- "Name": "Makina",
- "FullName": ""
+ "Name": "Makina"
},
{
- "Name": "Matbaa",
- "FullName": ""
+ "Name": "Matbaa"
},
{
"Name": "Medya, İletişim ve Yayıncılık"
@@ -730,22 +720,19 @@
"Name": "Metal"
},
{
- "Name": "Ofis",
- "FullName": ""
+ "Name": "Ofis"
},
{
"Name": "Otomotiv"
},
{
- "Name": "Oto Tamir-Servis",
- "FullName": ""
+ "Name": "Oto Tamir-Servis"
},
{
"Name": "Pnomatik"
},
{
- "Name": "Sağlık",
- "FullName": ""
+ "Name": "Sağlık"
},
{
"Name": "Sağlık ve Sosyal Hizmetler"
@@ -754,8 +741,7 @@
"Name": "Sarf"
},
{
- "Name": "Spor ve Rekreasyon",
- "FullName": ""
+ "Name": "Spor ve Rekreasyon"
},
{
"Name": "Tarım, Avcılık ve Balıkçılık"
@@ -764,8 +750,7 @@
"Name": "Tartı"
},
{
- "Name": "Tekstil, Hazır Giyim, Deri",
- "FullName": ""
+ "Name": "Tekstil, Hazır Giyim, Deri"
},
{
"Name": "Ticaret (Satış ve Pazarlama)"
diff --git a/ui/src/views/Dashboard.tsx b/ui/src/views/Dashboard.tsx
index 07fbc921..3e14eb8a 100644
--- a/ui/src/views/Dashboard.tsx
+++ b/ui/src/views/Dashboard.tsx
@@ -1,22 +1,22 @@
import { useLocalization } from '@/utils/hooks/useLocalization'
import { Helmet } from 'react-helmet'
import { useState } from 'react'
-import IntranetDashboard from '@/components/intranet/IntranetDashboard'
-import IntranetSidebar from '@/components/intranet/IntranetSidebar'
-import LeaveManagement from '@/components/intranet/HR/LeaveManagement'
-import OvertimeManagement from '@/components/intranet/HR/OvertimeManagement'
-import ExpenseManagement from '@/components/intranet/HR/ExpenseManagement'
-import AnnouncementsModule from '@/components/intranet/Announcements'
-import EventsModule from '@/components/intranet/Events'
-import DocumentsModule from '@/components/intranet/Documents'
-import TasksModule from '@/components/intranet/Tasks'
-import SocialWall from '@/components/intranet/SocialWall'
-import BirthdaysModule from '@/components/intranet/Birthdays'
-import TrainingModule from '@/components/intranet/Training'
-import ReservationsModule from '@/components/intranet/Reservations'
-import CafeteriaModule from '@/components/intranet/Cafeteria'
-import SurveysModule from '@/components/intranet/Surveys'
-import VisitorsModule from '@/components/intranet/Visitors'
+import IntranetSidebar from './intranet/Sidebar'
+import LeaveManagement from './intranet/HR/LeaveManagement'
+import OvertimeManagement from './intranet/HR/OvertimeManagement'
+import ExpenseManagement from './intranet/HR/ExpenseManagement'
+import EventsModule from './intranet/Event'
+import DocumentsModule from './intranet/Document'
+import TasksModule from './intranet/Task'
+import SocialWall from './intranet/SocialWall'
+import BirthdaysModule from './intranet/Birthday'
+import TrainingModule from './intranet/Training'
+import ReservationsModule from './intranet/Reservation'
+import CafeteriaModule from './intranet/Cafeteria'
+import SurveysModule from './intranet/Survey'
+import VisitorsModule from './intranet/Visitor'
+import AnnouncementsModule from './intranet/Announcement'
+import IntranetDashboard from './intranet/Dashboard'
const Dashboard = () => {
const { translate } = useLocalization()
diff --git a/ui/src/components/intranet/Announcements/index.tsx b/ui/src/views/intranet/Announcement.tsx
similarity index 99%
rename from ui/src/components/intranet/Announcements/index.tsx
rename to ui/src/views/intranet/Announcement.tsx
index f47d6a4d..ee70387d 100644
--- a/ui/src/components/intranet/Announcements/index.tsx
+++ b/ui/src/views/intranet/Announcement.tsx
@@ -10,7 +10,7 @@ import {
} from 'react-icons/hi2'
import dayjs from 'dayjs'
import 'dayjs/locale/tr'
-import { mockAnnouncements, Announcement } from '../../../mocks/mockIntranetData'
+import { mockAnnouncements, Announcement } from '../../mocks/mockIntranetData'
dayjs.locale('tr')
diff --git a/ui/src/components/intranet/Birthdays/index.tsx b/ui/src/views/intranet/Birthday.tsx
similarity index 99%
rename from ui/src/components/intranet/Birthdays/index.tsx
rename to ui/src/views/intranet/Birthday.tsx
index afbdb5c2..7663108a 100644
--- a/ui/src/components/intranet/Birthdays/index.tsx
+++ b/ui/src/views/intranet/Birthday.tsx
@@ -3,7 +3,7 @@ import { motion } from 'framer-motion'
import { HiCake, HiGift, HiCalendar } from 'react-icons/hi2'
import dayjs from 'dayjs'
import isBetween from 'dayjs/plugin/isBetween'
-import { mockBirthdays, mockAnniversaries, Birthday, WorkAnniversary } from '../../../mocks/mockIntranetData'
+import { mockBirthdays, mockAnniversaries, Birthday, WorkAnniversary } from '../../mocks/mockIntranetData'
dayjs.extend(isBetween)
diff --git a/ui/src/components/intranet/Cafeteria/index.tsx b/ui/src/views/intranet/Cafeteria.tsx
similarity index 99%
rename from ui/src/components/intranet/Cafeteria/index.tsx
rename to ui/src/views/intranet/Cafeteria.tsx
index ccd01cdd..e70f3e08 100644
--- a/ui/src/components/intranet/Cafeteria/index.tsx
+++ b/ui/src/views/intranet/Cafeteria.tsx
@@ -2,7 +2,7 @@ import React, { useState } from 'react'
import { motion } from 'framer-motion'
import { HiClock, HiMapPin } from 'react-icons/hi2'
import dayjs from 'dayjs'
-import { mockMealMenus, mockShuttleRoutes } from '../../../mocks/mockIntranetData'
+import { mockMealMenus, mockShuttleRoutes } from '../../mocks/mockIntranetData'
const CafeteriaModule: React.FC = () => {
const [selectedView, setSelectedView] = useState<'menu' | 'shuttle'>('menu')
diff --git a/ui/src/components/intranet/IntranetDashboard/index.tsx b/ui/src/views/intranet/Dashboard.tsx
similarity index 99%
rename from ui/src/components/intranet/IntranetDashboard/index.tsx
rename to ui/src/views/intranet/Dashboard.tsx
index b8588f85..86b43c5d 100644
--- a/ui/src/components/intranet/IntranetDashboard/index.tsx
+++ b/ui/src/views/intranet/Dashboard.tsx
@@ -27,7 +27,7 @@ import {
mockTasks,
mockDocuments,
Announcement,
-} from '../../../mocks/mockIntranetData'
+} from '../../mocks/mockIntranetData'
dayjs.locale('tr')
dayjs.extend(relativeTime)
diff --git a/ui/src/components/intranet/Documents/index.tsx b/ui/src/views/intranet/Document.tsx
similarity index 99%
rename from ui/src/components/intranet/Documents/index.tsx
rename to ui/src/views/intranet/Document.tsx
index 6280016a..99c19d29 100644
--- a/ui/src/components/intranet/Documents/index.tsx
+++ b/ui/src/views/intranet/Document.tsx
@@ -11,7 +11,7 @@ import {
} from 'react-icons/hi2'
import dayjs from 'dayjs'
import 'dayjs/locale/tr'
-import { mockDocuments, Document } from '../../../mocks/mockIntranetData'
+import { mockDocuments, Document } from '../../mocks/mockIntranetData'
dayjs.locale('tr')
diff --git a/ui/src/components/intranet/Events/index.tsx b/ui/src/views/intranet/Event.tsx
similarity index 99%
rename from ui/src/components/intranet/Events/index.tsx
rename to ui/src/views/intranet/Event.tsx
index a341e27a..8219cfbd 100644
--- a/ui/src/components/intranet/Events/index.tsx
+++ b/ui/src/views/intranet/Event.tsx
@@ -13,7 +13,7 @@ import {
import dayjs from 'dayjs'
import 'dayjs/locale/tr'
import relativeTime from 'dayjs/plugin/relativeTime'
-import { mockEvents, CalendarEvent, EventComment } from '../../../mocks/mockIntranetData'
+import { mockEvents, CalendarEvent, EventComment } from '../../mocks/mockIntranetData'
import { mockEmployees } from '@/mocks/mockEmployees'
dayjs.locale('tr')
diff --git a/ui/src/components/intranet/HR/ExpenseManagement.tsx b/ui/src/views/intranet/HR/ExpenseManagement.tsx
similarity index 100%
rename from ui/src/components/intranet/HR/ExpenseManagement.tsx
rename to ui/src/views/intranet/HR/ExpenseManagement.tsx
diff --git a/ui/src/components/intranet/HR/LeaveManagement.tsx b/ui/src/views/intranet/HR/LeaveManagement.tsx
similarity index 98%
rename from ui/src/components/intranet/HR/LeaveManagement.tsx
rename to ui/src/views/intranet/HR/LeaveManagement.tsx
index afebe922..23ac45a2 100644
--- a/ui/src/components/intranet/HR/LeaveManagement.tsx
+++ b/ui/src/views/intranet/HR/LeaveManagement.tsx
@@ -12,7 +12,7 @@ import {
import dayjs from 'dayjs'
import 'dayjs/locale/tr'
import { mockLeaveRequests } from '../../../mocks/mockIntranetData'
-import { HrLeave } from '@/types/hr'
+import { HrLeave, LeaveStatusEnum } from '@/types/hr'
dayjs.locale('tr')
@@ -258,9 +258,9 @@ const LeaveManagement: React.FC = () => {
{getTypeLabel(request.type)}
- {request.status === 'pending' && '⏳ Beklemede'}
- {request.status === 'approved' && '✅ Onaylandı'}
- {request.status === 'rejected' && '❌ Reddedildi'}
+ {request.status === LeaveStatusEnum.Pending && '⏳ Beklemede'}
+ {request.status === LeaveStatusEnum.Approved && '✅ Onaylandı'}
+ {request.status === LeaveStatusEnum.Rejected && '❌ Reddedildi'}
diff --git a/ui/src/components/intranet/HR/OvertimeManagement.tsx b/ui/src/views/intranet/HR/OvertimeManagement.tsx
similarity index 97%
rename from ui/src/components/intranet/HR/OvertimeManagement.tsx
rename to ui/src/views/intranet/HR/OvertimeManagement.tsx
index 4b9f7af6..f30e584f 100644
--- a/ui/src/components/intranet/HR/OvertimeManagement.tsx
+++ b/ui/src/views/intranet/HR/OvertimeManagement.tsx
@@ -10,7 +10,7 @@ import {
import dayjs from 'dayjs'
import 'dayjs/locale/tr'
import { mockOvertimeRequests } from '../../../mocks/mockIntranetData'
-import { HrOvertime } from '@/types/hr'
+import { HrOvertime, LeaveStatusEnum } from '@/types/hr'
dayjs.locale('tr')
@@ -194,9 +194,9 @@ const OvertimeManagement: React.FC = () => {
{dayjs(request.date).format('DD MMMM YYYY dddd')}
- {request.status === 'pending' && '⏳ Beklemede'}
- {request.status === 'approved' && '✅ Onaylandı'}
- {request.status === 'rejected' && '❌ Reddedildi'}
+ {request.status === LeaveStatusEnum.Pending && '⏳ Beklemede'}
+ {request.status === LeaveStatusEnum.Approved && '✅ Onaylandı'}
+ {request.status === LeaveStatusEnum.Rejected && '❌ Reddedildi'}
@@ -221,7 +221,7 @@ const OvertimeManagement: React.FC = () => {
Talep Tarihi
- {dayjs(request.createdAt).format('DD MMM')}
+ {dayjs(request.creationTime).format('DD MMM')}