Skip to content

Commit

Permalink
Merge pull request #106 from tobias-g1/develop
Browse files Browse the repository at this point in the history
Resolve issues surrounding CSS & Missed code within steemgigs page
  • Loading branch information
surpassinggoogle committed Mar 10, 2019
2 parents ed86b8e + 749d707 commit 38c7ca0
Show file tree
Hide file tree
Showing 6 changed files with 47 additions and 14 deletions.
4 changes: 2 additions & 2 deletions src/components/layout/footer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ export default {
background-color: #6361d0;
background-image: url("data:image/svg+xml,%3Csvg width='60' height='60' viewBox='0 0 60 60' xmlns='http://www.w3.org/2000/svg'%3E%3Cg fill='none' fill-rule='evenodd'%3E%3Cg fill='%23000000' fill-opacity='0.09'%3E%3Cpath d='M36 34v-4h-2v4h-4v2h4v4h2v-4h4v-2h-4zm0-30V0h-2v4h-4v2h4v4h2V6h4V4h-4zM6 34v-4H4v4H0v2h4v4h2v-4h4v-2H6zM6 4V0H4v4H0v2h4v4h2V6h4V4H6z'/%3E%3C/g%3E%3C/g%3E%3C/svg%3E");
height: auto !important;
padding: 50px 100px;
padding: 50px 100px !important;;
color: white;
h3, h4, a {
color: white;
Expand All @@ -150,7 +150,7 @@ export default {
}
@media only screen and (max-width: 600px) {
.sg-footer {
padding: 50px 30px;
padding: 50px 30px !important;
}
}
Expand Down
1 change: 1 addition & 0 deletions src/components/layout/nav.vue
Original file line number Diff line number Diff line change
Expand Up @@ -292,5 +292,6 @@ export default {
color: #ACACAC;
font-weight: bold;
margin-right: 10px;
cursor: pointer;
}
</style>
5 changes: 3 additions & 2 deletions src/components/snippets/category-preview.vue
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ export default {
props: {
post_type: String,
header: String,
description: String
description: String,
limit: Number
},
methods: {
async loadPosts () {
Expand All @@ -64,7 +65,7 @@ export default {
'type': this.post_type,
'pageNumber': 1,
'order': this.selectedOrder,
'limit': 4
'limit': this.limit
}
await Api.search(searchQuery).then(result => {
this.searchResults = result.data.results
Expand Down
16 changes: 11 additions & 5 deletions src/components/views/home.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@
</carousel>
<!-- Gigs -->
<el-row :gutter="15">
<categoryPreview post_type="steemgigs_post" header="SteemGigs" description="See what the SteemGigs community has to offer" />
<categoryPreview post_type="steemgigs_post" :limit="cardCount.gigs" header="SteemGigs" description="See what the SteemGigs community has to offer" />
</el-row>
<!-- Gigs Requests -->
<el-row :gutter="15">
<categoryPreview post_type="steemgigs_request" header="SteemGig Requests" description="Custom requests as provided by our community."></categoryPreview>
<categoryPreview post_type="steemgigs_request" :limit="cardCount.requests" header="SteemGig Requests" description="Custom requests as provided by our community."></categoryPreview>
</el-row>
<!-- Testimonial -->
<el-row :gutter="15">
<categoryPreview post_type="steemgigs_testimonial" header="Testimonials" description="SteemGigs success-stories written by our users"></categoryPreview>
<categoryPreview post_type="steemgigs_testimonial" :limit='cardCount.testimonials' header="Testimonials" description="SteemGigs success-stories written by our users"></categoryPreview>
</el-row>
<!-- SurpassingGoogle -->
<el-row :gutter="15">
<categoryPreview post_type="steemgigs_surpassinggoogle" header="SurpassingGoogle" description="The Knowledge-Bank of SteemGigs"></categoryPreview>
<categoryPreview post_type="steemgigs_surpassinggoogle" :limit="cardCount.surpassinggoogle" header="SurpassingGoogle" description="The Knowledge-Bank of SteemGigs"></categoryPreview>
</el-row>
</el-main>
</div>
Expand Down Expand Up @@ -51,7 +51,13 @@ export default {
userTags: [],
errorText: '',
successText: '',
isPosting: false
isPosting: false,
cardCount: {
gigs: 8,
requests: 4,
testimonials: 4,
surpassinggoogle: 4
}
}
},
methods: {
Expand Down
6 changes: 5 additions & 1 deletion src/components/views/landing.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<el-button class="primary" type="primary" slot="append" @click="search()">Search</el-button>
</el-input>
</el-col>
<el-col class="hero-img fill-height flex-col" :xs="0" :sm="0" :md="12" :lg="12" :xl="12">
<el-col class="hero-img fill-height flex-col" :xs="1" :sm="1" :md="12" :lg="12" :xl="12">
<img src="/static/img/landing/landing_1.svg" alt="">
</el-col>
</el-row>
Expand Down Expand Up @@ -381,6 +381,9 @@ export default {
section {
padding: 50px 30px;
}
.hero-img {
display: none;
}
}
}
Expand All @@ -392,6 +395,7 @@ export default {
}
img {
padding: 60px;
display: flex;
}
.el-input-group__append {
background-color: #6361D0 !important;
Expand Down
29 changes: 25 additions & 4 deletions src/pages/platform/steemgigs.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import Page from '@/components/page'
import CatNav from '@/components/layout/catNav'
import LoadingPlaceholder from '@/components/widgets/gigLoading'
import GigCard from '@/components/snippets/gigCard'
import Api from '@/services/api'
export default {
components: {
Expand All @@ -34,12 +35,32 @@ export default {
},
data () {
return {
loading: true
loading: true,
gigs: ''
}
},
computed: {
gigs () {
return this.$store.state.posts.steemgigs || []
mounted () {
this.getSteemGigs()
},
methods: {
async getSteemGigs () {
try {
let searchQuery = {
'type': 'steemgigs_post',
'pageNumber': 1,
'order': 'newest',
'limit': 50
}
await Api.search(searchQuery).then(result => {
this.gigs = result.data.results
})
} catch (err) {
// Send error toast notification upon error
this.$notify.error({
title: 'Error',
message: `Sorry, there seems to have been an error. Error Details - ${err}`
})
}
}
}
}
Expand Down

0 comments on commit 38c7ca0

Please sign in to comment.