Skip to content

Commit 574186c

Browse files
0xLeif0xLeif
committed
Add ScreenController
1 parent c6330f2 commit 574186c

12 files changed

+432
-0
lines changed

‎Server/.dockerignore

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
.build/
2+
.swiftpm/

‎Server/Dockerfile

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
# ================================
2+
# Build image
3+
# ================================
4+
FROM swift:5.5-focal as build
5+
6+
# Install OS updates and, if needed, sqlite3
7+
RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \
8+
&& apt-get -q update \
9+
&& apt-get -q dist-upgrade -y \
10+
&& rm -rf /var/lib/apt/lists/*
11+
12+
# Set up a build area
13+
WORKDIR /build
14+
15+
# First just resolve dependencies.
16+
# This creates a cached layer that can be reused
17+
# as long as your Package.swift/Package.resolved
18+
# files do not change.
19+
COPY ./Package.* ./
20+
RUN swift package resolve
21+
22+
# Copy entire repo into container
23+
COPY . .
24+
25+
# Build everything, with optimizations
26+
RUN swift build -c release --static-swift-stdlib
27+
28+
# Switch to the staging area
29+
WORKDIR /staging
30+
31+
# Copy main executable to staging area
32+
RUN cp "$(swift build --package-path /build -c release --show-bin-path)/Run" ./
33+
34+
# Copy any resources from the public directory and views directory if the directories exist
35+
# Ensure that by default, neither the directory nor any of its contents are writable.
36+
RUN [ -d /build/Public ] && { mv /build/Public ./Public && chmod -R a-w ./Public; } || true
37+
RUN [ -d /build/Resources ] && { mv /build/Resources ./Resources && chmod -R a-w ./Resources; } || true
38+
39+
# ================================
40+
# Run image
41+
# ================================
42+
FROM ubuntu:focal
43+
44+
# Make sure all system packages are up to date.
45+
RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && \
46+
apt-get -q update && apt-get -q dist-upgrade -y && apt-get -q install -y ca-certificates && \
47+
rm -r /var/lib/apt/lists/*
48+
49+
# Create a vapor user and group with /app as its home directory
50+
RUN useradd --user-group --create-home --system --skel /dev/null --home-dir /app vapor
51+
52+
# Switch to the new home directory
53+
WORKDIR /app
54+
55+
# Copy built executable and any staged resources from builder
56+
COPY --from=build --chown=vapor:vapor /staging /app
57+
58+
# Ensure all further commands run as the vapor user
59+
USER vapor:vapor
60+
61+
# Let Docker bind to port 8080
62+
EXPOSE 8080
63+
64+
# Start the Vapor service when the image is run, default to listening on 8080 in production environment
65+
ENTRYPOINT ["./Run"]
66+
CMD ["serve", "--env", "production", "--hostname", "0.0.0.0", "--port", "8080"]

‎Server/Package.resolved

+160
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,160 @@
1+
{
2+
"object": {
3+
"pins": [
4+
{
5+
"package": "async-http-client",
6+
"repositoryURL": "https://github.com/swift-server/async-http-client.git",
7+
"state": {
8+
"branch": null,
9+
"revision": "7a4dfe026f6ee0f8ad741b58df74c60af296365d",
10+
"version": "1.9.0"
11+
}
12+
},
13+
{
14+
"package": "async-kit",
15+
"repositoryURL": "https://github.com/vapor/async-kit.git",
16+
"state": {
17+
"branch": null,
18+
"revision": "e2f741640364c1d271405da637029ea6a33f754e",
19+
"version": "1.11.1"
20+
}
21+
},
22+
{
23+
"package": "console-kit",
24+
"repositoryURL": "https://github.com/vapor/console-kit.git",
25+
"state": {
26+
"branch": null,
27+
"revision": "75ea3b627d88221440b878e5dfccc73fd06842ed",
28+
"version": "4.2.7"
29+
}
30+
},
31+
{
32+
"package": "multipart-kit",
33+
"repositoryURL": "https://github.com/vapor/multipart-kit.git",
34+
"state": {
35+
"branch": null,
36+
"revision": "2dd9368a3c9580792b77c7ef364f3735909d9996",
37+
"version": "4.5.1"
38+
}
39+
},
40+
{
41+
"package": "routing-kit",
42+
"repositoryURL": "https://github.com/vapor/routing-kit.git",
43+
"state": {
44+
"branch": null,
45+
"revision": "5603b81ceb744b8318feab1e60943704977a866b",
46+
"version": "4.3.1"
47+
}
48+
},
49+
{
50+
"package": "ScreenData",
51+
"repositoryURL": "https://github.com/ServerDriven/ScreenData-swift.git",
52+
"state": {
53+
"branch": null,
54+
"revision": "20e1b73ec66076494135b041a29d43ca0870fd45",
55+
"version": "0.4.2"
56+
}
57+
},
58+
{
59+
"package": "swift-backtrace",
60+
"repositoryURL": "https://github.com/swift-server/swift-backtrace.git",
61+
"state": {
62+
"branch": null,
63+
"revision": "d3e04a9d4b3833363fb6192065b763310b156d54",
64+
"version": "1.3.1"
65+
}
66+
},
67+
{
68+
"package": "swift-crypto",
69+
"repositoryURL": "https://github.com/apple/swift-crypto.git",
70+
"state": {
71+
"branch": null,
72+
"revision": "067254c79435de759aeef4a6a03e43d087d61312",
73+
"version": "2.0.5"
74+
}
75+
},
76+
{
77+
"package": "swift-log",
78+
"repositoryURL": "https://github.com/apple/swift-log.git",
79+
"state": {
80+
"branch": null,
81+
"revision": "5d66f7ba25daf4f94100e7022febf3c75e37a6c7",
82+
"version": "1.4.2"
83+
}
84+
},
85+
{
86+
"package": "swift-metrics",
87+
"repositoryURL": "https://github.com/apple/swift-metrics.git",
88+
"state": {
89+
"branch": null,
90+
"revision": "eadb828f878fed144387e3845866225bb7082c56",
91+
"version": "2.3.0"
92+
}
93+
},
94+
{
95+
"package": "swift-nio",
96+
"repositoryURL": "https://github.com/apple/swift-nio.git",
97+
"state": {
98+
"branch": null,
99+
"revision": "d6e3762e0a5f7ede652559f53623baf11006e17c",
100+
"version": "2.39.0"
101+
}
102+
},
103+
{
104+
"package": "swift-nio-extras",
105+
"repositoryURL": "https://github.com/apple/swift-nio-extras.git",
106+
"state": {
107+
"branch": null,
108+
"revision": "f73ca5ee9c6806800243f1ac415fcf82de9a4c91",
109+
"version": "1.10.2"
110+
}
111+
},
112+
{
113+
"package": "swift-nio-http2",
114+
"repositoryURL": "https://github.com/apple/swift-nio-http2.git",
115+
"state": {
116+
"branch": null,
117+
"revision": "50c25c132b140e62b45e90b5a76f13ded02c8a46",
118+
"version": "1.20.1"
119+
}
120+
},
121+
{
122+
"package": "swift-nio-ssl",
123+
"repositoryURL": "https://github.com/apple/swift-nio-ssl.git",
124+
"state": {
125+
"branch": null,
126+
"revision": "b5260a31c2a72a89fa684f5efb3054d8725a2316",
127+
"version": "2.18.0"
128+
}
129+
},
130+
{
131+
"package": "swift-nio-transport-services",
132+
"repositoryURL": "https://github.com/apple/swift-nio-transport-services.git",
133+
"state": {
134+
"branch": null,
135+
"revision": "8ab824b140d0ebcd87e9149266ddc353e3705a3e",
136+
"version": "1.11.4"
137+
}
138+
},
139+
{
140+
"package": "vapor",
141+
"repositoryURL": "https://github.com/vapor/vapor.git",
142+
"state": {
143+
"branch": null,
144+
"revision": "5861bf9e2cff2c4cb0dcfb0c15ecfaa8bc5630e0",
145+
"version": "4.55.3"
146+
}
147+
},
148+
{
149+
"package": "websocket-kit",
150+
"repositoryURL": "https://github.com/vapor/websocket-kit.git",
151+
"state": {
152+
"branch": null,
153+
"revision": "e32033ad3c68ebec1b761bc961be7bd56bad02f8",
154+
"version": "2.3.1"
155+
}
156+
}
157+
]
158+
},
159+
"version": 1
160+
}

‎Server/Package.swift

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
// swift-tools-version:5.5
2+
import PackageDescription
3+
4+
let package = Package(
5+
name: "Server",
6+
platforms: [
7+
.macOS(.v12)
8+
],
9+
dependencies: [
10+
// 💧 A server-side Swift web framework.
11+
.package(url: "https://github.com/vapor/vapor.git", from: "4.0.0"),
12+
.package(name: "ScreenData", url: "https://github.com/ServerDriven/ScreenData-swift.git", from: "0.4.1")
13+
],
14+
targets: [
15+
.target(
16+
name: "App",
17+
dependencies: [
18+
.product(name: "Vapor", package: "vapor"),
19+
.product(name: "ScreenData", package: "ScreenData")
20+
],
21+
swiftSettings: [
22+
// Enable better optimizations when building in Release configuration. Despite the use of
23+
// the `.unsafeFlags` construct required by SwiftPM, this flag is recommended for Release
24+
// builds. See <https://github.com/swift-server/guides/blob/main/docs/building.md#building-for-production> for details.
25+
.unsafeFlags(["-cross-module-optimization"], .when(configuration: .release))
26+
]
27+
),
28+
.executableTarget(name: "Run", dependencies: [.target(name: "App")]),
29+
.testTarget(name: "AppTests", dependencies: [
30+
.target(name: "App"),
31+
.product(name: "XCTVapor", package: "vapor"),
32+
])
33+
]
34+
)

‎Server/Public/.gitkeep

Whitespace-only changes.

‎Server/Sources/App/Controllers/.gitkeep

Whitespace-only changes.

‎Server/Sources/App/Controllers/ScreenController.swift

+94
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
//
2+
// ScreenController.swift
3+
//
4+
//
5+
// Created by Leif on 4/5/22.
6+
//
7+
8+
import ScreenData
9+
import Vapor
10+
11+
struct ScreenController: RouteCollection {
12+
enum Screen: String {
13+
case index
14+
}
15+
16+
private let staticScreens: [String: SomeScreen] = [
17+
Screen.index.rawValue: SomeScreen(
18+
id: Screen.index.rawValue,
19+
title: "Index Screen",
20+
backgroundColor: SomeColor(red: 1, green: 1, blue: 1),
21+
headerView: nil,
22+
someView: SomeContainerView(
23+
isScrollable: true,
24+
axis: .vertical,
25+
views: [
26+
SomeLabel(
27+
title: "View Screens",
28+
font: .title,
29+
style: SomeStyle(
30+
foregroundColor: SomeColor(red: 0, green: 0, blue: 0)
31+
),
32+
destination: Destination(type: .screen, toID: "screens")
33+
)
34+
.someView
35+
]
36+
)
37+
.someView,
38+
footerView: nil
39+
)
40+
]
41+
42+
func boot(routes: RoutesBuilder) throws {
43+
routes.get(use: index)
44+
routes.get(":screen", use: getScreen)
45+
routes.get("screens", use: getScreens)
46+
}
47+
48+
func index(req: Request) throws -> SomeScreen {
49+
staticScreens[Screen.index.rawValue]!
50+
}
51+
52+
func getScreen(req: Request) throws -> SomeScreen {
53+
guard let id = req.parameters.get("screen") else {
54+
throw Abort(.badRequest)
55+
}
56+
57+
guard let screen = staticScreens[id] else {
58+
throw Abort(.noContent)
59+
}
60+
61+
return screen
62+
}
63+
64+
func getScreens(req: Request) throws -> SomeScreen {
65+
SomeScreen(
66+
id: "screens",
67+
title: "Screens",
68+
backgroundColor: SomeColor(red: 1, green: 1, blue: 1),
69+
headerView: nil,
70+
someView: SomeContainerView(
71+
isScrollable: true,
72+
axis: .vertical,
73+
views: staticScreens.map { (key, screen) in
74+
SomeLabel(
75+
title: screen.title,
76+
font: .body,
77+
style: SomeStyle(
78+
foregroundColor: SomeColor(red: 0, green: 0, blue: 0)
79+
),
80+
destination: screen.id.map {
81+
Destination(
82+
type: .screen,
83+
toID: $0
84+
)
85+
}
86+
)
87+
.someView
88+
}
89+
)
90+
.someView,
91+
footerView: nil
92+
)
93+
}
94+
}

‎Server/Sources/App/configure.swift

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import ScreenData
2+
import Vapor
3+
4+
extension SomeScreen: Content { }
5+
6+
// configures your application
7+
public func configure(_ app: Application) throws {
8+
app.middleware.use(
9+
FileMiddleware(
10+
publicDirectory: app.directory.publicDirectory
11+
)
12+
)
13+
14+
// register routes
15+
try routes(app)
16+
}

‎Server/Sources/App/routes.swift

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import ScreenData
2+
import Vapor
3+
4+
func routes(_ app: Application) throws {
5+
try app.register(collection: ScreenController())
6+
}

‎Server/Sources/Run/main.swift

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import App
2+
import Vapor
3+
4+
var env = try Environment.detect()
5+
try LoggingSystem.bootstrap(from: &env)
6+
let app = Application(env)
7+
defer { app.shutdown() }
8+
try configure(app)
9+
try app.run()

0 commit comments

Comments
 (0)