[CS2103T-F11-1] Calgo

.gitignore

@@ -19,3 +19,4 @@ src/test/data/sandbox/
 
 # MacOS custom attributes files created by Finder
 .DS_Store
+/src/main/java/life/calgo/ui/GraphPanel.java

LICENSE

@@ -2,11 +2,11 @@ MIT License
 
 Copyright (c) 2016 Software Engineering Education - FOSS Resources
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
+Permission is hereby granted, free of charge, to any food 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
+copies of the Software, and to permit foods 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

README.adoc

@@ -1,11 +1,7 @@
-= Address Book (Level 3)
+= Calgo
 ifdef::env-github,env-browser[:relfileprefix: docs/]
 
-https://travis-ci.org/se-edu/addressbook-level3[image:https://travis-ci.org/se-edu/addressbook-level3.svg?branch=master[Build Status]]
-https://ci.appveyor.com/project/damithc/addressbook-level3[image:https://ci.appveyor.com/api/projects/status/3boko2x2vr5cc3w2?svg=true[Build status]]
-https://coveralls.io/github/se-edu/addressbook-level3?branch=master[image:https://coveralls.io/repos/github/se-edu/addressbook-level3/badge.svg?branch=master[Coverage Status]]
-https://www.codacy.com/app/damith/addressbook-level3?utm_source=github.com&utm_medium=referral&utm_content=se-edu/addressbook-level3&utm_campaign=Badge_Grade[image:https://api.codacy.com/project/badge/Grade/fc0b7775cf7f4fdeaf08776f3d8e364a[Codacy Badge]]
-
+https://travis-ci.org/AY1920S2-CS2103T-F11-1/main[image:https://api.travis-ci.org/AY1920S2-CS2103T-F11-1/main.svg?branch=master[Build Status]]
 
 ifdef::env-github[]
 image::docs/images/Ui.png[width="600"]
@@ -15,22 +11,33 @@ ifndef::env-github[]
 image::images/Ui.png[width="600"]
 endif::[]
 
-* This is a desktop Address Book application. It has a GUI but most of the user interactions happen using a CLI (Command Line Interface).
-* It is a Java sample application intended for students learning Software Engineering while using Java as the main programming language.
-* It is *written in OOP fashion*. It provides a *reasonably well-written* code example that is *significantly bigger* (around 6 KLoC)than what students usually write in beginner-level SE modules.
+Can you remember what you had 2 days ago, for lunch? How about last week? +
+
+You already know how important a consistent diet is in shaping your fitness.
+In spite of its importance, not everybody is tracking their meals. Why?
+It is just too inconvenient and time-taking. You already have so many things to do and keeping track of what you
+eat simply could not fit into your schedule. But, now it can.
+
+Introducing *Calgo*, your personal meal-tracking assistant:
+
+* Change the way you approach fitness: Calgo offers an all-in-one calorie tracker that is easy-to-use and guaranteed to save you from the frustrations of meal tracking. Bye bye complexity!
+* Calgo's comprehensive reports also transform the way you approach your daily meals through intelligent suggestions on how to improve your meal consumption patterns.
+* A lot of careful thought has been put in when designing Calgo to ensure that you have a smooth experience and won't end up spending too much time in learning how it works. Save that time for other important stuff.
+* To evolve with the times and help you calculate your calories in a fraction of a second, Calgo is fully digital. It is a gift of convenience to you, packaged as a beautiful desktop application. I mean just look at our User Interface above. As the saying goes, pictures speak a thousand words but pictures of your consumption data saves you thousands of excess calories!
+* Excited and want to know how to start making calories go? Download Calgo now from our latest GitHub release!
 
 == Site Map
 
-* <<UserGuide#, User Guide>>
-* <<DeveloperGuide#, Developer Guide>>
-* <<LearningOutcomes#, Learning Outcomes>>
-* <<AboutUs#, About Us>>
-* <<ContactUs#, Contact Us>>
+* If you need help in setting up and learning about Calgo's features, check out our <<UserGuide#, User Guide>>.
+* If you are a developer wanting to contribute and learn how Calgo works, check out our <<DeveloperGuide#, Developer Guide>>.
+* To learn about the team working to make your Calgo experience effortless, read <<AboutUs#, About Us>>.
+* If you need anything else, <<ContactUs#, Contact Us>>.
 
 == Acknowledgements
 
