Skip to content

Commit bfec588

Browse files
BautistaRodriguezBautistaRodriguez
authored
Merge pull request #11 from TP-ACH/develop
Develop
2 parents d2366fd + b9368c0 commit bfec588

70 files changed

Lines changed: 5907 additions & 32 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Dockerfile‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
FROM node:18
2+
3+
WORKDIR /app
4+
5+
COPY app/package*.json ./
6+
7+
RUN npm install
8+
9+
COPY app ./
10+
11+
EXPOSE 5173
12+
13+
CMD ["npm", "run", "dev"]

‎README.md‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,42 @@
1616
cd app
1717
```
1818

19-
2. Install the dependencies
19+
2. Copy .env.example and set your environment variables
20+
21+
```sh
22+
cp .env.example .env
23+
```
24+
25+
3. Install the dependencies
2026

2127
```sh
2228
npm install
2329
```
2430

25-
3. Run app
31+
4. Run app
2632

2733
```sh
2834
npm run dev
2935
```
36+
37+
## Setup (Docker)
38+
39+
1. Go to app directory
40+
41+
```sh
42+
cd app
43+
```
44+
45+
2. Copy .env.example and set your environment variables
46+
47+
```sh
48+
cp .env.example .env
49+
```
50+
51+
3. Start Docker
52+
53+
```sh
54+
docker compose up -d
55+
```
56+
57+
- Make sure to run backend API

‎app/.env.example‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
VITE_API_PORT=8000
2+
VITE_TIMEZONE=America/Buenos_Aires

‎app/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<html lang="en">
33
<head>
44
<meta charset="UTF-8" />
5-
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
5+
<link rel="icon" href="/src/assets/favicon.ico" />
66
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
7-
<title>APP</title>
7+
<title>Cleverleafy</title>
88
</head>
99
<body>
1010
<div id="root"></div>

‎app/package-lock.json‎

Lines changed: 156 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/package.json‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,15 @@
1515
"@headlessui/tailwindcss": "^0.2.1",
1616
"@remixicon/react": "^4.2.0",
1717
"@tremor/react": "^3.17.4",
18+
"axios": "^1.7.7",
19+
"date-fns-tz": "^3.2.0",
1820
"react": "^18.3.1",
19-
"react-dom": "^18.3.1"
21+
"react-dom": "^18.3.1",
22+
"react-router-dom": "^6.26.0"
2023
},
2124
"devDependencies": {
2225
"@tailwindcss/forms": "^0.5.7",
26+
"@types/node": "^22.5.4",
2327
"@types/react": "^18.3.3",
2428
"@types/react-dom": "^18.3.0",
2529
"@typescript-eslint/eslint-plugin": "^7.15.0",
@@ -30,11 +34,11 @@
3034
"eslint-plugin-react-hooks": "^4.6.2",
3135
"eslint-plugin-react-refresh": "^0.4.7",
3236
"postcss": "^8.4.39",
37+
"prettier": "^3.0.1",
38+
"sass": "^1.66.1",
3339
"tailwindcss": "^3.4.6",
3440
"typescript": "^5.2.2",
35-
"vite": "^5.3.4",
36-
"sass": "^1.66.1",
37-
"prettier": "^3.0.1"
41+
"vite": "^5.3.4"
3842
},
3943
"prettier": {
4044
"trailingComma": "es5",

‎app/src/App.scss‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
1-
#root {
2-
max-width: 1280px;
3-
margin: 0 auto;
4-
padding: 2rem;
5-
text-align: center;
1+
#app {
2+
&:has(#side-nav) {
3+
margin: 0 auto;
4+
text-align: center;
5+
padding-top: 75px;
6+
7+
padding-left: 20vw;
8+
9+
&.hide-nav {
10+
padding-left: 0;
11+
#side-nav {
12+
width: 0;
13+
}
14+
}
15+
}
616
}

0 commit comments

Comments
 (0)