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

v2.1.1 #177

Merged
merged 18 commits into from
Aug 24, 2022
Merged
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
7 changes: 4 additions & 3 deletions api/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@

# Global args, set before the first FROM, shared by all stages
ARG NODE_ENV="production"
ARG NODE_DIGEST="sha256:1a9a71ea86aad332aa7740316d4111ee1bd4e890df47d3b5eff3e5bded3b3d10"

################################################################################
# Build stage 1 - `yarn build`

FROM node:16-alpine as builder
FROM node@${NODE_DIGEST} as builder
# Import our shared args
ARG NODE_ENV

Expand All @@ -24,7 +25,7 @@ RUN yarn run build
################################################################################
# Build stage 2 - COPY the relevant things (multiple steps)

FROM node:16-alpine as clean
FROM node@${NODE_DIGEST} as clean
# Import our shared args
ARG NODE_ENV

Expand All @@ -36,7 +37,7 @@ COPY --from=builder /app/migrations/ /app/migrations/
################################################################################
# Build stage FINAL - COPY everything, once, and then do a clean `yarn install`

FROM node:16-alpine
FROM node@${NODE_DIGEST}
# Import our shared args
ARG NODE_ENV

Expand Down
4 changes: 2 additions & 2 deletions api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
"lint-staged": "^11.2.3",
"nodemon": "^2.0.7",
"prettier": "^2.2.1",
"ts-node": "^9.1.1",
"ts-node": "^10.9.1",
"tslint": "^6.1.3",
"typescript": "^4.2.4"
"typescript": "^4.7.4"
}
}
1,282 changes: 492 additions & 790 deletions api/yarn.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion db/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM postgres:14
FROM postgres@sha256:596e4c843a9db32269a3757624d8a6a6f633e01895acb83fe0842497fd897eb7

COPY create-multiple-postgresql-databases.sh /docker-entrypoint-initdb.d/create-multiple-postgresql-databases.sh
2 changes: 1 addition & 1 deletion docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ services:
ports:
- '5432:5432'
hedgedoc:
image: quay.io/hedgedoc/hedgedoc:1.9.3-alpine
image: quay.io/hedgedoc/hedgedoc:1.9.4
environment:
CMD_DB_URL: 'postgres://ctfnote:ctfnote@db:5432/hedgedoc'
CMD_URL_PATH: 'pad'
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ services:
ports:
- 8080:80
hedgedoc:
image: quay.io/hedgedoc/hedgedoc:1.9.3-alpine
image: quay.io/hedgedoc/hedgedoc:1.9.4
environment:
- CMD_DB_URL=postgres://ctfnote:ctfnote@db:5432/hedgedoc
- CMD_URL_PATH=pad
Expand Down
4 changes: 2 additions & 2 deletions front/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:16-alpine AS build-deps
FROM node@sha256:1a9a71ea86aad332aa7740316d4111ee1bd4e890df47d3b5eff3e5bded3b3d10 AS build-deps

RUN mkdir -p /usr/src/app
COPY package.json quasar.conf.js .eslintrc.js .eslintignore tsconfig.json .postcssrc.js yarn.lock babel.config.js quasar.extensions.json /usr/src/app/
Expand All @@ -12,7 +12,7 @@ WORKDIR /usr/src/app
RUN yarn build

# _--------_
FROM nginx:1.21.6-alpine
FROM nginx@sha256:f335d7436887b39393409261603fb248e0c385ec18997d866dd44f7e9b621096

RUN mkdir -p /logs

Expand Down
3 changes: 2 additions & 1 deletion front/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
},
"dependencies": {
"@apollo/client": "^3.4.15",
"@quasar/cli": "^1.3.2",
"@quasar/extras": "^1.0.0",
"@quasar/quasar-app-extension-apollo": "^2.0.0-beta.3",
"@quasar/quasar-ui-qcalendar": "^4.0.0-beta.7",
Expand All @@ -38,7 +39,7 @@
"@graphql-codegen/typescript-document-nodes": "^2.1.4",
"@graphql-codegen/typescript-operations": "^2.1.6",
"@graphql-codegen/typescript-vue-apollo": "^3.1.4",
"@quasar/app": "^3.0.0",
"@quasar/app-webpack": "^3.5.3",
"@quasar/quasar-app-extension-qmarkdown": "^2.0.0-alpha.8",
"@types/apollo-upload-client": "^14.1.0",
"@types/color-hash": "^1.0.1",
Expand Down
32 changes: 17 additions & 15 deletions front/src/components/Menu/CtfMenu.vue
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
<template>
<template v-if="ctf && $q.screen.gt.sm">
<q-separator dark vertical />
<div class="row items-center justify-center">
<q-btn
class="q-mr-sm"
type="a"
target="_blank"
:href="ctf.ctfUrl"
flat
icon="language"
size="sm"
round
/>
<q-btn flat no-caps :to="ctf.tasksLink">{{ ctf.title }}</q-btn>
</div>
<template v-if="ctf && $q.screen.gt.xs">
<template v-if="$q.screen.gt.sm">
<q-separator dark vertical />
<div class="row items-center justify-center">
<q-btn
class="q-mr-sm"
type="a"
target="_blank"
:href="ctf.ctfUrl"
flat
icon="language"
size="sm"
round
/>
<q-btn flat no-caps :to="ctf.tasksLink">{{ ctf.title }}</q-btn>
</div>
</template>
<q-separator v-show="ctf.tasks.length" dark vertical />
<task-list-menu v-show="ctf.tasks.length" :ctf="ctf" :task-id="taskId" />
</template>
Expand Down
2 changes: 1 addition & 1 deletion front/src/ctfnote/parsers/ctfd.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { parseJson, parseJsonStrict } from '../utils';

const CTFDParser: Parser = {
name: 'CTFd parser',
hint: 'paste ctfd /api/v1/challenge',
hint: 'paste ctfd /api/v1/challenges',

parse(s: string): ParsedTask[] {
const tasks = [];
Expand Down
2 changes: 1 addition & 1 deletion front/src/quasar.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
// into `@quasar/app`
// As a side effect, since `@quasar/app` reference `quasar` to augment it,
// this declaration also apply `quasar` own augmentations (eg. adds `$q` into Vue component context)
/// <reference types="@quasar/app" />
/// <reference types="@quasar/app-webpack" />
2 changes: 1 addition & 1 deletion front/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "@quasar/app/tsconfig-preset",
"extends": "@quasar/app-webpack/tsconfig-preset",
"compilerOptions": {
"baseUrl": "."
}
Expand Down
Loading