Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates #1619

Merged
merged 14 commits into from
Jun 6, 2021
Merged

Updates #1619

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
restore-keys: |
${{ runner.os }}-yarn-
- name: ⤵️ Install dependencies
run: yarn install
run: yarn install:all
env:
CI: true
- name: 🚀 Run ESLint
Expand Down Expand Up @@ -158,7 +158,7 @@ jobs:
restore-keys: |
${{ runner.os }}-yarn-
- name: ⤵️ Install dependencies
run: yarn install
run: yarn install:all
env:
CI: true
- name: 🧪 Backend - Test
Expand Down Expand Up @@ -192,7 +192,7 @@ jobs:
restore-keys: |
${{ runner.os }}-yarn-
- name: ⤵️ Install dependencies
run: yarn install
run: yarn install:all
env:
CI: true
- name: 🚀 Backend - Compile
Expand Down
39 changes: 0 additions & 39 deletions .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

This file was deleted.

55 changes: 0 additions & 55 deletions .yarn/releases/yarn-2.4.1.cjs

This file was deleted.

45 changes: 0 additions & 45 deletions .yarnclean

This file was deleted.

13 changes: 0 additions & 13 deletions .yarnrc.yml

This file was deleted.

6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BUILD_FROM=ghcr.io/timmo001/container-base/amd64:1.0.1
ARG BUILD_FROM=ghcr.io/timmo001/container-base/amd64:1.0.2
# hadolint ignore=DL3006
FROM ${BUILD_FROM}

Expand All @@ -11,13 +11,13 @@ COPY . /opt/panel
# Set shell
SHELL ["/bin/ash", "-o", "pipefail", "-c"]

WORKDIR /opt/panel
WORKDIR /opt/panel/backend

# Install system
# hadolint ignore=DL3003,DL3018
RUN \
apk add --no-cache \
nginx=1.18.0-r13 \
nginx=1.18.0-r15 \
nodejs-current=15.10.0-r0 \
yarn=1.22.10-r0 \
\
Expand Down
10 changes: 5 additions & 5 deletions backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,16 @@
"@types/compression": "1.7.0",
"@types/cors": "2.8.10",
"@types/helmet": "4.0.0",
"@types/jest": "26.0.22",
"@types/jest": "26.0.23",
"@types/jsonwebtoken": "8.5.1",
"@types/nedb": "1.8.11",
"@types/serve-favicon": "2.5.2",
"jest": "26.6.3",
"jest-junit": "12.0.0",
"jest": "27.0.4",
"jest-junit": "12.1.0",
"nodemon": "2.0.7",
"shx": "0.3.3",
"ts-jest": "26.5.4",
"ts-jest": "27.0.2",
"ts-node-dev": "1.1.6",
"typescript": "4.2.4"
"typescript": "4.3.2"
}
}
2 changes: 1 addition & 1 deletion backend/src/channels.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export default function (app: Application): void {
return;
}

app.on("connection", (connection: unknown): void => {
app.on("connection", (connection: any): void => {
// On a new real-time connection, add it to the anonymous channel
app.channel("anonymous").join(connection);
});
Expand Down
14 changes: 6 additions & 8 deletions backend/test/authentication.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,13 @@ describe("authentication", () => {
password: "supersecret",
};

beforeAll(
async (): Promise<void> => {
try {
await app.service("users").create(userInfo);
} catch (error) {
// Do nothing, it just means the user already exists and can be tested
}
beforeAll(async (): Promise<void> => {
try {
await app.service("users").create(userInfo);
} catch (error) {
// Do nothing, it just means the user already exists and can be tested
}
);
});

it("authenticates user and creates accessToken", async (): Promise<void> => {
const { user, accessToken } = await app.service("authentication").create({
Expand Down
Loading