Skip to content
Snippets Groups Projects
Commit 8174ee69 authored by Edward Alexander Jaya's avatar Edward Alexander Jaya
Browse files

Merge branch 'dev' into 'feature-usermanagement' 

# Conflicts:
#   frontend/pages/main/label.vue
parents c5e53c6e ddfbed91
Branches
6 merge requests!40Release First Version,!31Output feature,!25Feature collab,!23CI script,!21Add dockerize,!5Feature usermanagement
Expand all Hide whitespace changes
Inline Side-by-side
frontend/components/view/Images.vue 0 → 100644
+ 50
− 0
View file @ 8174ee69
<template>
<article class="blog-card">
<img class="post-image" :src="imageURL" />
<div class="article-details">
<h3 class="post-title">{{ imageID }}</h3>
</div>
</article>
</template>
<script>
export default {
props: ["imageID", "imageURL"],
data () {
return {}
}
}
</script>
<style scoped>
.blog-card {
display: fix;
background: #fff;
box-shadow: 0 0.1875rem 1.5rem rgba(0, 0, 0, 0.2);
border-radius: 0.5rem;
overflow: hidden;
display: grid;
grid-template-columns: 1fr 2fr;
grid-template-rows: 1fr;
}
.post-image {
display: block;
width: 100%;
object-fit: cover;
height: 100%;
}
.article-details {
padding: 1.7rem;
}
.post-title {
font-size: 0.875rem;
line-height: 1;
color: #1E889B;
font-weight: bold;
margin: 0 0 0 0;
}
</style>
\ No newline at end of file
frontend/package-lock.json 0 → 100644
+ 13585
− 0
View file @ 8174ee69
This diff is collapsed.
frontend/pages/main/edit.vue
+ 112
− 0
View file @ 8174ee69
<template>
<div class="col">
<div class="ml-4">
<div class="row">
<div class="col">
<h5 class="title users-margin">
Choose Images
</h5>
</div>
</div>
<br>
<div class="row form-title-margin">
<div class="col">
<input
id="imagesID"
v-model="search"
type="text"
class="form-control form-border field-length form-content"
placeholder="Search for Images ID..."
name="imagesID"
>
</div>
</div>
<br>
<b-row>
<b-col v-for="labs in filterImages" v-bind:key="labs">
<div id="container">
<Images
:imageID="labs.name"
:imageURL="labs.image"
></Images>
<br>
</div>
</b-col>
</b-row>
</div>
</div>
</template>
<script>
export default {
data () {
return {
// search: ''
}
}
}
</script>
<script>
import Images from '~/components/view/Images'
export default {
components: {
Images
},
data () {
return {
label: [
{ name: 'sdfdosfhdauofhd', image: 'https://s3-us-west-2.amazonaws.com/s.cdpn.io/1159990/pike-place.jpg'},
{ name: 'sdfudjfijdieesi', image: 'https://s3-us-west-2.amazonaws.com/s.cdpn.io/1159990/pike-place.jpg'},
{ name: 'sdsfjifjdifjdid', image: 'https://s3-us-west-2.amazonaws.com/s.cdpn.io/1159990/pike-place.jpg'},
{ name: 'ssdsidinnddsass', image: 'https://s3-us-west-2.amazonaws.com/s.cdpn.io/1159990/pike-place.jpg'},
{ name: '93893ashdjhfuff', image: 'https://s3-us-west-2.amazonaws.com/s.cdpn.io/1159990/pike-place.jpg'},
{ name: '28948suduhduhfg', image: 'https://s3-us-west-2.amazonaws.com/s.cdpn.io/1159990/pike-place.jpg'},
{ name: '23454edjfidjfdf', image: 'https://s3-us-west-2.amazonaws.com/s.cdpn.io/1159990/pike-place.jpg'},
{ name: 'dsdssifjir84443', image: 'https://s3-us-west-2.amazonaws.com/s.cdpn.io/1159990/pike-place.jpg'},
{ name: '2343fndjnfdjnjd', image: 'https://s3-us-west-2.amazonaws.com/s.cdpn.io/1159990/pike-place.jpg'}
],
search: ''
}
},
methods: {
},
computed: {
filterImages: function(){
return this.label.filter((labs) => {
return labs.name.match(this.search);
});
}
}
}
</script>
<style scoped>
.form-title, .form-content, .btn-content {
font-size: 0.85rem;
color: #1E889B;
letter-spacing: 0.025rem;
font-family: 'Open Sans Regular';
}
.btn-action .btn-content {
color: white;
margin-top: 5px;
margin-left: -5px;
}
.form-title-margin {
margin-top: -5px;
}
#container {
grid-area: main;
align-self: center;
justify-self: center;
width: 18rem;
}
</style>
\ No newline at end of file
frontend/pages/main/label.vue
+ 112
− 5
View file @ 8174ee69
<template>
<div>
<p> Good morning my friend </p>
</div>
</template>
\ No newline at end of file
<template>
<div class="col">
<div class="ml-4">
<div class="row">
<div class="col">
<h5 class="title users-margin">
Choose Images
</h5>
</div>
</div>
<br>
<div class="row form-title-margin">
<div class="col">
<input
id="imagesID"
v-model="search"
type="text"
class="form-control form-border field-length form-content"
placeholder="Search for Images ID..."
name="imagesID"
>
</div>
</div>
<br>
<b-row>
<b-col v-for="labs in filterImages" v-bind:key="labs">
<div id="container">
<Images
:imageID="labs.name"
:imageURL="labs.image"
></Images>
<br>
</div>
</b-col>
</b-row>
</div>
</div>
</template>
<script>
export default {
data () {
return {
images: ''
}
}
}
</script>
<script>
import Images from '~/components/view/Images'
export default {
components: {
Images
},
data () {
return {
label: [
{ name: '028asd1', image: 'https://s3-us-west-2.amazonaws.com/s.cdpn.io/1159990/pike-place.jpg'},
{ name: 'ddddddd', image: 'https://s3-us-west-2.amazonaws.com/s.cdpn.io/1159990/pike-place.jpg'},
{ name: 'Zzzzzzzz', image: 'https://s3-us-west-2.amazonaws.com/s.cdpn.io/1159990/pike-place.jpg'},
{ name: 'aqweqwew', image: 'https://s3-us-west-2.amazonaws.com/s.cdpn.io/1159990/pike-place.jpg'},
{ name: '0112311', image: 'https://s3-us-west-2.amazonaws.com/s.cdpn.io/1159990/pike-place.jpg'},
{ name: 'aDDD661a', image: 'https://s3-us-west-2.amazonaws.com/s.cdpn.io/1159990/pike-place.jpg'},
{ name: ',,k,,l,,kp', image: 'https://s3-us-west-2.amazonaws.com/s.cdpn.io/1159990/pike-place.jpg'},
{ name: 'gggggggg', image: 'https://s3-us-west-2.amazonaws.com/s.cdpn.io/1159990/pike-place.jpg'},
{ name: '028azzz', image: 'https://s3-us-west-2.amazonaws.com/s.cdpn.io/1159990/pike-place.jpg'}
],
search: ''
}
},
methods: {
},
computed: {
filterImages: function(){
return this.label.filter((labs) => {
return labs.name.match(this.search);
});
}
}
}
</script>
<style scoped>
.form-title, .form-content, .btn-content {
font-size: 0.85rem;
color: #1E889B;
letter-spacing: 0.025rem;
font-family: 'Open Sans Regular';
}
.btn-action .btn-content {
color: white;
margin-top: 5px;
margin-left: -5px;
}
.form-title-margin {
margin-top: -5px;
}
#container {
grid-area: main;
align-self: center;
justify-self: center;
width: 18rem;
}
</style>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment