Commit af55cfd8 authored by Marek Veselý's avatar Marek Veselý
Browse files

Merge branch '743-chore-new-version-of-backend-v3-26-0' into 'main' 

Resolve "Chore: New version of Backend - v3.26.0"

Closes #742, #743, and inject-issues#183

See merge request inject/frontend!657
parents 5d73e911 bfd23f05

backend @ d34121c2

Compare 26a5c984 to d34121c2
Original line number Original line Diff line number Diff line 
Subproject commit 26a5c9845cad76d5b809c69de87fbba9eecd6b3f
 
Subproject commit d34121c247583921c8b1a524a1879f2980838be5

codegen/package.json

+1 −1
Original line number Original line Diff line number Diff line 
{

{

  "name": "@inject/codegen",

  "name": "@inject/codegen",

  "version": "3.24.0",

  "version": "3.26.0",

  "description": "GraphQL API Codegen Setup for the Inject Backend",

  "description": "GraphQL API Codegen Setup for the Inject Backend",

  "main": "index.js",

  "main": "index.js",

  "license": "MIT",

  "license": "MIT",

frontend/package.json

+5 −1
Original line number Original line Diff line number Diff line 
{

{

  "name": "@inject/frontend",

  "name": "@inject/frontend",

  "version": "3.24.0",

  "version": "3.26.0",

  "description": "Main wrapper for rendering INJECT Frontend",

  "description": "Main wrapper for rendering INJECT Frontend",

  "main": "index.js",

  "main": "index.js",

  "license": "MIT",

  "license": "MIT",
@@ -14,6 +14,8 @@ 
  "peerDependencies": {

  "peerDependencies": {

    "@blueprintjs/colors": "5",

    "@blueprintjs/colors": "5",

    "@blueprintjs/core": "5",

    "@blueprintjs/core": "5",

    "@blueprintjs/datetime": "5",

    "@blueprintjs/datetime2": "2",

    "@blueprintjs/icons": "5",

    "@blueprintjs/icons": "5",

    "@blueprintjs/select": "5",

    "@blueprintjs/select": "5",

    "@emotion/babel-plugin": "11",

    "@emotion/babel-plugin": "11",
@@ -34,6 +36,8 @@ 
  "devDependencies": {

  "devDependencies": {

    "@blueprintjs/colors": "*",

    "@blueprintjs/colors": "*",

    "@blueprintjs/core": "*",

    "@blueprintjs/core": "*",

    "@blueprintjs/datetime": "*",

    "@blueprintjs/datetime2": "*",

    "@blueprintjs/icons": "*",

    "@blueprintjs/icons": "*",

    "@blueprintjs/select": "*",

    "@blueprintjs/select": "*",

    "@emotion/babel-plugin": "^11.13.5",

    "@emotion/babel-plugin": "^11.13.5",

frontend/src/components/AllowedStartIntervalInput/index.tsx

0 → 100644
+48 −0
Original line number Original line Diff line number Diff line 
import { FormGroup } from '@blueprintjs/core'

import { DateRangeInput3 } from '@blueprintjs/datetime2'

import { css } from '@emotion/css'

import type { Dispatch, FC, SetStateAction } from 'react'



interface AllowedStartIntervalInputProps {

  interval: [Date | null, Date | null] | undefined

  setInterval: Dispatch<SetStateAction<[Date | null, Date | null] | undefined>>

  intervalError: boolean

}



export const AllowedStartIntervalInput: FC<AllowedStartIntervalInputProps> = ({

  interval,

  intervalError,

  setInterval,

}) => (

  <FormGroup

    className={css`

      margin: 0 !important;

      padding-top: 0.3rem;

    `}

    label='Allowed start interval'

    helperText={

      intervalError &&

      'Select an interval in which the teams can start the exercise'

    }

    intent={intervalError ? 'danger' : 'none'}

  >

    <DateRangeInput3

      startInputProps={{

        intent: intervalError ? 'danger' : 'none',

      }}

      endInputProps={{

        intent: intervalError ? 'danger' : 'none',

      }}

      value={interval}

      onChange={e => setInterval(e)}

      fill

      allowSingleDayRange

      shortcuts={false}

      minDate={new Date()}

      timePrecision='minute'

      timePickerProps={{

        showArrowButtons: true,

      }}

    />

  </FormGroup>

)

frontend/src/components/ConfigInfo/index.tsx

+1 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ const ConfigInfo: FC<ConfigInfoProps> = ({ 




  return (

  return (

    <div className={className}>

    <div className={className}>

      <Button onClick={() => setIsOpen(!isOpen)}>

      <Button onClick={() => setIsOpen(!isOpen)} active={isOpen}>

        {`${isOpen ? 'Hide' : 'Show'} config`}

        {`${isOpen ? 'Hide' : 'Show'} config`}

      </Button>

      </Button>

      <Collapse isOpen={isOpen}>

      <Collapse isOpen={isOpen}>