Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Merge] merge from dev into main #104

Merged
merged 12 commits into from
Aug 10, 2023
Merged

[Merge] merge from dev into main #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f95dd15
Merge remote-tracking branch 'origin/dev' into feat/blueprint
FacerAin Aug 10, 2023
2adcc4f
chore: change blueprint button position
FacerAin Aug 10, 2023
2140827
feat: delete MainBottom
FacerAin Aug 10, 2023
2fd57ab
feat: update ASG blueprint
FacerAin Aug 10, 2023
6364dfc
[수정] MainBottom 삭제 (#100)
Eeap Aug 10, 2023
09bfd65
feat: update ASG blueprintdata
FacerAin Aug 10, 2023
eb56e78
feat: fix ASG blueprintdata
FacerAin Aug 10, 2023
207678e
[수정] ASG 블루프린트 업데이트 (#101)
Eeap Aug 10, 2023
e1e7abd
Merge remote-tracking branch 'origin/dev' into feat/blueprint
FacerAin Aug 10, 2023
a35b907
feat: update ASG blueprintdata
FacerAin Aug 10, 2023
0d14e4a
chore: delete console log
FacerAin Aug 10, 2023
9a7cb37
[수정] ASG 블루프린트 수정 (#102)
FacerAin Aug 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified src/assets/resources/blueprints/ASG.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 6 additions & 1 deletion src/components/aws/drawer/ASGDrawer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ const handleUpdate = (newTextValue, arg, type) => {
tempNodeData[arg] = Number(newTextValue.target.value);
}
};

const handleAMIUpdate = (value, arg) => {
tempNodeData[arg] = value.ImageId;
};
</script>
<template>
<v-card class="mx-auto">
Expand Down Expand Up @@ -72,7 +76,8 @@ const handleUpdate = (newTextValue, arg, type) => {
variant="underlined"
></v-text-field>
<v-combobox
v-model="tempNodeData.image_id"
:model-value="tempNodeData.image_id"
@update:model-value="handleAMIUpdate($event, 'image_id')"
:items="store.state.aws.ami"
item-title="ImageId"
item-value="ImageId"
Expand Down
19 changes: 9 additions & 10 deletions src/components/dashboard/BluePrint.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,30 +42,26 @@ const onClick = () => {
></v-img>
</v-row>

<v-row>
<v-row class="text-header">
<div>
Build Auto Scailing Group for scale
in-out.
Auto Scailing Group for scale in-out.
</div>
</v-row>
<v-row>
<div>
Resources <br />
<ul>
<li>Auto Scailing Group</li>
<li>Elastic Load Balancer</li>
</ul>
Build Auto Scailing Group using ELB and
ASG on AWS.
</div>
</v-row>
</v-container>
</div>
</div>
</v-card-item>
<v-card-actions>
<v-btn @click="onClick" class="save-btn"> 만들기 </v-btn>
<v-btn @click="showDialog = false" class="cancel-btn">
취소
</v-btn>
<v-btn @click="onClick" class="save-btn"> 만들기 </v-btn>
</v-card-actions>
</v-card>
</v-dialog>
Expand All @@ -74,7 +70,10 @@ const onClick = () => {

<style>
.text-header {
font-weight: normal;
padding-top: 10px;
font-weight: bolder;
}
.text-description {
}
.dialog-form {
min-width: 400px;
Expand Down
163 changes: 91 additions & 72 deletions src/components/dashboard/BluePrintData.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ export const blueprintData = {
{
type: 'vpc',
dimensions: {
width: 1170,
height: 482,
width: 1982,
height: 615,
},
handleBounds: {},
computedPosition: {
x: 0.31950791077292706,
y: 41.6640625,
x: -1855.6324619965342,
y: 80.46564188156685,
z: 0,
},
selected: false,
Expand All @@ -20,20 +20,20 @@ export const blueprintData = {
name: 'example-vpc',
cidr: '10.0.0.0/16',
publicsubnet: 2,
privatesubnet: 3,
azs: ['us-east-1c', 'us-east-1a'],
privatesubnet: 2,
azs: ['us-east-1a', 'us-east-1c'],
nat_gateway: true,
},
events: {},
id: '0',
position: {
x: 0.31950791077292706,
y: 41.6640625,
x: -1855.6324619965342,
y: 80.46564188156685,
},
label: 'vpc node',
style: {
width: '1170.228822720381px',
height: '482px',
width: '1982px',
height: '615px',
},
},
{
Expand All @@ -44,78 +44,90 @@ export const blueprintData = {
},
handleBounds: {},
computedPosition: {
x: 149.88787342763385,
y: 168.60615664309148,
x: -1650.7081218903063,
y: 232.25519569005633,
z: 2,
},
selected: false,
dragging: false,
resizing: false,
initialized: true,
parentNode: '3',
parentNode: '5',
data: {},
events: {},
id: '1',
position: {
x: 82.56836551686092,
y: 55.94209414309148,
x: 115.14796253588065,
y: 69.73612123228042,
},
label: 'privatesubnet node',
expandParent: true,
style: {
width: '177px',
height: '247px',
},
},
{
type: 'asg',
type: 'privatesubnet',
dimensions: {
width: 330,
height: 375,
width: 200,
height: 300,
},
handleBounds: {},
computedPosition: {
x: 67.31950791077293,
y: 112.6640625,
z: 1,
x: -1356.0074042137308,
y: 245.70949296239496,
z: 2,
},
selected: false,
dragging: false,
resizing: false,
initialized: true,
parentNode: '0',
data: {
min_size: 1,
max_size: 3,
desired_capacity: 2,
image_id: 'ami-053b0d53c279acc90',
instance_type: 't2.micro',
user_data: 'echo test',
parentNode: '5',
data: {},
events: {},
id: '2',
position: {
x: 409.8486802124562,
y: 83.19041850461906,
},
label: 'privatesubnet node',
expandParent: true,
},
{
type: 'publicsubnet',
dimensions: {
width: 200,
height: 300,
},
handleBounds: {},
computedPosition: {
x: -785.3653308985199,
y: 243.0665120464571,
z: 2,
},
selected: false,
dragging: false,
resizing: false,
initialized: true,
parentNode: '6',
data: {},
events: {},
id: '3',
position: {
x: 67,
y: 71,
x: 90.22475462421971,
y: 92.34109641418354,
},
label: 'asg node',
label: 'publicsubnet node',
expandParent: true,
style: {
width: '330px',
height: '375px',
},
},
{
type: 'privatesubnet',
type: 'publicsubnet',
dimensions: {
width: 317,
height: 376,
width: 200,
height: 300,
},
handleBounds: {},
computedPosition: {
x: 414.9831281936739,
y: 112.59341219531507,
z: 1,
x: -540.5695418664354,
y: 246.92741341081557,
z: 2,
},
selected: false,
dragging: false,
Expand All @@ -126,58 +138,61 @@ export const blueprintData = {
events: {},
id: '4',
position: {
x: 414.663620282901,
y: 70.92934969531507,
x: 335.0205436563042,
y: 96.20199777854202,
},
label: 'privatesubnet node',
label: 'publicsubnet node',
expandParent: true,
style: {
width: '317px',
height: '376px',
},
},
{
type: 'publicsubnet',
type: 'asg',
dimensions: {
width: 307,
height: 377,
width: 765,
height: 479,
},
handleBounds: {},
computedPosition: {
x: 770.7803164309155,
y: 113.2201257861833,
x: -1765.856084426187,
y: 162.5190744577759,
z: 1,
},
selected: false,
dragging: false,
resizing: false,
initialized: true,
parentNode: '6',
data: {},
parentNode: '0',
data: {
min_size: 1,
max_size: 3,
desired_capacity: 2,
image_id: 'ami-0ab38cce86671f3f0',
instance_type: 't2.nano',
user_data: 'echo "test"',
},
events: {},
id: '5',
position: {
x: 770.4608085201426,
y: 71.5560632861833,
x: 89.77637757034722,
y: 82.05343257620905,
},
label: 'publicsubnet node',
label: 'asg node',
expandParent: true,
style: {
width: '307px',
height: '377px',
width: '765px',
height: '479px',
},
},
{
type: 'alb',
dimensions: {
width: 200,
height: 300,
width: 654,
height: 506,
},
handleBounds: {},
computedPosition: {
x: 852.0460458433295,
y: 173.7761890723665,
z: 2,
x: -875.5900855227396,
y: 150.72541563227355,
z: 1,
},
selected: false,
dragging: false,
Expand All @@ -188,11 +203,15 @@ export const blueprintData = {
events: {},
id: '6',
position: {
x: 500.26572941241398,
y: 60.55606328618319,
x: 980.0423764737945,
y: 70.2597737507067,
},
label: 'alb node',
expandParent: true,
style: {
width: '654px',
height: '506px',
},
},
],
};
23 changes: 0 additions & 23 deletions src/components/dashboard/MainBottom.vue
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/styles/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,5 +153,5 @@ body,
height: 80%;
}
.container-size {
height: 100%;
height: 100vh;
}
4 changes: 0 additions & 4 deletions src/views/dashboard/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,12 @@
<v-row class="row-vueflow">
<v-col><NodePlane @nodeClicked="handleRightDrawer" /></v-col>
</v-row>
<v-row>
<v-col><MainBottom /></v-col>
</v-row>
</v-container>
</v-main>
</template>

<script setup>
import NodePlane from '@/components/node/NodePlane';
import MainBottom from '@/components/dashboard/MainBottom';
import DrawerInput from '@/components/aws/DrawerInput.vue';
import { ref } from 'vue';
import store from '@/store';
Expand Down
Loading