Skip to content

Commit

Permalink
Merge pull request #264 from podkrepi-bg/renaming-github-org-to-podkr…
Browse files Browse the repository at this point in the history
…epi.bg

renamed: github organization from daritelska-platforma to podkrepi-bg as per #173
  • Loading branch information
kachar authored Jun 14, 2021
2 parents 7b15b21 + 12e7573 commit 5ffa57a
Show file tree
Hide file tree
Showing 25 changed files with 96 additions and 77 deletions.
8 changes: 4 additions & 4 deletions .env.dev
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ COMPOSE_PATH_SEPARATOR=":"
COMPOSE_PROJECT_NAME=podkrepi
COMPOSE_FILE=docker-compose.yml:docker-compose.dev.yml

WEB_DEPLOY_IMAGE=ghcr.io/daritelska-platforma/frontend/web
API_DEPLOY_IMAGE=ghcr.io/daritelska-platforma/frontend/api
FLYWAY_DEPLOY_IMAGE=ghcr.io/daritelska-platforma/frontend/flyway
CAMPAIGN_DEPLOY_IMAGE=ghcr.io/daritelska-platforma/frontend/campaign
WEB_DEPLOY_IMAGE=ghcr.io/podkrepi-bg/frontend/web
API_DEPLOY_IMAGE=ghcr.io/podkrepi-bg/frontend/api
FLYWAY_DEPLOY_IMAGE=ghcr.io/podkrepi-bg/frontend/flyway
CAMPAIGN_DEPLOY_IMAGE=ghcr.io/podkrepi-bg/frontend/campaign

DEPLOY_TAG=local

Expand Down
8 changes: 4 additions & 4 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ COMPOSE_PATH_SEPARATOR=":"
COMPOSE_PROJECT_NAME=podkrepi
COMPOSE_FILE=docker-compose.yml:docker-compose.dev.yml

WEB_DEPLOY_IMAGE=ghcr.io/daritelska-platforma/frontend/web
API_DEPLOY_IMAGE=ghcr.io/daritelska-platforma/frontend/api
FLYWAY_DEPLOY_IMAGE=ghcr.io/daritelska-platforma/frontend/flyway
CAMPAIGN_DEPLOY_IMAGE=ghcr.io/daritelska-platforma/frontend/campaign
WEB_DEPLOY_IMAGE=ghcr.io/podkrepi-bg/frontend/web
API_DEPLOY_IMAGE=ghcr.io/podkrepi-bg/frontend/api
FLYWAY_DEPLOY_IMAGE=ghcr.io/podkrepi-bg/frontend/flyway
CAMPAIGN_DEPLOY_IMAGE=ghcr.io/podkrepi-bg/frontend/campaign

DEPLOY_TAG=local

Expand Down
8 changes: 4 additions & 4 deletions .env.prod
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
COMPOSE_PROJECT_NAME=podkrepi
COMPOSE_FILE=docker-compose.yml:docker-compose.prod.yml

WEB_DEPLOY_IMAGE=ghcr.io/daritelska-platforma/frontend/web
API_DEPLOY_IMAGE=ghcr.io/daritelska-platforma/frontend/api
FLYWAY_DEPLOY_IMAGE=ghcr.io/daritelska-platforma/frontend/flyway
CAMPAIGN_DEPLOY_IMAGE=ghcr.io/daritelska-platforma/frontend/campaigns
WEB_DEPLOY_IMAGE=ghcr.io/podkrepi-bg/frontend/web
API_DEPLOY_IMAGE=ghcr.io/podkrepi-bg/frontend/api
FLYWAY_DEPLOY_IMAGE=ghcr.io/podkrepi-bg/frontend/flyway
CAMPAIGN_DEPLOY_IMAGE=ghcr.io/podkrepi-bg/frontend/campaigns

DEPLOY_TAG=

Expand Down
8 changes: 4 additions & 4 deletions .env.staging
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
COMPOSE_PROJECT_NAME=podkrepi-dev
COMPOSE_FILE=docker-compose.yml:docker-compose.prod.yml

