Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
113 commits
Select commit Hold shift + click to select a range
f2a9552
build: footer and services components
santgeek Jun 24, 2025
fb61a7e
build(services): responsive cards and elements section
santgeek Jun 25, 2025
0194379
Merge pull request #1 from Cloudtech-web-dev/sm-frontend
santgeek Jun 25, 2025
8e863fc
feat(process display): tab content rendering functionality
santgeek Jun 25, 2025
6152e4f
Merge pull request #2 from Cloudtech-web-dev/sm-frontend
santgeek Jun 25, 2025
72c4073
Good
UkuJoeMP Jun 26, 2025
52f57ad
build(proyects): component for portfolio display
santgeek Jun 26, 2025
a0e204f
navbar-part-1
UkuJoeMP Jun 26, 2025
26448eb
Merge branch 'jp-frontend' of https://github.com/Cloudtech-web-dev/Cl…
UkuJoeMP Jun 26, 2025
54260c7
build(testimonials): styles and responsive components finished
santgeek Jun 27, 2025
4467a26
Merge pull request #3 from Cloudtech-web-dev/sm-frontend
santgeek Jun 27, 2025
1f524a7
build(teamSection): card for team members with buttons and dynamic co…
santgeek Jun 27, 2025
0af3699
Merge pull request #4 from Cloudtech-web-dev/sm-frontend
santgeek Jun 27, 2025
885208f
feat(routes): define and testing of web routes
santgeek Jun 30, 2025
4f2ac37
Merge pull request #5 from Cloudtech-web-dev/sm-frontend
santgeek Jun 30, 2025
f9531a7
Styles(update): service cards updated with icons and animated contact…
santgeek Jun 30, 2025
477c3c6
Merge pull request #6 from Cloudtech-web-dev/sm-frontend
santgeek Jun 30, 2025
924b53a
Navbar-complete
UkuJoeMP Jun 30, 2025
d8ad41e
feat(endpoints): endpoints for receiving lead forms data tested and r…
santgeek Jul 1, 2025
b585325
Merge pull request #7 from Cloudtech-web-dev/sm-backend
santgeek Jul 1, 2025
24a9fba
HeaderHome-complete
UkuJoeMP Jul 1, 2025
e5056e9
prueba
UkuJoeMP Jul 2, 2025
ebcccca
Merge pull request #8 from Cloudtech-web-dev/jp-frontend
UkuJoeMP Jul 2, 2025
973c574
fix: node modules
santgeek Jul 3, 2025
6068113
Styles(header): built alternative styling for the home header
santgeek Jul 3, 2025
fd4664e
Merge pull request #9 from Cloudtech-web-dev/sm-frontend
santgeek Jul 3, 2025
4285fb1
Navbar-test
UkuJoeMP Jul 4, 2025
eea8c48
Merge branch 'sm-frontend' of https://github.com/Cloudtech-web-dev/Cl…
UkuJoeMP Jul 4, 2025
76b7ed3
feat(rendering data): dynamic rendering of capacities content
santgeek Jul 4, 2025
56cb034
Build: added final content for the project
santgeek Jul 4, 2025
0ca0f28
Merge pull request #10 from Cloudtech-web-dev/sm-frontend
santgeek Jul 4, 2025
d764ca7
Styles update: content display design for services
santgeek Jul 4, 2025
05296a7
Styles & Content adjustments
santgeek Jul 5, 2025
edd6a43
Merge pull request #11 from Cloudtech-web-dev/sm-frontend
santgeek Jul 5, 2025
aeaf60c
Navbar corrected
UkuJoeMP Jul 7, 2025
bdd797f
Merge branch 'sm-frontend' of https://github.com/Cloudtech-web-dev/Cl…
UkuJoeMP Jul 7, 2025
353269f
Merge pull request #12 from Cloudtech-web-dev/dev
UkuJoeMP Jul 7, 2025
bc6a4bf
Animation: team cards transition for profile pictures
santgeek Jul 7, 2025
c185a3b
feat: reception of messages on the backend
santgeek Jul 7, 2025
41d6e8d
Merge remote-tracking branch 'origin/dev' into sm-frontend
santgeek Jul 7, 2025
42e1ab8
Merge pull request #13 from Cloudtech-web-dev/sm-frontend
santgeek Jul 7, 2025
6003765
Headers corrected
UkuJoeMP Jul 8, 2025
ef3b264
Merge branch 'dev' of https://github.com/Cloudtech-web-dev/Cloudtech_…
UkuJoeMP Jul 8, 2025
b031733
updates
santgeek Jul 8, 2025
c2696b7
Merge branch 'dev' of https://github.com/Cloudtech-web-dev/Cloudtech_…
santgeek Jul 8, 2025
dd8421f
navbar error
UkuJoeMP Jul 8, 2025
0c1b53d
updated branch
santgeek Jul 8, 2025
6461392
feat(modal): dynamic load of portfolio images and use of modal feature
santgeek Jul 9, 2025
4a082b9
Build(update): content update
santgeek Jul 9, 2025
a1b582f
Merge pull request #14 from Cloudtech-web-dev/sm-frontend
santgeek Jul 9, 2025
b57c788
feat(services): code optimization and new category
santgeek Jul 10, 2025
ec86bf2
Merge pull request #15 from Cloudtech-web-dev/sm-frontend
santgeek Jul 10, 2025
43f33bd
feat(translate): integrated logico for translations with i18next
santgeek Jul 11, 2025
8209bde
Merge pull request #16 from Cloudtech-web-dev/sm-frontend
santgeek Jul 11, 2025
27bd1a3
build: json files for translation content with texts for all sections
santgeek Jul 11, 2025
637c821
Merge pull request #17 from Cloudtech-web-dev/sm-frontend
santgeek Jul 11, 2025
741b377
header mobile issues
UkuJoeMP Jul 14, 2025
4f05cc7
Merge pull request #18 from Cloudtech-web-dev/jp-frontend
UkuJoeMP Jul 14, 2025
205ec7f
Merge branch 'sm-frontend' of https://github.com/Cloudtech-web-dev/Cl…
UkuJoeMP Jul 14, 2025
aca2608
feat(language switch): language selector on the navbar
santgeek Jul 14, 2025
f4e43ec
Movile Navbar & Mobile Headers resolved
UkuJoeMP Jul 15, 2025
839cd4c
first try header contact api
UkuJoeMP Jul 16, 2025
16f6ac9
Merge branch 'sm-frontend' of https://github.com/Cloudtech-web-dev/Cl…
UkuJoeMP Jul 16, 2025
021e3c8
Header contact error subtitle
UkuJoeMP Jul 17, 2025
b2daffc
Merge branch 'dev' of https://github.com/Cloudtech-web-dev/Cloudtech_…
santgeek Jul 17, 2025
e1c9d83
Merge pull request #19 from Cloudtech-web-dev/dev
UkuJoeMP Jul 17, 2025
39fdbf9
Merge pull request #20 from Cloudtech-web-dev/jp-frontend
UkuJoeMP Jul 17, 2025
550fcc7
Merge branch 'dev' of https://github.com/Cloudtech-web-dev/Cloudtech_…
santgeek Jul 17, 2025
1d5ba28
build: text versions for english & spanish using i18next
santgeek Jul 17, 2025
eb285d4
Merge pull request #21 from Cloudtech-web-dev/sm-frontend
santgeek Jul 17, 2025
9496403
Navbar/Header Contact/Work with us/Whatsapp button completed
UkuJoeMP Jul 18, 2025
fa50f34
Merge pull request #22 from Cloudtech-web-dev/jp-frontend
UkuJoeMP Jul 18, 2025
6e1c9db
build: finished all content translations
santgeek Jul 18, 2025
5fda61e
Merge pull request #23 from Cloudtech-web-dev/sm-frontend
santgeek Jul 18, 2025
dcde43b
designs errors corrected
UkuJoeMP Jul 19, 2025
e7d4bce
translation whatsapp button
UkuJoeMP Jul 20, 2025
332c24b
merging with dev problems solved
UkuJoeMP Jul 20, 2025
ae04aa2
Merge pull request #25 from Cloudtech-web-dev/jp-frontend
UkuJoeMP Jul 20, 2025
f0229fa
feat(display leads): admin view functionality to bring all leads stor…
santgeek Jul 20, 2025
cbac74e
Merge branch 'dev' of https://github.com/Cloudtech-web-dev/Cloudtech_…
santgeek Jul 20, 2025
83251ed
text updates
santgeek Jul 20, 2025
dd8c57e
Merge pull request #26 from Cloudtech-web-dev/sm-frontend
santgeek Jul 20, 2025
cd0dd4a
space between header contact and footer
UkuJoeMP Jul 22, 2025
e598d8a
Merge branch 'dev' of https://github.com/Cloudtech-web-dev/Cloudtech_…
UkuJoeMP Jul 22, 2025
c91ffec
Merge pull request #27 from Cloudtech-web-dev/jp-frontend
UkuJoeMP Jul 22, 2025
39ce771
fix: button names and testimonials content
santgeek Jul 22, 2025
1d086ae
Merge pull request #28 from Cloudtech-web-dev/sm-frontend
santgeek Jul 22, 2025
cad8997
headers corrected in mobile
UkuJoeMP Jul 22, 2025
b3033a1
Merge branch 'dev' of https://github.com/Cloudtech-web-dev/Cloudtech_…
UkuJoeMP Jul 22, 2025
adf26ac
corrected UX issues
UkuJoeMP Jul 22, 2025
060dbac
Merge pull request #29 from Cloudtech-web-dev/jp-frontend
UkuJoeMP Jul 22, 2025
580e043
feat(admin login): added admin model and login functionality with has…
santgeek Jul 25, 2025
bab6a76
deploying
UkuJoeMP Jul 25, 2025
c4d2548
feat(login): login functionaltiy for admin user
santgeek Jul 25, 2025
f2cb8ef
Merge pull request #30 from Cloudtech-web-dev/sm-frontend
santgeek Jul 25, 2025
2d829a9
HeaderAbout issues fixed
UkuJoeMP Jul 26, 2025
2bc1ee4
deploy configuration
UkuJoeMP Jul 28, 2025
6beffa0
Merge pull request #31 from Cloudtech-web-dev/dev
UkuJoeMP Jul 28, 2025
7ca5fc6
styles(texts): minor adjustments for cards content
santgeek Jul 28, 2025
96dda73
styles update
UkuJoeMP Jul 29, 2025
d1fe196
Merge pull request #32 from Cloudtech-web-dev/dev
UkuJoeMP Jul 29, 2025
51ecf62
depuration code
UkuJoeMP Jul 29, 2025
6769db9
Merge pull request #33 from Cloudtech-web-dev/dev
UkuJoeMP Jul 29, 2025
d74dfeb
backendurl fixed
UkuJoeMP Jul 29, 2025
a86a68c
Merge pull request #34 from Cloudtech-web-dev/dev
UkuJoeMP Jul 29, 2025
494050f
requirements fixed
UkuJoeMP Jul 29, 2025
1a3f97a
Merge branch 'dev' of https://github.com/Cloudtech-web-dev/Cloudtech_…
santgeek Jul 30, 2025
779bfae
sincronizar cambios del despleigue: arreglos de seguridad
santgeek Aug 1, 2025
17b19d8
changes from local vps to dev
UkuJoeMP Aug 1, 2025
0c69691
Merge branch 'main' of https://github.com/Cloudtech-web-dev/Cloudtech…
santgeek Aug 14, 2025
5ceba61
fix & updates: mail protocol and image change functionality on projects
santgeek Aug 14, 2025
8301c02
Merge pull request #36 from Cloudtech-web-dev/sm-frontend
santgeek Aug 14, 2025
2caeb86
new changes pulled
UkuJoeMP Aug 18, 2025
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
22 changes: 22 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ Thumbs.db

