Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
bush1D3v committed Sep 16, 2024
2 parents c3f87c7 + 0c27430 commit e810563
Show file tree
Hide file tree
Showing 52 changed files with 638 additions and 757 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/devskim.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ name: DevSkim

on:
push:
branches: [ "main" ]
branches: [ "main", "dev" ]
pull_request:
branches: [ "main" ]
branches: [ "main", "dev" ]
schedule:
- cron: '35 6 * * 3'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ on:
schedule:
- cron: '36 20 * * *'
push:
branches: [ "main" ]
branches: [ "main", "dev" ]
tags: [ 'v*.*.*' ]
pull_request:
branches: [ "main" ]
branches: [ "main", "dev" ]

env:
REGISTRY: ghcr.io
Expand Down
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,8 @@ coverage
*.tsbuildinfo
.env
bun.lockb
package-lock.json
yarn.lock
pnpm-lock.yaml

*storybook.log
11 changes: 5 additions & 6 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
import type {StorybookConfig} from "@storybook/vue3-vite";

const config: StorybookConfig = {
stories: ["../src/**/*.stories.ts"],
stories: ["../src/**/*.mdx", "../src/**/*.stories.@(js|jsx|mjs|ts|tsx)"],
addons: [
"@storybook/addon-onboarding",
"@storybook/addon-links",
"@storybook/addon-essentials",
"@storybook/addon-interactions",
"@chromatic-com/storybook",
"@storybook/addon-interactions",
],
framework: {
name: "@storybook-vue/vue3",
options: {
docgen: "vue-component-meta",
},
name: "@storybook/vue3-vite",
options: {},
},
docs: {
autodocs: "tag",
Expand Down
6 changes: 6 additions & 0 deletions COMMIT_PATTERN.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ PT-BR 🇧🇷
| revert | Commits que revertem alterações anteriores. Eles são usados para desfazer um ou mais commits anteriores que introduziram problemas ou comportamentos indesejados. |
| style | Commits relacionados a melhorias na formatação do código, como ajustes de espaçamento, formatação de código e outros aspectos visuais. Isso ajuda a manter um estilo de código consistente e legível. |
| test | Commits relacionados a testes, como adição de novos testes, correções de testes existentes ou melhorias na infraestrutura de testes. Testes rigorosos são essenciais para garantir que o código funcione corretamente e para evitar regressões. |
| update | Commits relacionados a atualizações gerais que não se enquadram em outras categorias específicas. Atualizações de códigos já existentes e suas funcionalidades. |
| config | Commits relacionados a alterações de configuração no projeto. Isso pode incluir mudanças em arquivos de configuração, ajustes em scripts de build, configurações de ferramentas de desenvolvimento, ou qualquer outra modificação que afete a configuração do ambiente de desenvolvimento ou produção.
| delete | Commits relacionados a exclusão de arquivos ou diretórios. Isso pode incluir mudanças em arquivos ou diretórios que foram excluídos do projeto. |

ENG 🇺🇸
| Category | Description |
Expand All @@ -27,3 +30,6 @@ ENG 🇺🇸
| revert | Commits that revert previous changes. They are used to undo one or more previous commits that introduced problems or unwanted behavior. |
| style | Commits related to improvements in code formatting, such as spacing adjustments, code formatting and other visual aspects. This helps maintain a consistent and readable code style. |
| test | Test-related commits, such as adding new tests, fixing existing tests, or improving the testing infrastructure. Rigorous testing is essential to ensure code works correctly and to avoid regressions. |
| update | Commits related to general updates that do not fit into other specific categories. Updates to existing code and its functionalities. |
| config | Commits related to configuration changes in the project. This can include changes to configuration files, adjustments to build scripts, development tool configurations, or any other modifications that affect the development or production environment configuration. |
| delete | Commits related to file or directory deletion. This may include changes to files or directories that were removed from the project.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ COPY . .

RUN npm install

EXPOSE 3000
EXPOSE 5173

EXPOSE 6006

Expand Down
35 changes: 2 additions & 33 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ O **NEI Market Analytics** é um projeto de código aberto projetado para fornec
<img align='center' height='70' width='70' title='Docker' alt='docker' src='https://github.com/devicons/devicon/blob/master/icons/docker/docker-plain.svg' /> &nbsp;
<img align='center' height='60' width='50' title='Vitest' alt='vitest' src='https://github.com/bush1D3v/tsbank_api/assets/133554156/74803ee6-3f6e-4335-9f56-cb887a4285ff' /> &nbsp;&nbsp;
<img align='center' height='54' width='44' title='Storybook-js' alt='storybook-js' src='https://github.com/bush1D3v/my_portfolio/assets/133554156/213c8aa4-ce24-4b30-8e07-dceb476e8589' /> &nbsp;&nbsp;&nbsp;
<img align='center' height='54' width='54' title='Cypress' alt='cypress' src='https://github.com/user-attachments/assets/8eb060a2-57dc-4028-9e6b-9c93644fb545' /> &nbsp;&nbsp;&nbsp;
<img align='center' height='50' width='50' title='VueUse' alt='vueuse' src='https://github.com/user-attachments/assets/c4eb21ad-858d-4f28-a2c7-1dd0c23342c1' /> &nbsp;
<img align='center' height='50' width='60' title='Biomejs' alt='biomejs' src='https://github.com/user-attachments/assets/b3d8a249-e17f-4e64-9608-4a4783b7bbc0' /> &nbsp;
<img align='center' height='50' width='50' title='Chromatic' alt='chromatic' src='https://github.com/user-attachments/assets/6edd5832-5db7-4e2a-a8e4-4bbe7b8e7208' /> &nbsp;
Expand Down Expand Up @@ -74,25 +73,12 @@ bun build
### Executar testes de unidade com [Vitest](https://vitest.dev/)

```sh
bun test:unit
```

### Executar testes de ponta a ponta com [Cypress](https://www.cypress.io/)

```sh
bun test:e2e:dev
bun tests
```

Isso executa os testes de ponta a ponta no servidor de desenvolvimento Vite.
É muito mais rápido do que a compilação de produção.

Mas ainda é recomendado testar a compilação de produção com `test:e2e` antes de implantar (por exemplo, em ambientes de CI):

```sh
bun build
bun test:e2e
```

ENG 🇺🇸

# 📊 Nei Market Analytics
Expand Down Expand Up @@ -123,7 +109,6 @@ The **NEI Market Analytics** is an open-source project designed to provide compr
<img align='center' height='70' width='70' title='Docker' alt='docker' src='https://github.com/devicons/devicon/blob/master/icons/docker/docker-plain.svg' /> &nbsp;
<img align='center' height='54' width='44' title='Vitest' alt='vitest' src='https://github.com/bush1D3v/tsbank_api/assets/133554156/74803ee6-3f6e-4335-9f56-cb887a4285ff' /> &nbsp;&nbsp;
<img align='center' height='54' width='44' title='Storybook-js' alt='storybook-js' src='https://github.com/bush1D3v/my_portfolio/assets/133554156/213c8aa4-ce24-4b30-8e07-dceb476e8589' /> &nbsp;&nbsp;&nbsp;
<img align='center' height='54' width='54' title='Cypress' alt='cypress' src='https://github.com/user-attachments/assets/8eb060a2-57dc-4028-9e6b-9c93644fb545' /> &nbsp;&nbsp;&nbsp;
<img align='center' height='50' width='50' title='VueUse' alt='vueuse' src='https://github.com/user-attachments/assets/c4eb21ad-858d-4f28-a2c7-1dd0c23342c1' /> &nbsp;
<img align='center' height='50' width='60' title='Biomejs' alt='biomejs' src='https://github.com/user-attachments/assets/b3d8a249-e17f-4e64-9608-4a4783b7bbc0' /> &nbsp;
<img align='center' height='50' width='50' title='Chromatic' alt='chromatic' src='https://github.com/user-attachments/assets/6edd5832-5db7-4e2a-a8e4-4bbe7b8e7208' /> &nbsp;
Expand Down Expand Up @@ -170,21 +155,5 @@ bun build
### Run Unit Tests with [Vitest](https://vitest.dev/)

```sh
bun test:unit
```

### Run End-to-End Tests with [Cypress](https://www.cypress.io/)

```sh
bun test:e2e:dev
```

This runs the end-to-end tests against the Vite development server.
It is much faster than the production build.

But it's still recommended to test the production build with `test:e2e` before deploying (e.g. in CI environments):

```sh
bun build
bun test:e2e
bun tests
```
5 changes: 5 additions & 0 deletions chromatic.config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"onlyChanged": true,
"projectId": "Project:66e0e7399fb56c0cbb1451d2",
"zip": true
}
32 changes: 16 additions & 16 deletions components.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"$schema": "https://shadcn-vue.com/schema.json",
"style": "new-york",
"typescript": true,
"tsConfigPath": "./tsconfig.json",
"tailwind": {
"config": "tailwind.config.js",
"css": "src/assets/css/main.css",
"baseColor": "stone",
"cssVariables": true
},
"framework": "vite",
"aliases": {
"components": "@/components",
"utils": "@/lib/utils"
}
}
"$schema": "https://shadcn-vue.com/schema.json",
"style": "new-york",
"typescript": true,
"tsConfigPath": "./tsconfig.json",
"tailwind": {
"config": "tailwind.config.js",
"css": "src/assets/css/main.css",
"baseColor": "stone",
"cssVariables": true
},
"framework": "vite",
"aliases": {
"components": "@/components",
"utils": "@/lib/utils"
}
}
8 changes: 0 additions & 8 deletions cypress.config.ts

