Compare commits

..

11 Commits

Author SHA1 Message Date
aminecmi
a960889f34 Build changes.
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/promote/production Build is passing
2023-10-20 21:16:12 +02:00
aminecmi
25e435b2ee Fixing displaying issue.
All checks were successful
continuous-integration/drone Build is passing
continuous-integration/drone/push Build is passing
2022-08-19 21:25:59 +02:00
aminecmi
9775c6b0c6 Changed pisition handling.
All checks were successful
continuous-integration/drone Build is passing
continuous-integration/drone/push Build is passing
2022-08-12 22:22:41 +02:00
aminecmi
bb0c16501c Working cache and deployment.
All checks were successful
continuous-integration/drone Build is passing
continuous-integration/drone/push Build is passing
2022-08-06 16:04:21 +02:00
aminecmi
ecaffef993 Last cache try.
Some checks failed
continuous-integration/drone/push Build is passing
continuous-integration/drone Build is failing
2022-08-06 15:58:09 +02:00
aminecmi
82c7b793c0 Ssh and cache.
Some checks reported errors
continuous-integration/drone/push Build is passing
continuous-integration/drone Build was killed
2022-08-06 15:53:09 +02:00
aminecmi
e0f48c99bd Still caching.
Some checks reported errors
continuous-integration/drone/push Build is passing
continuous-integration/drone Build was killed
2022-08-06 15:46:18 +02:00
aminecmi
89808e8f6a Cache.
Some checks reported errors
continuous-integration/drone/push Build is passing
continuous-integration/drone Build was killed
2022-08-06 15:35:54 +02:00
aminecmi
15e69496b7 Laast pipeline should be laast.
Some checks reported errors
continuous-integration/drone/push Build is passing
continuous-integration/drone Build was killed
2022-08-06 15:24:47 +02:00
aminecmi
710af7eeee This may or may not work.
Some checks reported errors
continuous-integration/drone/push Build was killed
2022-08-06 15:24:06 +02:00
aminecmi
74f9e1fd94 Fixing drone build.
Some checks reported errors
continuous-integration/drone/push Build is passing
continuous-integration/drone Build was killed
2022-08-06 15:13:04 +02:00
3 changed files with 75 additions and 50 deletions

View File

@@ -1,44 +1,64 @@
kind: pipeline
type: docker
name: analyseAndBuild
name: build
steps:
- name: code-analysis
image: sonarsource/sonar-scanner-cli
detach: true
failure: ignore
commands:
- ls -la
- sonar-scanner -Dsonar.projectKey=LDC-WWW -Dsonar.sources=. -Dsonar.host.url=$SONAR_HOST_URL -Dsonar.login=$SONAR_LOGIN
environment:
SONAR_HOST_URL:
from_secret: sonarScannerHostUrl
SONAR_LOGIN:
from_secret: sonarScannerLogin
- name: build
- name: lintAndBuild
image: node:14
commands:
- npm install
- echo $VUE_APP_API_BASE_URL
- npm run lint
- npm run build:prod
environment:
VUE_APP_API_BASE_URL:
from_secret: baseurl
- name: saveNodeModules
image: drillster/drone-volume-cache
volumes:
- name: cache
path: /cache
settings:
rebuild: true
mount:
- ./node_modules
cache_key: [ DRONE_REPO_NAME, DRONE_BRANCH ]
trigger:
event:
- push
- pull_request
volumes:
- name: cache
host:
path: /tmp/cache
---
kind: pipeline
type: docker
name: CopyToServer
name: Deploy
steps:
- name: scp files
- name: getNodeModules
image: drillster/drone-volume-cache
volumes:
- name: cache
path: /cache
settings:
restore: true
mount:
- ./node_modules
cache_key: [ DRONE_REPO_NAME, DRONE_BRANCH ]
- name: build
image: node:14
commands:
- npm run build:prod
environment:
VUE_APP_API_BASE_URL:
from_secret: baseurl
- name: scpFiles
image: appleboy/drone-scp
settings:
host: amine-louveau.fr
@@ -49,33 +69,27 @@ steps:
target: /home/ubuntu/courses
source: dist/*
- name: deploy
image: appleboy/drone-ssh
settings:
host: amine-louveau.fr
user: ubuntu
key:
from_secret: privateKey
command_timeout: 2m
script:
- cd /home/ubuntu/courses
- mv dist/* ./
- sudo chown www-data:www-data ./*
- sudo rm -rf /var/www/amine/courses/*
- sudo mv ./* /var/www/amine/courses/
trigger:
event:
- promote
target:
- production
---
kind: pipeline
type: ssh
name: Deploy
server:
host: amine-louveau.fr
user: ubuntu
ssh_key:
from_secret: ssh_key
steps:
- name: copy
commands:
- cd /home/ubuntu/courses
- mv dist/* ./
- sudo chown www-data:www-data ./*
- sudo rm -rf /var/www/amine/courses/*
- sudo mv ./* /var/www/amine/courses/
trigger:
event:
- promote
target:
- production
volumes:
- name: cache
host:
path: /tmp/cache

View File

@@ -26,7 +26,7 @@
</div>
<draggable
v-model="searchResults"
v-model="uncheckedItems"
group="listItems"
@change="onChange"
item-key="id" v-if="searchQ.length <= 0"
@@ -35,6 +35,9 @@
<ListItem v-bind:item="element" v-bind:can-move="!element.checked" v-on:updateItem="updateItem" v-on:deleteElement="deleteElement"></ListItem>
</template>
</draggable>
<div v-if="searchQ.length <= 0">
<ListItem v-for="element in checkedItems" v-bind:can-move="false" :key="element.id" v-bind:item="element" v-on:updateItem="updateItem" v-on:deleteElement="deleteElement"></ListItem>
</div>
<div v-if="searchQ.length > 0">
<ListItem v-for="element in searchResults" v-bind:can-move="false" :key="element.id" v-bind:item="element" v-on:updateItem="updateItem" v-on:deleteElement="deleteElement"></ListItem>
</div>
@@ -56,6 +59,8 @@ export default {
listName: '',
searchQ: '',
searchResults: [],
uncheckedItems: [],
checkedItems: [],
initialItems: [],
loading: true,
addModalShown: false,
@@ -114,23 +119,20 @@ export default {
})
},
recopyItemsObject: function () {
this.searchResults = this.initialItems.map(x => ({...x}));
this.uncheckedItems = this.initialItems.filter(x => !x.checked).map(x => ({...x}));
this.checkedItems = this.initialItems.filter(x => x.checked).map(x => ({...x}));
},
searchItem: function (e) {
if (e.key === 'Enter') {
this.createItem();
} else {
if (this.searchQ.length > 0) {
this.searchResults = this.searchResults.filter(i => i.content.toLowerCase().indexOf(this.searchQ.toLowerCase()) >= 0)
this.searchResults = this.initialItems.filter(i => i.content.toLowerCase().indexOf(this.searchQ.toLowerCase()) >= 0)
} else {
this.recopyItemsObject();
}
}
},
addItem: function (item) {
this.initialItems.push(item);
this.recopyItemsObject();
},
onChange: function (event) {
if (event.moved) {
this.updateItem({

View File

@@ -108,3 +108,12 @@ export default {
}
}
</script>
<style scoped>
.columns {
flex-wrap: wrap;
}
</style>