Skip to content

Commit 655402d

Browse files
authored
Merge pull request #605 from Alt-Org/dev
Dev / testing the main ci pipe
2 parents 2adba75 + ab1e5c0 commit 655402d

File tree

272 files changed

+4842
-2631
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

272 files changed

+4842
-2631
lines changed
560 Bytes
Loading
1.11 KB
Loading
2.66 MB
Loading

frontend-next-migration/src/app/[lng]/(helper)/about/_getPage.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import { useServerTranslation } from '@/shared/i18n';
1+
import { getServerTranslation } from '@/shared/i18n';
22
import { createPage } from '@/app/_helpers';
33
import { AboutPageProps } from '@/preparedPages/AboutPage';
44
import { defaultOpenGraph } from '@/shared/seoConstants';
55
import { getRouteAboutPage } from '@/shared/appLinks/RoutePaths';
66

77
export async function _getPage(lng: any) {
8-
const { t } = await useServerTranslation(lng, 'about');
8+
const { t } = await getServerTranslation(lng, 'about');
99

1010
return createPage<AboutPageProps>({
1111
buildPage: () => ({
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
import { BarIndicator } from '@/shared/ui/v2/BarIndicator';
2+
3+
const BarIndicatorBlock = () => {
4+
return (
5+
<div
6+
style={{
7+
background: 'var(--base-card-background)',
8+
paddingBottom: '1.5em',
9+
marginTop: '1em',
10+
}}
11+
>
12+
<div
13+
style={{
14+
width: '100%',
15+
height: 'fit-content',
16+
padding: '2em',
17+
display: 'flex',
18+
flexWrap: 'wrap',
19+
alignItems: 'center',
20+
gap: '2rem',
21+
}}
22+
>
23+
<BarIndicator
24+
label={'Speed'}
25+
value={5}
26+
maxValue={20}
27+
developmentThreshold={'Kokenut'}
28+
/>
29+
<BarIndicator
30+
label={'HP'}
31+
value={'-'}
32+
developmentThreshold={'Harjoittelija'}
33+
/>
34+
<BarIndicator
35+
label={'strike'}
36+
value={12}
37+
maxValue={14}
38+
developmentThreshold={'Konkari'}
39+
/>
40+
<BarIndicator
41+
label={'size'}
42+
value={8}
43+
developmentThreshold={'Kokenut'}
44+
/>
45+
<BarIndicator
46+
label={'resistance'}
47+
value={16}
48+
maxValue={23}
49+
developmentThreshold={'Aloittelija'}
50+
/>
51+
<BarIndicator
52+
value={14}
53+
maxValue={20}
54+
/>
55+
</div>
56+
</div>
57+
);
58+
};
59+
60+
export default BarIndicatorBlock;

frontend-next-migration/src/app/[lng]/(helper)/admin/page.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import DefenseGalleryGrid from './_components/DefenseGalleryGrid';
1010
import NewsCardsGrid from './_components/NewsCardsGrid';
1111
import DescriptionCardsSection from './_components/DescriptionCardsSection';
1212
import MobileCardsGrid from './_components/MobileCardsGrid';
13+
import BarIndicatorBlock from '@/app/[lng]/(helper)/admin/_components/BarIndicatorBlock';
1314
import useSizes from '@/shared/lib/hooks/useSizes';
1415
import hannu from '@/shared/assets/images/heros/hannu-hodari/hannu-hodari.png';
1516
import vihapuhe from '@/shared/assets/images/heros/hate-speech/Vihapuhe.png';
@@ -114,6 +115,7 @@ const Page = () => {
114115
primary={jokester}
115116
secondary={hannu}
116117
/>
118+
<BarIndicatorBlock />
117119
</LayoutWithSidebars>
118120
);
119121
};

frontend-next-migration/src/app/[lng]/(helper)/artGame/_getPage.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { createPage } from '@/app/_helpers';
22
import { GameArtPageProps } from '@/preparedPages/GameArtPage';
33
import { makeArtGameSectionsWithI18n } from '@/entities/PresentationPackages';
4-
import { useServerTranslation } from '@/shared/i18n';
4+
import { getServerTranslation } from '@/shared/i18n';
55
import { defaultOpenGraph } from '@/shared/seoConstants';
66
import { getRouteGameArtPage } from '@/shared/appLinks/RoutePaths';
77

88
export async function _getPage(lng: string) {
9-
const { t } = await useServerTranslation(lng, 'artGame');
9+
const { t } = await getServerTranslation(lng, 'artGame');
1010

1111
return createPage<GameArtPageProps>({
1212
buildPage: () => ({

frontend-next-migration/src/app/[lng]/(helper)/auth/login/_getPage.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { createPage } from '@/app/_helpers';
22
import { getRouteLoginPage } from '@/shared/appLinks/RoutePaths';
3-
import { useServerTranslation } from '@/shared/i18n';
3+
import { getServerTranslation } from '@/shared/i18n';
44
import { defaultOpenGraph } from '@/shared/seoConstants';
55

66
export async function _getPage(lng: string) {
7-
const { t } = await useServerTranslation(lng, 'auth');
7+
const { t } = await getServerTranslation(lng, 'auth');
88
return createPage({
99
buildPage: () => ({}),
1010
buildSeo: () => ({

frontend-next-migration/src/app/[lng]/(helper)/auth/register/_getPage.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import { useServerTranslation } from '@/shared/i18n';
1+
import { getServerTranslation } from '@/shared/i18n';
22
import { createPage } from '@/app/_helpers';
33
import { defaultOpenGraph } from '@/shared/seoConstants';
44
import { getRouteRegisterPage } from '@/shared/appLinks/RoutePaths';
55

66
export async function _getPage(lng: string) {
7-
const { t } = await useServerTranslation(lng, 'auth');
7+
const { t } = await getServerTranslation(lng, 'auth');
88
return createPage({
99
buildPage: () => ({}),
1010
buildSeo: () => ({

frontend-next-migration/src/app/[lng]/(helper)/clans/[id]/_getPage.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { createPage } from '@/app/_helpers';
2-
import { useServerTranslation } from '@/shared/i18n';
2+
import { getServerTranslation } from '@/shared/i18n';
33
import { ClanRoomSubPageProps } from '@/preparedPages/ClanPages';
44
import { envHelper } from '@/shared/const/envHelper';
55
import { notFound } from 'next/navigation';
66

77
export async function _getPage(lng: string, id: string) {
8-
const { t } = await useServerTranslation(lng, 'clan');
8+
const { t } = await getServerTranslation(lng, 'clan');
99
const response = await fetch(`${envHelper.apiLink}/clan/${id}`);
1010
if (!response.ok) {
1111
return notFound();

0 commit comments

Comments
 (0)