[CS2113-T14-1] Fitness Checker

.github/workflows/gradle.yml

@@ -33,18 +33,4 @@ jobs:
       - name: Build and check with Gradle
         run: ./gradlew check
 
-      - name: Perform IO redirection test (*NIX)
-        if: runner.os == 'Linux'
-        working-directory:  ${{ github.workspace }}/text-ui-test
-        run: ./runtest.sh
-
-      - name: Perform IO redirection test (MacOS)
-        if: always() && runner.os == 'macOS'
-        working-directory:  ${{ github.workspace }}/text-ui-test
-        run: ./runtest.sh
-
-      - name: Perform IO redirection test (Windows)
-        if: always() && runner.os == 'Windows'
-        working-directory:  ${{ github.workspace }}/text-ui-test
-        shell: cmd
-        run: runtest.bat
+

.gitignore

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # IDEA files
 /.idea/
 /out/
@@ -15,3 +16,34 @@ bin/
 
 /text-ui-test/ACTUAL.TXT
 text-ui-test/EXPECTED-UNIX.TXT
+
+text-ui-test/EXPECTED.TXT
+text-ui-test/input.txt
+text-ui-test/runtest.sh
+text-ui-test/runtest.bat
+data/
+=======
+# IDEA files
+/.idea/
+/out/
+/*.iml
+
+# Gradle build files
+/.gradle/
+/build/
+src/main/resources/docs/
+
+# MacOS custom attributes files created by Finder
+.DS_Store
+*.iml
+bin/
+
+/text-ui-test/ACTUAL.TXT
+text-ui-test/EXPECTED-UNIX.TXT
+
+text-ui-test/EXPECTED.TXT
+text-ui-test/input.txt
+text-ui-test/runtest.sh
+text-ui-test/runtest.bat
+data/workoutRecording.txt
+>>>>>>> 39f25ad9df885da80c4d85dbb509a2975f9d8e3e

README.md

@@ -1,4 +1,4 @@
-# Duke project template
+# Fitnees checker
 
 This is a project template for a greenfield Java project. It's named after the Java mascot _Duke_. Given below are instructions on how to use it.
 

build.gradle

@@ -10,8 +10,11 @@ repositories {
 }
 
 dependencies {
-    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.5.0'
-    testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.5.0'
+    implementation 'junit:junit:4.13.1'
+    implementation 'junit:junit:4.13.1'
+    implementation 'org.testng:testng:7.1.0'
+    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.9.2'
+    testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.9.2'
 }
 
 test {

docs/AboutUs.md

@@ -1,9 +1,14 @@
 # About us
 
-Display | Name | Github Profile | Portfolio 
---------|:----:|:--------------:|:---------:
-![](https://via.placeholder.com/100.png?text=Photo) | John Doe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
-![](https://via.placeholder.com/100.png?text=Photo) | Don Joe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
-![](https://via.placeholder.com/100.png?text=Photo) | Ron John | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
-![](https://via.placeholder.com/100.png?text=Photo) | John Roe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
-![](https://via.placeholder.com/100.png?text=Photo) | Don Roe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
+| Display                                             |       Name        |                  Github Profile                  |             Portfolio             |
+|-----------------------------------------------------|:-----------------:|:------------------------------------------------:|:---------------------------------:|
+
+| ![](https://via.placeholder.com/100.png?text=Photo) | Richard Kurniawan |      [Github](https://github.com/Richardtok)      | [Portfolio](docs/team/johndoe.md) |
+
+| ![](https://via.placeholder.com/100.png?text=Photo) |      Don Joe      |      [Github](https://github.com/)                | [Portfolio](docs/team/johndoe.md) |
+
+| ![](https://via.placeholder.com/100.png?text=Photo) | Caleb Chan Jia Le |      [Github](https://github.com/calebcjl)        | [Portfolio](docs/team/johndoe.md) |
+
+| ![](https://via.placeholder.com/100.png?text=Photo) | Guillaume Gerony  |      [Github](https://github.com/guillaume-grn)   | [Portfolio](docs/team/johndoe.md) |
+
+