Skip to content

Commit a1750c9

Browse files
committed
[migrate] replace Fake Open-Source organization with Real Open-Source one
1 parent 1da03e2 commit a1750c9

File tree

12 files changed

+43
-44
lines changed

12 files changed

+43
-44
lines changed

ReadMe.md

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# Open Hackathon Platform - API service
1+
# Hackathon Open Platform - API service
22

33
[REST][1]ful API service scaffold based on [Node.js][2] & [TypeScript][3], which is a reimplement of [OHP API service v4](https://github.com/kaiyuanshe/open-hackathon-api).
44

5-
[![Deploy to Production environment](https://github.com/kaiyuanshe/OpenHackathon-service/actions/workflows/deploy-production.yml/badge.svg)][4]
5+
[![Deploy to Production environment](https://github.com/FreeCodeCamp-Chengdu/HOP-service/actions/workflows/deploy-production.yml/badge.svg)][4]
66

77
[![Deploy to Render](https://render.com/images/deploy-to-render-button.svg)][5]
88

@@ -45,7 +45,6 @@
4545
## Best practice
4646

4747
1. Install GitHub apps in your organization or account:
48-
4948
1. [Probot settings][17]: set up Issue labels & Pull Request rules
5049
2. [PR badge][18]: set up Online [VS Code][19] editor entries in Pull Request description
5150

@@ -61,10 +60,10 @@
6160

6261
## API Usage
6362

64-
- Entry: http://localhost:8080/
65-
- Document: http://localhost:8080/docs/
66-
- Schema: http://localhost:8080/docs/spec/
67-
- Type: https://github.com/kaiyuanshe/OpenHackathon-service/pkgs/npm/openhackathon-service
63+
- Entry: http://localhost:8080/
64+
- Document: http://localhost:8080/docs/
65+
- Schema: http://localhost:8080/docs/spec/
66+
- Type: https://github.com/FreeCodeCamp-Chengdu/HOP-service/pkgs/npm/hop-service
6867

6968
## Environment variables
7069

@@ -138,10 +137,10 @@ git push origin master --tags
138137
[1]: https://en.wikipedia.org/wiki/Representational_state_transfer
139138
[2]: https://nodejs.org/
140139
[3]: https://www.typescriptlang.org/
141-
[4]: https://github.com/kaiyuanshe/OpenHackathon-service/actions/workflows/deploy-production.yml
140+
[4]: https://github.com/FreeCodeCamp-Chengdu/HOP-service/actions/workflows/deploy-production.yml
142141
[5]: https://render.com/deploy
143-
[6]: https://codespaces.new/kaiyuanshe/openhackathon-service
144-
[7]: https://gitpod.io/?autostart=true#https://github.com/kaiyuanshe/OpenHackathon-service
142+
[6]: https://codespaces.new/FreeCodeCamp-Chengdu/hop-service
143+
[7]: https://gitpod.io/?autostart=true#https://github.com/FreeCodeCamp-Chengdu/HOP-service
145144
[8]: https://koajs.com/
146145
[9]: https://github.com/typestack/routing-controllers
147146
[10]: https://github.com/typestack/class-transformer
@@ -150,11 +149,11 @@ git push origin master --tags
150149
[13]: https://swagger.io/
151150
[14]: https://github.com/anttiviljami/openapi-backend
152151
[15]: https://jestjs.io/
153-
[16]: https://github.com/kaiyuanshe/Next-SSR-middleware
152+
[16]: https://github.com/idea2app/Next-SSR-middleware
154153
[17]: https://github.com/apps/settings
155154
[18]: https://pullrequestbadge.com/
156155
[19]: https://code.visualstudio.com/
157-
[20]: https://github.com/new?template_name=openhackathon-service&template_owner=kaiyuanshe
158-
[21]: https://github.com/kaiyuanshe/kaiyuanshe.github.io/blob/bb4675a56bf1d6b207231313da5ed0af7cf0ebd6/.github/workflows/pull-request.yml#L32-L56
159-
[22]: https://github.com/kaiyuanshe/OpenHackathon-service/issues/new/choose
160-
[23]: https://github.com/kaiyuanshe/OpenHackathon-service/projects
156+
[20]: https://github.com/new?template_name=hop-service&template_owner=FreeCodeCamp-Chengdu
157+
[21]: https://github.com/idea2app/Lark-Next-Bootstrap-ts/blob/80967ed49045af9dbcf4d3695a2c39d53a6f71f1/.github/workflows/pull-request.yml#L9-L11
158+
[22]: https://github.com/FreeCodeCamp-Chengdu/HOP-service/issues/new/choose
159+
[23]: https://github.com/FreeCodeCamp-Chengdu/HOP-service/projects

docker-compose.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: '3'
33
volumes:
44
database-data:
55
networks:
6-
kaiyuanshe:
6+
freecodecamp-chengdu:
77

88
services:
99
postgres:
@@ -13,18 +13,18 @@ services:
1313
volumes:
1414
- database-data:/var/lib/postgresql/data/
1515
networks:
16-
- kaiyuanshe
16+
- freecodecamp-chengdu
1717
restart: always
18-
openhackathon-service:
18+
hop-service:
1919
depends_on:
2020
- postgres
21-
image: kaiyuanshe/openhackathon-service
21+
image: freecodecamp-chengdu/hop-service
2222
environment:
2323
- NODE_ENV=production
2424
- DATABASE_URL=postgres://postgres:${JWT_SECRET}@postgres:5432/postgres
2525
- PORT=8080
2626
networks:
27-
- kaiyuanshe
27+
- freecodecamp-chengdu
2828
healthcheck:
2929
test: ['CMD-SHELL', 'curl -f http://localhost:8080/ || exit 1']
3030
interval: 3s
@@ -40,12 +40,12 @@ services:
4040
restart: always
4141
caddy:
4242
depends_on:
43-
- openhackathon-service
43+
- hop-service
4444
image: caddy
4545
ports:
4646
- 80:80
4747
- 443:443
4848
networks:
49-
- kaiyuanshe
49+
- freecodecamp-chengdu
5050
restart: always
51-
command: caddy reverse-proxy --from example.com --to openhackathon-service:8080
51+
command: caddy reverse-proxy --from example.com --to hop-service:8080

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "@kaiyuanshe/openhackathon-service",
2+
"name": "@freecodecamp-chengdu/hop-service",
33
"version": "1.0.0-rc.0",
44
"license": "LGPL-3.0",
55
"author": "shiy2008@gmail.com",
@@ -88,7 +88,7 @@
8888
},
8989
"scripts": {
9090
"prepare": "husky || true",
91-
"install": "get-git-folder https://github.com/kaiyuanshe/service-configuration main OpenHackathon-Web || true",
91+
"install": "get-git-folder https://github.com/freecodecamp-chengdu/service-configuration main HOP-Web || true",
9292
"dev": "cross-env TS_NODE_TRANSPILE_ONLY=true node -r ts-node/register --watch source/",
9393
"lint": "lint-staged",
9494
"build-test": "swagger-typescript-api generate -p http://localhost:8080/docs/spec -o test/ -n client.ts",
@@ -103,7 +103,7 @@
103103
"migration:run": "npm run typeorm -- migration:run",
104104
"upgrade:dev": "npm run migration:generate -- migration/version && npm run migration:run",
105105
"upgrade:pro": "cross-env NODE_ENV=production npm run migration:generate -- .data/version && npm run migration:run",
106-
"pack-image": "docker build -t kaiyuanshe/openhackathon-service:latest .",
107-
"container": "docker rm -f openhackathon-service && docker run --name openhackathon-service -p 8080:8080 -d kaiyuanshe/openhackathon-service:latest"
106+
"pack-image": "docker build -t freecodecamp-chengdu/hop-service:latest .",
107+
"container": "docker rm -f hop-service && docker run --name hop-service -p 8080:8080 -d freecodecamp-chengdu/hop-service:latest"
108108
}
109109
}

render.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
- type: web
3-
name: openhackathon-service-server
3+
name: hop-service-server
44
plan: free
55
runtime: node
66
buildCommand: npm install && npm run build
@@ -13,8 +13,8 @@ services:
1313
value: production
1414
- key: DATABASE_URL
1515
fromDatabase:
16-
name: openhackathon-service-data
16+
name: hop-service-data
1717
property: connectionString
1818
databases:
19-
- name: openhackathon-service-data
19+
- name: hop-service-data
2020
plan: free
File renamed without changes.

source/controller/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import { HackathonController } from './Hackathon';
1818
import { OauthController } from './OAuth';
1919
import { OrganizerController } from './Organizer';
2020
import { PlatformAdminController } from './PlatformAdmin';
21-
import { SurveyController } from './Questionnaire';
2221
import { StaffController } from './Staff';
22+
import { SurveyController } from './Survey';
2323
import { TeamController } from './Team';
2424
import { TeamMemberController } from './TeamMember';
2525
import { TeamWorkController } from './TeamWork';
@@ -37,8 +37,8 @@ export * from './Hackathon';
3737
export * from './OAuth';
3838
export * from './Organizer';
3939
export * from './PlatformAdmin';
40-
export * from './Questionnaire';
4140
export * from './Staff';
41+
export * from './Survey';
4242
export * from './Team';
4343
export * from './TeamMember';
4444
export * from './TeamWork';

source/model/ActivityLog.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import { GitTemplate } from './GitTemplate';
1717
import { Hackathon } from './Hackathon';
1818
import { Organizer } from './Organizer';
1919
import { PlatformAdmin } from './PlatformAdmin';
20-
import { Evaluation, Questionnaire, Standard } from './Questionnaire';
2120
import { Staff } from './Staff';
21+
import { Evaluation, Questionnaire, Standard } from './Survey';
2222
import { Team } from './Team';
2323
import { TeamMember } from './TeamMember';
2424
import { TeamWork } from './TeamWork';

source/model/Enrollment.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { Column, Entity } from 'typeorm';
1010

1111
import { ListChunk } from './Base';
1212
import { HackathonBase } from './Hackathon';
13-
import { Answer } from './Questionnaire';
13+
import { Answer } from './Survey';
1414
import { UserBaseFilter, UserInputData } from './User';
1515

1616
export enum EnrollmentStatus {

source/model/Questionnaire.ts renamed to source/model/Survey.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ export class Dimension {
7171
@IsInt()
7272
@Min(1)
7373
@IsOptional()
74-
maximuScore?: number = 10;
74+
maximumScore?: number = 10;
7575
}
7676

7777
@Entity()

source/model/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import { GitTemplate } from './GitTemplate';
1111
import { Hackathon } from './Hackathon';
1212
import { Organizer } from './Organizer';
1313
import { PlatformAdmin } from './PlatformAdmin';
14-
import { Evaluation, Questionnaire, Standard } from './Questionnaire';
1514
import { Staff } from './Staff';
15+
import { Evaluation, Questionnaire, Standard } from './Survey';
1616
import { Team } from './Team';
1717
import { TeamMember } from './TeamMember';
1818
import { TeamWork } from './TeamWork';
@@ -29,8 +29,8 @@ export * from './Hackathon';
2929
export * from './OAuth';
3030
export * from './Organizer';
3131
export * from './PlatformAdmin';
32-
export * from './Questionnaire';
3332
export * from './Staff';
33+
export * from './Survey';
3434
export * from './Team';
3535
export * from './TeamMember';
3636
export * from './TeamWork';

0 commit comments

Comments
 (0)