Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
language: java
jdk:
- oraclejdk8
sudo: false
script: mvn clean install -f tdt4140-gr1864/pom.xml $MAVEN_CLI_OPTS
notifications:
email: false
after_success:
- bash <(curl -s https://codecov.io/bash)
13 changes: 11 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
<h1><img src="https://i.imgur.com/NaEWdZ3.png" width="100" />&nbsp; &nbsp; E.C.
Shop :apple: :bacon: :hamburger: :stuffed_flatbread:</h1>

<img src="https://gitlab.stud.iie.ntnu.no/tdt4140-2018/64/badges/master/build.svg">
<img src="https://gitlab.stud.iie.ntnu.no/tdt4140-2018/64/badges/master/coverage.svg">
<img src="https://travis-ci.org/strandlie/EC-Shop.svg?branch=master">
<img src="https://codecov.io/gh/strandlie/EC-Shop/branch/master/graph/badge.svg">

This is a school project developed associated with the subject TDT4140 at NTNU.
The project was developed using SCRUM, split into three sprints. A private
Gitlab-instance was used - this repo is a clone of the final release. Issues,
wiki and pull-requests were not migrated.

E.C. Shop is a system for tracking customers in a store, similarly to systems
such as Amazon's Amazon Go. The system tracks customer inventories as they move
Expand All @@ -18,6 +21,8 @@ items in stock, and visualizations of customer movements throughout the shop.
- [Data providers](#features-for-data-providers-customers)
- [Installation](#installation)
- [System Architecture](#system-architecture)
- [Tools we've used](#list-of-tools-weve-used)
- [Documentation](#documentation)

## Feature overview
### Features for service providers / shop owners
Expand Down Expand Up @@ -113,3 +118,7 @@ The `app` module is responsible for starting and stopping the system cleanly.
* Eclipse - An open source IDE that is primarly used to develop in this project
* JavaFX - A set of graphics and media packages.
* JDBC - Short for Java Database Connectivity and is a standardized interface for java applications that communicates with a database.

## Documentation
[REST-API documentation is found here.](https://github.com/strandlie/EC-Shop/blob/master/tdt4140-gr1864/web.server/README.md)

This file was deleted.

4 changes: 2 additions & 2 deletions tdt4140-gr1864/app/src/main/java/org/app/App.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class App implements AppListener {
private static App app;

/**
* The Thread running the DataMocker.
* The Thread for running the DataMocker.
*/
private Thread mockerThread;

Expand Down Expand Up @@ -74,4 +74,4 @@ public static void main(String[] args) throws Exception {
App.initialize();
OwnerApp.launch(OwnerApp.class, args);
}
}
}