From a44203c7200150bd7d5b6bfaffe1862593114076 Mon Sep 17 00:00:00 2001 From: Andrey Gubskiy Date: Mon, 17 Feb 2025 13:11:42 +0200 Subject: [PATCH 1/3] Update Information card. --- README.md | 21 ++++++------------- .../(private)/cards/information-card.tsx | 8 ++++--- src/app/[locale]/(private)/page.tsx | 2 +- src/components/app-sidebar/footer.tsx | 2 -- src/messages/en.json | 5 +++-- src/messages/uk.json | 5 +++-- 6 files changed, 18 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index 8d043466..88749994 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/app/[locale]/(private)/cards/information-card.tsx b/src/app/[locale]/(private)/cards/information-card.tsx index e904108f..6142788d 100644 --- a/src/app/[locale]/(private)/cards/information-card.tsx +++ b/src/app/[locale]/(private)/cards/information-card.tsx @@ -11,16 +11,18 @@ 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('notice-board')} + {t('library-discovery')} {t('faq')} 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/messages/en.json b/src/messages/en.json index ba1e7630..71c2624f 100644 --- a/src/messages/en.json +++ b/src/messages/en.json @@ -190,9 +190,10 @@ "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" }, "social-networks": { "title": "Social Networks", diff --git a/src/messages/uk.json b/src/messages/uk.json index 82758afc..04f221ff 100644 --- a/src/messages/uk.json +++ b/src/messages/uk.json @@ -190,9 +190,10 @@ "information": { "title": "Інформація", "schedule": "Розклад занять та сесії", - "notice-board": "Дошка оголошень", "faq": "Поширенi запитання", - "user-manual": "Інструкція користувача" + "user-manual": "Інструкція користувача", + "university-notice-board": "Загальноуніверситетські оголошення", + "library-discovery": "Каталог бібліотеки" }, "social-networks": { "title": "Соціальні мережі", From 81251b575cf27f38f4eb6628c200183736194c0a Mon Sep 17 00:00:00 2001 From: Andrey Gubskiy Date: Mon, 17 Feb 2025 17:33:37 +0200 Subject: [PATCH 2/3] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 88749994..1eceb5cb 100644 --- a/README.md +++ b/README.md @@ -67,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 3000:3000/tcp kpiua/ecampus-kpi-ua:latest + -p 3000:3000/tcp kpiua/ecampus.kpi.ua:latest ``` ## Adding translations From d4bef83b1caf5370d67786e63a435c4961150d9f Mon Sep 17 00:00:00 2001 From: Andrey Gubskiy Date: Mon, 17 Feb 2025 17:33:45 +0200 Subject: [PATCH 3/3] Move links to env --- .env.development | 5 ++++- .env.production | 5 ++++- src/app/[locale]/(private)/cards/information-card.tsx | 10 +++++----- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.env.development b/.env.development index 1ffdbf05..285fe024 100644 --- a/.env.development +++ b/.env.development @@ -14,4 +14,7 @@ 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/ diff --git a/.env.production b/.env.production index 5334a010..138dd980 100644 --- a/.env.production +++ b/.env.production @@ -11,4 +11,7 @@ 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/ \ No newline at end of file diff --git a/src/app/[locale]/(private)/cards/information-card.tsx b/src/app/[locale]/(private)/cards/information-card.tsx index 6142788d..67906d8f 100644 --- a/src/app/[locale]/(private)/cards/information-card.tsx +++ b/src/app/[locale]/(private)/cards/information-card.tsx @@ -16,19 +16,19 @@ export const InformationCard = ({ className }: InformationCardProps) => { {t('title')} - {t('schedule')} + {t('schedule')} - {t('university-notice-board')} + {t('university-notice-board')} - {t('library-discovery')} + {t('library-discovery')} - {t('faq')} + {t('faq')} - {t('user-manual')} + {t('user-manual')}