WEB_DEPLOY_IMAGE=ghcr.io/daritelska-platforma/frontend/nightly/web
API_DEPLOY_IMAGE=ghcr.io/daritelska-platforma/frontend/nightly/api
FLYWAY_DEPLOY_IMAGE=ghcr.io/daritelska-platforma/frontend/nightly/flyway
CAMPAIGN_DEPLOY_IMAGE=ghcr.io/daritelska-platforma/frontend/nightly/campaigns
WEB_DEPLOY_IMAGE=ghcr.io/podkrepi-bg/frontend/nightly/web
API_DEPLOY_IMAGE=ghcr.io/podkrepi-bg/frontend/nightly/api
FLYWAY_DEPLOY_IMAGE=ghcr.io/podkrepi-bg/frontend/nightly/flyway
CAMPAIGN_DEPLOY_IMAGE=ghcr.io/podkrepi-bg/frontend/nightly/campaigns

DEPLOY_TAG=

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
blank_issues_enabled: true
contact_links:
- name: Ask Question
url: https://github.com/daritelska-platforma/frontend/discussions
url: https://github.com/podkrepi-bg/frontend/discussions
about: Ask technical questions
- name: Join Discord
url: https://discord.gg/pwkfzvPBSm
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ jobs:
- name: Push image to GitHub Container Registry
id: push-image-to-registry
run: |
IMAGE_ID=ghcr.io/daritelska-platforma/frontend/nightly/$IMAGE_NAME
IMAGE_ID=ghcr.io/podkrepi-bg/frontend/nightly/$IMAGE_NAME
# Change all uppercase to lowercase
IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ jobs:
- name: Push image to GitHub Container Registry
id: push-image-to-registry
run: |
IMAGE_ID=ghcr.io/daritelska-platforma/frontend/$IMAGE_NAME
IMAGE_ID=ghcr.io/podkrepi-bg/frontend/$IMAGE_NAME
# Change all uppercase to lowercase
IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
Expand Down
14 changes: 12 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Table of contents:
### Setup local dev environment

```shell
git clone git@github.com:daritelska-platforma/frontend.git
git clone https://github.com/podkrepi-bg/frontend
cd frontend

# Symlink dev environment
Expand All @@ -33,6 +33,16 @@ ln -hfs .env.dev .env
yarn
```

### NOTE! For existing clones update github remote to podkrepi-bg/frontend
```
# View existing remotes
git remote -v
# Change the 'origin' remote's URL
git remote set-url origin https://github.com/podkrepi-bg/frontend
# Check updated remotes
git remote -v
```

### Start development server

```shell
Expand Down Expand Up @@ -454,7 +464,7 @@ export default Page

We're integrated with <https://allcontributors.org/> bot

Comment on [this issue](https://github.com/daritelska-platforma/frontend/issues/2), asking @all-contributors bot to add a contributor:
Comment on [this issue](https://github.com/podkrepi-bg/frontend/issues/2), asking @all-contributors bot to add a contributor:

```
@all-contributors please add @<username> for <contributions>
Expand Down
63 changes: 36 additions & 27 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# Дарителска Платформа Подкрепи.бг

