@@ -51,7 +51,7 @@ body,h1,h2,h3,h4,h5,h6 {font-family: "Raleway", sans-serif}
- 
+ 
+
-
+
diff --git a/Sources/App/configure.swift b/Sources/App/configure.swift
new file mode 100644
index 0000000..746898b
--- /dev/null
+++ b/Sources/App/configure.swift
@@ -0,0 +1,15 @@
+import Leaf
+import Vapor
+
+// Called before your application initializes.
+public func configure(_ app: Application) throws {
+ //leaf
+ app.views.use(.leaf)
+
+ //Register middleware
+ app.middleware.use(FileMiddleware(publicDirectory: app.directory.publicDirectory))
+ app.middleware.use(ErrorMiddleware.default(environment: app.environment))
+
+ //routes
+ try routes(app)
+}
diff --git a/Sources/App/routes.swift b/Sources/App/routes.swift
new file mode 100644
index 0000000..01de541
--- /dev/null
+++ b/Sources/App/routes.swift
@@ -0,0 +1,20 @@
+import Vapor
+
+// Register your application's routes here.
+public func routes(_ app: Application) throws {
+ app.get("") { req async throws -> View in
+ return try await req.view.render("home")
+ }
+ app.get("index.html") { req async throws -> View in
+ return try await req.view.render("home")
+ }
+ app.get("privacy") { req async throws -> View in
+ return try await req.view.render("privacy")
+ }
+ app.get("welcome") { req async throws -> View in
+ return try await req.view.render("welcome")
+ }
+ app.get("**") { req async throws -> View in
+ return try await req.view.render("404")
+ }
+}
diff --git a/Sources/Run/main.swift b/Sources/Run/main.swift
new file mode 100644
index 0000000..373be5f
--- /dev/null
+++ b/Sources/Run/main.swift
@@ -0,0 +1,9 @@
+import App
+import Vapor
+
+var env = try Environment.detect()
+try LoggingSystem.bootstrap(from: &env)
+let app = Application(env)
+defer { app.shutdown() }
+try configure(app)
+try app.run()
diff --git a/Tests/AppTests/AppTests.swift b/Tests/AppTests/AppTests.swift
new file mode 100644
index 0000000..d915e80
--- /dev/null
+++ b/Tests/AppTests/AppTests.swift
@@ -0,0 +1,12 @@
+import XCTest
+@testable import App
+
+class AppTests: XCTestCase {
+ func testStub() throws {
+ XCTAssert(true)
+ }
+
+ static let allTests = [
+ ("testStub", testStub),
+ ]
+}
diff --git a/Tests/LinuxMain.swift b/Tests/LinuxMain.swift
new file mode 100644
index 0000000..f78cb77
--- /dev/null
+++ b/Tests/LinuxMain.swift
@@ -0,0 +1,11 @@
+#if os(Linux)
+
+import XCTest
+@testable import AppTests
+
+XCTMain([
+ // AppTests
+ testCase(AppTests.allTests),
+])
+
+#endif
diff --git a/app.py b/app.py
deleted file mode 100644
index 2531976..0000000
--- a/app.py
+++ /dev/null
@@ -1,30 +0,0 @@
-from flask import Flask, render_template, request, Response
-from flask_api import status
-import sys
-
-app = Flask(__name__)
-
-
-# main smpark.in stuff
-@app.route('/', methods=["GET"])
-def home():
- return render_template('home.html')
-
-
-@app.route('/welcome', methods=["GET"])
-def welcome():
- return render_template('welcome.html')
-
-
-@app.route('/privacy', methods=["GET"])
-def privacy():
- return render_template('privacy.html')
-
-
-@app.errorhandler(404)
-def fourohfour():
- return render_template('404.html')
-
-
-if __name__ == '__main__':
- app.run(host='0.0.0.0', port=5000)
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..c46e129
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,30 @@
+# Docker Compose file for Vapor
+#
+# Install Docker on your system to run and test
+# your Vapor app in a production-like environment.
+#
+# Note: This file is intended for testing and does not
+# implement best practices for a production deployment.
+#
+# Learn more: https://docs.docker.com/compose/reference/
+#
+# Build images: docker-compose build
+# Start app: docker-compose up app
+# Stop all: docker-compose down
+#
+version: '3.7'
+
+x-shared_environment: &shared_environment
+ LOG_LEVEL: ${LOG_LEVEL:-debug}
+
+services:
+ app:
+ image: smparkin:latest
+ build:
+ context: .
+ environment:
+ <<: *shared_environment
+ ports:
+ - '8888:8888'
+ # user: '0' # uncomment to run as root for testing purposes even though Dockerfile defines 'vapor' user.
+ command: ["serve", "--env", "production", "--hostname", "0.0.0.0", "--port", "8888"]
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index e6aae64..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-flask
-flask_api
+