Skip to content

Commit

Permalink
Merge pull request #30 from solaoi/feature_update-dependencies
Browse files Browse the repository at this point in the history
Feature update dependencies
  • Loading branch information
solaoi authored Feb 26, 2022
2 parents 4d04c36 + d8d167b commit eb432a0
Show file tree
Hide file tree
Showing 10 changed files with 3,172 additions and 3,040 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/npm-check-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: "14.x"
node-version: "16.x"
- name: Update dependencies
id: vars
run: |
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM mhart/alpine-node:14 as builder
FROM mhart/alpine-node:16 as builder
WORKDIR /app

COPY package.json package-lock.json ./
RUN apk add --no-cache make gcc g++ python3 libtool autoconf automake
RUN npm ci

FROM mhart/alpine-node:slim-14
FROM mhart/alpine-node:slim-16
WORKDIR /app
ENV PATH /app/node_modules/.bin:$PATH

Expand Down
2 changes: 1 addition & 1 deletion app/core/components/Form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export function Form<S extends z.ZodType<any, any>>({
<Flex align="center" justify="center">
<Button
type="submit"
disabled={submitting}
isDisabled={submitting}
colorScheme="blue"
variant="solid"
_hover={{ bg: "blue.400", borderColor: "blue.400" }}
Expand Down
2 changes: 1 addition & 1 deletion app/core/components/LabeledSelectField.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export const LabeledSelectField = forwardRef<HTMLSelectElement, LabeledSelectFie
</FormLabel>
<Select
{...(input as any)}
disabled={submitting}
isDisabled={submitting}
{...extraProps}
ref={ref as any}
borderColor={hasError ? "red.500" : "gray.200"}
Expand Down
2 changes: 1 addition & 1 deletion app/core/components/LabeledTextAreaField.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export const LabeledTextAreaField = forwardRef<HTMLInputElement, LabeledTextArea
<FormControl {...outerProps}>
<FormLabel>
{label}
<Textarea {...input} disabled={submitting} {...props} ref={ref as any} />
<Textarea {...input} isDisabled={submitting} {...props} ref={ref as any} />
</FormLabel>
{touched && normalizedError && (
<div role="alert" style={{ color: "red" }}>
Expand Down
4 changes: 2 additions & 2 deletions app/core/components/LabeledTextField.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@ export const LabeledTextField = forwardRef<HTMLInputElement, LabeledTextFieldPro
<FormLabel>
{label}
{props.type === "number" ? (
<NumberInput {...input} disabled={submitting} {...props} ref={ref} min={0}>
<NumberInput {...input} isDisabled={submitting} {...props} ref={ref} min={0}>
<NumberInputField />
<NumberInputStepper>
<NumberIncrementStepper />
<NumberDecrementStepper />
</NumberInputStepper>
</NumberInput>
) : (
<Input {...input} disabled={submitting} {...props} ref={ref} />
<Input {...input} isDisabled={submitting} {...props} ref={ref} />
)}
</FormLabel>
{touched && normalizedError && (
Expand Down
4 changes: 2 additions & 2 deletions app/pages/projects/[projectId].tsx
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ export const Project = () => {

<Flex justify="space-between">
<Button
disabled={page === 0}
isDisabled={page === 0}
onClick={goToPreviousPage}
colorScheme="teal"
variant="solid"
Expand All @@ -256,7 +256,7 @@ export const Project = () => {
Previous
</Button>
<Button
disabled={!hasMore}
isDisabled={!hasMore}
onClick={goToNextPage}
colorScheme="teal"
variant="solid"
Expand Down
4 changes: 2 additions & 2 deletions app/pages/projects/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ export const ProjectsList = () => {

<Flex justify="space-between">
<Button
disabled={page === 0}
isDisabled={page === 0}
onClick={goToPreviousPage}
colorScheme="teal"
variant="solid"
Expand All @@ -158,7 +158,7 @@ export const ProjectsList = () => {
Previous
</Button>
<Button
disabled={!hasMore}
isDisabled={!hasMore}
onClick={goToNextPage}
colorScheme="teal"
variant="solid"
Expand Down
Loading

0 comments on commit eb432a0

Please sign in to comment.