Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
kszkepzes-frontend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Köpeczi-Bócz Gergely
kszkepzes-frontend
Commits
50ffeb8c
Commit
50ffeb8c
authored
Jan 28, 2020
by
Rafael László
Browse files
Options
Downloads
Patches
Plain Diff
popover menu
parent
61097e67
No related branches found
No related tags found
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
public/index.html
+1
-1
1 addition, 1 deletion
public/index.html
src/components/App.js
+1
-0
1 addition, 0 deletions
src/components/App.js
src/components/Header.js
+49
-23
49 additions, 23 deletions
src/components/Header.js
src/components/pages/Home.js
+2
-1
2 additions, 1 deletion
src/components/pages/Home.js
with
53 additions
and
25 deletions
public/index.html
+
1
−
1
View file @
50ffeb8c
...
...
@@ -2,7 +2,7 @@
<html
lang=
"en"
>
<head>
<meta
charset=
"utf-8"
>
<!--
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-->
<meta
name=
"viewport"
content=
"width=device-width, initial-scale=1, shrink-to-fit=no"
>
<meta
name=
"theme-color"
content=
"#000000"
>
<!--
manifest.json provides metadata used when your web app is added to the
...
...
This diff is collapsed.
Click to expand it.
src/components/App.js
+
1
−
0
View file @
50ffeb8c
...
...
@@ -3,6 +3,7 @@ import Header from './Header';
import
Main
from
'
./Main
'
;
import
Footer
from
'
./Footer
'
;
const
App
=
()
=>
(
<
div
style
=
{{
minHeight
:
'
100%
'
,
position
:
'
relative
'
}}
>
<
header
id
=
'
header
'
>
...
...
This diff is collapsed.
Click to expand it.
src/components/Header.js
+
49
−
23
View file @
50ffeb8c
...
...
@@ -7,6 +7,9 @@ import {
Segment
,
Visibility
,
Image
,
Grid
,
Popup
,
Icon
,
}
from
'
semantic-ui-react
'
;
import
{
connect
}
from
'
react-redux
'
;
import
{
getUserData
}
from
'
../actions
'
;
...
...
@@ -58,7 +61,7 @@ const menuItems = [
];
const
FixedMenu
=
({
user
})
=>
(
<
Menu
fixed
=
'
top
'
size
=
'
large
'
pointing
>
<
Menu
vertical
fixed
=
'
top
'
size
=
'
medium
'
pointing
>
<
Container
>
{
menuItems
.
map
((
item
,
i
)
=>
(
user
.
permission
>=
item
.
permissionLevel
||
...
...
@@ -107,7 +110,6 @@ class Header extends Component {
render
()
{
const
{
visible
}
=
this
.
state
;
return
(
<
div
>
{
visible
?
<
FixedMenu
user
=
{
this
.
props
.
user
}
/> : null
}
...
...
@@ -117,17 +119,40 @@ class Header extends Component {
once
=
{
false
}
>
<
Segment
inverted
textAlign
=
'
center
'
vertical
>
<
Container
>
<
Grid
verticalAlign
=
'
middle
'
columns
=
{
5
}
centered
>
<
Grid
.
Row
>
<
Menu
inverted
secondary
size
=
'
large
'
>
{
menuItems
.
map
((
item
,
i
)
=>
(
this
.
props
.
user
.
permission
>=
item
.
permissionLevel
||
(
item
.
permissionLevel
===
0
)
?
(
item
.
permissionLevel
===
0
?
<
Grid
.
Column
>
<
Menu
.
Item
key
=
{
i
}
as
=
{
Link
}
to
=
{
item
.
to
}
>
{
item
.
prefix
}{
item
.
text
}
<
/Menu.Item
>
:
null
))}
<
Menu
.
Item
position
=
'
right
'
>
<
/Grid.Column
>
:
null
))
}
<
Popup
trigger
=
{
<
Menu
.
Item
>
<
Icon
name
=
'
angle down
'
size
=
'
large
'
/>
<
/Menu.Item
>
}
position
=
'
center
'
flowing
hoverable
inverted
>
<
Menu
inverted
secondary
size
=
'
large
'
>
<
Grid
.
Row
>
{
menuItems
.
map
((
item
,
i
)
=>
(
this
.
props
.
user
.
permission
>=
item
.
permissionLevel
&&
item
.
permissionLevel
>
0
?
<
Grid
.
Column
>
<
Menu
.
Item
key
=
{
i
}
as
=
{
Link
}
to
=
{
item
.
to
}
>
{
item
.
prefix
}{
item
.
text
}
<
/Menu.Item
>
<
/Grid.Column
>
:
null
))
}
<
/Grid.Row
>
<
/Menu
>
<
/Popup
>
<
Grid
.
Column
>
<
Menu
.
Item
floated
=
'
right
'
width
=
{
5
}
>
{
this
.
props
.
user
.
id
?
<
Button
.
Group
>
...
...
@@ -138,9 +163,10 @@ class Header extends Component {
<
Button
as
=
'
a
'
href
=
'
/api/v1/login/authsch/
'
inverted
>
Bejelentkezés
<
/Button
>
}
<
/Menu.Item
>
<
/Grid.Column
>
<
/Menu
>
<
/Container
>
<
/Grid.Row
>
<
/Grid
>
<
/Segment
>
<
/Visibility
>
<
/div
>
...
...
This diff is collapsed.
Click to expand it.
src/components/pages/Home.js
+
2
−
1
View file @
50ffeb8c
...
...
@@ -39,6 +39,7 @@ const range = (count) => {
class
Home
extends
Component
{
render
()
{
const
kszk_age
=
new
Date
().
getFullYear
()
-
1976
return
(
<
div
>
<
div
className
=
'
car-image-kszk
'
>
...
...
@@ -146,7 +147,7 @@ class Home extends Component {
<
p
style
=
{{
fontSize
:
'
1.33em
'
,
fontFamily
:
'
Arial
'
}}
>
A
Kollégiumi
Számítástechnikai
Kör
az
Egyetem
legrégebben
működő
és
legnagyobb
aktív
,
informatikával
foglalkozó
öntevékeny
csoportosulása
,
idén
ünnepeljük
42
.
születésnapunkat
.
A
patinás
csoportosulása
,
idén
ünnepeljük
{
kszk_age
}
.
születésnapunkat
.
A
patinás
név
mögött
vidám
hangulatú
,
alkotó
kedvű
csapat
rejlik
,
mely
a
Kar
jó
szakmai
képességű
,
számítástechnika
iránt
kiemelten
érdeklődő
tagjaiból
verbuválódott
,
és
bővül
évente
új
tehetségekkel
,
lelkes
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment