Merge pull request #74 from KevinKelly25/dev

Merge master branch into dev

Author: cinnaco

.gitignore

@@ -1,6 +1,11 @@
-node_modules/
-client/fonts
-client/stylesheets
-client/javascripts/bootstrap.min.js
-client/javascripts/jquery.min.js
-client/javascripts/popper.min.js
+src/webapp/node_modules/*
+!src/webapp/node_modules/bootstrap
+src/webapp/client/fonts
+src/webapp/client/stylesheets
+src/webapp/client/javascripts/bootstrap.min.js
+src/webapp/client/javascripts/jquery.min.js
+src/webapp/client/javascripts/popper.min.js
+*.log
+src/webapp/client/javascripts/jquery.dataTables.min.js
+src/webapp/client/javascripts/angular-datatables.min.js
+src/webapp/client/javascripts/controllers/testControllers/

README.md

@@ -1,23 +1,9 @@
-# Bootstrap 4.1 Starter Pack
+<a href="https://postgresql.org"><img src="https://img.shields.io/badge/Powered%20by-PostgreSQL-blue.svg"/></a>
+<a href="https://github.com"><img src="https://img.shields.io/badge/Hosted%20on-GitHub-brightgreen.svg"/></a>
+<a href="https://zenhub.com"><img src="https://raw.githubusercontent.com/ZenHubIO/support/master/zenhub-badge.png"/></a>
 
-**Includes complete Bootstrap 4.1.0 dev environment with Gulp and Sass**
+# LearnSQL
 
-## Install Dependencies
+LearnSQL is an easy to use and easy to access Web Class Database that is specialized for learning SQL. This site currently has one main section that is a sandbox environment for students to practice SQL. Teachers are able to create these "sandbox" databases for each of their classes. For each database the instructor can view all their students work in that database. However, all students are only allowed to see thier own work. Teachers are also allowed to see student connections history and DDL activity. This is all done by using specialized databases using ClassDB. See here for more info: https://github.com/DASSL/ClassDB 
 
-`npm install`
-## Compile Sass and Run Dev Server
-
-`npm start`
-
-
-**Note: Browser-Sync is set with default browser as Firefox.**
-
-`gulp.task("serve", ["sass"], function() {
-	browserSync.init({
-		server: "./src",
-		browser: "firefox"
-	});`
-
-  **Remove:**  , browser: "firefox"* to use your default browser or set to a browser of your choice.
-
-	adding some test stuffs
+Another planned section is the learning section where there is a large amount of tutorials about SQL. In these tutorials we bring students the SQL standard definitions. After the written tutorial there are questions based on the tutorial the student just did. In these questions the students will write there own SQL statements and submit these statments to a live database to see if their answers are correct. These answers will provide real database responses so students are exposed to the real situations they may see out in the working world.