This file was deleted.

8 changes: 0 additions & 8 deletions cypress/e2e/example.cy.ts

This file was deleted.

8 changes: 0 additions & 8 deletions cypress/e2e/tsconfig.json

This file was deleted.

5 changes: 0 additions & 5 deletions cypress/fixtures/example.json

This file was deleted.

39 changes: 0 additions & 39 deletions cypress/support/commands.ts

This file was deleted.

20 changes: 0 additions & 20 deletions cypress/support/e2e.ts

This file was deleted.

48 changes: 24 additions & 24 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
version: '3.2'

services:
vue:
image: node:20
volumes:
- .:/app
working_dir: /app
environment:
- GIT_USER_EMAIL=${GIT_USER_EMAIL}
- GIT_USER_NAME=${GIT_USER_NAME}
command: sh -c "git config --global user.email \"$GIT_USER_EMAIL\" && git config --global user.name \"$GIT_USER_NAME\" && git config --global --add safe.directory /app && npm run dev"
ports:
- "3000:3000"
vue:
image: node:20
volumes:
- .:/app
working_dir: /app
environment:
- GIT_USER_EMAIL=${GIT_USER_EMAIL}
- GIT_USER_NAME=${GIT_USER_NAME}
command: sh -c "git config --global user.email \"$GIT_USER_EMAIL\" && git config --global user.name \"$GIT_USER_NAME\" && git config --global --add safe.directory /app && npm run dev"
ports:
- "5173:5173"

