Skip to content

Develop #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 242 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
242 commits
Select commit Hold shift + click to select a range
2df78df
Merge branch 'release-0.0.2' into develop
thomasmchen Sep 8, 2018
3f5898a
Added Angular project
dmorton2297 Sep 13, 2018
792bc97
Added navigation bar component and main menu component
dmorton2297 Sep 13, 2018
4763dbe
Added routing to front end
dmorton2297 Sep 13, 2018
9e6a878
Added basic menu buttons
dmorton2297 Sep 13, 2018
0099435
Frontend update
dmorton2297 Sep 15, 2018
8d9eae4
Added cell, grid, game-controls component scaffolding
dmorton2297 Sep 15, 2018
0d57ff7
core - created a rough layout of what the main menu will be
Sep 16, 2018
dc4dda0
merge issue - fixed an issue with my last commit, accidently overwrot…
Sep 16, 2018
b771e81
Added component + routing for main menu
dmorton2297 Sep 17, 2018
013ce8b
Added battleship grid component
dmorton2297 Sep 18, 2018
30a33c5
Fixed inputs for grid
dmorton2297 Sep 18, 2018
06812db
System responds with cell coordinates when user selects a tiletile
dmorton2297 Sep 18, 2018
f668d51
quick fix - fixed some scaling issues with the main menu
Sep 19, 2018
d666d37
quick fix - another small fix to the main menu that I missed before
Sep 19, 2018
2041c2d
Added event emitter for grid object
dmorton2297 Sep 19, 2018
c2416be
Grid component onCellClicked() can be mapped to parent component hand…
dmorton2297 Sep 19, 2018
b7d0b1a
Updating local repo
dmorton2297 Sep 19, 2018
eb6c637
Added component to add ships
dmorton2297 Sep 20, 2018
bd10ee7
core - add Map and Cell classes
thomasmchen Sep 20, 2018
1cb7ec1
core - base commit for spring api module
thomasmchen Sep 20, 2018
ce7157e
Updated with correct ships + added input validation on ship placement
dmorton2297 Sep 21, 2018
ee62d0c
Added google sign in api button. Must be logged in to navigate throug…
dmorton2297 Sep 21, 2018
6e49a11
Added go home button to navigation bar
dmorton2297 Sep 21, 2018
b41ef73
Merge pull request #1 from thomasmchen/feat/scaffolding
thomasmchen Sep 21, 2018
ea71eb7
core - add Cell and CellType classes with tests
thomasmchen Sep 21, 2018
2ff11ce
Added input validation to new game form
dmorton2297 Sep 22, 2018
cfdaf33
Added check to make sure ships cannot overlap
dmorton2297 Sep 22, 2018
7984c1b
core - add Ship and ShipType classes with tests
thomasmchen Sep 22, 2018
86eba0c
infra - update maven compiler source to 1.8 to support lambda express…
thomasmchen Sep 22, 2018
7fb53d7
core - comment Cell classes
thomasmchen Sep 23, 2018
55ca048
Fixed json format for exporting placed ships locations
dmorton2297 Sep 24, 2018
5547585
structure - created the basic structure for Settings and About pages,…
Sep 25, 2018
f6db0f6
added DarkModeService to applicable components to support dark theme
aalthof1 Sep 26, 2018
b472869
rudimentary dark theme working for everything except statistics and c…
aalthof1 Sep 26, 2018
4672961
Pulling
dmorton2297 Sep 26, 2018
fe40bba
Pulling
dmorton2297 Sep 26, 2018
2088e25
added darkmode.service
aalthof1 Sep 26, 2018
7d81737
Pulling down changes
dmorton2297 Sep 26, 2018
9cd54ce
Resolved merge conflicts
dmorton2297 Sep 26, 2018
ae51b9b
Added colinear check to front end
dmorton2297 Sep 26, 2018
10d3541
Added fifth ship (correct battleship rules) to new game
dmorton2297 Sep 26, 2018
cb3df17
Fixed format of placed ships to be sent to backend in post request
dmorton2297 Sep 26, 2018
b70653b
Added JSON format for hhow gamewindow is expecting to recieve informa…
dmorton2297 Sep 26, 2018
79e1ff1
core - add Player class base and tests
thomasmchen Sep 26, 2018
d040cc0
core - add Map base and tests
thomasmchen Sep 26, 2018
4e61c06
core - add point calculation functionality to Ship class
thomasmchen Sep 26, 2018
9edd3ed
Able to parse json from get ships obejct. Need to work on rendering t…
dmorton2297 Sep 26, 2018
4fda911
infra - update pom.xml to include Spring dependencies
thomasmchen Sep 26, 2018
904658d
core - add static resources for websocket stub
thomasmchen Sep 26, 2018
7517087
core - add websocket stub
thomasmchen Sep 26, 2018
e20c7bf
Fixed null cell id issue
dmorton2297 Sep 27, 2018
2b1ab55
Ensured x and y coordinates of a cell can always be determined from c…
dmorton2297 Sep 27, 2018
d96dbae
Gamewindow able to render placed ships from api request
dmorton2297 Sep 27, 2018
a574a09
added timer support into darkmode.service.ts, timer appears in upper …
aalthof1 Sep 27, 2018
f089332
feature - added fullscreen option in Settings module, still need to f…
Sep 27, 2018
91cb466
merge - fixed merge issue
Sep 27, 2018
97381f8
added formatting for timer to differentiate minutes and seconds
aalthof1 Sep 27, 2018
ba56a6a
Merge branch 'feat/scaffolding' of https://github.com/thomasmchen/bsh…
aalthof1 Sep 27, 2018
9587d86
removed test div from settings and added correct labels for settings
aalthof1 Sep 27, 2018
b493c3f
core - add BoardState POJO base
thomasmchen Sep 27, 2018
41cc466
core - add tests for api stub
thomasmchen Sep 27, 2018
5bdece4
Merge branch 'feat/spring-core' into develop
thomasmchen Sep 27, 2018
896b499
core - removed Game from model package
thomasmchen Sep 27, 2018
99309d9
Checking out
dmorton2297 Sep 27, 2018
3ef9c5f
update .gitignore
dmorton2297 Sep 27, 2018
d354cf1
Merging
dmorton2297 Sep 27, 2018
dc7b5e7
Added stying to timer
dmorton2297 Sep 27, 2018
e93f2ea
Fixed merge conflicts
dmorton2297 Sep 27, 2018
b23393b
feat - adjusted pages to fit fullscreen format; included navigation b…
Sep 27, 2018
d717627
merge - fixed merge conflicts, nothing major
Sep 27, 2018
81d799b
Checkin gout
dmorton2297 Sep 27, 2018
e230d55
core - update test cases for Map, Player, Ship classes
thomasmchen Sep 27, 2018
3ef359b
Merge branch 'feat/core-model' into develop
thomasmchen Sep 27, 2018
343aaf3
removed timer box in gameWindow when timer is false
aalthof1 Sep 27, 2018
9c79953
feature - changed goFullscreen switch to a simple button, commented o…
Sep 27, 2018
f8450bc
Merged scaffolding into local repro
dmorton2297 Sep 28, 2018
a16483b
incremental/regression testing doc and updated backlog
dmorton2297 Sep 29, 2018
a173df7
Resolving merge
dmorton2297 Sep 29, 2018
5176555
incremental/regression testing and updated backlog sprint 1
dmorton2297 Sep 29, 2018
d1d16b5
Merge pull request #4 from thomasmchen/feat/scaffolding
thomasmchen Oct 5, 2018
62c89d7
Pulling down remote changes
dmorton2297 Oct 5, 2018
6342225
NewGameRequest class created
dmorton2297 Oct 5, 2018
f758a88
AttackRequest class created
dmorton2297 Oct 5, 2018
fb173a3
Added moverequest class
dmorton2297 Oct 5, 2018
ca7de82
tests - created some simple Unit Tests for the MainMenu component. I'…
Oct 8, 2018
2e14087
tests | more simple tests cases for NewGame and Settings, mostly test…
Oct 9, 2018
c20f33c
core - add base for engine controller
thomasmchen Oct 10, 2018
860e3b8
Skeleton for web service added to front end
dmorton2297 Oct 11, 2018
0e4a56f
Updated backend endpoint and began writing configuraiton
dmorton2297 Oct 11, 2018
9c83ac4
Added web service to connect front end to backend. Make sure to run n…
dmorton2297 Oct 11, 2018
23d136b
Committing before merge
dmorton2297 Oct 12, 2018
da0915c
Fixed merge conflicts
dmorton2297 Oct 12, 2018
9a17ebc
Merging pojo into branch
dmorton2297 Oct 12, 2018
7032445
core - update all core model classes for new CellType enum
thomasmchen Oct 12, 2018
054b106
core - add CellType/CellGroup nested enum class
thomasmchen Oct 12, 2018
14e7547
core - add cli client for testing
thomasmchen Oct 12, 2018
f2912d6
core - add additional testing for model package
thomasmchen Oct 12, 2018
2b0651f
core - add input validation for ship placement
thomasmchen Oct 12, 2018
a818fe3
tests - attempt #3 to add these tests to develop...
Oct 12, 2018
5aafb96
Added dependency
dmorton2297 Oct 12, 2018
74a3f5d
Mergin api-core
dmorton2297 Oct 12, 2018
b9f08de
Socket setup correctly
dmorton2297 Oct 12, 2018
32cd0c2
Enginecontroller can know parse NewGameRequest into java object
dmorton2297 Oct 12, 2018
601a57e
core -add mvn:exec to execute cli client
thomasmchen Oct 12, 2018
ddc3d79
Merge pull request #8 from thomasmchen/tests
thomasmchen Oct 12, 2018
a543adf
core - add more robust input validation for cli client
thomasmchen Oct 12, 2018
6e8cd66
core - add player state tracking of opponents board
thomasmchen Oct 12, 2018
12bc654
core - refactor AI into Playable interface implementations and added …
thomasmchen Oct 12, 2018
c7d4b8b
Fixed new game menu to have appropriately defined ships
dmorton2297 Oct 12, 2018
20a3929
Merging from remote
dmorton2297 Oct 12, 2018
46deb6d
NewGameRequest is parsed into POJO object successfully using Model cl…
dmorton2297 Oct 12, 2018
b0eb5c5
Fixed approriate method header names
dmorton2297 Oct 12, 2018
4133572
core - add better input validation for cli client
thomasmchen Oct 12, 2018
00c19b3
PUshing
dmorton2297 Oct 12, 2018
27f1dfc
Checking out
dmorton2297 Oct 13, 2018
604ab9f
Mergin feat/api-core
dmorton2297 Oct 13, 2018
5b365d6
Gamewindow now pulls down user placed ships
dmorton2297 Oct 14, 2018
715ffa8
Basic battleship turns implemented
dmorton2297 Oct 14, 2018
53e6f1c
Removed ambigious Thread.sleep(1000); call in EngineController.ts
dmorton2297 Oct 14, 2018
6f920fd
database - updated pom.xml and created application.properites file to…
Oct 14, 2018
641a6cc
added tests to ensure that darkmode is applied to modules
aalthof1 Oct 14, 2018
60f92a0
docs - added sprint 2 doc
Oct 14, 2018
1db286a
weird merge issues...
Oct 14, 2018
b1f411c
Merge pull request #10 from thomasmchen/tests
s-merritt Oct 14, 2018
3022803
Merge pull request #9 from thomasmchen/feat/integration
s-merritt Oct 14, 2018
346379b
Merge branch 'develop' into docs
dmorton2297 Oct 14, 2018
7941816
update to settings
Oct 14, 2018
da6a65d
fixed pom.xml file
Oct 14, 2018
fa69bdc
removed duplicate test files
Oct 14, 2018
33fd519
Merge pull request #12 from thomasmchen/docs
s-merritt Oct 14, 2018
f0e7efe
core - update Game engine class with scrimmage and cli functionality,…
thomasmchen Oct 15, 2018
9eb5214
core - add statistics module for data gathering functionality
thomasmchen Oct 15, 2018
cfb5c29
core - add ai interface and naive, intermediate battleship AIs
thomasmchen Oct 15, 2018
ce9a269
core - add additional testing for model package
thomasmchen Oct 15, 2018
41cde2f
core - update api files to accomodate package refactor
thomasmchen Oct 15, 2018
544c39e
core - refactor controller functionality into engine package
thomasmchen Oct 15, 2018
2fba712
core - add testing for statistics package
thomasmchen Oct 15, 2018
4755c4d
core - resolve merge conflicts with develop
thomasmchen Oct 15, 2018
36f3b2a
core - remove simulate function
thomasmchen Oct 15, 2018
5efa9b5
Merge branch 'feat/ai-patch' into develop
thomasmchen Oct 15, 2018
400171a
Fixed issue when merging devlop into this branch
Oct 16, 2018
22e8ba8
re-merged with develop
Oct 16, 2018
272bee8
Created Database class to push data to/from H2 DB
Oct 16, 2018
b6040b1
func - added functions that will add Users and GameStats to appropria…
Oct 17, 2018
edfd339
minor tweak, nothing important
Oct 17, 2018
1cc3767
added user ID passing from authentication to gameWindow
aalthof1 Oct 17, 2018
6380e7d
Hit sunk and miss messages implemented
dmorton2297 Oct 18, 2018
cdeb71e
Game now prompts user when there is a victor and the result of each t…
dmorton2297 Oct 18, 2018
8b2b290
Nothing important in this commit besides build changes
Oct 18, 2018
46bdd94
func - Added H2-specific for creating the DB locally and emptying it …
Oct 18, 2018
acbdb2e
added base code for sending userIDs to backend
aalthof1 Oct 18, 2018
7db96bc
got userID sent to backend. still need to remove frontent debugging p…
aalthof1 Oct 19, 2018
ea636f0
Merge pull request #13 from thomasmchen/feat/integration
s-merritt Oct 19, 2018
160dff6
quick fix | just fixed a minor typo I noticed, figured I'd commit it …
Oct 19, 2018
edbe1ec
func | added function to pull all GameStats based on User_ID, also ad…
Oct 19, 2018
151a907
quick fix - deleted import statement that was not being used
Oct 19, 2018
f81bfae
Cleaned up some things
dmorton2297 Oct 19, 2018
19e99d6
Added drop down element to select AI to play
dmorton2297 Oct 19, 2018
97f02f9
Now can select an AI to play
dmorton2297 Oct 19, 2018
8363db0
Fixed bug that broke game after playing more than one game in a row
dmorton2297 Oct 19, 2018
7268672
Merge pull request #14 from thomasmchen/feat/integration
s-merritt Oct 19, 2018
54cee01
core - update core classes to to prepare for Movement functionality
thomasmchen Oct 21, 2018
bbfa8bb
core - refactor ai package to support better idiomatic usage of Playa…
thomasmchen Oct 21, 2018
fee3570
Merge branch 'feat/ai-core' into develop
thomasmchen Oct 21, 2018
c0942f4
Merge branch 'develop' of https://github.com/thomasmchen/bshpvs into …
thomasmchen Oct 21, 2018
0d9dcd0
infra - update codecov config, remove empty classes
thomasmchen Oct 21, 2018
6108aab
core - update model to handle multiplayer + ship movement
thomasmchen Oct 21, 2018
1abc66d
core - update engines to handle multiplayer changes
thomasmchen Oct 21, 2018
7813c42
test - update existing unit tests to be compatible with multiplayer c…
thomasmchen Oct 21, 2018
b029902
core - change win/loss calculation to make sense for multiplayer
thomasmchen Oct 21, 2018
ba6b052
core - updated ai package to support multiplayer + new turn model api
thomasmchen Oct 21, 2018
3949816
core - updated EngineController to use new multiplayer model usage
thomasmchen Oct 21, 2018
e448e71
Fixed end game condition
dmorton2297 Oct 22, 2018
5e815dc
tests - updated directories and created framework for DB tests
Oct 22, 2018
0ef8cea
fixed merge conflicts
Oct 22, 2018
d599c09
func - New users can now be added to the database once they start a n…
Oct 22, 2018
beb4597
minor changes with how data was saved in DB, confirmed gamestat added…
Oct 22, 2018
4675f20
Pulling from remote
dmorton2297 Oct 22, 2018
80270b2
Major changes in EngineController.java to integrate changes from feat…
dmorton2297 Oct 22, 2018
96bc8ab
Game controls updated. Event emitter added so GameWindow can be infor…
dmorton2297 Oct 22, 2018
e70701d
Fixed bug founrd in EngineController.java that was incorrectly assign…
dmorton2297 Oct 22, 2018
f4030a0
User interface controls implemented for user to make move ship request
dmorton2297 Oct 22, 2018
b8e6373
Adjusted MoveRequest typescript interface and MoveRequest.java to mee…
dmorton2297 Oct 22, 2018
6b2d25e
Moving ships implemented for the user... still needs to be implemente…
dmorton2297 Oct 23, 2018
2f00bd3
created new classes to handle communication of Stats from DB to Client
Oct 23, 2018
09d7f2a
fixed merge issue
Oct 23, 2018
b60e07f
Add files via upload
s-merritt Oct 23, 2018
0b117ff
Merge pull request #17 from thomasmchen/sprint-2-doc
dmorton2297 Oct 23, 2018
3837004
feat - double-clicking refresh button on stats page will now retreive…
Oct 23, 2018
e8dade7
LogOut functionality and basic stats page layout created
kelvinchoi95 Oct 23, 2018
d1a2ef2
Move implementation finished for user player
dmorton2297 Oct 23, 2018
e462965
Merge branch 'develop' into feat/integration
dmorton2297 Oct 23, 2018
8ff22f7
Merge pull request #18 from thomasmchen/feat/integration
s-merritt Oct 23, 2018
636fb94
Added drop down on new game menu that allows a user to specify the am…
dmorton2297 Oct 23, 2018
325a960
Application now renders appropriate amount of grids based on user input
dmorton2297 Oct 23, 2018
e2ba27a
Multiple enemies now added to user in backend
dmorton2297 Oct 23, 2018
09b7f2d
fixed merge conflict when merging login
Oct 23, 2018
aedcf14
fixed building issue
Oct 23, 2018
bc117ab
Finished table for game stat data, also adjusted other pages to work …
Oct 24, 2018
ad6c45a
minor fix
Oct 24, 2018
fcda9b7
fixed merge conflicts with develop
Oct 24, 2018
5bfc143
Adjusted AttackRequest to include info on which opponent is being att…
dmorton2297 Oct 24, 2018
9c4dee6
Merge branch 'develop' into feat/database
s-merritt Oct 24, 2018
6662364
Merge pull request #19 from thomasmchen/feat/database
s-merritt Oct 24, 2018
4da31f8
Playing against up to 3 multiple bots minimum support (no in game mes…
dmorton2297 Oct 24, 2018
1ec8434
Fixed merge conflicts from pull
dmorton2297 Oct 24, 2018
ee81671
When computers die, other bot opponents will not try and attack their…
dmorton2297 Oct 24, 2018
aa484cd
update config file
Oct 24, 2018
32ae75a
Fixed bugs
dmorton2297 Oct 24, 2018
ff602ff
Large update integrating multiplayer and database functionality
dmorton2297 Oct 24, 2018
83e0bec
Made some UI changes
dmorton2297 Oct 24, 2018
48106e6
Merge pull request #20 from thomasmchen/feat/multiplayer
s-merritt Oct 24, 2018
3e54c7e
Merge branch 'develop' of https://github.com/thomasmchen/bshpvs into …
Oct 24, 2018
0cb2f5f
fixed dark theme for statistics page and fixed issue with timer not a…
aalthof1 Oct 25, 2018
90f611c
fixed dark mode for game controls inside GameWindow
aalthof1 Oct 25, 2018
cd88e43
Merge pull request #21 from thomasmchen/feat/dark
s-merritt Oct 25, 2018
6785a56
Merge branch 'develop' of https://github.com/thomasmchen/bshpvs into …
Oct 25, 2018
c4de6e3
Merge branch 'develop' into feat/scaling
Oct 25, 2018
4d14085
updates - a few different things: first I fixed some scaling issues i…
Oct 25, 2018
ab69ef2
Merge pull request #22 from thomasmchen/feat/scaling
s-merritt Oct 25, 2018
b2c711e
core - update AI init paramters for test runnable
thomasmchen Oct 25, 2018
11a290d
Merge branch 'feat/multiplayer' of https://github.com/thomasmchen/bsh…
thomasmchen Oct 25, 2018
52797c4
Added game messaging back
dmorton2297 Oct 26, 2018
5efffa6
Enemy ships now turn purple when they are sunk
dmorton2297 Oct 26, 2018
7ee30bd
Ships now turn purple when they are sunk
dmorton2297 Oct 26, 2018
e8e1951
Pulling from remote
dmorton2297 Oct 26, 2018
be6999e
Merge branch 'develop' into feat/multiplayer
dmorton2297 Oct 26, 2018
c89747c
Merge pull request #23 from thomasmchen/feat/multiplayer
s-merritt Oct 26, 2018
cdabd7b
fixed UI issue when placing ships
aalthof1 Oct 26, 2018
8ce486c
Merge branch 'develop' into feat/dark
s-merritt Oct 27, 2018
f15e4a4
Merge pull request #24 from thomasmchen/feat/dark
aalthof1 Oct 27, 2018
2a6faa7
removed unnecessary surrender button from game controls
aalthof1 Oct 27, 2018
fd7f3d0
Merge pull request #26 from thomasmchen/feat/dark
aalthof1 Oct 27, 2018
b366a1d
Added diagnol ship check
dmorton2297 Oct 28, 2018
0193a68
Merge pull request #27 from thomasmchen/quickfix/diag
thomasmchen Oct 28, 2018
53a8801
Fixed overlap issue
dmorton2297 Oct 30, 2018
2990558
Added color legend to game window
dmorton2297 Oct 30, 2018
45ca818
Merge pull request #28 from thomasmchen/hotfix
s-merritt Oct 30, 2018
62ceb81
Added stables and seeded executables
dmorton2297 Oct 30, 2018
da471a0
Added defect log
dmorton2297 Nov 2, 2018
61169af
Merge pull request #29 from thomasmchen/defectsdocs
s-merritt Nov 2, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 49 additions & 0 deletions .classpath
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="target/generated-sources/annotations">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="m2e-apt" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="m2e-apt" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ target/
.idea/dictionaries
.idea/
\.DS_Store

node_modules/
.vscode/launch.json

# Sensitive or high-churn files:
.idea/**/dataSources/
Expand Down
23 changes: 23 additions & 0 deletions .project
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>bshpvs</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>
5 changes: 5 additions & 0 deletions .settings/org.eclipse.core.resources.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
encoding//src/main/resources=UTF-8
encoding//src/test/java=UTF-8
encoding/<project>=UTF-8
2 changes: 2 additions & 0 deletions .settings/org.eclipse.jdt.apt.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
org.eclipse.jdt.apt.aptEnabled=false
7 changes: 7 additions & 0 deletions .settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.processAnnotations=disabled
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=1.8
4 changes: 4 additions & 0 deletions .settings/org.eclipse.m2e.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
30 changes: 30 additions & 0 deletions .vscode/launch.test.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"run": {
"default": "",
"items": [
{
"name": "bshpvs",
"projectName": "bshpvs",
"workingDirectory": "/Users/dmorton/Documents/Senior Year/CS40800/bshpvs",
"args": [],
"vmargs": [],
"env": {},
"preLaunchTask": ""
}
]
},
"debug": {
"default": "",
"items": [
{
"name": "bshpvs",
"projectName": "bshpvs",
"workingDirectory": "/Users/dmorton/Documents/Senior Year/CS40800/bshpvs",
"args": [],
"vmargs": [],
"env": {},
"preLaunchTask": ""
}
]
}
}
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"java.configuration.updateBuildConfiguration": "interactive"
}
1 change: 1 addition & 0 deletions bin
Submodule bin added at 0eb1d6
13 changes: 13 additions & 0 deletions client/battleship/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Editor configuration, see http://editorconfig.org
root = true

