Skip to content

Commit

Permalink
feat: use new frontend
Browse files Browse the repository at this point in the history
  • Loading branch information
goxiaoy committed Jul 9, 2022
1 parent c7e238e commit b833ed8
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 11 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,22 +35,22 @@ Layout Repo( For creating new service): https://github.com/go-saas/kit-layout
### For Microservice

```
docker-compose -f docker-compose.yml -f docker-compose.ms.yml -f docker-compose.pulsar.yml -f docker-compose.tracing.yml up -d
docker-compose -f docker-compose.yml -f docker-compose.ms.yml -f docker-compose.kafka.yml -f docker-compose.tracing.yml up -d
```

Or with build
```
docker-compose -f docker-compose.yml -f docker-compose.ms.yml -f docker-compose.pulsar.yml -f docker-compose.tracing.yml up -d --build
docker-compose -f docker-compose.yml -f docker-compose.ms.yml -f docker-compose.kafka.yml -f docker-compose.tracing.yml up -d --build
```

### For Monolithic

```
docker-compose -f docker-compose.yml -f docker-compose.monolithic.yml -f docker-compose.pulsar.yml -f docker-compose.tracing.yml up -d
docker-compose -f docker-compose.yml -f docker-compose.monolithic.yml -f docker-compose.kafka.yml -f docker-compose.tracing.yml up -d
```
Or with build
```
docker-compose -f docker-compose.yml -f docker-compose.monolithic.yml -f docker-compose.pulsar.yml -f docker-compose.tracing.yml up -d --build
docker-compose -f docker-compose.yml -f docker-compose.monolithic.yml -f docker-compose.kafka.yml -f docker-compose.tracing.yml up -d --build
```

[//]: # (With hydra)
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '3.7'
services:

web:
image: ${DOCKER_REGISTRY}go-saas-kit-web:${DOCKER_TAG:-latest}
image: ${DOCKER_REGISTRY}go-saas-kit-frontend:${DOCKER_TAG:-latest}
restart: on-failure

api_docs:
Expand Down
12 changes: 6 additions & 6 deletions quickstart/configs/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ data:
topic: kit
group: golang
# If you would like to use kafka
# addr: kafka:9092
# type: kafka
type: pulsar
addr: pulsar://pulsar:6650
addr: kafka:9092
type: kafka
# type: pulsar
# addr: pulsar://pulsar:6650
saas:
group: saas-golang
user:
Expand All @@ -37,13 +37,13 @@ data:
blobs:
user:
provider: os
public_url: /
public_url: http://localhost
base_path: "assets/user"
os:
dir: ".assets"
saas:
provider: os
public_url: /
public_url: http://localhost
base_path: "assets/saas"
os:
dir: ".assets"
Expand Down
3 changes: 3 additions & 0 deletions user/private/service/role.go
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,9 @@ func (s *RoleService) UpdateRole(ctx context.Context, req *pb.UpdateRoleRequest)
if r == nil {
return nil, errors.NotFound("", "")
}
if r.IsPreserved {
return nil, pb.ErrorRolePreserved("")
}
r.Name = req.Role.Name
if err := s.mgr.Update(ctx, r.ID.String(), r, nil); err != nil {
return nil, err
Expand Down

0 comments on commit b833ed8

Please sign in to comment.