# ignore node/grunt dependency directories
node_modules/
/venv/
/dist/

# webpack output
dist/*
Expand All @@ -72,6 +74,8 @@ dist/*
!.htaccess
!.eslintrc
!.env.example
.env
.env.*
.now

# backend stuff
Expand All @@ -80,3 +84,21 @@ database.database
database.db
diagram.png
__pycache__/

# Logs y caches
npm-debug.log*
yarn-debug.log*
yarn-error.log*
/coverage

# Archivos de editor
.vscode/
.idea/

# Archivos de sistema operativo
.DS_Store
Thumbs.db

# Ignorar la carpeta de certificados SSL
nginx-proxy/certs/

27 changes: 0 additions & 27 deletions .gitpod.Dockerfile

This file was deleted.

28 changes: 0 additions & 28 deletions .gitpod.yml

This file was deleted.

21 changes: 13 additions & 8 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
{
"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode",
"workbench.editorAssociations": {
"*.md": "vscode.markdown.preview.editor"
},
"[javascriptreact]": {
"editor.defaultFormatter": "vscode.typescript-language-features"
}
"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode",
"workbench.editorAssociations": {
"*.md": "vscode.markdown.preview.editor"
},
"[javascriptreact]": {
"editor.defaultFormatter": "vscode.typescript-language-features"
},
"emmet.includeLanguages": {
"javascript": "javascriptreact",
"typescript": "typescriptreact"
},
"emmet.triggerExpansionOnTab": true
}
Binary file removed 4geeks.ico
Binary file not shown.
18 changes: 18 additions & 0 deletions Dockerfile.backend
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
FROM python:3.11-slim-bookworm

WORKDIR /app

RUN apt-get update && apt-get install -y --no-install-recommends \
build-essential \
libpq-dev

COPY requirements.txt .
RUN pip install --no-cache-dir -r requirements.txt

COPY src/ .

COPY migrations/ /app/migrations/

EXPOSE 8000

CMD ["gunicorn", "--bind", "0.0.0.0:8000", "app:app"]
22 changes: 22 additions & 0 deletions Dockerfile.frontend
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
FROM node:20-alpine AS builder

WORKDIR /app

COPY package.json package-lock.json vite.config.js ./
COPY index.html .

RUN npm install

COPY src/front/ ./src/front/
COPY public/ ./public/

RUN npm run build

FROM nginx:stable-alpine

COPY --from=builder /app/dist /usr/share/nginx/html

COPY nginx.conf /etc/nginx/conf.d/default.conf

EXPOSE 80
CMD ["nginx", "-g", "daemon off;"]
13 changes: 0 additions & 13 deletions Dockerfile.render

This file was deleted.

35 changes: 7 additions & 28 deletions Pipfile
Original file line number Diff line number Diff line change
@@ -1,36 +1,15 @@
[[source]]
name = "pypi"
url = "https://pypi.org/simple"
verify_ssl = true

[dev-packages]
name = "pypi"

[packages]
flask = "*"
flask-sqlalchemy = "*"
flask-migrate = "*"
flask-swagger = "*"
psycopg2-binary = "*"
python-dotenv = "*"
flask-cors = "*"
gunicorn = "*"
cloudinary = "*"
flask-admin = "*"
typing-extensions = "*"
flask-jwt-extended = "==4.6.0"
wtforms = "==3.1.2"
sqlalchemy = "*"
alembic = "==1.12.0"
certifi = "==2020.12.5"
click = "==8.1.3"
flask = "==2.3.2"

[dev-packages]

[requires]
python_version = "3.13"

[scripts]
start="flask run -p 3001 -h 0.0.0.0"
init="flask db init"
migrate="flask db migrate"
local="heroku local"
upgrade="flask db upgrade"
downgrade="flask db downgrade"
insert-test-data="flask insert-test-data"
reset_db="bash ./docs/assets/reset_migrations.bash"
deploy="echo 'Please follow this 3 steps to deploy: https://github.com/4GeeksAcademy/flask-rest-hello/blob/master/README.md#deploy-your-website-to-heroku' "
Loading