Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
pleroma-fe
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
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
Pleroma
pleroma-fe
Commits
34bc38f0
Commit
34bc38f0
authored
8 years ago
by
lain
Browse files
Options
Downloads
Patches
Plain Diff
Add settings page to app.
parent
52dd7c00
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/App.js
+1
-3
1 addition, 3 deletions
src/App.js
src/App.scss
+5
-0
5 additions, 0 deletions
src/App.scss
src/App.vue
+3
-1
3 additions, 1 deletion
src/App.vue
src/main.js
+3
-1
3 additions, 1 deletion
src/main.js
with
12 additions
and
5 deletions
src/App.js
+
1
−
3
View file @
34bc38f0
import
UserPanel
from
'
./components/user_panel/user_panel.vue
'
import
NavPanel
from
'
./components/nav_panel/nav_panel.vue
'
import
Notifications
from
'
./components/notifications/notifications.vue
'
import
StyleSwitcher
from
'
./components/style_switcher/style_switcher.vue
'
export
default
{
name
:
'
app
'
,
components
:
{
UserPanel
,
NavPanel
,
Notifications
,
StyleSwitcher
Notifications
},
data
:
()
=>
({
mobileActivePanel
:
'
timeline
'
...
...
This diff is collapsed.
Click to expand it.
src/App.scss
+
5
−
0
View file @
34bc38f0
...
...
@@ -256,3 +256,8 @@ nav {
display
:
flex
;
}
}
.item.right
{
text-align
:
right
;
padding-right
:
20px
;
}
This diff is collapsed.
Click to expand it.
src/App.vue
+
3
−
1
View file @
34bc38f0
...
...
@@ -5,7 +5,9 @@
<div
class=
'item'
>
<a
route-to=
'friends-timeline'
href=
"#"
>
{{
sitename
}}
</a>
</div>
<style
-switcher
></style-switcher>
<div
class=
'item right'
>
<router-link
:to=
"
{ name: 'settings'}">
<i
class=
"icon-cog"
></i></router-link>
</div>
</div>
</nav>
<div
class=
"container"
id=
"content"
>
...
...
This diff is collapsed.
Click to expand it.
src/main.js
+
3
−
1
View file @
34bc38f0
...
...
@@ -8,6 +8,7 @@ import FriendsTimeline from './components/friends_timeline/friends_timeline.vue'
import
ConversationPage
from
'
./components/conversation-page/conversation-page.vue
'
import
Mentions
from
'
./components/mentions/mentions.vue
'
import
UserProfile
from
'
./components/user_profile/user_profile.vue
'
import
Settings
from
'
./components/settings/settings.vue
'
import
statusesModule
from
'
./modules/statuses.js
'
import
usersModule
from
'
./modules/users.js
'
...
...
@@ -48,7 +49,8 @@ const routes = [
{
path
:
'
/main/friends
'
,
component
:
FriendsTimeline
},
{
name
:
'
conversation
'
,
path
:
'
/notice/:id
'
,
component
:
ConversationPage
},
{
name
:
'
user-profile
'
,
path
:
'
/users/:id
'
,
component
:
UserProfile
},
{
name
:
'
mentions
'
,
path
:
'
/:username/mentions
'
,
component
:
Mentions
}
{
name
:
'
mentions
'
,
path
:
'
/:username/mentions
'
,
component
:
Mentions
},
{
name
:
'
settings
'
,
path
:
'
/settings
'
,
component
:
Settings
}
]
const
router
=
new
VueRouter
({
...
...
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