-* Some parts of this sample application were inspired by the excellent http://code.makery.ch/library/javafx-8-tutorial/[Java FX tutorial] by
+* Some parts of this application were inspired by the excellent http://code.makery.ch/library/javafx-8-tutorial/[Java FX tutorial] by
 _Marco Jakob_.
-* Libraries used: https://openjfx.io/[JavaFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/junit-team/junit5[JUnit5]
+* Calgo is adapted from the AddressBook-Level3 project created by the https://se-education.org[SE-EDU initiative].
+* Libraries used: https://openjfx.io/[JavaFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/junit-team/junit5[JUnit5].
 
 == Licence : link:LICENSE[MIT]

build.gradle

@@ -15,7 +15,7 @@ plugins {
 }
 
 // Specifies the entry point of the application
-mainClassName = 'seedu.address.Main'
+mainClassName = 'life.calgo.Main'
 
 sourceCompatibility = JavaVersion.VERSION_11
 targetCompatibility = JavaVersion.VERSION_11
@@ -64,10 +64,11 @@ dependencies {
     testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: jUnitVersion
 
     testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: jUnitVersion
+    implementation 'junit:junit:4.12'
 }
 
 shadowJar {
-    archiveName = 'addressbook.jar'
+    archiveName = 'calgo_v1.4.jar'
 
     destinationDir = file("${buildDir}/jar/")
 }
