nus-cs2113-AY2223S2 · ollayf · Mar 29, 2023 · Mar 29, 2023 · Mar 29, 2023 · Mar 29, 2023
diff --git a/.gitignore b/.gitignore
@@ -13,5 +13,5 @@ src/main/resources/docs/
 *.iml
 bin/
 
-/text-ui-test/ACTUAL.TXT
-text-ui-test/EXPECTED-UNIX.TXT
+assets/database.txt
+assets/logFiles.txt
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: seedu.securenus.SecureNUS
+
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ Prerequisites: JDK 11 (use the exact version), update Intellij to the most recen
 
 1. **Ensure Intellij JDK 11 is defined as an SDK**, as described [here](https://www.jetbrains.com/help/idea/sdk.html#set-up-jdk) -- this step is not needed if you have used JDK 11 in a previous Intellij project.
 1. **Import the project _as a Gradle project_**, as described [here](https://se-education.org/guides/tutorials/intellijImportGradleProject.html).
-1. **Verify the set up**: After the importing is complete, locate the `src/main/java/seedu/duke/Duke.java` file, right-click it, and choose `Run Duke.main()`. If the setup is correct, you should see something like the below:
+1. **Verify the set up**: After the importing is complete, locate the `src/main/java/seedu/secureNUS/Duke.java` file, right-click it, and choose `Run Duke.main()`. If the setup is correct, you should see something like the below:
    ```
    > Task :compileJava
    > Task :processResources NO-SOURCE
@@ -39,7 +39,7 @@ Prerequisites: JDK 11 (use the exact version), update Intellij to the most recen
 
 ### JUnit tests
 
-* A skeleton JUnit test (`src/test/java/seedu/duke/DukeTest.java`) is provided with this project template. 
+* A skeleton JUnit test (`src/test/java/seedu/secureNUS/DukeTest.java`) is provided with this project template. 
 * If you are new to JUnit, refer to the [JUnit Tutorial at se-education.org/guides](https://se-education.org/guides/tutorials/junit.html).
 
 ## Checkstyle

diff --git a/assets/.gitignore b/assets/.gitignore
@@ -0,0 +1,3 @@
+logFiles.txt
+log*
+test*
diff --git a/build.gradle b/build.gradle
@@ -10,8 +10,8 @@ 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'
+    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 {
@@ -29,11 +29,11 @@ test {
 }
 
 application {
-    mainClass = "seedu.duke.Duke"
+    mainClass = "seedu.securenus.SecureNUS"
 }
 
 shadowJar {
-    archiveBaseName = "duke"
+    archiveBaseName = "secureNUS"
     archiveClassifier = null
 }
 

diff --git a/docs/AboutUs.md b/docs/AboutUs.md
@@ -1,9 +1,9 @@
 # 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                |
+|-------------------------------------------------------------------|:-----------------:|:---------------------------------------------:|:---------------------------------------:|
+| <img src="./team/pics/hosea.jpg" width="50%" height="50%" />      |       Hosea       |      [Github](https://github.com/ollayf)      |      [Portfolio](./team/ollayf.md)      |
+| <img src="./team/pics/khairul.jpg" width="50%" height="50%" />     |   Khairul Aizat   |     [Github](https://github.com/kairuler)     |     [Portfolio](./team/kairuler.md)     |
+| ![](https://via.placeholder.com/100.png?text=Photo)               |     Zheng Xi      |    [Github](https://github.com/euzhengxi)     |    [Portfolio](./team/euzhengxi.md)     |
+| <img src="./team/pics/Deepanjali.jpg" width="50%" height="50%" /> | Deepanjali Dhawan | [Github](https://github.com/DeepanjaliDhawan) | [Portfolio](./team/deepanjalidhawan.md) |
+| ![](https://rb.gy/2lyjkm)                                         |      Steven       |   [Github](https://github.com/stevenantya)    |      [Portfolio](./team/steven.md)      |
diff --git a/docs/DGDiagramsCreator/Backend-Backend_Component_Diagram.png b/docs/DGDiagramsCreator/Backend-Backend_Component_Diagram.png
diff --git a/docs/DGDiagramsCreator/Backend.puml b/docs/DGDiagramsCreator/Backend.puml
@@ -0,0 +1,11 @@
+@startuml
+!include Style.puml
+title Backend Component Diagram
+file database
+node SecretMaster
+component Backend {
+    rectangle Backend
+}
+SecretMaster <-[dotted]right-> Backend.Backend : sends data for export OR\n collects data for import
+database <-[dotted]left-> Backend.Backend : encrypts data for export OR\n decrypts data for import
+@enduml
diff --git a/docs/DGDiagramsCreator/Basic_Intro.png b/docs/DGDiagramsCreator/Basic_Intro.png
diff --git a/docs/DGDiagramsCreator/Basic_Intro.puml b/docs/DGDiagramsCreator/Basic_Intro.puml
@@ -0,0 +1,57 @@
+!include Style.puml
+@startuml
+'https://plantuml.com/sequence-diagram
+
+autoactivate on
+actor User #FFFBBB
+  -> "secureNUS:SecureNUS"#00cccc: run()
+"secureNUS:SecureNUS" -> "<<class>>\nUi"#F00000: greetUser()
+return
+loop while !isExit
+
+    "secureNUS:SecureNUS" -> "secureNUS:SecureNUS"#FF0AB0: parseCommand()
+    "secureNUS:SecureNUS" -> "<<class>>\nUi"#F00000: readCommand()
+    User-> "<<class>>\nUi" #FFBBBB: "new password"
+    return
+    return
+    "secureNUS:SecureNUS" -> "<<class>>\nParser"#BBFFFF: parse(command, usedNames, folders)
+    "<<class>>\nParser"-> "<<class>>\nParser"#FFFAAA:parseAdd(command, usedNames)
+    "<<class>>\nParser" -> ":AddBasicPassword" **
+    activate ":AddBasicPassword"#BBB
+    ":AddBasicPassword"-> ":AddBasicPassword"#FFFAAA:extractName(input, keyword)
+    return
+    ":AddBasicPassword"-> ":AddBasicPassword"#FFFAAA:extractFolderName(input)
+    return
+    ":AddBasicPassword"-> ":AddBasicPassword"#FFFAAA:inquire(URL, "URL")
+    return
+    ":AddBasicPassword"-> ":AddBasicPassword"#FFFAAA:inquire(USERNAME, "Username")
+    return
+    ":AddBasicPassword"-> ":AddBasicPassword"#FFFAAA:inquire(PASSWORD, "Password")
+    return
+    return
+    return
+    return
+    return command
+    "secureNUS:SecureNUS" -> "secureNUS:SecureNUS"#BBFFFB:executeCommand(c)
+    "secureNUS:SecureNUS" -> ":AddBasicPassword"#FFAAFF:execute(secureNUSData)
+    ":AddBasicPassword" -> ":BasicPassword"**
+    activate ":BasicPassword"
+    return
+
+
+    ":AddBasicPassword" -> "secureNUSData:SecretMaster"#FA0012:addSecret(basicPasswordData)
+    "secureNUSData:SecretMaster" -> "secretEnumerator:SecretEnumerator"#FF1233:add(secret)
+    return
+    "secureNUSData:SecretMaster" -> "secretSearcher:SecretSearcher"#FF1233:add(secret)
+    return
+    return
+    ":AddBasicPassword" -> "<<class>>\nUi"#000134: inform("I have added new basic password...")
+    return
+    ":AddBasicPassword" -> "<<class>>\nBackend"#317821: updateStorage(input)
+    return
+    return isExit = false
+    destroy ":AddBasicPassword"
+return
+end
+
+@enduml
diff --git a/docs/DGDiagramsCreator/ClassHigh-Class_Connectivity_Diagram.png b/docs/DGDiagramsCreator/ClassHigh-Class_Connectivity_Diagram.png
diff --git a/docs/DGDiagramsCreator/ClassHigh.puml b/docs/DGDiagramsCreator/ClassHigh.puml
@@ -0,0 +1,61 @@
+@startuml
+!include Style.puml
+title Class Connectivity Diagram
+component "Application" {
+    component 'SecureNUS {
+        package "command" {
+            node Commands
+        }
+        package secureNUS {
+            node SecureNUS
+        }
+    }
+
+    component UI {
+        package "ui" {
+            node Ui
+            node Parser
+            Ui -> Parser
+        }
+
+    }
+
+    Parser -right-> Commands
+
+    component 'Backend {
+        package secureNUS {
+            node Backend
+        }
+    }
+    component SecretStorage {
+        package SecretStorage {
+            node SecretMaster
+            node SecretEnumerator
+            node SecretSearcher
+        }
+    }
+
+    Commands --> SecureNUS
+    SecureNUS --> SecretMaster
+    SecretMaster --> SecretSearcher
+    SecretMaster --> SecretEnumerator
+    SecretMaster <-right-> Backend
+
+}
+component InputCLI {
+    actor User
+}
+component Logger {
+    node secure.SecureNUSLogger
+    node secure.SecureNUSLoggerFormatter
+    SecureNUSLogger --> SecureNUSLoggerFormatter
+}
+component OutputFiles {
+    file logFiles
+    file database
+}
+Application --> SecureNUSLogger
+SecureNUSLoggerFormatter --> logFiles
+User --> Ui
+Backend <-> database
+@enduml
diff --git a/docs/DGDiagramsCreator/ClassLevel.puml b/docs/DGDiagramsCreator/ClassLevel.puml
@@ -0,0 +1,23 @@
+@startuml
+!include Style.puml
+
+package Application {
+    rectangle Commands
+    class Parser {
+    }
+    class UI {
+    }
+    Commands <- Parser
+    Parser <- UI
+    Commands --> SecureNUS
+    SecureNUS --> SecretMaster
+    SecretMaster --> SecretSearcher
+    SecretMaster --> SecretEnumerator
+    SecretMaster <-> Backend
+}
+actor InputCLI.User
+file OutputFile.database
+InputCLI.User -> UI
+Backend <-> OutputFile.database
+
+@enduml
diff --git a/docs/DGDiagramsCreator/DGUsedDiagrams/ArchitectureDiagram.png b/docs/DGDiagramsCreator/DGUsedDiagrams/ArchitectureDiagram.png
diff --git a/docs/DGDiagramsCreator/DGUsedDiagrams/BackendComponent.png b/docs/DGDiagramsCreator/DGUsedDiagrams/BackendComponent.png
diff --git a/docs/DGDiagramsCreator/DGUsedDiagrams/ClassConnectivityDiagram.png b/docs/DGDiagramsCreator/DGUsedDiagrams/ClassConnectivityDiagram.png
diff --git a/docs/DGDiagramsCreator/DGUsedDiagrams/CommandComponent.png b/docs/DGDiagramsCreator/DGUsedDiagrams/CommandComponent.png
diff --git a/docs/DGDiagramsCreator/DGUsedDiagrams/ExclamationMark.png b/docs/DGDiagramsCreator/DGUsedDiagrams/ExclamationMark.png
diff --git a/docs/DGDiagramsCreator/DGUsedDiagrams/LightBulb.png b/docs/DGDiagramsCreator/DGUsedDiagrams/LightBulb.png
diff --git a/docs/DGDiagramsCreator/DGUsedDiagrams/SecretStorageComponent.png b/docs/DGDiagramsCreator/DGUsedDiagrams/SecretStorageComponent.png
diff --git a/docs/DGDiagramsCreator/DGUsedDiagrams/SequenceDiagramNew.png b/docs/DGDiagramsCreator/DGUsedDiagrams/SequenceDiagramNew.png
diff --git a/docs/DGDiagramsCreator/DGUsedDiagrams/UIComponent.png b/docs/DGDiagramsCreator/DGUsedDiagrams/UIComponent.png
diff --git a/docs/DGDiagramsCreator/DGUsedDiagrams/image23.png b/docs/DGDiagramsCreator/DGUsedDiagrams/image23.png
diff --git a/docs/DGDiagramsCreator/Delete_Intro.png b/docs/DGDiagramsCreator/Delete_Intro.png
diff --git a/docs/DGDiagramsCreator/Delete_Intro.puml b/docs/DGDiagramsCreator/Delete_Intro.puml
@@ -0,0 +1,41 @@
+!include Style.puml
+@startuml
+'https://plantuml.com/sequence-diagram
+
+autoactivate on
+actor User #FFFBBB
+  -> "secureNUS:SecureNUS"#00cccc: run()
+"secureNUS:SecureNUS" -> "<<class>>\nUi"#F00000: greetUser()
+return
+loop while !isExit
+
+    "secureNUS:SecureNUS" -> "secureNUS:SecureNUS"#FF0AB0: parseCommand()
+    "secureNUS:SecureNUS" -> "<<class>>\nUi"#F00000: readCommand()
+    User-> "<<class>>\nUi" #FFBBBB: "delete password"
+    return
+    return
+    "secureNUS:SecureNUS" -> "<<class>>\nParser"#BBFFFF: parse(command, usedNames, folders)
+
+    "<<class>>\nParser" -> ":DeleteCommand" **
+    activate ":DeleteCommand"#BBB
+    ":DeleteCommand"-> ":DeleteCommand"#FFFAAA:extractName(input, keyword)
+    return
+
+    return
+    return DeleteCommand
+    return
+    "secureNUS:SecureNUS" -> "secureNUS:SecureNUS"#BBFFFB:executeCommand(c)
+    "secureNUS:SecureNUS" -> ":DeleteCommand"#FFAAFF:execute(secureNUSData)
+    ":DeleteCommand" -> ":SecretMaster":getByName(name)
+    return deleteData
+    ":DeleteCommand" -> ":SecretMaster":removeSecret(deleteData)
+    return
+    return
+    destroy ":DeleteCommand"
+
+    "secureNUS:SecureNUS" -> "<<class>>\nBackend"#317821: updateStorage(input)
+    return
+    return isExit = false
+
+end
+@enduml
diff --git a/docs/DGDiagramsCreator/HighLevel-High_Level_Architecture_Diagram.png b/docs/DGDiagramsCreator/HighLevel-High_Level_Architecture_Diagram.png
diff --git a/docs/DGDiagramsCreator/HighLevel.png b/docs/DGDiagramsCreator/HighLevel.png
diff --git a/docs/DGDiagramsCreator/HighLevel.puml b/docs/DGDiagramsCreator/HighLevel.puml
@@ -0,0 +1,33 @@
+@startuml
+!include Style.puml
+title High Level Architecture Diagram
+component Application {
+
+    rectangle SecureNUS
+    rectangle UI
+    rectangle Backend
+    rectangle SecretStorage
+    rectangle Logger
+    SecureNUS <- UI
+    SecureNUS <--> SecretStorage
+    SecretStorage <-> Backend
+    SecureNUS -> Backend
+}
+component InputCLI {
+    actor User
+}
+InputCLI.User -left-> UI
+
+component OutputFiles {
+    file logFiles
+    file database
+}
+
+UI -> Logger
+SecureNUS -> Logger
+SecretStorage -> Logger
+Backend -> Logger
+Logger --> logFiles
+Backend <-down-> database
+
+@enduml
diff --git a/docs/DGDiagramsCreator/Implementation_Add.puml b/docs/DGDiagramsCreator/Implementation_Add.puml
@@ -0,0 +1,24 @@
+@startuml
+'https://plantuml.com/component-diagram
+
+circle "user"
+
+rectangle "SecureNUS Application" {
+    rectangle "<u>secureNUS:SecureNUS"
+    "user" -u-> "<u>secureNUS:SecureNUS"
+    rectangle "Parser"
+    "<u>secureNUS:SecureNUS" -r-> "Parser" : parse(command, usedNames, folders)
+    rectangle "<u>:AddBasicPasswordCommand"
+    "Parser" -u-> "<u>:AddBasicPasswordCommand"
+
+'    "<u>secureNUS:SecureNUS" -r-> "<u>:AddBasicPasswordCommand":execute(command)
+'    rectangle "<u>:BasicPassword"
+'    "<u>:AddBasicPasswordCommand" -u-> "<u>:BasicPassword"
+''
+'    rectangle "<u>secureNUSData:SecretMaster"
+'    "<u>:AddBasicPasswordCommand" -d-> "<u>secureNUSData:SecretMaster": addSecret(BasicPassword)
+'    rectangle "Backend"
+'    "<u>secureNUS:SecureNUS" -r-> "Backend": updateStorage(ArrayList<Secret>)
+}
+
+@enduml
diff --git a/docs/DGDiagramsCreator/Implementation_Delete.puml b/docs/DGDiagramsCreator/Implementation_Delete.puml
@@ -0,0 +1,24 @@
+@startuml
+'https://plantuml.com/component-diagram
+
+circle "user"
+
+rectangle "SecureNUS Application" {
+    rectangle "<u>secureNUS:SecureNUS"
+    "user" -u-> "<u>secureNUS:SecureNUS"
+    rectangle "Parser"
+    "<u>secureNUS:SecureNUS" -r-> "Parser" : parse(command, usedNames, folders)
+    rectangle "<u>:DeleteCommand"
+    "Parser" -u-> "<u>:DeleteCommand"
+
+'    "<u>secureNUS:SecureNUS" -r-> "<u>:DeleteCommand":execute(command)
+'    rectangle "<u>basicPasswordData:BasicPassword"
+'    "<u>:DeleteCommand" -u-> "<u>basicPasswordData:BasicPassword"
+''
+'    rectangle "<u>secureNUSData:SecretMaster"
+'    "<u>:DeleteCommand" -d-> "<u>secureNUSData:SecretMaster": removeSecret(deleteData)
+'    rectangle "Backend"
+'    "<u>secureNUS:SecureNUS" -r-> "Backend": updateStorage(ArrayList<Secret>)
+}
+
+@enduml
diff --git a/docs/DGDiagramsCreator/Implementation_List_folderName.puml b/docs/DGDiagramsCreator/Implementation_List_folderName.puml
@@ -0,0 +1,27 @@
+@startuml
+'https://plantuml.com/component-diagram
+
+circle "user"
+
+rectangle "SecureNUS Application" {
+    rectangle "<u>secureNUS:SecureNUS"
+    "user" -u-> "<u>secureNUS:SecureNUS"
+    rectangle "Parser"
+    "<u>secureNUS:SecureNUS" -r-> "Parser" : parse(command, usedNames, folders)
+    rectangle "<u>:ListCommand"
+    "Parser" -u-> "<u>:ListCommand"
+
+'    "<u>secureNUS:SecureNUS" -r-> "<u>:ListCommand":execute(command)
+'    rectangle "<u>basicPasswordData:BasicPassword"
+'    "<u>:ListCommand" -u-> "<u>basicPasswordData:BasicPassword"
+''
+'    rectangle "<u>secureNUSData:SecretMaster"
+'    "<u>:ListCommand" -d-> "<u>secureNUSData:SecretMaster": listSecrets(folderName)
+'    "<u>:ListCommand" -d-> "<u>secureNUSData:SecretMaster": getSecretTypeInfo(secret)
+'    rectangle "Backend"
+'    "<u>secureNUS:SecureNUS" -r-> "Backend": updateStorage(ArrayList<Secret>)
+'    rectangle "System out"
+'    "<u>:ListCommand" -d-> "System out":println("List ...")
+}
+
+@enduml
diff --git a/docs/DGDiagramsCreator/List_intro.png b/docs/DGDiagramsCreator/List_intro.png
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		Manifest-Version: 1.0
		Main-Class: seedu.securenus.SecureNUS