Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
laboite
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
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
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
apps.education
laboite
Commits
04b4c47e
Commit
04b4c47e
authored
2 years ago
by
otho
Browse files
Options
Downloads
Patches
Plain Diff
fix(route): profile selection route has correct format
parent
d6849e4a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!559
Resolve "profile selection route should not be in camel case"
Pipeline
#14662
passed
2 years ago
Stage: initial-checks
Stage: deps
Stage: test
Stage: build
Stage: release
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/imports/ui/layouts/MainLayout.jsx
+2
-2
2 additions, 2 deletions
app/imports/ui/layouts/MainLayout.jsx
app/imports/ui/pages/system/ProfilePage.jsx
+1
-1
1 addition, 1 deletion
app/imports/ui/pages/system/ProfilePage.jsx
with
3 additions
and
3 deletions
app/imports/ui/layouts/MainLayout.jsx
+
2
−
2
View file @
04b4c47e
...
...
@@ -127,7 +127,7 @@ function MainLayout({ appsettings, ready }) {
<
Route
exact
path
=
"/"
component
=
{
PersonalPage
}
/>
<
Route
exact
path
=
"/profile"
component
=
{
ProfilePage
}
/>
<
Route
exact
path
=
"/contact"
component
=
{
ContactPage
}
/>
<
Route
exact
path
=
"/profile
S
tructure
S
election"
component
=
{
StructureSelectionPage
}
/>
<
Route
exact
path
=
"/profile
s
tructure
s
election"
component
=
{
StructureSelectionPage
}
/>
<
Route
exact
path
=
"/services"
component
=
{
ServicesPage
}
/>
<
Route
exact
path
=
"/structure"
component
=
{
ServicesPage
}
/>
<
Route
exact
path
=
"/help"
component
=
{
HelpPage
}
/>
...
...
@@ -167,7 +167,7 @@ function MainLayout({ appsettings, ready }) {
)
:
(
<
Switch
>
<
Route
exact
path
=
"/profile"
component
=
{
ProfilePage
}
/>
<
Route
exact
path
=
"/profile
S
tructure
S
election"
component
=
{
StructureSelectionPage
}
/>
<
Route
exact
path
=
"/profile
s
tructure
s
election"
component
=
{
StructureSelectionPage
}
/>
{
!
disabledFeatures
.
introductionTab
&&
(
<
Route
exact
path
=
"/introduction"
component
=
{
IntroductionPage
}
/>
)
}
...
...
This diff is collapsed.
Click to expand it.
app/imports/ui/pages/system/ProfilePage.jsx
+
1
−
1
View file @
04b4c47e
...
...
@@ -629,7 +629,7 @@ const ProfilePage = () => {
/>
</
FormControl
>
<
FormControl
variant
=
"filled"
className
=
{
classes
.
formControl
}
fullWidth
>
<
Button
variant
=
"outlined"
onClick
=
{
()
=>
history
.
push
(
'
/profile
S
tructure
S
election
'
)
}
>
<
Button
variant
=
"outlined"
onClick
=
{
()
=>
history
.
push
(
'
/profile
s
tructure
s
election
'
)
}
>
{
i18n
.
__
(
'
pages.ProfilePage.openStructureSelection
'
)
}
</
Button
>
</
FormControl
>
...
...
This diff is collapsed.
Click to expand it.
Ghost User
@ghost
mentioned in commit
002b029c
·
2 years ago
mentioned in commit
002b029c
mentioned in commit 002b029cbdcc588ac2557397be63c7aded6405dc
Toggle commit list
Ghost User
@ghost
mentioned in commit
54fa39a3
·
2 years ago
mentioned in commit
54fa39a3
mentioned in commit 54fa39a3744a9a91b7903b61be2c5ef7dc249e67
Toggle commit list
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