[*]
charset = utf-8
indent_style = space
indent_size = 2
insert_final_newline = true
trim_trailing_whitespace = true

[*.md]
max_line_length = off
trim_trailing_whitespace = false
39 changes: 39 additions & 0 deletions client/battleship/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
/tmp
/out-tsc

# dependencies
/node_modules

# IDEs and editors
/.idea
.project
.classpath
.c9/
*.launch
.settings/
*.sublime-workspace

# IDE - VSCode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json

# misc
/.sass-cache
/connect.lock
/coverage
/libpeerconnection.log
npm-debug.log
yarn-error.log
testem.log
/typings

# System Files
.DS_Store
Thumbs.db
27 changes: 27 additions & 0 deletions client/battleship/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Battleship

This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 6.1.5.

## Development server

Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.

## Code scaffolding

Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.

## Build

Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `--prod` flag for a production build.

## Running unit tests

Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).

## Running end-to-end tests

Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).

## Further help

To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
127 changes: 127 additions & 0 deletions client/battleship/angular.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"newProjectRoot": "projects",
"projects": {
"battleship": {
"root": "",
"sourceRoot": "src",
"projectType": "application",
"prefix": "app",
"schematics": {},
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "dist/battleship",
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.app.json",
"assets": [
"src/favicon.ico",
"src/assets"
],
"styles": [
"src/styles.css"
],
"scripts": []
},
"configurations": {
"production": {
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.prod.ts"
}
],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true
}
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "battleship:build"
},
"configurations": {
"production": {
"browserTarget": "battleship:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "battleship:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "src/test.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.spec.json",
"karmaConfig": "src/karma.conf.js",
"styles": [
"src/styles.css"
],
"scripts": [],
"assets": [
"src/favicon.ico",
"src/assets"
]
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"src/tsconfig.app.json",
"src/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
]
}
}
}
},
"battleship-e2e": {
"root": "e2e/",
"projectType": "application",
"architect": {
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "e2e/protractor.conf.js",
"devServerTarget": "battleship:serve"
},
"configurations": {
"production": {
"devServerTarget": "battleship:serve:production"
}
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": "e2e/tsconfig.e2e.json",
"exclude": [
"**/node_modules/**"
]
}
}
}
}
},
"defaultProject": "battleship"
}
28 changes: 28 additions & 0 deletions client/battleship/e2e/protractor.conf.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// Protractor configuration file, see link for more information
// https://github.com/angular/protractor/blob/master/lib/config.ts

const { SpecReporter } = require('jasmine-spec-reporter');

exports.config = {
allScriptsTimeout: 11000,
specs: [
'./src/**/*.e2e-spec.ts'
],
capabilities: {
'browserName': 'chrome'
},
directConnect: true,
baseUrl: 'http://localhost:4200/',
framework: 'jasmine',
jasmineNodeOpts: {
showColors: true,
defaultTimeoutInterval: 30000,
print: function() {}
},
onPrepare() {
require('ts-node').register({
project: require('path').join(__dirname, './tsconfig.e2e.json')
});
jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
}
};
Loading