Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,10 @@ jobs:
restore-keys: |
${{ runner.os }}-node-

- run: npm ci
- run: npm ci --no-audit
working-directory: frontend

- run: npm run lint-check
- run: npm run lint:check
working-directory: frontend

print-eslint:
Expand All @@ -162,10 +162,10 @@ jobs:
restore-keys: |
${{ runner.os }}-node-

- run: npm ci
- run: npm ci --no-audit
working-directory: print

- run: npm run lint
- run: npm run lint:check
working-directory: print

api-tests:
Expand Down Expand Up @@ -312,7 +312,7 @@ jobs:
restore-keys: |
${{ runner.os }}-node-

- run: npm ci
- run: npm ci --no-audit
working-directory: frontend

- run: npm run build
Expand Down Expand Up @@ -349,7 +349,7 @@ jobs:
restore-keys: |
${{ runner.os }}-node-

- run: npm ci
- run: npm ci --no-audit
working-directory: print

- run: npm run build
Expand Down Expand Up @@ -428,10 +428,10 @@ jobs:
# run end-to-end tests
- run: docker run -v $PWD:/e2e -w /e2e --network host -e CYPRESS_BASE_URL=http://localhost:3000 cypress/included:10.1.0
working-directory: frontend

# print docker container logs (good for debugging; can be disabled again lateron)
- run: docker-compose logs --tail="all"

coveralls-finished:
name: "Finish coveralls report"
needs:
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
*/.DS_Store
.idea/
.vscode/
/.print-data/
.cache/
/.caddy/
/.env
Expand Down
8 changes: 8 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
Comment thread
manuelmeister marked this conversation as resolved.
"trailingComma": "es5",
"singleQuote": true,
"semi": false,
"bracketSameLine": false,
"bracketSpacing": true,
"printWidth": 90
}
Empty file removed .print-data/.gitkeep
Empty file.
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@

## English

*(deutsche Übersetzung weiter unten)*
_(deutsche Übersetzung weiter unten)_

eCamp is a web application for planning J+S camps, J+S courses and other camps. It helps to exchange all planned programme among the camp organizers.

An older version called "eCamp v2" is productive and can be used at the following address (but only in german): [https://ecamp.pfadiluzern.ch](https://ecamp.pfadiluzern.ch/)

eCamp3 is a project that aims to re-develop the features of eCamp v2 with modern technologies and an extensible architecture. Currently, we focus on re-building just the camp planning features, which will be released in an MVP (minimal viable product). Later, extensions for course planning and other features will follow.

The following commonly requested improvements over eCamp v2 are already implemented:
Expand All @@ -25,6 +25,7 @@ eCamp v3 is made up of a backend based on the PHP framework API Platform (Symfon
### Want to help?

Thanks for helping! There are a few ways to get started.

- Visit our test environment at https://dev.ecamp3.ch. If you discover a bug, [open an issue](https://github.com/ecamp/ecamp3/issues/new) for it.
- To run the project on your computer for development, follow one of our installation guides:
- [Installation with Docker on Linux](https://github.com/ecamp/ecamp3/wiki/installation-development-linux) (German only)
Expand All @@ -35,7 +36,6 @@ Thanks for helping! There are a few ways to get started.
- Study the [documentation in the wiki](https://github.com/ecamp/ecamp3/wiki)
- Choose an [issue labeled "good first issue"](https://github.com/ecamp/ecamp3/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) and try to solve it


## Deutsch

eCamp ist eine Webapplikation, mit welcher J+S-Lager, J+S-Kurse und andere Lager geplant werden können. Dabei verfügen alle Benutzer stets über den aktuellsten Stand der Planung.
Expand All @@ -57,6 +57,7 @@ eCamp v3 besteht aus einem Backend basierend auf dem PHP-Framework API Platform
### Mithelfen

Danke dass du mithelfen möchtest! Es gibt ein paar verschiedene Arten wie du beginnen kannst.

- Besuche unsere Testumgebung auf https://dev.ecamp3.ch. Wenn du einen Fehler entdeckst, [eröffne ein Issue dafür](https://github.com/ecamp/ecamp3/issues/new).
- Um das Projekt bei dir auf dem Computer laufen zu lassen, folge einer der Installationsanleitungen:
- [Installation mit Docker auf Linux](https://github.com/ecamp/ecamp3/wiki/installation-development-linux)
Expand Down
5 changes: 1 addition & 4 deletions common/helpers/dateHelperVCalendar.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,4 @@ function utcStringToTimestamp (string) {
return dayjs(dayjs.utc(string).format('YYYY-MM-DD HH:mm')).valueOf()
}

export {
timestampToUtcString,
utcStringToTimestamp
}
export { timestampToUtcString, utcStringToTimestamp }
2 changes: 1 addition & 1 deletion common/locales/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -158,4 +158,4 @@
"title": "Grobprogramm für {period}"
}
}
}
}
2 changes: 1 addition & 1 deletion common/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -176,4 +176,4 @@
"title": "Program overview for {period}"
}
}
}
}
2 changes: 1 addition & 1 deletion common/locales/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,4 @@
"name": "Inscription au calendrier"
}
}
}
}
2 changes: 1 addition & 1 deletion common/locales/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,4 @@
"name": "Inserimento nel programma"
}
}
}
}
4 changes: 3 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ services:
container_name: 'ecamp3-frontend'
ports:
- '3000:3000'
- '9229:9229' # jest debug
- '9229:9229' # jest debug
stdin_open: true
tty: true
user: ${USER_ID:-1000}
volumes:
- ./.prettierrc:/.prettierrc
- ./frontend:/app:delegated
- ./common:/common:delegated
- ./.cache/npm:/home/node/.npm
Expand Down Expand Up @@ -107,6 +108,7 @@ services:
- '3003:3003'
user: ${USER_ID:-1000}
volumes:
- ./.prettierrc:/.prettierrc
- ./print:/app:delegated
- ./common:/common:delegated
- ./.cache/npm:/home/node/.npm
Expand Down
159 changes: 0 additions & 159 deletions docs/UseCases.md

This file was deleted.

Binary file removed docs/images/UC01.png
Binary file not shown.
Binary file removed docs/images/UC02_1.png
Binary file not shown.
Binary file removed docs/images/UC02_2.png
Binary file not shown.
Binary file removed docs/images/UseCases-UC07.1b.png
Binary file not shown.
Binary file removed docs/images/UseCases-UC07.2b.png
Binary file not shown.
4 changes: 4 additions & 0 deletions frontend/.prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
src/common/locales/
src/locales/
/dist
.vscode
13 changes: 5 additions & 8 deletions frontend/.vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
{
"javascript.format.enable": false,
"eslint.format.enable": true,
"i18n-ally.localesPaths": [
"src/locales",
"src/plugins/i18n"
],
"i18n-ally.keystyle": "nested"
}
"javascript.format.enable": false,
"eslint.format.enable": true,
"i18n-ally.localesPaths": ["src/locales", "src/plugins/i18n"],
"i18n-ally.keystyle": "nested"
}
6 changes: 6 additions & 0 deletions frontend/README.md
Original file line number Diff line number Diff line change
@@ -1,31 +1,37 @@
# frontend

## Project setup

```
npm install
```

### Compiles and hot-reloads for development

```
npm run serve
```

### Compiles and minifies for production

```
npm run build
```

### Lints and fixes files

```
npm run lint
```

### Run your unit tests

```
npm run test:unit
```

### Run your end-to-end tests

```
npm run test:e2e
```
Loading