Skip to content

Commit

Permalink
Merge pull request #20 from dedevpradev/feature/frontend_next
Browse files Browse the repository at this point in the history
Feature/frontend next
  • Loading branch information
mffonseca authored Jul 23, 2024
2 parents 615ac20 + 51021cf commit 832ec01
Show file tree
Hide file tree
Showing 51 changed files with 16,336 additions and 13,757 deletions.
Binary file modified .DS_Store
Binary file not shown.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Set up Node.js
uses: actions/setup-node@v4
with:
node-version: '14'
node-version: '18.17.0'

- name: Install frontend dependencies
working-directory: ./frontend
Expand All @@ -25,9 +25,9 @@ jobs:
working-directory: ./frontend
run: npm run build

- name: Test frontend
working-directory: ./frontend
run: npm test -- --watchAll=false
#- name: Test frontend
# working-directory: ./frontend
# run: npm test -- --watchAll=false

- name: Set up Go
uses: actions/setup-go@v4
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:14-alpine as frontend
FROM node:20-alpine as frontend

WORKDIR /app
COPY ./frontend .
Expand All @@ -16,7 +16,7 @@ COPY ./backend/go.mod ./backend/go.sum ./
RUN go mod download
COPY ./backend .

COPY --from=frontend /app/build ./frontend/build
COPY --from=frontend /app/.next ./frontend/.next

COPY entrypoint.sh /app/

Expand Down
2 changes: 2 additions & 0 deletions backend/pkg/handlers/handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@ import (

func FormHandler(c *gin.Context) {
tmpl, err := template.ParseFiles("templates/web/form.html")

if err != nil {
c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("error parsing template: %v", err))
return
}

tmpl.Execute(c.Writer, nil)
}

Expand Down
31 changes: 15 additions & 16 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
services:
postgres:
image: postgres:13-alpine3.20
image: postgres:13
container_name: postgres
environment:
POSTGRES_USER: userpostgres
POSTGRES_PASSWORD: passwordpostgres
POSTGRES_DB: faladev
ports:
- "5432:5432"
- '5432:5432'
volumes:
- postgres-data:/var/lib/postgresql/data

Expand All @@ -18,22 +18,22 @@ services:
PGADMIN_DEFAULT_EMAIL: [email protected]
PGADMIN_DEFAULT_PASSWORD: admin
ports:
- "5050:80"
- '5050:80'
volumes:
- ./servers.json:/pgadmin4/servers.json

jaeger:
image: jaegertracing/all-in-one:1.31
container_name: jaeger
ports:
- "5775:5775/udp"
- "6831:6831/udp"
- "6832:6832/udp"
- "5778:5778"
- "16686:16686"
- "14268:14268"
- "14250:14250"
- "9411:9411"
- '5775:5775/udp'
- '6831:6831/udp'
- '6832:6832/udp'
- '5778:5778'
- '16686:16686'
- '14268:14268'
- '14250:14250'
- '9411:9411'

backend:
build:
Expand All @@ -49,8 +49,7 @@ services:
DATABASE_URL: postgres://userpostgres:passwordpostgres@postgres:5432/faladev?sslmode=disable
OTEL_EXPORTER_JAEGER_ENDPOINT: http://jaeger:14268/api/traces
ports:
- "8080:8080"
- "2345:2345"
- '8080:8080'
volumes:
- ./backend:/app/backend
- ./frontend/build:/app/frontend/build
Expand All @@ -59,15 +58,15 @@ services:
- jaeger

frontend:
image: node:14-alpine
image: node:20-alpine
container_name: frontend
working_dir: /app
command: sh -c "npm install && npm start"
command: sh -c "npm install && npm run dev"
volumes:
- ./frontend:/app
- /app/node_modules
ports:
- "3000:3000"
- '3000:3000'
networks:
- app-network

Expand Down
6 changes: 6 additions & 0 deletions frontend/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"extends": [
"next/core-web-vitals",
"plugin:storybook/recommended"
]
}
23 changes: 19 additions & 4 deletions frontend/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,35 @@
/node_modules
/.pnp
.pnp.js
.yarn/install-state.gz

