Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.0.1 #59

Open
wants to merge 41 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
3cb578b
Assets - styles for new style
Sanandres2001 Jun 9, 2023
36b16ef
Merge pull request #53 from ProgramacionCompetitivaUFPS/ss_assets_new…
Sanandres2001 Jun 9, 2023
365bb18
Update app.js
Sanandres2001 Jun 9, 2023
d98d8c1
Services updated
Sanandres2001 Jun 9, 2023
2988393
modules and layouts found
Sanandres2001 Jun 9, 2023
23d72dd
models
Sanandres2001 Jun 9, 2023
6702c48
config added
Sanandres2001 Jun 9, 2023
4dca493
Merge pull request #54 from ProgramacionCompetitivaUFPS/ss_authorStat…
Sanandres2001 Jun 9, 2023
544075c
Changes on canvas and images
Sanandres2001 Jun 9, 2023
929fdb8
Update home.html
Sanandres2001 Jun 9, 2023
f000943
changes on backend
Sanandres2001 Jun 9, 2023
92f401e
package json and web pack
Sanandres2001 Jun 9, 2023
5a6785a
Merge pull request #55 from ProgramacionCompetitivaUFPS/ss_authorStat…
Sanandres2001 Jun 14, 2023
fd295ab
changes on app header, category problems
Sanandres2001 Jun 14, 2023
de4ea30
Merge branch '2.0.1' into ss_headerCategory
Sanandres2001 Jun 14, 2023
bb2f077
Merge pull request #56 from ProgramacionCompetitivaUFPS/ss_headerCate…
Sanandres2001 Jun 14, 2023
40e1f7a
integration with inputs done
Sanandres2001 Jun 14, 2023
505501b
controller changes
Sanandres2001 Jun 14, 2023
f752f03
Merge pull request #57 from ProgramacionCompetitivaUFPS/ss_InputsOutp…
Sanandres2001 Jun 14, 2023
40d233f
Detalles en Ver Logs
Valentina-03 Jun 14, 2023
b02ab9b
Actualizacion migraciones de la base de datos
Valentina-03 Jun 14, 2023
12b866b
Update partners.json
Sanandres2001 Jun 14, 2023
b692fdd
Dist agregado
Sanandres2001 Jun 20, 2023
c01005e
Cambios en api.js config environment
Sanandres2001 Jun 26, 2023
9282036
Update environment.production.json
Sanandres2001 Jun 26, 2023
cd90764
Cambios sobre estilos para validar en produccion
Sanandres2001 Jun 26, 2023
5e5ef5e
Se añade el dist agregando la variable de entorno de produccion en no…
Sanandres2001 Jun 27, 2023
f646bd6
Ajuste Dockerfile install docker en el docker_backend por cambios de …
miljeveco Jun 27, 2023
b32e58a
Limpiando frontend en repo deploy
miljeveco Jun 27, 2023
bdb1d48
changes in clean
Sanandres2001 Jun 27, 2023
3ddaafa
changes in clean
Sanandres2001 Jun 27, 2023
c33fbdc
Update sandbox.js
Valentina-03 Jun 27, 2023
86f474f
se sube el dist con los cambios realizados (tasa de aprobacion, autor…
Sanandres2001 Jun 27, 2023
916ed58
Update problems.js
Valentina-03 Jun 27, 2023
79f8318
Actualizacion dist
Valentina-03 Jun 27, 2023
b0824e1
Actualizacion dist
Valentina-03 Jun 27, 2023
2c5c082
Remove node_modules directory at frontend
miljeveco Jun 27, 2023
d06dbd6
Actualizacion dist
Valentina-03 Jun 27, 2023
e123c8f
Merge branch '2.0.1' of https://github.com/ProgramacionCompetitivaUFP…
Valentina-03 Jun 27, 2023
54a134c
Update problems.js
Valentina-03 Jun 27, 2023
c7b8fed
Dist again...
Valentina-03 Jun 28, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
/files/
npm-debug.log
.sql
.idea

1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Para poder ejecutar el proyecto se deben crear los siguientes directorios:
- files/outputs
- files/materials
- files/codes
- files/errors

En estos directorios se almacenaran todos los archivos para el correcto funcionamiento de la plataforma.

Expand Down
2 changes: 1 addition & 1 deletion backend/.end_dev
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ MYSQL_PASSWORD=trainingdev
FRONTEND_PORT=8080
BACKEND_PORT=8081
DATABASE_PORT=3306
DATABASE_URL=mysql://admindev:[email protected]:3306/training_center?reconnect=true
DATABASE_URL=
NODE_ENV=production
SECRET_TOKEN=84515EA65656DB656C565231987A94651321984893DD68489CCCD651AC6165BB
SMTP_HOST=smtp.zoho.com
Expand Down
13 changes: 4 additions & 9 deletions backend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#-------------------------------------------------------------------------------#

# Pull base image
#FROM node:latest
FROM node:carbon
FROM node:latest
#FROM node:carbon

# Create app directory
WORKDIR /usr/src/app
Expand All @@ -17,13 +17,8 @@ RUN apt-get update && \
curl \
gnupg2 \
software-properties-common && \
curl -fsSL https://download.docker.com/linux/$(. /etc/os-release; echo "$ID")/gpg > /tmp/dkey; apt-key add /tmp/dkey && \
add-apt-repository \
"deb [arch=amd64] https://download.docker.com/linux/$(. /etc/os-release; echo "$ID") \
$(lsb_release -cs) \
stable" && \
apt-get update && \
apt-get -y install docker-ce
curl -fsSL https://get.docker.com -o /tmp/get-docker.sh && \
sh /tmp/get-docker.sh


# Install app dependencies
Expand Down
Loading