Merge pull request #97 from cevataykans/unstable

Final Merge

Author: cevataykans

.gitignore

@@ -6,7 +6,8 @@
 .idea/
 Catan.iml
 CS319-3C-CA.iml
-
+backend/dist/
+backend/node_modules/
 
 
 # User-specific stuff

How To Install JavaFX and AnimateFX.txt renamed to How To Run.txt

@@ -22,7 +22,7 @@ on bottom right and then you are done with modules.
 
 Edit Configurations:
 
-For the files you want to run (In our case the GameController, but you may have Test UI files you want to run) go to Run > Edit Configurations
+For the files you want to run (In our case the GameStart, but you may have Test UI files you want to run) go to Run > Edit Configurations
 and select your main class. For its VM Options, copy paste this in there (except change the part I marked below):
 --module-path **PATH TO YOUR JAVAFX FOLDER**\javafx-sdk-11.0.2\lib --add-modules javafx.controls,javafx.fxml
 and click Apply then OK. You are done with JavaFx
@@ -44,4 +44,29 @@ then click OK, it will download it for you.
 
 You are done with installing AnimateFX.
 
+How to add javafx.media:
+
+Open edit configuration of GameApplication.
+At VM options, add javafx.media to the end of the line.
+Click OK. It is done!
+
+How to install Socket-IO:
+
+1. Go to https://jar-download.com/artifacts/io.socket/socket.io-client/1.0.0/source-code
+
+2. Download socket-io (1.0.0)
+
+3. In the zip files you just downloaded, there are 5 jar files, put them in a folder and put the folder 
+in a place of your choice (make note of path)
+
+4. In Intellij, go to File > Project Structure
+
+5. Go to libraries
+
+6. Click the plus sign, select java and select all 5 jar files you downloaded.
+
+7. Click ok and add the jar files to the modules.
+
+8. Click apply and ok.
+
 AFTER YOU HAVE DONE BOTH, YOU CAN RUN THE MAIN UI CLASSES OF THE PROJECT!

README.md

@@ -20,15 +20,13 @@
 
 ## **Google Docs**
 
-### **Strategies**
-* [Meeting Logs](https://docs.google.com/document/d/1YEGElk27ZHa33cCEx46ROMKLR4PsSZnCwg8WuQudfV0/edit?usp=sharing)
-* [Scrum Table](https://docs.google.com/spreadsheets/d/115HN1STXjMm86rDx6S7wuDnutEHHgbMg2HYOdZIEgwY/edit?usp=sharing)
-
 ### **Iteration 1**
 * [Analysis Report](https://drive.google.com/file/d/1lChs5JGEpPjOdcbx_pfUOEZPQzpjT2E7/view?usp=sharing)
 * [Design Report](https://docs.google.com/document/d/1ENSQk3wdsQxmHv6eHtjSDhl6wFeL1WiFZxwjv5hoJDM/edit?usp=sharing)
-* [Final Report](https://docs.google.com/document/d/1QzuSwr4GFrtTxmu5OVGzC3DHmW7I_45uFiPZci5Z4Zw/edit?usp=sharing)
+* [Implementation Report](https://docs.google.com/document/d/1QzuSwr4GFrtTxmu5OVGzC3DHmW7I_45uFiPZci5Z4Zw/edit?usp=sharing)
 
 ### **Iteration 2**
 
-* Coming soon!
+* [Final Analysis Report](https://docs.google.com/document/d/13H8EdYlDQLpHxxDCcO5YupmPMzLSRQC3exlOHkJ5rkE/edit?usp=sharing)
+* [Final Design Report](https://docs.google.com/document/d/1le-MR7AAY2leZ1kjepFANwTwxalrcouuHc4Tb4URPuo/edit?usp=sharing)
+* [Final Implementation Report](https://docs.google.com/document/d/1k8MLamS2d4iooGKrpEHurJ-GVyrmAwXpwKF7sCa9YyQ/edit?usp=sharing)