# testing
/coverage

# next.js
/.next/
/out/

# production
/build

# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local
*.pem

# debug
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# local env files
.env*.local

# vercel
.vercel

# typescript
*.tsbuildinfo
next-env.d.ts

*storybook.log
1 change: 1 addition & 0 deletions frontend/.nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v20
10 changes: 10 additions & 0 deletions frontend/.prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"printWidth": 120,
"tabWidth": 2,
"useTabs": true,
"semi": false,
"singleQuote": true,
"trailingComma": "all",
"arrowParens": "avoid",
"endOfLine": "lf"
}
18 changes: 18 additions & 0 deletions frontend/.storybook/main.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import type { StorybookConfig } from '@storybook/nextjs'

const config: StorybookConfig = {
stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|mjs|ts|tsx)'],
addons: [
'@storybook/addon-onboarding',
'@storybook/addon-links',
'@storybook/addon-essentials',
'@chromatic-com/storybook',
'@storybook/addon-interactions',
],
framework: {
name: '@storybook/nextjs',
options: {},
},
staticDirs: ['../public'],
}
export default config
14 changes: 14 additions & 0 deletions frontend/.storybook/preview.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import type { Preview } from '@storybook/react'

const preview: Preview = {
parameters: {
controls: {
matchers: {
color: /(background|color)$/i,
date: /Date$/i,
},
},
},
}

export default preview
78 changes: 22 additions & 56 deletions frontend/README.md
Original file line number Diff line number Diff line change
@@ -1,70 +1,36 @@
# Getting Started with Create React App
This is a [Next.js](https://nextjs.org/) project bootstrapped with [`create-next-app`](https://github.com/vercel/next.js/tree/canary/packages/create-next-app).

This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
## Getting Started

## Available Scripts
First, run the development server:

In the project directory, you can run:
```bash
npm run dev
# or
yarn dev
# or
pnpm dev
# or
bun dev
```

### `npm start`
Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.

Runs the app in the development mode.\
Open [http://localhost:3000](http://localhost:3000) to view it in your browser.
You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file.

The page will reload when you make changes.\
You may also see any lint errors in the console.

### `npm test`

Launches the test runner in the interactive watch mode.\
See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.

### `npm run build`

Builds the app for production to the `build` folder.\
It correctly bundles React in production mode and optimizes the build for the best performance.

The build is minified and the filenames include the hashes.\
Your app is ready to be deployed!

See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.

### `npm run eject`

**Note: this is a one-way operation. Once you `eject`, you can't go back!**

If you aren't satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.

Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you're on your own.

You don't have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn't feel obligated to use this feature. However we understand that this tool wouldn't be useful if you couldn't customize it when you are ready for it.
This project uses [`next/font`](https://nextjs.org/docs/basic-features/font-optimization) to automatically optimize and load Inter, a custom Google Font.

## Learn More

You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).

To learn React, check out the [React documentation](https://reactjs.org/).

### Code Splitting

This section has moved here: [https://facebook.github.io/create-react-app/docs/code-splitting](https://facebook.github.io/create-react-app/docs/code-splitting)

### Analyzing the Bundle Size

This section has moved here: [https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size](https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size)

### Making a Progressive Web App

This section has moved here: [https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app](https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app)

### Advanced Configuration
To learn more about Next.js, take a look at the following resources:

This section has moved here: [https://facebook.github.io/create-react-app/docs/advanced-configuration](https://facebook.github.io/create-react-app/docs/advanced-configuration)
- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API.
- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial.

### Deployment
You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js/) - your feedback and contributions are welcome!

This section has moved here: [https://facebook.github.io/create-react-app/docs/deployment](https://facebook.github.io/create-react-app/docs/deployment)
## Deploy on Vercel

### `npm run build` fails to minify
The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js.

This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify)
Check out our [Next.js deployment documentation](https://nextjs.org/docs/deployment) for more details.
4 changes: 4 additions & 0 deletions frontend/next.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/** @type {import('next').NextConfig} */
const nextConfig = {}

export default nextConfig
Loading

0 comments on commit 832ec01

Please sign in to comment.