[AY1920S1-CS2113-T14-2] restaurant manager

.gitignore

@@ -12,3 +12,7 @@ src/main/resources/docs/
 .DS_Store
 *.iml
 bin/
+
+# Less cluster please
+.vscode/
+*.class

.travis.yml

@@ -1,21 +1,5 @@
 language: java
-matrix:
-  include:
-    - jdk: openjdk11
+jdk: oraclejdk11
 
 before_install:
   - chmod +x gradlew
-  - chmod +x config/travis/*
-
-script: >-
-  ./config/travis/run-checks.sh &&
-  ./gradlew clean checkstyleMain checkstyleTest test
-
-before_cache:
-  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
-  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
-
-cache:
-  directories:
-    - $HOME/.gradle/caches/
-    - $HOME/.gradle/wrapper/

Fridge.uml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Diagram>
+  <ID>JAVA</ID>
+  <OriginalElement>duke.fridge.Fridge</OriginalElement>
+  <nodes>
+    <node x="37.0" y="0.0">duke.ingredient.Ingredient</node>
+    <node x="0.0" y="257.0">duke.fridge.Fridge</node>
+  </nodes>
+  <notes />
+  <edges>
+    <edge source="duke.fridge.Fridge" target="duke.ingredient.Ingredient">
+      <point x="-72.75" y="-158.5" />
+      <point x="72.75" y="232.0" />
+      <point x="91.25" y="232.0" />
+      <point x="-54.25" y="103.5" />
+    </edge>
+  </edges>
+  <settings layout="Hierarchic Group" zoom="1.0904024767801856" x="209.90086910464152" y="286.767461669506" />
+  <SelectedNodes />
+  <Categories>
+    <Category>Constructors</Category>
+    <Category>Methods</Category>
+    <Category>Inner Classes</Category>
+    <Category>Fields</Category>
+    <Category>Properties</Category>
+  </Categories>
+  <SCOPE>All</SCOPE>
+  <VISIBILITY>private</VISIBILITY>
+</Diagram>
+

README.md

@@ -1,40 +1,17 @@
-# Setting up
+# Duke
 
-**Prerequisites**
+![UI](https://github.com/AY1920S1-CS2113-T14-2/main1/blob/master/docs/images/Ui.png)
 
-* JDK 11
-* Recommended: IntelliJ IDE
-* Fork this repo to your GitHub account and clone the fork to your computer
+* This project aims to allow the restaurant chef to be more organised in terms of his admin duties which includes, keeping track of ingredients, recipes, etc.
+* Java is the main programming language that is used in this project
 
-**Importing the project into IntelliJ**
 
-1. Open IntelliJ (if you are not in the welcome screen, click `File` > `Close Project` to close the existing project dialog first).
-1. Set up the correct JDK version.
-   * Click `Configure` > `Structure for new Projects` (in older versions of Intellij:`Configure` > `Project Defaults` > `Project Structure`).
-   * If JDK 11 is listed in the drop down, select it. If it is not, click `New...` and select the directory where you installed JDK 11.
-   * Click `OK`.
-1. Click `Import Project`.
-1. Locate the project directory and click `OK`.
-1. Select `Create project from existing sources` and click `Next`.
-1. Rename the project if you want. Click `Next`.
-1. Ensure that your src folder is checked. Keep clicking `Next`.
-1. Click `Finish`.
+## Site Navigation
 
-# Tutorials 
+- [User Guide](https://github.com/AY1920S1-CS2113-T14-2/main1/blob/master/docs/UserGuide.md)
+- [Developer Guide](https://github.com/AY1920S1-CS2113-T14-2/main1/blob/master/docs/DeveloperGuide.md)
+- [About Us](https://github.com/AY1920S1-CS2113-T14-2/main1/blob/master/docs/AboutUs.md)
 
-Duke Increment | Tutorial
----------------|---------------
-`A-Gradle` | [Gradle Tutorial](tutorials/gradleTutorial.md)
-`A-TextUiTesting` | [Text UI Testing Tutorial](tutorials/textUiTestingTutorial.md)
-`Level-10` | JavaFX tutorials:<br>→ [Part 1: Introduction to JavaFX][fx1]<br>→ [Part 2: Creating a GUI for Duke][fx2]<br>→ [Part 3: Interacting with the user][fx3]<br>→ [Part 4: Introduction to FXML][fx4]
 
-[fx1]: <tutorials/javaFxTutorialPart1.md>
-[fx2]: <tutorials/javaFxTutorialPart2.md>
-[fx3]: <tutorials/javaFxTutorialPart3.md>
-[fx4]: <tutorials/javaFxTutorialPart4.md>
-
-# Feedback, Bug Reports
-
-* If you have feedback or bug reports, please post in [se-edu/duke issue tracker](https://github.com/se-edu/duke/issues).
-* We welcome pull requests too.
+## Acknowledgements
 

build.gradle

@@ -5,51 +5,47 @@ plugins {
     id 'com.github.johnrengelman.shadow' version '5.1.0'
 }
 
-checkstyle {
-    toolVersion = '8.23'
-}
-
 group 'seedu.duke'
 version '0.1.0'
 
 repositories {
     mavenCentral()
 }
 
-application {
-    // Change this to your main class.
-    mainClassName = "Duke"
-}
-
 shadowJar {
-    archiveBaseName = "duke"
-    archiveVersion = "0.1.3"
+    archiveBaseName = null
+    archiveVersion = "v1.4"
     archiveClassifier = null
     archiveAppendix = null
 }
 
-dependencies {
-    String javaFxVersion = '11'
-    implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'win'
-    implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'mac'
-    implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'linux'
-    implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'win'
-    implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'mac'
-    implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'linux'
-    implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'win'
-    implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'mac'
-    implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'linux'
-    implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'win'
-    implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'mac'
-    implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'linux'
+sourceSets{
+    main {
+        resources {
+            srcDirs = ['src/main/java']
+        }
+    }
+}
 
+checkstyle {
+    toolVersion = '8.23'
+}
+
+dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter:5.5.0'
+    compile group: 'com.massisframework', name: 'j-text-utils', version: '0.3.4'
+    implementation 'junit:junit:4.12'
+    implementation 'junit:junit:4.12'
 }
 
 test {
     useJUnitPlatform()
 }
+application {
+    // Change this to your main class.
+    mainClassName = "duke/Duke"
+}
 
 run {
     standardInput = System.in
-}
+}

config/checkstyle/checkstyle.xml

@@ -47,7 +47,7 @@
             <property name="max" value="120"/>
             <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
         </module>
-        <module name="AvoidStarImport"/>
+        <!-- module name="AvoidStarImport"/ -->
         <module name="OneTopLevelClass"/>
         <module name="NoLineWrap"/>
         <module name="EmptyBlock">
@@ -182,7 +182,7 @@
         <module name="Indentation">
             <property name="basicOffset" value="4"/>
             <property name="braceAdjustment" value="0"/>
-            <property name="caseIndent" value="0"/>
+            <property name="caseIndent" value="4"/>
             <property name="throwsIndent" value="4"/>
             <property name="lineWrappingIndentation" value="4"/>
             <property name="arrayInitIndent" value="4"/>

data/fridge.txt

@@ -0,0 +1,2 @@
+joey|17|23/11/2019
+joey|17|08/08/2020

data/order.txt

@@ -0,0 +1,10 @@
+0|07/11/2019|D|fish|1|D|chili crab|1|D|rice|2
+0|07/11/2019|D|cereal shrimp|1
+0|12/11/2019|D|beef noodle|1|D|pork dumplings|2
+0|12/09/2018|D|beef noodle|1|D|chili crab|1|D|rice|3
+0|07/11/2019|D|cereal shrimp|1|D|soup|4
+0|31/12/2019|D|beef|1|D|pork dumplings|2|D|beef noodle|1
+0|31/12/2019|D|beef|1|D|pork dumplings|2
+0|31/12/2017|D|beef|1|D|pork dumplings|2|D|beef noodle|1
+0|31/12/2017|D|beef|1|D|pork dumplings|2|D|beef noodle|1
+0|07/11/2019|D|fried chicken|1

data/recipebook.txt

@@ -0,0 +1,4 @@
+cake|milk|3|sugar|2|egg|1|wheat|3
+pumpkin pie|pumpkin|1|sugar|1|egg|1
+cookie|wheat|2|cocoa beans|1
+golden apple|gold ingot|8|apple|1

data/tasks.txt

@@ -0,0 +1,9 @@
+T|1|read book
+T|0|beef 16/10/2019
+T|0|test 09/09/09
+T|1|test1 16/10/2019 
+T|0|read books
+T|0|sleep
+T|0|sleep
+T|2|null
+T|0|beef 24/10/2019

docs/AboutUs.md

@@ -0,0 +1,60 @@
+# About Us
+
+Chef Duke v1.4 is developed by the CS2113-T14-2 team. 
+
+We are a team based in the [School of Computing, National University of Singapore](http://www.comp.nus.edu.sg/).
+
+
+
+## Project Team
+
+### Hafidz Bin Hussain
+
+<img src="./images/9hafidz6.png" alt="drawing" width="200"/>
+
+[[github](https://github.com/9hafidz6)] [profolio]
+
+Role: Team Lead
+
+Responsibilities: develop the dishes feature
+
+### Sara Djambazovska
+
+<img src="./images/saradj.png" alt="drawing" width="200"/>
+
+[[github](https://github.com/saradj/)] [profolio]
+
+Role: Developer
+
+Responsibilities: develop the fridge feature
+
+### Jiahan Yu
+
+<img src="./images/virginiayu.png" alt="drawing" width="200"/>
+
+[[github](https://github.com/VirginiaYu)] [[profolio](https://github.com/VirginiaYu/main/edit/master/docs/JiahanPPP.md)]
+
+Role: Developer
+
+Responsibilities: develop the order, todo list features
+
+### Goh Zhen Hao Joey
+
+<img src="./images/x3chillax.png" alt="drawing" width="200"/>
+
+[[github](https://github.com/x3chillax)] [profolio]
+
+Role: Developer
+
+Responsibilities: develop ingredient feature
+
+### Lincoln Lim
+
+<img src="./images/ceglincoln.png" alt="drawing" width="200"/>
+
+[[github](https://github.com/CEGLincoln)] [profolio]
+
+Role: Developer
+
+Responsibilities: develop recipebook feature
+