Skip to content

Commit

Permalink
Ask @lvkaszus! - version: 2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
lvkaszus committed Sep 14, 2023
1 parent f782f95 commit a435af5
Show file tree
Hide file tree
Showing 14 changed files with 1,572 additions and 1,161 deletions.
Empty file removed asklvkaszus-admin/nginx.conf
Empty file.
1,587 changes: 885 additions & 702 deletions asklvkaszus-admin/package-lock.json

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions asklvkaszus-admin/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "asklvkaszus-admin",
"private": true,
"version": "2.0",
"private": false,
"version": "2.1",
"type": "module",
"scripts": {
"dev": "vite",
Expand All @@ -21,7 +21,6 @@
"express": "^4.18.2",
"js-cookie": "^3.0.5",
"react": "^18.2.0",
"react-cookie": "^4.1.1",
"react-dom": "^18.2.0",
"react-helmet": "^6.1.0",
"react-i18next": "^13.0.2",
Expand Down
Binary file added asklvkaszus-admin/public/main_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions asklvkaszus-admin/src/Components/QuestionsList.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,12 @@ const QuestionsList = () => {
<p className="text-xl"><FontAwesomeIcon icon={faCircleExclamation} className='mr-2' />{t('msg-noquestionsyet')}</p>
) : (
data.map(({ answer, date, question, id }) => (
<div key={id} className="rounded-lg p-3 my-2">
<p className="bg-gradient-to-br from-stPrimary to-stSecondary text-white font-light text-xl py-2 rounded-t-lg">{decodeAndFormatText(question)}</p>
<div key={id} className="rounded-lg p-3 my-2 break-words">
<p className="bg-gradient-to-br from-stPrimary to-stSecondary text-white font-light text-xl p-2 rounded-t-lg">{decodeAndFormatText(question)}</p>
{answer === 'TODO' ? (
<p className="bg-bgStickerBot text-gray-400 text-xl px-4 pt-2 pb-6">{yourNickname + ' ' + t('msg-notanswered')}</p>
<p className="bg-bgStickerBot text-gray-400 text-xl p-4 pb-6">{yourNickname + ' ' + t('msg-notanswered')}</p>
) : (
<p className="bg-bgStickerBot text-black text-xl px-2 pt-2 pb-6">{decodeAndFormatText(answer)}</p>
<p className="bg-bgStickerBot text-black font-light text-xl px-2 pt-4 pb-6">{decodeAndFormatText(answer)}</p>
)}

<AnswerQuestion questionId={id} questionText={question} />
Expand Down
2 changes: 1 addition & 1 deletion asklvkaszus-admin/src/Components/VersionCheck.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export const VersionCheck = () => {
fetchLatestVersion();
}, []);

const currentVersion = '2.0';
const currentVersion = '2.1';
const isLatestVersion = currentVersion === latestVersion;

return { currentVersion, latestVersion, isLatestVersion };
Expand Down
2 changes: 1 addition & 1 deletion asklvkaszus-admin/src/Locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@

"info-pageauthors": "Authors of the site, components, graphics and design:",
"info-author1-work": "Entire site from scratch all the way to the end including scripting, etc.",
"info-author2-work": "Konfiguracja i wdrożenie",
"info-author2-work": "Configuration and deployment",

"notfound-pagetitle": "404: Not Found!",
"notfound-backtohomepage": "Back to homepage",
Expand Down
4 changes: 0 additions & 4 deletions asklvkaszus-admin/vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,4 @@ export default defineConfig({
includeAssets: ['/main_icon.png']
})
],
server: {
host: '10.30.1.38',
port: 3006
},
})
Loading

0 comments on commit a435af5

Please sign in to comment.