storybook:
image: node:20
volumes:
- .:/app
working_dir: /app
environment:
- GIT_USER_EMAIL=${GIT_USER_EMAIL}
- GIT_USER_NAME=${GIT_USER_NAME}
command: sh -c "apt-get update && apt-get install -y xdg-utils && git config --global user.email \"$GIT_USER_EMAIL\" && git config --global user.name \"$GIT_USER_NAME\" && git config --global --add safe.directory /app && npm run storybook"
ports:
- "6006:6006"
depends_on:
- vue
storybook:
image: node:20
volumes:
- .:/app
working_dir: /app
environment:
- GIT_USER_EMAIL=${GIT_USER_EMAIL}
- GIT_USER_NAME=${GIT_USER_NAME}
command: sh -c "apt-get update && apt-get install -y xdg-utils && git config --global user.email \"$GIT_USER_EMAIL\" && git config --global user.name \"$GIT_USER_NAME\" && git config --global --add safe.directory /app && npm run storybook"
ports:
- "6006:6006"
depends_on:
- vue
33 changes: 26 additions & 7 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,13 +1,32 @@
<!DOCTYPE html>
<html lang="en">
<head>
<html lang="pt-BR">

<head>
<meta charset="UTF-8">
<link rel="icon" href="/favicon.ico">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Vite App</title>
</head>
<body>
<meta name="description"
content="NEI Market Analytics is an open-source project designed to provide comprehensive market value analyses for various financial instruments and digital assets. This repository aims to create a robust platform for tracking and analyzing market trends across multiple sectors.">
<meta name="keywords"
content="market analysis, business insights, NEI Market Analytics, data analysis, market trends">
<meta property="og:title" content="NEI Market Analytics">
<meta property="og:description"
content="NEI Market Analytics is an open-source project designed to provide comprehensive market value analyses for various financial instruments and digital assets. This repository aims to create a robust platform for tracking and analyzing market trends across multiple sectors.">
<meta property="og:image" content="/logo.svg">
<meta property="og:url" content="http://localhost:5173">
<meta property="og:type" content="website">
<meta name="robots" content="index, follow">
<meta name="author" content="Victor Navarro">
<meta name="theme-color" content="#ffffff">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta http-equiv="refresh" content="30">
<link rel="canonical" href="http://localhost:5173">
<link rel="icon" href="/favicon.ico">
<title>NEI Market Analytics</title>
</head>

<body>
<div id="app"></div>
<script type="module" src="/src/main.ts"></script>
</body>
</body>

</html>
Loading

0 comments on commit e810563

Please sign in to comment.