Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…storming-tool/r/eventstorming-ui-dev

# Conflicts:
#	.env
#	.gitignore
#	README.md
#	acebase/mydb.acebase/__auth__~accounts-access_token.idx
#	acebase/mydb.acebase/__auth__~accounts-email.idx
#	acebase/mydb.acebase/__auth__~accounts-username.idx
#	acebase/mydb.acebase/data.db
#	gateway/src/main/resources/application.yml
#	package.json
#	public/global-style.css
#	public/index.html
#	public/manifest.json
#	public/static/env.txt
#	public/static/external/vue-material.css
#	public/static/lib/opengraph/OpenGraph-0.1.3-SNAPSHOT.bac
#	public/static/lib/opengraph/OpenGraph-0.1.3-SNAPSHOT.js
#	src/App.vue
#	src/components/CommonStorageBase.vue
#	src/components/SeparatePanelComponents.vue
#	src/components/designer/CodeViewer.vue
#	src/components/designer/ModelerImageGenerator.vue
#	src/components/designer/gitAPIMenu.vue
#	src/components/designer/k8s-modeling/Clusters.vue
#	src/components/designer/k8s-modeling/ClustersBase.vue
#	src/components/designer/k8s-modeling/ClustersLocalStorage.vue
#	src/components/designer/k8s-modeling/KubeCodeViewer.vue
#	src/components/designer/k8s-modeling/KubeCommonPanel.vue
#	src/components/designer/k8s-modeling/KubeSubController.vue
#	src/components/designer/k8s-modeling/KubeYamlEditor.vue
#	src/components/designer/k8s-modeling/KubernetesModelCanvas.vue
#	src/components/designer/k8s-modeling/KubernetesPanel.vue
#	src/components/designer/k8s-modeling/LocalYamlEditor.vue
#	src/components/designer/k8s-modeling/argo-element/Application.vue
#	src/components/designer/k8s-modeling/argo-element/EventSource.vue
#	src/components/designer/k8s-modeling/argo-element/Rollout.vue
#	src/components/designer/k8s-modeling/argo-element/RolloutRelation.vue
#	src/components/designer/k8s-modeling/argo-element/Sensor.vue
#	src/components/designer/k8s-modeling/argo-element/Workflow.vue
#	src/components/designer/k8s-modeling/argo-element/WorkflowDag.vue
#	src/components/designer/k8s-modeling/argo-element/WorkflowStep.vue
#	src/components/designer/k8s-modeling/argo-element/WorkflowTemplate.vue
#	src/components/designer/k8s-modeling/element/CRD.vue
#	src/components/designer/k8s-modeling/element/CRDPropertyPanel.vue
#	src/components/designer/k8s-modeling/element/ClusterRole.vue
#	src/components/designer/k8s-modeling/element/ClusterRoleBinding.vue
#	src/components/designer/k8s-modeling/element/ClusterRoleBindingPropertyPanel.vue
#	src/components/designer/k8s-modeling/element/ClusterRolePropertyPanel.vue
#	src/components/designer/k8s-modeling/element/ConfigMap.vue
#	src/components/designer/k8s-modeling/element/ConfigMapPropertyPanel.vue
#	src/components/designer/k8s-modeling/element/CronJob.vue
#	src/components/designer/k8s-modeling/element/CronJobPropertyPanel.vue
#	src/components/designer/k8s-modeling/element/CustomResourceDefinition.vue
#	src/components/designer/k8s-modeling/element/CustomResourceDefinitionPropertyPanel.vue
#	src/components/designer/k8s-modeling/element/DaemonSet.vue
#	src/components/designer/k8s-modeling/element/DaemonSetPropertyPanel.vue
#	src/components/designer/k8s-modeling/element/Deployment.vue
#	src/components/designer/k8s-modeling/element/DeploymentPropertyPanel.vue
#	src/components/designer/k8s-modeling/element/HPA.vue
#	src/components/designer/k8s-modeling/element/HPAPanel.vue
#	src/components/designer/k8s-modeling/element/Ingress.vue
#	src/components/designer/k8s-modeling/element/IngressPropertyPanel.vue
#	src/components/designer/k8s-modeling/element/IngressToService.vue
#	src/components/designer/k8s-modeling/element/IngressToServicePanel.vue
#	src/components/designer/k8s-modeling/element/Job.vue
#	src/components/designer/k8s-modeling/element/JobPropertyPanel.vue
#	src/components/designer/k8s-modeling/element/KubeRelation.vue
#	src/components/designer/k8s-modeling/element/KubeRelationPanel.vue
#	src/components/designer/k8s-modeling/element/Namespace.vue
#	src/components/designer/k8s-modeling/element/NamespacePropertyPanel.vue
#	src/components/designer/k8s-modeling/element/PersistentVolume.vue
#	src/components/designer/k8s-modeling/element/PersistentVolumeClaim.vue
#	src/components/designer/k8s-modeling/element/PersistentVolumeClaimPropertyPanel.vue
#	src/components/designer/k8s-modeling/element/PersistentVolumePropertyPanel.vue
#	src/components/designer/k8s-modeling/element/Pod.vue
#	src/components/designer/k8s-modeling/element/PodPropertyPanel.vue
#	src/components/designer/k8s-modeling/element/ReplicaSet.vue
#	src/components/designer/k8s-modeling/element/ReplicaSetPropertyPanel.vue
#	src/components/designer/k8s-modeling/element/Role.vue
#	src/components/designer/k8s-modeling/element/RoleBinding.vue
#	src/components/designer/k8s-modeling/element/RoleBindingPropertyPanel.vue
#	src/components/designer/k8s-modeling/element/RolePropertyPanel.vue
#	src/components/designer/k8s-modeling/element/Secret.vue
#	src/components/designer/k8s-modeling/element/SecretPropertyPanel.vue
#	src/components/designer/k8s-modeling/element/Service.vue
#	src/components/designer/k8s-modeling/element/ServiceAccount.vue
#	src/components/designer/k8s-modeling/element/ServiceAccountPanel.vue
#	src/components/designer/k8s-modeling/element/ServicePropertyPanel.vue
#	src/components/designer/k8s-modeling/element/StatefulSet.vue
#	src/components/designer/k8s-modeling/element/StatefulSetPropertyPanel.vue
#	src/components/designer/k8s-modeling/element/StorageClass.vue
#	src/components/designer/k8s-modeling/element/StorageClassPropertyPanel.vue
#	src/components/designer/k8s-modeling/istio-element/DestinationRule.vue
#	src/components/designer/k8s-modeling/istio-element/DestinationRuleSubset.vue
#	src/components/designer/k8s-modeling/istio-element/Gateway.vue
#	src/components/designer/k8s-modeling/istio-element/MemQuota.vue
#	src/components/designer/k8s-modeling/istio-element/Quota.vue
#	src/components/designer/k8s-modeling/istio-element/QuotaSpec.vue
#	src/components/designer/k8s-modeling/istio-element/QuotaSpecBinding.vue
#	src/components/designer/k8s-modeling/istio-element/Rule.vue
#	src/components/designer/k8s-modeling/istio-element/ServiceEntry.vue
#	src/components/designer/k8s-modeling/istio-element/Sidecar.vue
#	src/components/designer/k8s-modeling/istio-element/VirtualService.vue
#	src/components/designer/k8s-modeling/istio-element/VirtualSeviceToDestinationRule.vue
#	src/components/designer/k8s-modeling/knative-element/Service.vue
#	src/components/designer/modeling/CodeGenerator.vue
#	src/components/designer/modeling/Element.vue
#	src/components/designer/modeling/ExpectedTemplateTestDialog.vue
#	src/components/designer/modeling/ModelCanvas.vue
#	src/components/designer/modeling/ModelCanvasShare.vue
#	src/components/designer/modeling/ModelCanvasShareDialog.vue
#	src/components/designer/modeling/ModelElement.vue
#	src/components/designer/modeling/ModelPanel.vue
#	src/components/designer/modeling/ModelStorageBase.vue
#	src/components/designer/modeling/ModelStorageDialog.vue
#	src/components/designer/modeling/StorageBase.vue
#	src/components/designer/modeling/StorageBaseAbstract.vue
#	src/components/designer/modeling/StorageBaseAceBase.vue
#	src/components/designer/modeling/StorageBaseAceBase_.vue
#	src/components/designer/modeling/StorageBaseComposition.vue
#	src/components/designer/modeling/generators/AIGenerator.js
#	src/components/oauth/GitlabRedirectPage.vue
#	src/components/oauth/Login.vue
#	src/components/oauth/LoginByAcebase.vue
#	src/components/oauth/LoginByGitlab.vue
#	src/components/opengraph/Opengraph.vue
#	src/components/opengraph/shape/EdgeElement.vue
#	src/components/opengraph/shape/GeometryElement.vue
#	src/components/opengraph/shape/GroupElement.vue
#	src/components/opengraph/shape/ImageElement.vue
#	src/components/opengraph/shape/OpengraphElement.vue
#	src/components/opengraph/shape/SubElements.vue
#	src/locales/en.json
#	src/locales/ko.json
#	src/main.js
#	src/plugins/vuetify.js
#	src/router.js
#	src/store.js
#	src/utils/Git.js
#	src/utils/GitAPI.js
#	src/utils/Github.js
#	src/utils/Gitlab.js
#	vue.config.js
#	webpack.config.js
  • Loading branch information
