diff --git a/.env.development b/.env.development index 1ffdbf05..828f7913 100644 --- a/.env.development +++ b/.env.development @@ -14,4 +14,9 @@ NEXT_PUBLIC_TWITTER_URL=https://x.com/kpiuaofficial NEXT_PUBLIC_CODE_OF_HONOR=https://kpi.ua/code NEXT_PUBLIC_INTERNAL_REGULATIONS=https://kpi.ua/admin-rule NEXT_PUBLIC_EDUCATIONAL_ORGANIZATION_REGULATION=https://kpi.ua/regulations -NEXT_PUBLIC_COMPLAINTS_FORM="https://docs.google.com/forms/d/e/1FAIpQLSdlWaMSxcYVSfYDZpVgygSIl8reTZBM2Nl2ZzyuZzdaFwef_w/viewform?embedded=true" \ No newline at end of file +NEXT_PUBLIC_COMPLAINTS_FORM="https://docs.google.com/forms/d/e/1FAIpQLSdlWaMSxcYVSfYDZpVgygSIl8reTZBM2Nl2ZzyuZzdaFwef_w/viewform?embedded=true" +NEXT_PUBLIC_SCHEDULE_URL=https://schedule.kpi.ua +NEXT_PUBLIC_UNIVERSITY_NOTICE_BOARD_URL=https://kpi.ua/boardlist/ +NEXT_PUBLIC_LIBRARY_DISCOVERY_URL=https://discovery.kpi.ua/ +NEXT_PUBLIC_UNIVERSITY_NEWS=https://kpi.ua/news/ +NEXT_PUBLIC_STUDENT_COUNCIL==https://sc.kpi.ua/ \ No newline at end of file diff --git a/.env.production b/.env.production index 5334a010..05e1501e 100644 --- a/.env.production +++ b/.env.production @@ -11,4 +11,9 @@ NEXT_PUBLIC_TWITTER_URL=https://x.com/kpiuaofficial NEXT_PUBLIC_CODE_OF_HONOR=https://kpi.ua/code NEXT_PUBLIC_INTERNAL_REGULATIONS=https://kpi.ua/admin-rule NEXT_PUBLIC_EDUCATIONAL_ORGANIZATION_REGULATION=https://kpi.ua/regulations -NEXT_PUBLIC_COMPLAINTS_FORM="https://docs.google.com/forms/d/e/1FAIpQLSdlWaMSxcYVSfYDZpVgygSIl8reTZBM2Nl2ZzyuZzdaFwef_w/viewform?embedded=true" \ No newline at end of file +NEXT_PUBLIC_COMPLAINTS_FORM="https://docs.google.com/forms/d/e/1FAIpQLSdlWaMSxcYVSfYDZpVgygSIl8reTZBM2Nl2ZzyuZzdaFwef_w/viewform?embedded=true" +NEXT_PUBLIC_SCHEDULE_URL=https://schedule.kpi.ua +NEXT_PUBLIC_UNIVERSITY_NOTICE_BOARD_URL=https://kpi.ua/boardlist/ +NEXT_PUBLIC_LIBRARY_DISCOVERY_URL=https://discovery.kpi.ua/ +NEXT_PUBLIC_UNIVERSITY_NEWS=https://kpi.ua/news/ +NEXT_PUBLIC_STUDENT_COUNCIL==https://sc.kpi.ua/ \ No newline at end of file diff --git a/README.md b/README.md index 8d043466..1eceb5cb 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,9 @@ -[![GitHub license](https://img.shields.io/github/license/kpi-ua/ecampus.kpi.ua.svg)](https://github.com/kpi-ua/ecampus.kpi.ua/blob/master/LICENSE) -[![GitHub contributors](https://img.shields.io/github/contributors/kpi-ua/ecampus.kpi.ua.svg)](https://GitHub.com/kpi-ua/ecampus.kpi.ua/graphs/contributors/) -[![GitHub issues](https://img.shields.io/github/issues/kpi-ua/ecampus.kpi.ua.svg)](https://GitHub.com/kpi-ua/ecampus.kpi.ua/issues/) -[![GitHub pull-requests](https://img.shields.io/github/issues-pr/kpi-ua/ecampus.kpi.ua.svg)](https://GitHub.com/kpi-ua/ecampus.kpi.ua/pulls/) -[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) -![Docker Image Version (latest by date)](https://img.shields.io/docker/v/kpiua/ecampus-kpi-ua) - -[![GitHub watchers](https://img.shields.io/github/watchers/kpi-ua/ecampus.kpi.ua.svg?style=social&label=Watch)](https://GitHub.com/kpi-ua/ecampus.kpi.ua/watchers/) -[![GitHub forks](https://img.shields.io/github/forks/kpi-ua/ecampus.kpi.ua.svg?style=social&label=Fork)](https://GitHub.com/kpi-ua/ecampus.kpi.ua/network/) -[![GitHub stars](https://img.shields.io/github/stars/kpi-ua/ecampus.kpi.ua.svg?style=social&label=Star)](https://GitHub.com/kpi-ua/ecampus.kpi.ua/stargazers/) - # Electronic Campus of Igor Sikorsky Kyiv Polytechnic Institute [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](http://makeapullrequest.com) [![Docker Image Version (latest by date)](https://img.shields.io/docker/v/kpiua/ecampus.kpi.ua)](https://hub.docker.com/r/kpiua/ecampus.kpi.ua) +[![GitHub license](https://img.shields.io/github/license/kpi-ua/ecampus.kpi.ua.svg)](https://github.com/kpi-ua/ecampus.kpi.ua/blob/master/LICENSE) +[![GitHub contributors](https://img.shields.io/github/contributors/kpi-ua/ecampus.kpi.ua.svg)](https://GitHub.com/kpi-ua/ecampus.kpi.ua/graphs/contributors/) The information system "Electronic Campus of Igor Sikorsky Kyiv Polytechnic Institute" is an automated system supporting educational process informatization. It provides digital communication tools for students, faculty, and department heads, enhancing educational quality through modern technology. @@ -52,7 +43,7 @@ npm run storybook ### Build container ```shell -docker build ./ --file ./Dockerfile --tag kpiua/ecampus-kpi-ua:latest +docker build ./ --file ./Dockerfile --tag kpiua/ecampus.kpi.ua:latest ``` ### Run @@ -60,13 +51,13 @@ docker build ./ --file ./Dockerfile --tag kpiua/ecampus-kpi-ua:latest #### Run with default settings ```shell -docker run --rm -it -p 80:80/tcp kpiua/ecampus-kpi-ua:latest +docker run --rm -it -p 3000:3000/tcp kpiua/ecampus.kpi.ua:latest ``` #### Run with custom settings ```shell - docker run --rm -it -e CAMPUS_API_BASE_PATH=https://dev-api.campus.cloud.kpi.ua -p 80:80/tcp kpiua/ecampus-kpi-ua:latest + docker run --rm -it -e CAMPUS_API_BASE_PATH=https://dev-api.campus.cloud.kpi.ua -p 80:80/tcp kpiua/ecampus.kpi.ua:latest ``` or @@ -76,7 +67,7 @@ docker run --rm -it \ -e CAMPUS_API_BASE_PATH=https://dev-api.campus.cloud.kpi.ua \ -e COOKIE_DOMAIN=localhost \ -e NEXT_PUBLIC_RECAPTCHA_KEY=6LeMy30qAAAAAIC6KUhNfReP-Us5wkrkp3FLfOgl \ - -p 80:80/tcp kpiua/ecampus-kpi-ua:latest + -p 3000:3000/tcp kpiua/ecampus.kpi.ua:latest ``` ## Adding translations diff --git a/src/actions/menu.actions.ts b/src/actions/menu.actions.ts index 8851ad2b..6bbce9ee 100644 --- a/src/actions/menu.actions.ts +++ b/src/actions/menu.actions.ts @@ -50,12 +50,6 @@ const getStaticMenuItems = async (): Promise => { url: '/notice-board', isExternal: false, }, - { - name: 'feedback', - title: t('feedback'), - url: '/feedback', - isExternal: false, - }, { name: 'settings', title: t('settings'), diff --git a/src/app/[locale]/(private)/cards/information-card.tsx b/src/app/[locale]/(private)/cards/information-card.tsx index e904108f..33f8645b 100644 --- a/src/app/[locale]/(private)/cards/information-card.tsx +++ b/src/app/[locale]/(private)/cards/information-card.tsx @@ -4,6 +4,7 @@ import { Card, CardContent } from '@/components/ui/card'; import { cn } from '@/lib/utils'; import { useTranslations } from 'next-intl'; import { Link } from '@/i18n/routing'; +import { Separator } from '@/components/ui/separator'; interface InformationCardProps { className?: string; @@ -11,22 +12,41 @@ interface InformationCardProps { export const InformationCard = ({ className }: InformationCardProps) => { const t = useTranslations('private.main.cards.information'); - return ( {t('title')} - {t('schedule')} + + {t('schedule')} + + + + + {t('university-notice-board')} + + + + + {t('library-discovery')} + + + + + {t('university-news')} + - {t('notice-board')} + + {t('student-council')} + + - {t('faq')} + {t('faq')} - {t('user-manual')} + {t('user-manual')} diff --git a/src/app/[locale]/(private)/feedback/page.tsx b/src/app/[locale]/(private)/feedback/page.tsx deleted file mode 100644 index 7e1cfc2f..00000000 --- a/src/app/[locale]/(private)/feedback/page.tsx +++ /dev/null @@ -1,24 +0,0 @@ -import { SubLayout } from '@/app/[locale]/(private)/sub-layout'; -import { getTranslations, setRequestLocale } from 'next-intl/server'; -import { useTranslations } from 'next-intl'; -import { ComplaintsForm } from '@/components/complaints-form'; - -const INTL_NAMESPACE = 'private.feedback'; - -export async function generateMetadata({ params: { locale } }: any) { - const t = await getTranslations({ locale, namespace: INTL_NAMESPACE }); - - return { - title: t('title'), - }; -} - -export default function FeedbackPage({ params: { locale } }: { params: { locale: string } }) { - setRequestLocale(locale); - const t = useTranslations(INTL_NAMESPACE); - return ( - - - - ); -} diff --git a/src/app/[locale]/(private)/page.tsx b/src/app/[locale]/(private)/page.tsx index 3079e1d9..dfa21db1 100644 --- a/src/app/[locale]/(private)/page.tsx +++ b/src/app/[locale]/(private)/page.tsx @@ -6,7 +6,7 @@ export default function Home() {
- +
diff --git a/src/components/app-sidebar/footer.tsx b/src/components/app-sidebar/footer.tsx index c745fe35..e2ffe005 100644 --- a/src/components/app-sidebar/footer.tsx +++ b/src/components/app-sidebar/footer.tsx @@ -6,8 +6,6 @@ import dayjs from 'dayjs'; import { useTranslations } from 'next-intl'; const createFooterLinks = (t: ReturnType) => [ - { title: t('user-manual'), url: '/user-manual' }, - { title: t('faq'), url: '/frequently-asked-questions' }, { title: t('about'), url: '/about' }, { title: t('documents'), url: '/kpi-documents' }, { title: t('terms-of-service'), url: '/terms-of-service' }, diff --git a/src/components/app-sidebar/menu-icon.tsx b/src/components/app-sidebar/menu-icon.tsx index 6701131a..45de0b23 100644 --- a/src/components/app-sidebar/menu-icon.tsx +++ b/src/components/app-sidebar/menu-icon.tsx @@ -20,7 +20,7 @@ export const menuIcon: Map = new Map([ ['profile', UserCircle], ['current-superintendence', CircleWavyCheck], ['certification-results', Exam], - ['feedback', ChatCenteredText], + ['msg', ChatCenteredText], ['employment', BagSimple], ['settings', Gear], ['sdchoice2021admin', ListNumbers], diff --git a/src/messages/en.json b/src/messages/en.json index ba1e7630..c1b53a87 100644 --- a/src/messages/en.json +++ b/src/messages/en.json @@ -80,11 +80,8 @@ "menu": { "main": "Home", "profile": "Profile", - "feedback": "Send feedback", "settings": "Settings", "user-manual": "User manual", - "faq": "Frequently asked questions", - "about": "About", "documents": "KPI documents", "terms-of-service": "Terms of service", "contacts": "Contacts", @@ -190,9 +187,12 @@ "information": { "title": "Information", "schedule": "Schedule", - "notice-board": "Notice board", "faq": "Frequently asked questions", - "user-manual": "User manual" + "user-manual": "User manual", + "university-notice-board": "University notice board", + "library-discovery": "Library catalog", + "university-news": "University news", + "student-council": "Student council" }, "social-networks": { "title": "Social Networks", diff --git a/src/messages/uk.json b/src/messages/uk.json index 82758afc..96ed4d74 100644 --- a/src/messages/uk.json +++ b/src/messages/uk.json @@ -80,10 +80,7 @@ "menu": { "main": "Головна", "profile": "Профіль", - "feedback": "Відправити відгук", "settings": "Налаштування", - "user-manual": "Інструкція користувача", - "faq": "Поширенi запитання", "about": "Про систему", "documents": "Документи КПІ", "terms-of-service": "Правила використання", @@ -190,9 +187,12 @@ "information": { "title": "Інформація", "schedule": "Розклад занять та сесії", - "notice-board": "Дошка оголошень", "faq": "Поширенi запитання", - "user-manual": "Інструкція користувача" + "user-manual": "Інструкція користувача", + "university-notice-board": "Загальноуніверситетські оголошення", + "library-discovery": "Каталог бібліотеки", + "university-news": "Новини університету", + "student-council": "Студентська рада" }, "social-networks": { "title": "Соціальні мережі",