Skip to content

Commit

Permalink
Merge pull request #216 from Tauffer-Consulting/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
vinicvaz authored Feb 19, 2024
2 parents 021e9c0 + a357276 commit 5708c2b
Show file tree
Hide file tree
Showing 151 changed files with 11,541 additions and 10,402 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/integration-tests-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
DOMINO_GITHUB_ACCESS_TOKEN_WORKFLOWS: ${{ secrets.TESTS_GITHUB_WORKFLOWS_TOKEN }}
DOMINO_GITHUB_WORKFLOWS_REPOSITORY: ${{secrets.TESTS_WORKFLOWS_REPOSITORY}}
run: pytest --cov=rest --cov-report=xml --cov-report=term-missing rest/tests/ -v -s

- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v3
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-airflow-images-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
push: true
tags: ghcr.io/tauffer-consulting/domino-airflow-base:latest-dev
context: .
file: Dockerfile-airflow-domino.dev
file: Dockerfile-airflow-domino.dev

domino-base-piece:
name: Domino Base Piece Image
Expand Down
19 changes: 7 additions & 12 deletions .github/workflows/release-airflow-images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,19 @@ on:
branches:
- main
paths:
- src/domino/**
- Dockerfile-airflow-domino.prod
- Dockerfile-domino-piece.gpu-prod
- Dockerfile-domino-piece.prod
# workflow_run:
# workflows:
# - "Build and publish domino-py package"
# branches:
# - main
# types:
# - completed
workflow_run:
workflows: ["Build and publish domino-py package"]
branches: [main]
types:
- completed
paths:
- src/domino/**

jobs:
domino-airflow-base:
#if: ${{ github.event.workflow_run.conclusion == 'success' }}
name: Domino Airflow Base Image
runs-on: ubuntu-latest
steps:
Expand All @@ -44,7 +42,6 @@ jobs:
file: Dockerfile-airflow-domino.prod

domino-base-piece:
#if: ${{ github.event.workflow_run.conclusion == 'success' }}
name: Domino Base Piece Image
runs-on: ubuntu-latest
steps:
Expand All @@ -69,7 +66,6 @@ jobs:
file: Dockerfile-domino-piece.prod

domino-base-piece-gpu:
#if: ${{ github.event.workflow_run.conclusion == 'success' }}
name: Domino Base Piece GPU Image
runs-on: ubuntu-latest
steps:
Expand All @@ -94,7 +90,6 @@ jobs:
file: Dockerfile-domino-piece.gpu-prod

domino-storage-sidecar:
#if: ${{ github.event.workflow_run.conclusion == 'success' }}
name: Domino Storage Sidecar Image
runs-on: ubuntu-latest
steps:
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@ pieces_repository_test/*
airflow/*
domino_data/*

.vscode/*

**/**.pyc
**/**.swn
**/**.swl
**/**.swp
**/**.swo
**/**.swm
.vscode
**/__pycache__/**
.python-version
**/ENV/**
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<p align="center">
<img src="https://raw.githubusercontent.com/Tauffer-Consulting/domino/main/media/logo.png" width="450" title="Domino">
<img src="media/brand/main_logo.png" width="450" title="Domino">
</p>
<p align="center"><i>Build amazing ideas, piece by piece.</i></p>
<p align="center">
Expand Down
5 changes: 3 additions & 2 deletions docker-compose-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -360,14 +360,15 @@ services:
context: ./frontend
dockerfile: Dockerfile.dev
container_name: domino-frontend
command: yarn start
command: pnpm debug
environment:
- DOMINO_DEPLOY_MODE=local-compose
- API_URL=http://localhost:8000
ports:
- 3000:3000
- 9222:9222 # Expose debug port
volumes:
- ./frontend:/usr/src/app # Enable hot reload for frontend
- ./frontend:/usr/src/app
- /usr/src/app/node_modules
depends_on:
domino_rest:
Expand Down
21 changes: 16 additions & 5 deletions frontend/Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,14 +1,25 @@
# Install pnpm
FROM node:18-alpine as base
ENV PNPM_HOME="/pnpm"
ENV PATH="$PNPM_HOME:$PATH"
RUN corepack enable

# Build Stage
FROM node:18-alpine as build
FROM base as build
WORKDIR /usr/src/app
COPY package.json pnpm-lock.yaml ./
RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile

# Debug Stage
FROM base as debug
WORKDIR /usr/src/app
COPY package.json yarn.lock ./
RUN yarn install --frozen-lockfile
EXPOSE 9222

# Final Stage
FROM node:18-alpine
FROM base
WORKDIR /usr/src/app
COPY --from=build /usr/src/app/node_modules ./node_modules
COPY . .
RUN chmod -R 777 node_modules/
USER node
CMD ["yarn", "start"]
CMD ["pnpm", "run", "debug"]
10 changes: 6 additions & 4 deletions frontend/Dockerfile.prod
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
# Stage 1: Build the React app
FROM node:18-slim as build

ENV PNPM_HOME="/pnpm"
ENV PATH="$PNPM_HOME:$PATH"
RUN corepack enable
# Set the working directory
WORKDIR /app

# Copy package.json and yarn.lock files
COPY package.json yarn.lock ./
COPY package.json pnpm-lock.yaml ./

# Install dependencies
RUN yarn install --production --frozen-lockfile && yarn cache clean
RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile

RUN npx pkg ./node_modules/@import-meta-env/cli/bin/import-meta-env.js \
-o import-meta-env -y
Expand All @@ -17,7 +19,7 @@ RUN npx pkg ./node_modules/@import-meta-env/cli/bin/import-meta-env.js \
COPY . .

# Build the app for production
RUN yarn build
RUN pnpm run build

# Stage 2: Create a minimal NGINX image
FROM nginx:1.25.2
Expand Down
6 changes: 3 additions & 3 deletions frontend/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
### Recommended

This config allow you to ensure code style every time you save a file in frontend folder,
alternatively you can just run the command `yarn lint:fix`
alternatively you can just run the command `pnpm run lint:fix`

- [ESlint extension](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint)
- Add to settings.json ([Ctrl + Shift + P] to open 'Open Settings (JSON)')
Expand All @@ -29,13 +29,13 @@ alternatively you can just run the command `yarn lint:fix`
#### Install dependencies

```bash
yarn install
pnpm install
```

#### Run the application
Running Domino frontend locally:
```bash
yarn start
pnpm start
```

### Build image
Expand Down
93 changes: 93 additions & 0 deletions frontend/fonts/OFL.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
Copyright 2022 The Rethink Sans Project Authors (https://github.com/hans-thiessen/Rethink-Sans)

This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at:
https://openfontlicense.org


-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------

PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
development of collaborative font projects, to support the font creation
efforts of academic and linguistic communities, and to provide a free and
open framework in which fonts may be shared and improved in partnership
with others.

The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
requirement for fonts to remain under this license does not apply
to any document created using the fonts or their derivatives.

DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
Holder(s) under this license and clearly marked as such. This may
include source files, build scripts and documentation.

"Reserved Font Name" refers to any names specified as such after the
copyright statement(s).

"Original Version" refers to the collection of Font Software components as
distributed by the Copyright Holder(s).

"Modified Version" refers to any derivative made by adding to, deleting,
or substituting -- in part or in whole -- any of the components of the
Original Version, by changing formats or by porting the Font Software to a
new environment.

"Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software.

PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining
a copy of the Font Software, to use, study, copy, merge, embed, modify,
redistribute, and sell modified and unmodified copies of the Font
Software, subject to the following conditions:

1) Neither the Font Software nor any of its individual components,
in Original or Modified Versions, may be sold by itself.

2) Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license. These can be
included either as stand-alone text files, human-readable headers or
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.

3) No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the corresponding
Copyright Holder. This restriction only applies to the primary font name as
presented to the users.

4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
Modified Version, except to acknowledge the contribution(s) of the
Copyright Holder(s) and the Author(s) or with their explicit written
permission.

5) The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
remain under this license does not apply to any document created
using the Font Software.

TERMINATION
This license becomes null and void if any of the above conditions are
not met.

DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.
73 changes: 73 additions & 0 deletions frontend/fonts/README.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
Rethink Sans Variable Font
==========================

This download contains Rethink Sans as both variable fonts and static fonts.

Rethink Sans is a variable font with this axis:
wght

This means all the styles are contained in these files:
RethinkSans-VariableFont_wght.ttf
RethinkSans-Italic-VariableFont_wght.ttf

If your app fully supports variable fonts, you can now pick intermediate styles
that aren’t available as static fonts. Not all apps support variable fonts, and
in those cases you can use the static font files for Rethink Sans:
static/RethinkSans-Regular.ttf
static/RethinkSans-Medium.ttf
static/RethinkSans-SemiBold.ttf
static/RethinkSans-Bold.ttf
static/RethinkSans-ExtraBold.ttf
static/RethinkSans-Italic.ttf
static/RethinkSans-MediumItalic.ttf
static/RethinkSans-SemiBoldItalic.ttf
static/RethinkSans-BoldItalic.ttf
static/RethinkSans-ExtraBoldItalic.ttf

Get started
-----------

1. Install the font files you want to use

2. Use your app's font picker to view the font family and all the
available styles

Learn more about variable fonts
-------------------------------

https://developers.google.com/web/fundamentals/design-and-ux/typography/variable-fonts
https://variablefonts.typenetwork.com
https://medium.com/variable-fonts

In desktop apps

https://theblog.adobe.com/can-variable-fonts-illustrator-cc
https://helpx.adobe.com/nz/photoshop/using/fonts.html#variable_fonts

Online

https://developers.google.com/fonts/docs/getting_started
https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Fonts/Variable_Fonts_Guide
https://developer.microsoft.com/en-us/microsoft-edge/testdrive/demos/variable-fonts

Installing fonts

MacOS: https://support.apple.com/en-us/HT201749
Linux: https://www.google.com/search?q=how+to+install+a+font+on+gnu%2Blinux
Windows: https://support.microsoft.com/en-us/help/314960/how-to-install-or-remove-a-font-in-windows

Android Apps

https://developers.google.com/fonts/docs/android
https://developer.android.com/guide/topics/ui/look-and-feel/downloadable-fonts

License
-------
Please read the full license text (OFL.txt) to understand the permissions,
restrictions and requirements for usage, redistribution, and modification.

You can use them in your products & projects – print or digital,
commercial or otherwise.

This isn't legal advice, please consider consulting a lawyer and see the full
license for all details.
Binary file added frontend/fonts/RethinkSans-Bold.ttf
Binary file not shown.
Binary file added frontend/fonts/RethinkSans-BoldItalic.ttf
Binary file not shown.
Binary file added frontend/fonts/RethinkSans-ExtraBold.ttf
Binary file not shown.
Binary file added frontend/fonts/RethinkSans-ExtraBoldItalic.ttf
Binary file not shown.
Binary file added frontend/fonts/RethinkSans-Italic.ttf
Binary file not shown.
Binary file added frontend/fonts/RethinkSans-Medium.ttf
Binary file not shown.
Binary file added frontend/fonts/RethinkSans-MediumItalic.ttf
Binary file not shown.
Binary file added frontend/fonts/RethinkSans-Regular.ttf
Binary file not shown.
Binary file added frontend/fonts/RethinkSans-SemiBold.ttf
Binary file not shown.
Binary file added frontend/fonts/RethinkSans-SemiBoldItalic.ttf
Binary file not shown.
5 changes: 5 additions & 0 deletions frontend/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@

<!-- Icons to support Material Design -->
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" />
<link rel="apple-touch-icon" sizes="180x180" href="/favicon/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/favicon/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/favicon/favicon-16x16.png">
<link rel="icon" type="image/png" sizes="192x192" href="/favicon/android-chrome-192x192.png">
<link rel="icon" type="image/png" sizes="512x512" href="/favicon/android-chrome-512x512.png">


<title>Domino</title>
Expand Down
Loading

0 comments on commit 5708c2b

Please sign in to comment.