Compare commits

..

7 Commits

Author SHA1 Message Date
fbbe74a082
docs: update to use GitHub instead of GitLab 2024-05-27 18:42:52 +02:00
8029204d44
chore: add MIT License 2024-05-23 23:13:39 +02:00
15ab592513
ci: usage of GitHub Actions 2024-05-23 23:03:36 +02:00
beac8b37dc
docs: delete ARCHITECTURE.md file as not done yet 2024-05-23 22:53:16 +02:00
0793720f70
chore(release): v1.1.1 2024-05-23 15:56:22 +02:00
Maxime RICHARD
b789fad149 fix: center 2024-05-23 15:55:00 +02:00
Maxime RICHARD
671639862c fix: added scrollview to the stats page 2024-05-23 15:46:25 +02:00
11 changed files with 69 additions and 41 deletions

27
.github/workflows/ci.yml vendored Normal file
View File

@ -0,0 +1,27 @@
name: "ci"
on:
push:
branches: [develop]
pull_request:
branches: [main, develop, staging]
jobs:
ci:
runs-on: "ubuntu-latest"
steps:
- uses: "actions/checkout@v4.1.6"
- name: "Setup Node.js"
uses: "actions/setup-node@v4.0.2"
with:
node-version: "20.x"
cache: "npm"
- run: "npm clean-install"
- run: "npm run expo:typed-routes"
- run: 'npm run lint:commit -- --to "${{ github.sha }}"'
- run: "npm run lint:prettier"
- run: "npm run lint:eslint"
- run: "npm run lint:typescript"
- run: "npm run test"

View File

@ -1,28 +0,0 @@
default:
image: "node:20.13.1"
stages:
- "test"
test:
stage: "test"
only:
- "merge_requests"
- "develop"
script:
- "npm clean-install"
- "npm run expo:typed-routes"
- 'echo "${CI_COMMIT_MESSAGE}" | npm run lint:commit'
- "npm run lint:prettier"
- "npm run lint:eslint"
- "npm run lint:typescript"
- "npm run test"
# artifacts:
# paths:
# - "coverage/"
# reports:
# coverage_report:
# coverage_format: "cobertura"
# path: "coverage/cobertura-coverage.xml"
# junit: "junit.xml"
# coverage: '/All files[^|]*\|[^|]*\s+([\d\.]+)/'

24
LICENSE Normal file
View File

@ -0,0 +1,24 @@
# MIT License
Copyright (c) Théo LUDWIG <contact@theoludwig.fr>
Copyright (c) Haoxuan LI <haoxuan.li@etu.unistra.fr>
Copyright (c) Maxime RUMPLER <mrumpler68@gmail.com>
Copyright (c) Maxime RICHARD <maxime.richard2@etu.unistra.fr>
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

View File

@ -21,7 +21,6 @@ Un tracker d'habitudes pour performer au boulot et dans la vie de tous les jours
- [Sujet](./docs/SUJET.md) + [Cahier des charges](./docs/CAHIER-DES-CHARGES.md)
- [Modèle Logique des Données (MLD)](./docs/MLD.md)
- [Architecture](./docs/ARCHITECTURE.md)
- [Conventions développement informatique](./docs/CONVENTIONS.md)
- [Kanban Board (Trello)](https://trello.com/b/8kYlcLA8/habits-tracker)
@ -46,7 +45,7 @@ Un tracker d'habitudes pour performer au boulot et dans la vie de tous les jours
```sh
# Cloner le projet
git clone git@git.unistra.fr:rrll/p61-project.git
git clone git@github.com:theoludwig/p61-project.git
# Se déplacer dans le répertoire du projet
cd p61-project

View File

@ -2,7 +2,7 @@
"expo": {
"name": "Habits Tracker",
"slug": "p61-project",
"version": "1.1.0",
"version": "1.1.1",
"orientation": "portrait",
"icon": "./presentation/assets/images/icon.png",
"scheme": "p61-project",
@ -15,7 +15,7 @@
"assetBundlePatterns": ["**/*"],
"ios": {
"supportsTablet": true,
"buildNumber": "1.1.0"
"buildNumber": "1.1.1"
},
"android": {
"adaptiveIcon": {
@ -23,7 +23,7 @@
"backgroundColor": "#ffffff"
},
"package": "com.theoludwig.p61project",
"versionCode": 5
"versionCode": 6
},
"web": {
"bundler": "metro",

View File

@ -1 +0,0 @@
# Clean Architecture

View File

@ -19,7 +19,7 @@ npm run test
npm run test -- --u
```
Une pipeline CI ([`.gitlab-ci.yml`](../.gitlab-ci.yml)) est en place pour vérifier que le code respecte ces bonnes pratiques et que les tests passent.
Une pipeline CI est en place pour vérifier que le code respecte ces bonnes pratiques et que les tests passent.
## GitFlow

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{
"name": "p61-project",
"version": "1.1.0",
"version": "1.1.1",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "p61-project",
"version": "1.1.0",
"version": "1.1.1",
"hasInstallScript": true,
"dependencies": {
"@expo/vector-icons": "14.0.2",

View File

@ -2,7 +2,7 @@
"name": "p61-project",
"private": true,
"main": "expo-router/entry",
"version": "1.1.0",
"version": "1.1.1",
"scripts": {
"start": "expo start",
"android": "expo start --android",

View File

@ -20,9 +20,15 @@ export const About: React.FC<AboutProps> = (props) => {
style={{
flex: 1,
paddingHorizontal: 20,
justifyContent: "center",
}}
>
<View
style={{
alignItems: "center",
marginVertical: 20,
}}
>
<View style={{ alignItems: "center", marginVertical: 20 }}>
<Text
style={{
fontWeight: "bold",

View File

@ -2,6 +2,7 @@ import { Card, Divider, Text } from "react-native-paper"
import CircularProgress from "react-native-circular-progress-indicator"
import { Agenda } from "react-native-calendars"
import { useState } from "react"
import { ScrollView } from "react-native"
import { getNowDateUTC, getISODate } from "@/utils/dates"
import type { HabitsTracker } from "@/domain/entities/HabitsTracker"
@ -39,7 +40,7 @@ export const HabitsStatistics: React.FC<HabitsStatisticsProps> = (props) => {
selected={selectedDateISO}
renderList={() => {
return (
<>
<ScrollView>
<Divider />
<Text
@ -107,7 +108,7 @@ export const HabitsStatistics: React.FC<HabitsStatisticsProps> = (props) => {
)
},
)}
</>
</ScrollView>
)
}}
/>