diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b6767e2 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +.gradle/ +.idea/ +*.iml +build/ +**/src/generated/ \ No newline at end of file diff --git a/LICENCE.md b/LICENCE.md new file mode 100644 index 0000000..83bb267 --- /dev/null +++ b/LICENCE.md @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2017-2018 TTÜ e-Sport + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/config/application-dev.yaml b/config/application-dev.yaml new file mode 100644 index 0000000..21a0929 --- /dev/null +++ b/config/application-dev.yaml @@ -0,0 +1,5 @@ +spring: + datasource: + username: "root" + password: "root" + url: "jdbc:mariadb://localhost/esport2018spring" diff --git a/config/application.yaml b/config/application.yaml new file mode 100644 index 0000000..a162127 --- /dev/null +++ b/config/application.yaml @@ -0,0 +1,8 @@ +flyway: + baseline-version: 0 + out-of-order: true +spring: + datasource: + driver-class-name: "org.mariadb.jdbc.Driver" + jooq: + sql-dialect: "MARIADB" diff --git a/db/build.gradle b/db/build.gradle new file mode 100644 index 0000000..db18c96 --- /dev/null +++ b/db/build.gradle @@ -0,0 +1,52 @@ +buildscript { + ext { + springBootVersion = '1.5.9.RELEASE' + } + repositories { + mavenCentral() + } + dependencies { + classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}") + } +} + +apply plugin: 'java' +apply plugin: 'eclipse' +apply plugin: 'org.springframework.boot' + +group = 'ee.e-sport.spring2018' +version = '0.0.1-SNAPSHOT' +sourceCompatibility = 1.8 + +repositories { + mavenCentral() +} + +dependencies { + compile('org.flywaydb:flyway-core') + compile('org.springframework.boot:spring-boot-starter-jooq') + compile('org.jooq:jooq-codegen') + compile('org.jooq:jooq-meta') + compile('org.mariadb.jdbc:mariadb-java-client:2.2.0') + compileOnly('org.springframework.boot:spring-boot-configuration-processor') + compileOnly('org.projectlombok:lombok') + testCompile('org.springframework. boot:spring-boot-starter-test') +} + +clean.doFirst { + delete '' + projectDir + '/src/generated/java/' +} + +bootRun.systemProperties = System.properties +bootRun.systemProperties['user.dir'] = projectDir +bootRun.systemProperties['spring.config.location'] = 'file:' + rootProject.projectDir + '/config/' + +task compileGenerated(type: JavaCompile, dependsOn: 'bootRun') { + source = fileTree(dir: 'src/generated/java', include: '**/*.java') + destinationDir = file('build/classes/java/main') + classpath = sourceSets.main.compileClasspath +} + +classes.finalizedBy bootRun +bootRun.finalizedBy compileGenerated + diff --git a/db/src/main/java/ee/esport/spring2018/db/DatabaseSetupApplication.java b/db/src/main/java/ee/esport/spring2018/db/DatabaseSetupApplication.java new file mode 100644 index 0000000..d5b4eca --- /dev/null +++ b/db/src/main/java/ee/esport/spring2018/db/DatabaseSetupApplication.java @@ -0,0 +1,52 @@ +package ee.esport.spring2018.db; + +import lombok.extern.apachecommons.CommonsLog; +import org.apache.tomcat.jdbc.pool.DataSource; +import org.jooq.util.GenerationTool; +import org.jooq.util.jaxb.*; +import org.springframework.boot.CommandLineRunner; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +import javax.annotation.Resource; +import java.sql.Connection; + +@CommonsLog +@SpringBootApplication +public class DatabaseSetupApplication implements CommandLineRunner { + + @Resource + private DataSource dataSource; + + public static void main(String[] args) throws Exception { + SpringApplication app = new SpringApplication(DatabaseSetupApplication.class); + app.setWebEnvironment(false); + app.run(args); + } + + @Override + public void run(String... args) throws Exception { + generateJooqClasses(); + } + + private void generateJooqClasses() throws Exception { + GenerationTool generationTool = new GenerationTool(); + Connection connection = dataSource.getConnection(); + generationTool.setConnection(connection); + generationTool.run(createJooqGeneratorConfig(connection.getCatalog())); + } + + private static Configuration createJooqGeneratorConfig(String schema) { + Database databaseConfig = new Database().withName("org.jooq.util.mariadb.MariaDBDatabase") + .withExcludes("schema_version") + .withInputSchema(schema); + Target targetConfig = new Target().withPackageName("ee.esport.spring2018.jooq") + .withDirectory("src/generated/java"); + Strategy strategyConfig = new Strategy().withName(EsportGenerationStrategy.class.getCanonicalName()); + return new Configuration().withGenerator(new Generator().withDatabase(databaseConfig) + .withTarget(targetConfig) + .withStrategy(strategyConfig)); + } + + +} diff --git a/db/src/main/java/ee/esport/spring2018/db/EsportGenerationStrategy.java b/db/src/main/java/ee/esport/spring2018/db/EsportGenerationStrategy.java new file mode 100644 index 0000000..60b3fcd --- /dev/null +++ b/db/src/main/java/ee/esport/spring2018/db/EsportGenerationStrategy.java @@ -0,0 +1,22 @@ +package ee.esport.spring2018.db; + +import org.jooq.util.DefaultGeneratorStrategy; +import org.jooq.util.Definition; + +public class EsportGenerationStrategy extends DefaultGeneratorStrategy { + + @Override + public String getJavaClassName(Definition definition, Mode mode) { + return capitilize(definition.getOutputName() + "Record"); + } + + private String capitilize(String string) { + return Character.toUpperCase(string.charAt(0)) + string.substring(1); + } + + @Override + public String getJavaIdentifier(Definition definition) { + return definition.getOutputName().replaceAll("(.+)(\\p{javaUpperCase})", "$1_$2").toUpperCase(); + } + +} diff --git a/db/src/main/resources/db/migration/V0.0__ticket_types.sql b/db/src/main/resources/db/migration/V0.0__ticket_types.sql new file mode 100644 index 0000000..1f9c324 --- /dev/null +++ b/db/src/main/resources/db/migration/V0.0__ticket_types.sql @@ -0,0 +1,19 @@ +CREATE TABLE TicketTypes +( + id INT PRIMARY KEY AUTO_INCREMENT, + name VARCHAR(255) NOT NULL, + amountAvailable INT NOT NULL, + baseCost DECIMAL(15, 2) NOT NULL +); +CREATE UNIQUE INDEX TicketTypes_name_uindex ON TicketTypes (name); + +CREATE TABLE Tickets +( + id INT PRIMARY KEY AUTO_INCREMENT, + typeId INT NOT NULL, + ownerEmail VARCHAR(255) NOT NULL, + ownerSteamId VARCHAR(255), + status VARCHAR(255) NOT NULL, + dateCreated DATETIME NOT NULL DEFAULT NOW(), + CONSTRAINT Tickets_TicketTypes_id_fk FOREIGN KEY (typeId) REFERENCES TicketTypes (id) +); \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..1a958be Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..6dbd0ef --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Tue Dec 19 22:26:12 EET 2017 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-3.5.1-all.zip diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..4453cce --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save ( ) { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..f955316 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/preannounce/images/background.png b/preannounce/images/background.png new file mode 100644 index 0000000..eff1870 Binary files /dev/null and b/preannounce/images/background.png differ diff --git a/preannounce/images/favicon.png b/preannounce/images/favicon.png new file mode 100644 index 0000000..0012831 Binary files /dev/null and b/preannounce/images/favicon.png differ diff --git a/preannounce/images/favicon2.png b/preannounce/images/favicon2.png new file mode 100644 index 0000000..a540cc1 Binary files /dev/null and b/preannounce/images/favicon2.png differ diff --git a/preannounce/images/logo.svg b/preannounce/images/logo.svg new file mode 100644 index 0000000..e387556 --- /dev/null +++ b/preannounce/images/logo.svg @@ -0,0 +1,123 @@ + + + + diff --git a/preannounce/index.html b/preannounce/index.html new file mode 100644 index 0000000..5b960e8 --- /dev/null +++ b/preannounce/index.html @@ -0,0 +1,142 @@ + + +
+ + +