![Lint](https://github.com/daritelska-platforma/frontend/workflows/Lint/badge.svg)
![Build](https://github.com/daritelska-platforma/frontend/workflows/Build/badge.svg)
![Build docker image](https://github.com/daritelska-platforma/frontend/workflows/Build%20docker%20image/badge.svg)
![Lint](https://github.com/podkrepi-bg/frontend/workflows/Lint/badge.svg)
![Build](https://github.com/podkrepi-bg/frontend/workflows/Build/badge.svg)
![Build docker image](https://github.com/podkrepi-bg/frontend/workflows/Build%20docker%20image/badge.svg)

[![Nightly deployment](https://github.com/daritelska-platforma/frontend/actions/workflows/deploy-nightly.yml/badge.svg)](https://github.com/daritelska-platforma/frontend/actions/workflows/deploy-nightly.yml)
[![Prod deployment](https://github.com/daritelska-platforma/frontend/actions/workflows/deploy-prod.yml/badge.svg)](https://github.com/daritelska-platforma/frontend/actions/workflows/deploy-prod.yml)
[![Nightly deployment](https://github.com/podkrepi-bg/frontend/actions/workflows/deploy-nightly.yml/badge.svg)](https://github.com/podkrepi-bg/frontend/actions/workflows/deploy-nightly.yml)
[![Prod deployment](https://github.com/podkrepi-bg/frontend/actions/workflows/deploy-prod.yml/badge.svg)](https://github.com/podkrepi-bg/frontend/actions/workflows/deploy-prod.yml)

![Dependencies](https://img.shields.io/david/daritelska-platforma/frontend?path=frontend)
![Dev Dependencies](https://img.shields.io/david/dev/daritelska-platforma/frontend?path=frontend)
![](https://img.shields.io/github/license/daritelska-platforma/frontend?path=frontend)
![](https://img.shields.io/github/issues/daritelska-platforma/frontend?path=frontend)
![Dependencies](https://img.shields.io/david/podkrepi-bg/frontend?path=frontend)
![Dev Dependencies](https://img.shields.io/david/dev/podkrepi-bg/frontend?path=frontend)
![](https://img.shields.io/github/license/podkrepi-bg/frontend?path=frontend)
![](https://img.shields.io/github/issues/podkrepi-bg/frontend?path=frontend)

<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
[![All Contributors](https://img.shields.io/badge/all_contributors-22-orange.svg?style=flat-square)](#contributors-)
Expand All @@ -34,18 +34,27 @@
## Initial setup

```shell
git clone git@github.com:daritelska-platforma/frontend.git
git clone https://github.com/podkrepi-bg/frontend
cd frontend

# Symlink dev environment
ln -s .env.dev .env
ln -hfs .env.dev .env

# Symlink dev environment on Windows
mklink .env .env.dev
```

## Development
### NOTE! For existing clones update github remote to podkrepi-bg/frontend
```
# View existing remotes
git remote -v
# Change the 'origin' remote's URL
git remote set-url origin https://github.com/podkrepi-bg/frontend
# Check updated remotes
git remote -v
```

## Development
```shell
docker-compose up -d
```
Expand All @@ -54,20 +63,20 @@ Visit <http://localhost:3040/>

## Contributors ✨

Please check [contributors guide](https://github.com/daritelska-platforma/frontend/blob/master/CONTRIBUTING.md) for:

- [Development setup](https://github.com/daritelska-platforma/frontend/blob/master/CONTRIBUTING.md#development)
- [Linting](https://github.com/daritelska-platforma/frontend/blob/master/CONTRIBUTING.md#linting)
- [Production setup](https://github.com/daritelska-platforma/frontend/blob/master/CONTRIBUTING.md#production)
- [Pull requests guidelines](https://github.com/daritelska-platforma/frontend/blob/master/CONTRIBUTING.md#pull-requests)
- [Branching strategy](https://github.com/daritelska-platforma/frontend/blob/master/CONTRIBUTING.md#branching-strategy)
- [React guidelines](https://github.com/daritelska-platforma/frontend/blob/master/CONTRIBUTING.md#react-guidelines)
- [Imports](https://github.com/daritelska-platforma/frontend/blob/master/CONTRIBUTING.md#imports)
- [File structure](https://github.com/daritelska-platforma/frontend/blob/master/CONTRIBUTING.md#file-structure)
- [Types](https://github.com/daritelska-platforma/frontend/blob/master/CONTRIBUTING.md#types)
- [Components definition](https://github.com/daritelska-platforma/frontend/blob/master/CONTRIBUTING.md#components)
- [Styles](https://github.com/daritelska-platforma/frontend/blob/master/CONTRIBUTING.md#styles)
- [Translations](https://github.com/daritelska-platforma/frontend/blob/master/CONTRIBUTING.md#translations-i18n)
Please check [contributors guide](https://github.com/podkrepi-bg/frontend/blob/master/CONTRIBUTING.md) for:

- [Development setup](https://github.com/podkrepi-bg/frontend/blob/master/CONTRIBUTING.md#development)
- [Linting](https://github.com/podkrepi-bg/frontend/blob/master/CONTRIBUTING.md#linting)
- [Production setup](https://github.com/podkrepi-bg/frontend/blob/master/CONTRIBUTING.md#production)
- [Pull requests guidelines](https://github.com/podkrepi-bg/frontend/blob/master/CONTRIBUTING.md#pull-requests)
- [Branching strategy](https://github.com/podkrepi-bg/frontend/blob/master/CONTRIBUTING.md#branching-strategy)
- [React guidelines](https://github.com/podkrepi-bg/frontend/blob/master/CONTRIBUTING.md#react-guidelines)
- [Imports](https://github.com/podkrepi-bg/frontend/blob/master/CONTRIBUTING.md#imports)
- [File structure](https://github.com/podkrepi-bg/frontend/blob/master/CONTRIBUTING.md#file-structure)
- [Types](https://github.com/podkrepi-bg/frontend/blob/master/CONTRIBUTING.md#types)
- [Components definition](https://github.com/podkrepi-bg/frontend/blob/master/CONTRIBUTING.md#components)
- [Styles](https://github.com/podkrepi-bg/frontend/blob/master/CONTRIBUTING.md#styles)
- [Translations](https://github.com/podkrepi-bg/frontend/blob/master/CONTRIBUTING.md#translations-i18n)

Thanks goes to these wonderful people:

Expand Down Expand Up @@ -112,6 +121,6 @@ Thanks goes to these wonderful people:

<!-- ALL-CONTRIBUTORS-LIST:END -->

If you want to be added or removed from this list please follow up on [this issue](https://github.com/daritelska-platforma/frontend/issues/2).
If you want to be added or removed from this list please follow up on [this issue](https://github.com/podkrepi-bg/frontend/issues/2).

This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind are welcome!
2 changes: 1 addition & 1 deletion backend/contact/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/daritelska-platforma/v2
module github.com/podkrepi-bg/v2

go 1.16

Expand Down
12 changes: 6 additions & 6 deletions backend/contact/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import (
"fmt"
"log"

"github.com/daritelska-platforma/v2/api"
"github.com/daritelska-platforma/v2/api/config"
"github.com/daritelska-platforma/v2/database"
"github.com/daritelska-platforma/v2/routes/contact"
"github.com/daritelska-platforma/v2/routes/healthcheck"
"github.com/daritelska-platforma/v2/routes/support_request"
"github.com/podkrepi-bg/v2/api"
"github.com/podkrepi-bg/v2/api/config"
"github.com/podkrepi-bg/v2/database"
"github.com/podkrepi-bg/v2/routes/contact"
"github.com/podkrepi-bg/v2/routes/healthcheck"
"github.com/podkrepi-bg/v2/routes/support_request"

"github.com/asaskevich/govalidator"
"github.com/gofiber/fiber/v2"
Expand Down
2 changes: 1 addition & 1 deletion backend/contact/routes/contact/contact.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"errors"

"github.com/asaskevich/govalidator"
"github.com/daritelska-platforma/v2/database"
"github.com/podkrepi-bg/v2/database"
"github.com/gofiber/fiber/v2"
"github.com/google/uuid"
_ "gorm.io/driver/postgres"
Expand Down
2 changes: 1 addition & 1 deletion backend/contact/routes/healthcheck/healthcheck.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package healthcheck

import (
"github.com/daritelska-platforma/v2/database"
"github.com/podkrepi-bg/v2/database"

"github.com/gofiber/fiber/v2"
)
Expand Down
2 changes: 1 addition & 1 deletion backend/contact/routes/support_request/support_request.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"errors"

"github.com/asaskevich/govalidator"
"github.com/daritelska-platforma/v2/database"
"github.com/podkrepi-bg/v2/database"

"github.com/gofiber/fiber/v2"
"github.com/google/uuid"
Expand Down
2 changes: 1 addition & 1 deletion backend/graphql-gateway/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/daritelska-platforma/graphql-gateway
module github.com/podkrepi-bg/graphql-gateway

go 1.16

Expand Down
8 changes: 4 additions & 4 deletions backend/graphql-gateway/gqlgen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ resolver:
# gqlgen will search for any type names in the schema in these go packages
# if they match it will use them, otherwise it will generate them.
autobind:
- 'github.com/daritelska-platforma/graphql-gateway/graph/model'
- 'github.com/podkrepi-bg/graphql-gateway/graph/model'

# This section declares type mapping between the GraphQL and go type systems
#
Expand All @@ -46,7 +46,7 @@ models:
# UUID:
# model:
# - github.com/google/uuid.UUID
# - github.com/daritelska-platforma/graphql-gateway/graph.UUID
# - github.com/podkrepi-bg/graphql-gateway/graph.UUID
ID:
model:
- github.com/99designs/gqlgen/graphql.ID
Expand All @@ -61,8 +61,8 @@ models:

## AccountService
Account:
model: [github.com/daritelska-platforma/graphql-gateway/pb/account.Account]
model: [github.com/podkrepi-bg/graphql-gateway/pb/account.Account]
CreateAccount:
model: [github.com/daritelska-platforma/graphql-gateway/pb/account.CreateAccountRequest]
model: [github.com/podkrepi-bg/graphql-gateway/pb/account.CreateAccountRequest]

## CampaignService
4 changes: 2 additions & 2 deletions backend/graphql-gateway/graph/generated/generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion backend/graphql-gateway/graph/model/models_gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion backend/graphql-gateway/graph/resolver.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package graph

import "github.com/daritelska-platforma/graphql-gateway/pb/account"
import "github.com/podkrepi-bg/graphql-gateway/pb/account"

// This file will not be regenerated automatically.
//
Expand Down
6 changes: 3 additions & 3 deletions backend/graphql-gateway/graph/schema.resolvers.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"context"
"fmt"

"github.com/daritelska-platforma/graphql-gateway/graph/generated"
"github.com/daritelska-platforma/graphql-gateway/graph/model"
"github.com/daritelska-platforma/graphql-gateway/pb/account"
"github.com/podkrepi-bg/graphql-gateway/graph/generated"
"github.com/podkrepi-bg/graphql-gateway/graph/model"
"github.com/podkrepi-bg/graphql-gateway/pb/account"
)

func (r *mutationResolver) CreateAccount(ctx context.Context, input account.CreateAccountRequest) (*account.Account, error) {
Expand Down
6 changes: 3 additions & 3 deletions backend/graphql-gateway/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (

"github.com/99designs/gqlgen/graphql/handler"
"github.com/99designs/gqlgen/graphql/playground"
"github.com/daritelska-platforma/graphql-gateway/graph"
"github.com/daritelska-platforma/graphql-gateway/graph/generated"
"github.com/daritelska-platforma/graphql-gateway/pb/account"
"github.com/podkrepi-bg/graphql-gateway/graph"
"github.com/podkrepi-bg/graphql-gateway/graph/generated"
"github.com/podkrepi-bg/graphql-gateway/pb/account"
"github.com/kelseyhightower/envconfig"
"google.golang.org/grpc"
)
Expand Down
2 changes: 1 addition & 1 deletion backend/module-accounts/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/daritelska-platforma/accounts/v2
module github.com/podkrepi-bg/accounts/v2

go 1.16

Expand Down
2 changes: 1 addition & 1 deletion backend/module-accounts/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"os"
"time"

"github.com/daritelska-platforma/accounts/v2/pb/account"
"github.com/podkrepi-bg/accounts/v2/pb/account"
"github.com/google/uuid"
"google.golang.org/grpc"
"google.golang.org/grpc/reflection"
Expand Down
2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "frontend",
"version": "0.0.1",
"license": "MIT",
"repository": "https://github.com/orgs/daritelska-platforma",
"repository": "https://github.com/orgs/podkrepi-bg",
"scripts": {
"dev": "yarn && next -p 3040",
"build": "next build",
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/common/routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export const baseUrl = APP_URL
export const defaultOgImage = `${baseUrl}/img/og-image.jpg`

export const staticUrls = {
github: 'https://github.com/daritelska-platforma/frontend',
github: 'https://github.com/podkrepi-bg/frontend',
docs: 'https://docs.podkrepi.bg/',
devDocs: 'https://docs.podkrepi.bg/development',
}
Expand Down

0 comments on commit 5ffa57a

Please sign in to comment.