Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
boco-frontend
Manage
Activity
Members
Labels
Plan
Issues
21
Issue boards
Milestones
Wiki
Code
Merge requests
0
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
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
idatt2106_2022_02
boco-frontend
Commits
9bd60ee2
Commit
9bd60ee2
authored
2 years ago
by
Titus Netland
Browse files
Options
Downloads
Plain Diff
Merge branch 'members_icon' into 'main'
Members icon See merge request
!54
parents
b7a61fba
2ce63e18
No related branches found
No related tags found
1 merge request
!54
Members icon
Pipeline
#177665
failed with stages
Stage:
Stage:
in 1 minute and 17 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/assets/members.png
+0
-0
0 additions, 0 deletions
src/assets/members.png
src/components/CommunityComponents/CommunityHome.vue
+15
-1
15 additions, 1 deletion
src/components/CommunityComponents/CommunityHome.vue
src/router/index.js
+1
-2
1 addition, 2 deletions
src/router/index.js
with
16 additions
and
3 deletions
src/assets/members.png
0 → 100644
+
0
−
0
View file @
9bd60ee2
4.38 KiB
This diff is collapsed.
Click to expand it.
src/components/CommunityComponents/CommunityHome.vue
+
15
−
1
View file @
9bd60ee2
<
template
>
<
template
>
<section
class=
"relative w-full max-w-md px-5 py-4 mx-auto rounded-md"
>
<section
class=
"relative w-full max-w-md px-5 py-4 mx-auto rounded-md"
>
<div>
<img
class=
"cursor-pointer h-8 float-right"
v-if=
"isLoggedIn"
src=
"@/assets/members.png"
alt=
"Medlemmer"
@
click=
"$router.push('/group/:id/memberlist')"
/>
</div>
<div
class=
"mb-5 mt-5 border-b-2 border-blue-900"
>
<div
class=
"mb-5 mt-5 border-b-2 border-blue-900"
>
<label
class=
"text-xl font-bold"
>
Tøyenhus borettslag
</label>
<label
class=
"text-xl font-bold"
>
Tøyenhus borettslag
</label>
</div>
</div>
...
@@ -41,7 +50,6 @@ export default {
...
@@ -41,7 +50,6 @@ export default {
components
:
{
components
:
{
ItemCard
,
ItemCard
,
},
},
computed
:
{
computed
:
{
searchedItems
()
{
searchedItems
()
{
let
filteredItems
=
[];
let
filteredItems
=
[];
...
@@ -56,6 +64,11 @@ export default {
...
@@ -56,6 +64,11 @@ export default {
return
filteredItems
;
return
filteredItems
;
},
},
},
},
created
()
{
if
(
this
.
$store
.
state
.
user
.
token
!==
null
){
this
.
isLoggedIn
=
true
}
},
/**
/**
* Her må det lages en metode som henter alle items (i en gruppe) fra databasen.
* Her må det lages en metode som henter alle items (i en gruppe) fra databasen.
...
@@ -65,6 +78,7 @@ export default {
...
@@ -65,6 +78,7 @@ export default {
data
()
{
data
()
{
return
{
return
{
isLoggedIn
:
false
,
items
:
[
items
:
[
{
img
:
""
,
adresse
:
"
Oslo
"
,
title
:
"
Dyson
"
,
price
:
1000
},
{
img
:
""
,
adresse
:
"
Oslo
"
,
title
:
"
Dyson
"
,
price
:
1000
},
...
...
This diff is collapsed.
Click to expand it.
src/router/index.js
+
1
−
2
View file @
9bd60ee2
...
@@ -93,10 +93,9 @@ const routes = [
...
@@ -93,10 +93,9 @@ const routes = [
component
:
()
=>
import
(
"
../views/CommunityViews/MyCommunitiesView.vue
"
),
component
:
()
=>
import
(
"
../views/CommunityViews/MyCommunitiesView.vue
"
),
},
},
{
{
path
:
"
/
groupHomePage
"
,
path
:
"
/
community/:id
"
,
name
:
"
GroupHome
"
,
name
:
"
GroupHome
"
,
component
:
()
=>
import
(
"
../views/CommunityViews/CommunityHomeView.vue
"
),
component
:
()
=>
import
(
"
../views/CommunityViews/CommunityHomeView.vue
"
),
beforeEnter
:
guardRoute
,
},
},
];
];
...
...
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