Commit 22b19300 authored by Adam Štěpánek's avatar Adam Štěpánek
Browse files

Merge branch 'web/design-tweaks' into 'main'

Design effects to bordered buttons

See merge request legtvar/pivo!18
parents bfdc2b6d b829f9ff
Loading
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import { Link } from 'react-router-dom';
import { Brand } from '../brand/Brand';
import { Logo } from '../brand/Logo';
import { ColorModeToggle } from '../utils/ColorModeToggle';
import { ContactUs } from '../utils/ContactUs';
import { LanguageToggle } from '../utils/LanguageToggle';
import { SidebarButton, SidebarButtonProps } from './SidebarButton';

@@ -214,6 +215,8 @@ export const SideBar = ({ reload }: SideBarProps) => {

                                    <LanguageToggle aria-label="Language" onLanguageToggled={() => reload()} />

                                    <ContactUs />

                                    <Text fontSize="xs" color={useColorModeValue('gray.400', 'gray.600')}>
                                        {t('menuButtons.madeby')}
                                        <br />© 2024
@@ -266,6 +269,8 @@ export const SideBar = ({ reload }: SideBarProps) => {

                    <LanguageToggle aria-label="Language" onLanguageToggled={() => reload()} />

                    <ContactUs />

                    <Text fontSize="xs" color={useColorModeValue('gray.400', 'gray.600')}>
                        {t('menuButtons.madeby')}
                        <br />© 2024
+0 −3
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ import {
} from '@chakra-ui/react';
import { t } from 'i18next';
import { useReloadVar } from '../../hooks/useReload';
import { ContactUs } from '../utils/ContactUs';
import { PageTitle } from '../utils/PageTitle';

export function About() {
@@ -71,8 +70,6 @@ export function About() {
                <Text marginBottom={5} fontSize="sm">
                    {t('about.paragraph5')}
                </Text>

                <ContactUs />
            </VStack>
        </Box>
    );
+23 −73
Original line number Diff line number Diff line
import {
    Box,
    Breadcrumb,
    BreadcrumbItem,
    BreadcrumbLink,
    Divider,
    Image,
    Link,
    Stack,
    Text,
    VStack,
    useColorModeValue,
} from '@chakra-ui/react';
import { Box, Breadcrumb, BreadcrumbItem, BreadcrumbLink, Image, Stack, Text, VStack } from '@chakra-ui/react';
import { t } from 'i18next';

import { Link } from 'react-router-dom';
import { useReloadVar } from '../../hooks/useReload';
import { ContactUs } from '../utils/ContactUs';
import { HighlightedBlock, HighlightedBlockHeading } from '../utils/HighlightedBlock';
import { PageTitle } from '../utils/PageTitle';

export function Community() {
@@ -50,66 +39,27 @@ export function Community() {
                    {t('community.paragraph1')}
                </Text>
                <Stack direction="column" gap={'20px'}>
                    <Link href="https://visiongame.cz/" target="_blank" rel="noopener noreferrer">
                        <Stack direction="row" h="30px" alignItems={'center'} gap={'20px'}>
                            <Divider
                                orientation="vertical"
                                borderWidth={'2px'}
                                borderColor={useColorModeValue('brand.500', 'brand.400')}
                                opacity={1}
                            />

                            <Text fontSize="md" fontWeight={'semibold'}>
                                Visiongame
                            </Text>
                        </Stack>
                    <HighlightedBlock>
                        <Link to="https://visiongame.cz/" target="_blank" rel="noopener noreferrer">
                            <HighlightedBlockHeading>Visiongame</HighlightedBlockHeading>
                        </Link>
                    <Link href="https://www.gamedevarea.com/about/" target="_blank" rel="noopener noreferrer">
                        <Stack direction="row" h="30px" alignItems={'center'} gap={'20px'}>
                            <Divider
                                orientation="vertical"
                                borderWidth={'2px'}
                                borderColor={useColorModeValue('brand.500', 'brand.400')}
                                opacity={1}
                            />

                            <Text fontSize="md" fontWeight={'semibold'}>
                                GameDev Area
                            </Text>
                        </Stack>
                    </HighlightedBlock>
                    <HighlightedBlock>
                        <Link to="https://www.gamedevarea.com/about/" target="_blank" rel="noopener noreferrer">
                            <HighlightedBlockHeading>GameDev Area</HighlightedBlockHeading>
                        </Link>
                    <Link href="https://gamebaze.cz/" target="_blank" rel="noopener noreferrer">
                        <Stack direction="row" h="30px" alignItems={'center'} gap={'20px'}>
                            <Divider
                                orientation="vertical"
                                borderWidth={'2px'}
                                borderColor={useColorModeValue('brand.500', 'brand.400')}
                                opacity={1}
                            />

                            <Text fontSize="md" fontWeight={'semibold'}>
                                Gamebaze
                            </Text>
                        </Stack>
                    </HighlightedBlock>
                    <HighlightedBlock>
                        <Link to="https://gamebaze.cz/" target="_blank" rel="noopener noreferrer">
                            <HighlightedBlockHeading>Gamebaze</HighlightedBlockHeading>
                        </Link>
                    <Link href="http://gamestudies.cz//" target="_blank" rel="noopener noreferrer">
                        <Stack direction="row" h="30px" alignItems={'center'} gap={'20px'}>
                            <Divider
                                orientation="vertical"
                                borderWidth={'2px'}
                                borderColor={useColorModeValue('brand.500', 'brand.400')}
                                opacity={1}
                            />

                            <Text fontSize="md" fontWeight={'semibold'}>
                                MU Game Studies
                            </Text>
                        </Stack>
                    </HighlightedBlock>
                    <HighlightedBlock>
                        <Link to="http://gamestudies.cz//" target="_blank" rel="noopener noreferrer">
                            <HighlightedBlockHeading>MU Game Studies</HighlightedBlockHeading>
                        </Link>
                    </HighlightedBlock>
                </Stack>
                <Box paddingTop={8}>
                    <ContactUs />
                </Box>
            </VStack>
        </Box>
    );
+69 −78
Original line number Diff line number Diff line
import {
    Box,
    Breadcrumb,
    BreadcrumbItem,
    BreadcrumbLink,
    Divider,
    Image,
    Stack,
    Text,
    VStack,
    useColorModeValue,
} from '@chakra-ui/react';
import { Box, Breadcrumb, BreadcrumbItem, BreadcrumbLink, Image, Stack, Text, VStack } from '@chakra-ui/react';
import { t } from 'i18next';
import { Link, useLocation } from 'react-router-dom';
import { useReloadVar } from '../../hooks/useReload';
import { HighlightedBlock, HighlightedBlockHeading } from '../utils/HighlightedBlock';
import { PageTitle } from '../utils/PageTitle';

export function Courses() {
@@ -50,76 +40,77 @@ export function Courses() {
                    {t('courses.paragraph1')}
                </Text>
                <Stack direction="column" gap={'20px'}>
                    <HighlightedBlock>
                        <Link to="https://is.muni.cz/predmet/fi/PV255" target="_blank" rel="noopener noreferrer">
                        <Stack direction="row" h="30px" alignItems={'center'} gap={'20px'}>
                            <Divider
                                orientation="vertical"
                                borderWidth={'2px'}
                                borderColor={useColorModeValue('brand.500', 'brand.400')}
                                opacity={1}
                            />
                            <Stack direction="column">
                                <HighlightedBlockHeading>FI:PV255 Game Development I</HighlightedBlockHeading>

                            <Text fontSize="md" fontWeight={'semibold'}>
                                FI:PV255 Game Development I
                                <Text>
                                    The aim of the course is to introduce the field of development of digital games, in
                                    both theoretical and practical approaches. Lectures will provide theoretical
                                    principles of game development (computer graphics, physics, games interfaces, etc.).
                                    At seminars, students will get experience with the development of digital games
                                    through work on individual and later team-based projects.
                                </Text>
                            </Stack>
                        </Link>
                    </HighlightedBlock>
                    <HighlightedBlock>
                        <Link to="https://is.muni.cz/predmet/fi/PV266" target="_blank" rel="noopener noreferrer">
                        <Stack direction="row" h="30px" alignItems={'center'} gap={'20px'}>
                            <Divider
                                orientation="vertical"
                                borderWidth={'2px'}
                                borderColor={useColorModeValue('brand.500', 'brand.400')}
                                opacity={1}
                            />
                            <Stack direction="column">
                                <HighlightedBlockHeading>FI:PV266 Game Development II</HighlightedBlockHeading>

                            <Text fontSize="md" fontWeight={'semibold'}>
                                FI:PV266 Game Development II
                                <Text>
                                    The goal of the course is to provide more experience with the development of digital
                                    games. Students will continue the development of games prototyped in PV255 Game
                                    Development I with the goal to create a final game by the end of the course. By
                                    working on a team project and guidance of lecturers, students will get more
                                    experience with all digital game production phases: preproduction and planning;
                                    production; testing; release and presentation of the game The main output of the
                                    course - digital game - should also serve as an important item in students'
                                    professional portfolio.
                                </Text>
                            </Stack>
                        </Link>
                    </HighlightedBlock>
                    <HighlightedBlock>
                        <Link to="https://is.muni.cz/predmet/fi/PA215" target="_blank" rel="noopener noreferrer">
                        <Stack direction="row" h="30px" alignItems={'center'} gap={'20px'}>
                            <Divider
                                orientation="vertical"
                                borderWidth={'2px'}
                                borderColor={useColorModeValue('brand.500', 'brand.400')}
                                opacity={1}
                            />
                            <Stack direction="column">
                                <HighlightedBlockHeading>FI:PA215 Game Design I</HighlightedBlockHeading>

                            <Text fontSize="md" fontWeight={'semibold'}>
                                FI:PA215 Game Design I
                                <Text>
                                    The aim of the Game Design I. course is to (a) develop the ability to critically
                                    analyze digital and board game rules and structure and (b) to teach students
                                    practical methods of rapid paper prototyping of gaming systems. These two building
                                    blocks support the main objective of the course which is (c) to improve students
                                    skill in designing games.
                                </Text>
                            </Stack>
                        </Link>
                    </HighlightedBlock>
                    <HighlightedBlock>
                        <Link to="https://is.muni.cz/predmet/fi/PA216" target="_blank" rel="noopener noreferrer">
                        <Stack direction="row" h="30px" alignItems={'center'} gap={'20px'}>
                            <Divider
                                orientation="vertical"
                                borderWidth={'2px'}
                                borderColor={useColorModeValue('brand.500', 'brand.400')}
                                opacity={1}
                            />
                            <Stack direction="column">
                                <HighlightedBlockHeading>FI:PA216 Game Design II</HighlightedBlockHeading>

                            <Text fontSize="md" fontWeight={'semibold'}>
                                FI:PA216 Game Design II
                                <Text>
                                    The aim of Game Design II. is to (a) enhance the knowledge and applied the use of
                                    (digital) games language, (b) analyze complex design techniques and specific
                                    features of digital games, and (c) develop the ability to connect individual
                                    elements of (digital) games to interrelated dependencies. The main objective of the
                                    course is (d) to train and develop students skills in designing games.
                                </Text>
                            </Stack>
                        </Link>
                    </HighlightedBlock>
                    <HighlightedBlock>
                        <Link to={location.pathname + '/dungeon'} target="_self" rel="noopener noreferrer">
                        <Stack direction="row" h="30px" alignItems={'center'} gap={'20px'}>
                            <Divider
                                orientation="vertical"
                                borderWidth={'2px'}
                                borderColor={useColorModeValue('brand.500', 'brand.400')}
                                opacity={1}
                            />

                            <Text fontSize="md" fontWeight={'semibold'}>
                                FI:VV078 Game Development Dungeon
                            </Text>
                            <Stack direction="column">
                                <HighlightedBlockHeading>FI:VV078 Game Development Dungeon</HighlightedBlockHeading>
                                <Text>{t('dungeon.paragraph1')}</Text>
                            </Stack>
                        </Link>
                    </HighlightedBlock>
                </Stack>
            </VStack>
        </Box>
+0 −5
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ import { getPrefered } from '../../utils/preferedLanguage';
import { sequence } from '../../utils/sequence';
import { PivoImage } from '../media/PivoImage';
import { AwaitAPI } from '../utils/AwaitAPI';
import { ContactUs } from '../utils/ContactUs';
import { Loading } from '../utils/Loading';
import { OutletOrChildren } from '../utils/OutletOrChildren';
import { PageTitle } from '../utils/PageTitle';
@@ -637,10 +636,6 @@ export function GamesGallery() {
                                    );
                                }}
                            </AwaitAPI>

                            <Box paddingTop={8}>
                                <ContactUs />
                            </Box>
                        </VStack>
                    </Box>
                )}
Loading