Skip to content

Commit

Permalink
use teammapper name instead of mindmapper (#44)
Browse files Browse the repository at this point in the history
  • Loading branch information
JannikStreek authored Jan 8, 2022
1 parent 5095927 commit 5230d90
Show file tree
Hide file tree
Showing 236 changed files with 202 additions and 195 deletions.
22 changes: 11 additions & 11 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ ca/*.req
docker-compose*
Dockerfile*
LICENSE
mindmapper-backend/client-build
mindmapper-backend/dist
mindmapper-backend/LICENSE
mindmapper-backend/node_modules
mindmapper-backend/npm-debug.log
mindmapper-backend/README.md
mindmapper-frontend/dist
mindmapper-frontend/LICENSE
mindmapper-frontend/node_modules
mindmapper-frontend/npm-debug.log
mindmapper-frontend/README.md
teammapper-backend/client-build
teammapper-backend/dist
teammapper-backend/LICENSE
teammapper-backend/node_modules
teammapper-backend/npm-debug.log
teammapper-backend/README.md
teammapper-frontend/dist
teammapper-frontend/LICENSE
teammapper-frontend/node_modules
teammapper-frontend/npm-debug.log
teammapper-frontend/README.md
README.md
12 changes: 6 additions & 6 deletions .env.default
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
APP_BACKEND_PORT=3000
APP_FRONTEND_PORT=4200

POSTGRES_DB=mindmapper-backend-dev
POSTGRES_PASSWORD=mindmapper-password
POSTGRES_DB=teammapper-backend-dev
POSTGRES_PASSWORD=teammapper-password
POSTGRES_PORT=5432
POSTGRES_SSL=false
POSTGRES_USER=mindmapper-user
POSTGRES_USER=teammapper-user

DOCKER_COMPOSE_APP_ENV_POSTGRES_TEST_DATABASE=mindmapper-backend-test
DOCKER_COMPOSE_APP_ENV_POSTGRES_TEST_DATABASE=teammapper-backend-test
DOCKER_COMPOSE_APP_ENV_POSTGRES_TEST_HOST=postgres
DOCKER_COMPOSE_APP_ENV_POSTGRES_TEST_PASSWORD=mindmapper-password
DOCKER_COMPOSE_APP_ENV_POSTGRES_TEST_PASSWORD=teammapper-password
DOCKER_COMPOSE_APP_ENV_POSTGRES_TEST_PORT=5432
DOCKER_COMPOSE_APP_ENV_POSTGRES_TEST_USER=mindmapper-user
DOCKER_COMPOSE_APP_ENV_POSTGRES_TEST_USER=teammapper-user

# Environment Variables PRODUCTION
APP_PROD_PORT=3011
Expand Down
32 changes: 16 additions & 16 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
- main

jobs:
mindmapper-backend-build:
teammapper-backend-build:
runs-on: ubuntu-latest

steps:
Expand All @@ -35,26 +35,26 @@ jobs:
tags: |
ghcr.io/b310-digital/mindmapper:latest
mindmapper-backend-lint:
teammapper-backend-lint:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- run: npm --prefix mindmapper-backend ci
- run: npm --prefix teammapper-backend ci

- run: npm --prefix mindmapper-backend run lint
- run: npm --prefix teammapper-backend run lint

mindmapper-backend-test-e2e:
teammapper-backend-test-e2e:
runs-on: ubuntu-latest

services:
postgres:
image: postgres:10.8
env:
POSTGRES_USER: mindmapper-user
POSTGRES_PASSWORD: mindmapper-password
POSTGRES_DB: mindmapper-backend-test
POSTGRES_USER: teammapper-user
POSTGRES_PASSWORD: teammapper-password
POSTGRES_DB: teammapper-backend-test
ports:
# Will assign a random free host port
- 5432/tcp
Expand All @@ -64,18 +64,18 @@ jobs:
steps:
- uses: actions/checkout@v2

- run: npm --prefix mindmapper-backend ci
- run: npm --prefix teammapper-backend ci

- run: npm --prefix mindmapper-backend run test:e2e
- run: npm --prefix teammapper-backend run test:e2e
env:
POSTGRES_DATABASE: "mindmapper-backend-test"
POSTGRES_DATABASE: "teammapper-backend-test"
POSTGRES_HOST: "localhost"
POSTGRES_PASSWORD: "mindmapper-password"
POSTGRES_PASSWORD: "teammapper-password"
POSTGRES_PORT: ${{ job.services.postgres.ports[5432] }}
POSTGRES_SSL: false
POSTGRES_TEST_DATABASE: "mindmapper-backend-test"
POSTGRES_TEST_DATABASE: "teammapper-backend-test"
POSTGRES_TEST_HOST: "localhost"
POSTGRES_TEST_PASSWORD: "mindmapper-password"
POSTGRES_TEST_PASSWORD: "teammapper-password"
POSTGRES_TEST_PORT: ${{ job.services.postgres.ports[5432] }}
POSTGRES_TEST_USER: "mindmapper-user"
POSTGRES_USER: "mindmapper-user"
POSTGRES_TEST_USER: "teammapper-user"
POSTGRES_USER: "teammapper-user"
28 changes: 14 additions & 14 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,36 +3,36 @@ FROM node:16.13.1-alpine3.14 as base
USER node

ENV APP_PATH=/home/node/app
ENV APP_BACKEND_PATH=${APP_PATH}/mindmapper-backend
ENV APP_FRONTEND_PATH=${APP_PATH}/mindmapper-frontend
ENV APP_BACKEND_PATH=${APP_PATH}/teammapper-backend
ENV APP_FRONTEND_PATH=${APP_PATH}/teammapper-frontend

RUN mkdir -p $APP_PATH
WORKDIR $APP_PATH

FROM base as production_buildstage
USER node

COPY --chown=node:node mindmapper-backend/package.json mindmapper-backend/package-lock.json $APP_BACKEND_PATH/
RUN npm --prefix mindmapper-backend install
COPY --chown=node:node teammapper-backend/package.json teammapper-backend/package-lock.json $APP_BACKEND_PATH/
RUN npm --prefix teammapper-backend install

COPY --chown=node:node mindmapper-frontend/package.json mindmapper-frontend/package-lock.json $APP_FRONTEND_PATH/
RUN npm --prefix mindmapper-frontend install
COPY --chown=node:node teammapper-frontend/package.json teammapper-frontend/package-lock.json $APP_FRONTEND_PATH/
RUN npm --prefix teammapper-frontend install

COPY --chown=node:node package.json $APP_PATH/

COPY --chown=node:node mindmapper-backend $APP_BACKEND_PATH/
COPY --chown=node:node teammapper-backend $APP_BACKEND_PATH/
RUN npm run build:backend:prod

COPY --chown=node:node mindmapper-frontend $APP_FRONTEND_PATH/
COPY --chown=node:node teammapper-frontend $APP_FRONTEND_PATH/
RUN GENERATE_SOURCEMAP=false npm run build:frontend:prod

FROM base as production
USER node

COPY --chown=node:node package.json $APP_PATH/

COPY --chown=node:node mindmapper-backend/package.json mindmapper-backend/package-lock.json $APP_BACKEND_PATH/
RUN npm --prefix mindmapper-backend install --production
COPY --chown=node:node teammapper-backend/package.json teammapper-backend/package-lock.json $APP_BACKEND_PATH/
RUN npm --prefix teammapper-backend install --production

COPY --chown=node:node --from=production_buildstage $APP_BACKEND_PATH/dist $APP_BACKEND_PATH/dist
COPY --chown=node:node --from=production_buildstage $APP_FRONTEND_PATH/dist $APP_BACKEND_PATH/client
Expand All @@ -43,8 +43,8 @@ CMD ["./entrypoint.prod.sh"]
FROM base as development
USER node

COPY --chown=node:node mindmapper-frontend/package.json mindmapper-frontend/package-lock.json $APP_FRONTEND_PATH/
RUN npm --prefix mindmapper-frontend install
COPY --chown=node:node teammapper-frontend/package.json teammapper-frontend/package-lock.json $APP_FRONTEND_PATH/
RUN npm --prefix teammapper-frontend install

COPY --chown=node:node mindmapper-backend/package.json mindmapper-backend/package-lock.json $APP_BACKEND_PATH/
RUN npm --prefix mindmapper-backend install
COPY --chown=node:node teammapper-backend/package.json teammapper-backend/package-lock.json $APP_BACKEND_PATH/
RUN npm --prefix teammapper-backend install
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Mindmapper
# teammapper

Mindmapping made simple: Host and create your own mindmaps. Share your mindmap sessions with others and collaborate on mindmaps.

Mindmapper is based on mindmapp (https://github.com/cedoor/mindmapp , discontinued). In contrast to mindmapp, mindmapper features shared mindmapping sessions with multiple users based on websockets.
teammapper is based on mindmapp (https://github.com/cedoor/mindmapp , discontinued). In contrast to mindmapp, teammapper features shared mindmapping sessions with multiple users based on websockets.

## Features:

Expand All @@ -28,7 +28,7 @@ Mindmapper is based on mindmapp (https://github.com/cedoor/mindmapp , discontinu
```bash
docker-compose exec app sh
# Inside docker container, you execute the following
npm --prefix mindmapper-backend run dev
npm --prefix teammapper-backend run dev
```

or start frontend and backend separately
Expand All @@ -37,10 +37,10 @@ Mindmapper is based on mindmapp (https://github.com/cedoor/mindmapp , discontinu
# Open to terminal session on your host machine
# I first terminal session
docker-compose exec app npm --prefix mindmapper-backend start
docker-compose exec app npm --prefix teammapper-backend start
# I second terminal session
docker-compose exec app npm --prefix mindmapper-frontend start
docker-compose exec app npm --prefix teammapper-frontend start
```

- Visit the frontend in http://localhost:4200
Expand All @@ -50,13 +50,13 @@ Mindmapper is based on mindmapp (https://github.com/cedoor/mindmapp , discontinu
- Create a test database

```bash
docker-compose exec postgres createdb -e -U mindmapper-user -W mindmapper-backend-test
docker-compose exec postgres createdb -e -U teammapper-user -W teammapper-backend-test
```

- Execute the tests

```bash
docker-compose exec app npm -prefix mindmapper-backend run test:e2e
docker-compose exec app npm -prefix teammapper-backend run test:e2e
```

### Production
Expand Down Expand Up @@ -86,7 +86,7 @@ Mindmapper is based on mindmapp (https://github.com/cedoor/mindmapp , discontinu
docker-compose --file docker-compose-prod.yml --env-file .env.prod up -d --build --force-recreate
```

- Go to `http://localhost` to open up mindmapper
- Go to `http://localhost` to open up teammapper
- Optional:

If you want to make sure, to include the most recent updates, run first:
Expand Down Expand Up @@ -126,8 +126,8 @@ Mindmapper is based on mindmapp (https://github.com/cedoor/mindmapp , discontinu

kits is a project platform hosted by a public institution for quality
development in schools (Lower Saxony, Germany) and focusses on digital tools
and media in language teaching. mindmapper is used in workshops to activate
prior knowledge, and collect and structure ideas. In addition, mindmapper can
and media in language teaching. teammapper is used in workshops to activate
prior knowledge, and collect and structure ideas. In addition, teammapper can
be found on https://kits.blog/tools and can be used by schools for free.

Logos and text provided with courtesy of kits.
Expand Down
2 changes: 1 addition & 1 deletion docker-compose-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ services:
POSTGRES_PORT: ${POSTGRES_PROD_PROD_PORT:-5432}
POSTGRES_SSL: ${POSTGRES_PROD_SSL:-true}
POSTGRES_SSL_REJECT_UNAUTHORIZED: ${POSTGRES_PROD_SSL_REJECT_UNAUTHORIZED:-false}
POSTGRES_USER: ${POSTGRES_PROD_USER:-mindmapper-user}
POSTGRES_USER: ${POSTGRES_PROD_USER:-teammapper-user}
DELETE_AFTER_DAYS: ${DELETE_AFTER_DAYS:-30}
ports:
- "${APP_PROD_PORT:-80}:3000"
Expand Down
22 changes: 11 additions & 11 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,35 +11,35 @@ services:
environment:
MODE: DEV
BINDING: "0.0.0.0"
POSTGRES_DATABASE: ${POSTGRES_DB:-mindmapper-backend-dev}
POSTGRES_DATABASE: ${POSTGRES_DB:-teammapper-backend-dev}
POSTGRES_HOST: ${POSTGRES_HOST:-postgres}
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-mindmapper-password}
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-teammapper-password}
POSTGRES_PORT: ${POSTGRES_PORT:-5432}
POSTGRES_USER: ${POSTGRES_USER:-mindmapper-user}
POSTGRES_USER: ${POSTGRES_USER:-teammapper-user}
POSTGRES_SSL: ${POSTGRES_SSL:-false}
POSTGRES_TEST_DATABASE: ${DOCKER_COMPOSE_APP_ENV_POSTGRES_TEST_DATABASE:-mindmapper-backend-test}
POSTGRES_TEST_DATABASE: ${DOCKER_COMPOSE_APP_ENV_POSTGRES_TEST_DATABASE:-teammapper-backend-test}
POSTGRES_TEST_HOST: ${DOCKER_COMPOSE_APP_ENV_POSTGRES_HOST:-postgres}
POSTGRES_TEST_PASSWORD: ${DOCKER_COMPOSE_APP_ENV_POSTGRES_PASSWORD:-mindmapper-password}
POSTGRES_TEST_PASSWORD: ${DOCKER_COMPOSE_APP_ENV_POSTGRES_PASSWORD:-teammapper-password}
POSTGRES_TEST_PORT: ${DOCKER_COMPOSE_APP_ENV_POSTGRES_PORT:-5432}
POSTGRES_TEST_USER: ${DOCKER_COMPOSE_APP_ENV_POSTGRES_USER:-mindmapper-user}
POSTGRES_TEST_USER: ${DOCKER_COMPOSE_APP_ENV_POSTGRES_USER:-teammapper-user}
DELETE_AFTER_DAYS: ${DELETE_AFTER_DAYS:-30}
ports:
- "${APP_FRONTEND_PORT:-4200}:4200"
- "${APP_BACKTEND_PORT:-3000}:3000"
volumes:
- .:/home/node/app
- app_backend_node_modules:/home/node/app/mindmapper-backend/node_modules
- app_frontend_node_modules:/home/node/app/mindmapper-frontend/node_modules
- app_backend_node_modules:/home/node/app/teammapper-backend/node_modules
- app_frontend_node_modules:/home/node/app/teammapper-frontend/node_modules
depends_on:
- postgres

postgres:
image: postgres:12-alpine
environment:
PGDATA: /var/lib/postgresql/data/pgdata
POSTGRES_DB: ${POSTGRES_DB:-mindmapper-backend-dev}
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-mindmapper-password}
POSTGRES_USER: ${POSTGRES_USER:-mindmapper-user}
POSTGRES_DB: ${POSTGRES_DB:-teammapper-backend-dev}
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-teammapper-password}
POSTGRES_USER: ${POSTGRES_USER:-teammapper-user}
# Exposing the port is not needed unless you want to access this database instance from the host.
# Be careful when other postgres docker container are running on the same port
ports:
Expand Down
2 changes: 1 addition & 1 deletion entrypoint.prod.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
npm --prefix mindmapper-backend run typeorm:prod:migrate
npm --prefix teammapper-backend run typeorm:prod:migrate
npm run start:prod

This file was deleted.

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "mindmapper",
"name": "teammapper",
"version": "0.0.1",
"description": "Web application to create and work on mindmaps with multiple users.",
"author": "b310 digital gmbh",
Expand All @@ -10,10 +10,10 @@
"node": "~16.6.2"
},
"scripts": {
"build:prod": "npm run build:frontend:prod && cp mindmapper-frontend/dist -TRv mindmapper-backend/client && npm run build:backend:prod",
"build:backend:prod": "npm --prefix mindmapper-backend run build",
"build:frontend:prod": "GENERATE_SOURCEMAP=false npm --prefix mindmapper-frontend run build:prod",
"clear": "rm mindmapper-backend/dist mindmapper-backend/client mindmapper-frontend/dist",
"start:prod": "npm --prefix mindmapper-backend run start:prod"
"build:prod": "npm run build:frontend:prod && cp teammapper-frontend/dist -TRv teammapper-backend/client && npm run build:backend:prod",
"build:backend:prod": "npm --prefix teammapper-backend run build",
"build:frontend:prod": "GENERATE_SOURCEMAP=false npm --prefix teammapper-frontend run build:prod",
"clear": "rm teammapper-backend/dist teammapper-backend/client teammapper-frontend/dist",
"start:prod": "npm --prefix teammapper-backend run start:prod"
}
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
8 changes: 4 additions & 4 deletions mindmapper-backend/README.md → teammapper-backend/README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Backend for Mindmapper
# Backend for TeamMapper

## Description

Backend for mindmapper, build with [Nest](https://github.com/nestjs/nest)
Backend for TeamMapper, build with [Nest](https://github.com/nestjs/nest)

## Installation

Expand Down Expand Up @@ -81,9 +81,9 @@ npm run typeorm migration:run
Generate new migration based on current changes

```bash
npm run typeorm migration:generate -- -n MindmapperRefactoring
npm run typeorm migration:generate -- -n teammapperRefactoring
```

## License

Nest and mindmapper are [MIT licensed](LICENSE).
Nest and teammapper are [MIT licensed](LICENSE).
File renamed without changes.

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

Loading

0 comments on commit 5230d90

Please sign in to comment.