Skip to content
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
2 changes: 1 addition & 1 deletion .babelrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"presets": [
"@babel/typescript",
"@babel/preset-typescript",
"@babel/preset-env"
],
"plugins": [
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/beta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
uses: actions/checkout@v2

- name: Install dependencies
run: npm ci
run: yarn install --pure-lockfile

- name: Typescript
run: npm run tsc
run: yarn tsc

deploy:

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
uses: actions/checkout@v2

- name: Install dependencies
run: npm ci
run: yarn install --pure-lockfile

- name: Typescript
run: npm run tsc
run: yarn tsc

deploy:

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ jobs:
- name: Checkout code
uses: actions/checkout@v2
- name: Install dependencies
run: npm ci
run: yarn install --pure-lockfile
- name: Typescript
run: npm run tsc
run: yarn tsc
4 changes: 2 additions & 2 deletions .github/workflows/prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:
uses: actions/checkout@v2

- name: Install dependencies
run: npm ci
run: yarn install --pure-lockfile

- name: Typescript
run: npm run tsc
run: yarn tsc

deploy:

Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,7 @@ dump.rdb
/dist/stylesheets
/dist/fonts
/dist/@types

# Yarn
yarn-error.log
package-lock.json
11 changes: 6 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.7.1-alpine
FROM ruby:2.7.1-alpine3.12

ARG UID=1000
ARG GID=1000
Expand All @@ -7,10 +7,11 @@ RUN addgroup -S webapp -g $GID && adduser -D -S webapp -G webapp -u $UID

RUN apk add --update --no-cache \
alpine-sdk \
nodejs \
nodejs-current \
python2 \
git \
nodejs-npm \
yarn \
tzdata

WORKDIR /app/
Expand All @@ -19,17 +20,17 @@ RUN chown -R $UID:$GID .

USER webapp

COPY --chown=$UID:$GID package.json package-lock.json Gemfile Gemfile.lock /app/
COPY --chown=$UID:$GID package.json yarn.lock Gemfile Gemfile.lock /app/

COPY --chown=$UID:$GID vendor /app/vendor

RUN npm ci
RUN yarn install --pure-lockfile

RUN gem install bundler && bundle install

COPY --chown=$UID:$GID . /app/

RUN npm run bundle
RUN yarn bundle

RUN bundle exec rails assets:precompile

Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,10 @@ This repo contains the core code used in the web app, as well as the Electron-ba

**Instructions:**

1. Ensure you have [Yarn](https://classic.yarnpkg.com) installed
1. Clone the repo
1. `npm run setup`
1. `npm start`
1. `yarn setup`
1. `yarn start`

Then open your browser to `http://localhost:3001`.

Expand Down
2 changes: 1 addition & 1 deletion app/assets/javascripts/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"compilerOptions": {
"target": "esnext",
"target": "ES2019",
"module": "commonjs",
"moduleResolution": "node",
"allowJs": true,
Expand Down
4 changes: 2 additions & 2 deletions app/assets/javascripts/ui_models/app_state.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ class ActionsMenuState {

export class SyncState {
inProgress = false;
errorMessage?: string;
humanReadablePercentage?: string;
errorMessage?: string = undefined;
humanReadablePercentage?: string = undefined;

constructor() {
makeObservable(this, {
Expand Down
Loading