Skip to content
This repository was archived by the owner on Apr 20, 2024. It is now read-only.

Commit c110aad

Browse files
Use Github Actions (#143)
* Use Github Actions * Add workaround for Swift 5.3 bug * Fix braces * Include dashboard route * Don't forget the login controller routes!
1 parent b403683 commit c110aad

File tree

3 files changed

+75
-118
lines changed

3 files changed

+75
-118
lines changed

.circleci/config.yml

-67
This file was deleted.

.github/workflows/test.yml

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: test
2+
on:
3+
pull_request:
4+
push:
5+
branches:
6+
- master
7+
jobs:
8+
macos:
9+
runs-on: macos-latest
10+
env:
11+
DEVELOPER_DIR: /Applications/Xcode_12.app/Contents/Developer
12+
steps:
13+
- uses: actions/checkout@v2
14+
- run: brew install libressl
15+
- run: xcrun swift test --enable-test-discovery --sanitize=thread -Xcxx "-I/usr/local/opt/openssl/include" -Xlinker "-L/usr/local/opt/openssl/lib"
16+
linux-4_2:
17+
runs-on: ubuntu-latest
18+
container:
19+
image: swift:4.2
20+
steps:
21+
- uses: actions/checkout@v2
22+
- run: swift test
23+
linux:
24+
runs-on: ubuntu-latest
25+
strategy:
26+
fail-fast: false
27+
matrix:
28+
image:
29+
- swift:5.2-focal
30+
- swift:5.3-focal
31+
container: ${{ matrix.image }}
32+
steps:
33+
- uses: actions/checkout@v2
34+
- run: apt-get -qq update && apt-get install -y libssl-dev
35+
- run: swift test --enable-test-discovery --sanitize=thread

Sources/AdminPanel/routes.swift

+40-51
Original file line numberDiff line numberDiff line change
@@ -61,65 +61,54 @@ public extension Router {
6161
let endpoints = config.endpoints
6262
let controllers = config.controllers
6363

64+
let loginController = controllers.loginController
65+
let dashboardController = controllers.dashboardController
66+
let adminPanelUserController = controllers.adminPanelUserController
67+
6468
// MARK: Login routes
6569

66-
unprotected.get(endpoints.login, use: controllers.loginController.renderLogin)
67-
unprotected.post(endpoints.login, use: controllers.loginController.login)
68-
unprotected.get(endpoints.logout, use: controllers.loginController.logout)
70+
unprotected.get(endpoints.login) { req in
71+
try loginController.renderLogin(req)
72+
}
73+
unprotected.post(endpoints.login) { req in
74+
try loginController.login(req)
75+
}
76+
unprotected.get(endpoints.logout) { req in
77+
try loginController.logout(req)
78+
}
6979

7080
// MARK: Dashboard routes
7181

72-
protected.get(
73-
endpoints.dashboard,
74-
use: controllers.dashboardController.renderDashboard
75-
)
82+
protected.get(endpoints.dashboard) { req in
83+
try dashboardController.renderDashboard(req)
84+
}
7685

7786
// MARK: Admin Panel User routes
7887

79-
protected.get(
80-
endpoints.adminPanelUserBasePath,
81-
use: controllers.adminPanelUserController.renderList
82-
)
83-
protected.get(
84-
endpoints.adminPanelUserBasePath,
85-
endpoints.createSlug,
86-
use: controllers.adminPanelUserController.renderCreate
87-
)
88-
protected.post(
89-
endpoints.adminPanelUserBasePath,
90-
endpoints.createSlug,
91-
use: controllers.adminPanelUserController.create
92-
)
93-
protected.get(
94-
endpoints.adminPanelUserBasePath,
95-
U.parameter,
96-
endpoints.editSlug,
97-
use: controllers.adminPanelUserController.renderEditUser
98-
)
99-
protected.post(
100-
endpoints.adminPanelUserBasePath,
101-
U.parameter,
102-
endpoints.editSlug,
103-
use: controllers.adminPanelUserController.editUser
104-
)
105-
protected.post(
106-
endpoints.adminPanelUserBasePath,
107-
U.parameter,
108-
endpoints.deleteSlug,
109-
use: controllers.adminPanelUserController.delete
110-
)
111-
protected.get(
112-
endpoints.adminPanelUserBasePath,
113-
endpoints.meSlug,
114-
endpoints.editSlug,
115-
use: controllers.adminPanelUserController.renderEditMe
116-
)
117-
protected.post(
118-
endpoints.adminPanelUserBasePath,
119-
endpoints.meSlug,
120-
endpoints.editSlug,
121-
use: controllers.adminPanelUserController.editMe
122-
)
88+
protected.get(endpoints.adminPanelUserBasePath) { req in
89+
try adminPanelUserController.renderList(req)
90+
}
91+
protected.get(endpoints.adminPanelUserBasePath, endpoints.createSlug) { req in
92+
try adminPanelUserController.renderCreate(req)
93+
}
94+
protected.post(endpoints.adminPanelUserBasePath, endpoints.createSlug) { req in
95+
try adminPanelUserController.create(req)
96+
}
97+
protected.get(endpoints.adminPanelUserBasePath, U.parameter, endpoints.editSlug) { req in
98+
try adminPanelUserController.renderEditUser(req)
99+
}
100+
protected.post(endpoints.adminPanelUserBasePath, U.parameter, endpoints.editSlug) { req in
101+
try adminPanelUserController.editUser(req)
102+
}
103+
protected.post(endpoints.adminPanelUserBasePath, U.parameter, endpoints.deleteSlug) { req in
104+
try adminPanelUserController.delete(req)
105+
}
106+
protected.get(endpoints.adminPanelUserBasePath, endpoints.meSlug, endpoints.editSlug) { req in
107+
try adminPanelUserController.renderEditMe(req)
108+
}
109+
protected.post(endpoints.adminPanelUserBasePath, endpoints.meSlug, endpoints.editSlug) { req in
110+
try adminPanelUserController.editMe(req)
111+
}
123112

124113
// MARK: Reset routes
125114

0 commit comments

Comments
 (0)