dhtns818 committed Nov 3, 2023
1 parent d5dab87 commit 24d5c3c
Show file tree
Hide file tree
Showing 597 changed files with 69,494 additions and 81,725 deletions.
Binary file modified acebase/mydb.acebase/data.db
Binary file not shown.
45 changes: 0 additions & 45 deletions gateway/.gitignore

This file was deleted.

6 changes: 0 additions & 6 deletions gateway/Dockerfile

This file was deleted.

85 changes: 0 additions & 85 deletions gateway/cloudbuild.yaml

This file was deleted.

21 changes: 0 additions & 21 deletions gateway/kubernetes/deployment.yml

This file was deleted.

13 changes: 0 additions & 13 deletions gateway/kubernetes/service.yaml

This file was deleted.

54 changes: 0 additions & 54 deletions gateway/pom.xml

This file was deleted.

70 changes: 39 additions & 31 deletions gateway/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ spring:
profiles: default
cloud:
gateway:
#<<< API Gateway / Routes
routes:
- id: tunneling
uri: http://localhost:8080
- id: java-reverse
uri: http://localhost:8099
predicates:
- Path=/api/**, /apis/**
- Path=/java-reverse/**,
- id: frontend
# uri: https://localhost:8081
uri: http://localhost:8081
predicates:
- Path=/**
#>>> API Gateway / Routes

globalcors:
corsConfigurations:
'[/**]':
Expand All @@ -30,31 +30,39 @@ spring:
allowCredentials: true


---
# ---

spring:
profiles: docker
cloud:
gateway:
routes:
- id: tunneling
uri: http://localhost:8080
predicates:
- Path=/api/**, /apis/**
- id: frontend
uri: http://localhost:8081
predicates:
- Path=/**
globalcors:
corsConfigurations:
'[/**]':
allowedOrigins:
- "*"
allowedMethods:
- "*"
allowedHeaders:
- "*"
allowCredentials: true
# spring:
# profiles: docker
# cloud:
# gateway:
# routes:
# - id: order
# uri: http://order:8080
# predicates:
# - Path=/orders/**,
# - id: product
# uri: http://product:8080
# predicates:
# - Path=/products/**,
# - id: delivery
# uri: http://delivery:8080
# predicates:
# - Path=/deliveries/**,
# - id: frontend
# uri: http://frontend:8080
# predicates:
# - Path=/**
# globalcors:
# corsConfigurations:
# '[/**]':
# allowedOrigins:
# - "*"
# allowedMethods:
# - "*"
# allowedHeaders:
# - "*"
# allowCredentials: true

server:
port: 8080
# server:
# port: 8080
Binary file removed mydb.acebase/__auth__~accounts-access_token.idx
Binary file not shown.
Binary file removed mydb.acebase/__auth__~accounts-email.idx
Binary file not shown.
Binary file removed mydb.acebase/__auth__~accounts-username.idx
Binary file not shown.
Binary file removed mydb.acebase/data.db
Binary file not shown.
6 changes: 0 additions & 6 deletions mydb.acebase/rules.json

This file was deleted.

Binary file removed public/favicon.ico
Binary file not shown.
Loading

0 comments on commit 24d5c3c

Please sign in to comment.