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
JetBrains YouTrack
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
KSZK
DevTeam
kszkepzes
old
kszkepzes-frontend
Compare revisions
e254fc95fdad107dc2f63c29740341ded9ea7a60 to master
Compare revisions
Changes are shown as if the
source
revision was being merged into the
target
revision.
Learn more about comparing revisions.
Source
kszk/devteam/kszkepzes/old/kszkepzes-frontend
Select target project
No results found
master
Select Git revision
Swap
Target
kbgergely/kszkepzes-frontend
Select target project
kszk/devteam/kszkepzes/old/kszkepzes-frontend
kbgergely/kszkepzes-frontend
2 results
e254fc95fdad107dc2f63c29740341ded9ea7a60
Select Git revision
Show changes
Only incoming changes from source
Include changes to target since source was created
Compare
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/components/pages/Schedule.js
+43
-41
43 additions, 41 deletions
src/components/pages/Schedule.js
src/setupProxy.js
+20
-13
20 additions, 13 deletions
src/setupProxy.js
with
63 additions
and
54 deletions
src/components/pages/Schedule.js
View file @
2eef83d2
import
'
moment/locale/hu
'
;
import
"
moment/locale/hu
"
;
import
{
Accordion
,
...
...
@@ -7,12 +7,12 @@ import {
Header
,
Icon
,
Segment
,
}
from
'
semantic-ui-react
'
;
import
React
,
{
Component
}
from
'
react
'
;
}
from
"
semantic-ui-react
"
;
import
React
,
{
Component
}
from
"
react
"
;
import
{
connect
}
from
'
react-redux
'
;
import
{
getStudentEvents
}
from
'
../../actions/statistics
'
;
import
moment
from
'
moment
'
;
import
{
connect
}
from
"
react-redux
"
;
import
{
getStudentEvents
}
from
"
../../actions/statistics
"
;
import
moment
from
"
moment
"
;
class
Schedule
extends
Component
{
// eslint-disable-next-line react/state-in-constructor
...
...
@@ -34,32 +34,34 @@ class Schedule extends Component {
const
{
activeIndex
}
=
this
.
state
;
const
{
events
}
=
this
.
props
;
const
panels
=
events
.
map
((
event
)
=>
(
<
Accordion
key
=
{
Math
.
random
()}
>
<
Accordion
.
Title
active
=
{
activeIndex
===
event
.
id
}
index
=
{
event
.
id
}
onClick
=
{
this
.
handleClick
}
>
<
h2
>
<
Grid
>
<
Grid
.
Column
floated
=
"
left
"
width
=
{
5
}
textAlign
=
"
left
"
>
<
Icon
name
=
"
calendar alternate outline
"
color
=
"
blue
"
/>
{
'
'
}
{
event
.
name
}
<
/Grid.Column
>
<
Grid
.
Column
floated
=
"
right
"
width
=
{
8
}
textAlign
=
"
right
"
>
{
moment
(
event
.
date
).
locale
(
'
hu
'
).
format
(
'
LLLL
'
)}
<
/Grid.Column
>
<
/Grid
>
<
/h2
>
<
/Accordion.Title
>
<
Accordion
.
Content
active
=
{
activeIndex
===
event
.
id
}
>
<
Segment
textAlign
=
"
left
"
style
=
{{
overflowWrap
:
'
break-word
'
}}
>
{
event
.
description
}
<
/Segment
>
<
/Accordion.Content
>
<
/Accordion
>
));
const
panels
=
events
.
sort
((
a
,
b
)
=>
a
.
date
-
b
.
date
)
.
map
((
event
)
=>
(
<
Accordion
key
=
{
Math
.
random
()}
>
<
Accordion
.
Title
active
=
{
activeIndex
===
event
.
id
}
index
=
{
event
.
id
}
onClick
=
{
this
.
handleClick
}
>
<
h2
>
<
Grid
>
<
Grid
.
Column
floated
=
"
left
"
width
=
{
5
}
textAlign
=
"
left
"
>
<
Icon
name
=
"
calendar alternate outline
"
color
=
"
blue
"
/>
{
"
"
}
{
event
.
name
}
<
/Grid.Column
>
<
Grid
.
Column
floated
=
"
right
"
width
=
{
8
}
textAlign
=
"
right
"
>
{
moment
(
event
.
date
).
locale
(
"
hu
"
).
format
(
"
LLLL
"
)}
<
/Grid.Column
>
<
/Grid
>
<
/h2
>
<
/Accordion.Title
>
<
Accordion
.
Content
active
=
{
activeIndex
===
event
.
id
}
>
<
Segment
textAlign
=
"
left
"
style
=
{{
overflowWrap
:
"
break-word
"
}}
>
{
event
.
description
}
<
/Segment
>
<
/Accordion.Content
>
<
/Accordion
>
));
return
(
<
div
>
...
...
@@ -68,10 +70,10 @@ class Schedule extends Component {
as
=
"
h1
"
content
=
"
Képzés alkalmak
"
style
=
{{
fontSize
:
'
2em
'
,
fontWeight
:
'
bold
'
,
marginBottom
:
'
0.5em
'
,
marginTop
:
'
0.5em
'
,
fontSize
:
"
2em
"
,
fontWeight
:
"
bold
"
,
marginBottom
:
"
0.5em
"
,
marginTop
:
"
0.5em
"
,
}}
/
>
<
Accordion
fluid
styled
>
...
...
@@ -79,12 +81,12 @@ class Schedule extends Component {
<
/Accordion
>
<
Header
as
=
"
h1
"
content
=
"
Tábor
"
content
=
"
Tábor
: április 11-13
"
style
=
{{
fontSize
:
'
2em
'
,
fontWeight
:
'
bold
'
,
marginBottom
:
'
0.5em
'
,
marginTop
:
'
1.5em
'
,
fontSize
:
"
2em
"
,
fontWeight
:
"
bold
"
,
marginBottom
:
"
0.5em
"
,
marginTop
:
"
1.5em
"
,
}}
/
>
<
/Container
>
...
...
This diff is collapsed.
Click to expand it.
src/setupProxy.js
View file @
2eef83d2
const
{
createProxyMiddleware
}
=
require
(
'
http-proxy-middleware
'
);
const
{
createProxyMiddleware
}
=
require
(
"
http-proxy-middleware
"
);
module
.
exports
=
function
(
app
)
{
app
.
use
(
'
/api
'
,
"
/api
"
,
createProxyMiddleware
({
target
:
'
http://localhost:8000
'
,
target
:
"
http://localhost:8000
"
,
changeOrigin
:
true
,
})
})
,
);
app
.
use
(
'
/admin
'
,
"
/admin
"
,
createProxyMiddleware
({
target
:
'
http://localhost:8000
'
,
target
:
"
http://localhost:8000
"
,
changeOrigin
:
true
,
})
})
,
);
app
.
use
(
'
/staticfiles
'
,
"
/staticfiles
"
,
createProxyMiddleware
({
target
:
'
http://localhost:8000
'
,
target
:
"
http://localhost:8000
"
,
changeOrigin
:
true
,
})
})
,
);
app
.
use
(
'
/mediafiles
'
,
"
/mediafiles
"
,
createProxyMiddleware
({
target
:
'
http://localhost:8000
'
,
target
:
"
http://localhost:8000
"
,
changeOrigin
:
true
,
})
}),
);
app
.
use
(
"
/oidc
"
,
createProxyMiddleware
({
target
:
"
http://localhost:8000
"
,
changeOrigin
:
true
,
}),
);
};
This diff is collapsed.
Click to expand it.
Prev
1
2
Next