@@ -120,22 +121,22 @@ asciidoctor {
     outputDir "${buildDir}/docs"
 
     options = [
-        template_dirs: [file("${sourceDir}/templates")],
+            template_dirs: [file("${sourceDir}/templates")],
     ]
 
     attributes = [
-        linkcss: true,
-        stylesheet: 'gh-pages.css',
-        'source-highlighter': 'coderay',
-        icons: 'font',
-        experimental: true,
-        sectlinks: true,
-        idprefix: '',  // for compatibility with GitHub preview
-        idseparator: '-',
-        'site-root': "${sourceDir}",  // must be the same as sourceDir, do not modify
-        'site-name': 'AddressBook-Level3',
-        'site-githuburl': 'https://github.com/se-edu/addressbook-level3',
-        'site-seedu': true,  // delete this line if your project is not a fork (not a SE-EDU project)
+            linkcss: true,
+            stylesheet: 'gh-pages.css',
+            'source-highlighter': 'coderay',
+            icons: 'font',
+            experimental: true,
+            sectlinks: true,
+            idprefix: '',  // for compatibility with GitHub preview
+            idseparator: '-',
+            'site-root': "${sourceDir}",  // must be the same as sourceDir, do not modify
+            'site-name': 'Calgo',
+            'site-githuburl': 'https://github.com/AY1920S2-CS2103T-F11-1/main',
+            'site-seedu': true,  // delete this line if your project is not a fork (not a SE-EDU project)
     ]
 
     options['template_dirs'].each {

config/travis/deploy_github_pages.sh

@@ -14,7 +14,7 @@ cd build/docs/html5
 
 git init
 git config user.name 'Deployment Bot (Travis)'
-git config user.email '[email protected]'
+git config user.fat '[email protected]'
 
 git config credential.helper 'store --file=.git/credentials'
 echo "https://${GITHUB_TOKEN}:@github.com" > .git/credentials

docs/AboutUs.adoc

@@ -4,53 +4,53 @@
 :imagesDir: images
 :stylesDir: stylesheets
 
-AddressBook - Level 3 was developed by the https://se-edu.github.io/docs/Team.html[se-edu] team. +
-_{The dummy content given below serves as a placeholder to be used by future forks of the project.}_ +
+Calgo was developed by the http://github.com/AY1920S2-CS2103T-F11-1[CS2103T F11-1] team. +
 {empty} +
-We are a team based in the http://www.comp.nus.edu.sg[School of Computing, National University of Singapore].
+We are a student team based in the http://www.comp.nus.edu.sg[School of Computing, National University of Singapore].
 
-== Project Team
+== Project Team: F11-1
 
-=== John Doe
-image::damithc.jpg[width="150", align="left"]
-{empty}[http://www.comp.nus.edu.sg/~damithch[homepage]] [https://github.com/damithc[github]] [<<johndoe#, portfolio>>]
+=== Vineeth Buddha
+image::buddhavineeth.png[width="150", align="left"]
+{empty}[https://github.com/buddhavineeth[github]] [<<buddhavineeth#, portfolio>>]
 
-Role: Project Advisor
+Role: Software Developer & Git Expert +
+Responsibilities: Data Analysis & Insights Report, Deliverables & Deadlines In-Charge
 
 '''
 
-=== John Roe
-image::lejolly.jpg[width="150", align="left"]
-{empty}[http://github.com/lejolly[github]] [<<johndoe#, portfolio>>]
+=== Eugene Tan Yew Chin
+image::eugenetyc.png[width="150", align="left"]
+{empty}[https://github.com/eugenetyc[github]] [<<eugenetyc#, portfolio>>]
 
-Role: Team Lead +
-Responsibilities: UI
+Role: Software Developer +
+Responsibilities: Data Search & Storage, Team Lead
 
 '''
 
-=== Johnny Doe
-image::yijinl.jpg[width="150", align="left"]
-{empty}[http://github.com/yijinl[github]] [<<johndoe#, portfolio>>]
+=== Cai Rui Cong
+image::ray-97.png[width="150", align="left"]
+{empty}[https://github.com/ray-97[github]] [<<ray-97#, portfolio>>]
 
-Role: Developer +
-Responsibilities: Data
+Role: Software Developer +
+Responsibilities: Data Collection & Organisation, Code Integration
 
 '''
 
-=== Johnny Roe
-image::m133225.jpg[width="150", align="left"]
-{empty}[http://github.com/m133225[github]] [<<johndoe#, portfolio>>]
+=== Low Zhang Xian
+image::jeremylow97.png[width="150", align="left"]
+{empty}[https://github.com/jeremylow97[github]] [<<jeremylow97#, portfolio>>]
 
-Role: Developer +
-Responsibilities: Dev Ops + Threading
+Role: Software Developer +
+Responsibilities: Object Modelling, Architecture & Code Quality
 
 '''
 
-=== Benson Meier
-image::yl_coder.jpg[width="150", align="left"]
-{empty}[http://github.com/yl-coder[github]] [<<johndoe#, portfolio>>]
+=== Janice Ong Yi Wen
+image::j-dan23.png[width="150", align="left"]
+{empty}[https://github.com/J-Dan23[github]] [<<j-dan23#, portfolio>>]
 
-Role: Developer +
-Responsibilities: UI
+Role: Software Developer +
+Responsibilities: User Experience, Graphical Interface & Documentation
 
 '''

docs/ContactUs.adoc

@@ -2,6 +2,6 @@
 :site-section: ContactUs
 :stylesDir: stylesheets
 
-* *Bug reports, Suggestions* : Post in our https://github.com/se-edu/addressbook-level3/issues[issue tracker] if you noticed bugs or have suggestions on how to improve.
-* *Contributing* : We welcome pull requests. Follow the process described https://github.com/oss-generic/process[here]
-* *Email us* : You can also reach us at `damith [at] comp.nus.edu.sg`
+* *Bug reports, Suggestions* : Post in our https://github.com/AY1920S2-CS2103T-F11-1/main/issues[issue tracker] if you noticed bugs or have suggestions on how to improve.
+* *Contributing* : This is a closed project and contributions can only be made by approved software developers.
+* *Email us* : For any queries or contribution requests, please reach us via `rc97 [at] u.nus.edu`

docs/DevOps.adoc

@@ -34,7 +34,7 @@ When a pull request has changes to asciidoc files, you can use https://www.netli
 
 Here are the steps to create a new release.
 
-.  Update the version number in link:{repoURL}/src/main/java/seedu/address/MainApp.java[`MainApp.java`].
+.  Update the version number in link:{repoURL}/src/main/java/seedu/protein/MainApp.java[`MainApp.java`].
 .  Generate a JAR file <<UsingGradle#creating-the-jar-file, using Gradle>>.
 .  Tag the repo with the version number. e.g. `v0.1`
 .  https://help.github.com/articles/creating-releases/[Create a new release using GitHub] and upload the JAR file you created.