Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
8a557a4
https version
tcrurav Sep 3, 2022
461b03d
https version
tcrurav Sep 3, 2022
ac17d63
It works in dev mode with docker
tcrurav Sep 4, 2022
d1fa74e
It works in development with docker better organized
tcrurav Sep 4, 2022
449dfc8
It works in production using https://somosbluecity.es:8443 and https:…
tcrurav Sep 4, 2022
f968f89
it works in hosting
tcrurav Sep 12, 2022
39047ac
fixed some bugs regarding admin panel Sessions and Users sections
mianfiga Sep 14, 2022
e67d74c
updated ruby version
mianfiga Sep 16, 2022
5d0cab7
fixed to chat
mianfiga Sep 26, 2022
e891569
Extrafields woring version
mianfiga Sep 26, 2022
1b20971
Fixed backend notification system, changed backend user dropdown to t…
mianfiga Oct 4, 2022
4f931b0
fixed profile username change, unread chat order, chat list z-index
mianfiga Oct 9, 2022
270b586
updating chat seen for unread chat info
mianfiga Oct 9, 2022
045a4e3
session links fixed
mianfiga Oct 9, 2022
d3c2bc0
README.md changes
tcrurav Oct 10, 2022
94b4e5a
README.md changes
tcrurav Oct 10, 2022
e23f7b7
Development issues in README.md
tcrurav Oct 11, 2022
93ea6df
improved admin user interface, fixed user filtering
mianfiga Oct 11, 2022
ea3b249
wq
mianfiga Oct 13, 2022
f58ba70
Fixed order issue in user list
mianfiga Oct 13, 2022
ad75656
Making deployment instructions easier
tcrurav Oct 14, 2022
fb974b8
Some README.md fixing
tcrurav Oct 14, 2022
6be709d
Added Danish tranlations
Oct 14, 2022
4546c05
git clone added to README.md
tcrurav Oct 14, 2022
8c66135
fixed hiding menu option in desktop menu when disabled
mianfiga Oct 14, 2022
185cbc4
Merge pull request #1 from eduapp-project/sosu
mianfiga Oct 14, 2022
5368599
Merge pull request #2 from eduapp-project/rincon
mianfiga Oct 14, 2022
aeb1c44
fixed filtering of enrollments
mianfiga Nov 10, 2022
aed100c
frontend danish translations
mianfiga Nov 10, 2022
7f5f4cf
login feedback on failing login
mianfiga Nov 14, 2022
4bee289
course API fixed
mianfiga Nov 14, 2022
de6973f
fixed subjects api
mianfiga Nov 16, 2022
09ffe06
fixed session api
mianfiga Nov 16, 2022
a09c322
Added Romanian translations
mianfiga Nov 17, 2022
5591523
Added romanian flag to admin site
mianfiga Nov 30, 2022
d0c98c6
reorganized inline creation form part I
mianfiga Nov 30, 2022
44f2a5e
Fix imports and add enrollment
PdgarHern Dec 16, 2022
fd52eea
Add subject user enrollment
PdgarHern Dec 20, 2022
aec4044
Merge pull request #5 from eduapp-project/issue/5423
mianfiga Jan 16, 2023
3db5745
Change frontend lateral menu
PdgarHern Dec 27, 2022
c8a6804
Merge pull request #6 from eduapp-project/issue/5436
mianfiga Jan 16, 2023
dd7e00b
Change frontend resources dropdown
PdgarHern Dec 27, 2022
678ad7d
Merge pull request #8 from eduapp-project/issue/5438
mianfiga Jan 16, 2023
2ff38b4
Add deletion confirmation box
PdgarHern Jan 17, 2023
f02b4a1
Add participant in enrollment
PdgarHern Jan 17, 2023
b095a0d
Change language icons
PdgarHern Jan 18, 2023
84ffed8
Add subject enrollments to profile
PdgarHern Jan 18, 2023
b913384
Change profile to separate page
PdgarHern Jan 18, 2023
3f6b296
Merge pull request #10 from eduapp-project/issue/5468
mianfiga Jan 23, 2023
0fce2db
Merge pull request #11 from eduapp-project/issue/5477
mianfiga Jan 23, 2023
ce00a35
some .env changes
tcrurav Oct 14, 2022
cb97704
Save avatar image in local stoarage instead of firabase
AleVeraM Jan 24, 2023
a80bdeb
Fix url image
AleVeraM Jan 24, 2023
4f20166
Fix saveUserOffile
AleVeraM Jan 24, 2023
0def3f1
Merge branch 'issue/5482' of github.com:eduapp-project/eduapp into is…
AleVeraM Jan 26, 2023
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
38 changes: 38 additions & 0 deletions backend/eduapp_db/.env-example-development
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# RAILS
# Do not modify unless you know what you are doing.
RAILS_SECRET_KEY=599fef69235287bd8c268db895897f236aebf4f63971aa48f48e3ee81c5612006a4857751cb1859546ccde67bb84cb3cc799a6aa9196b036d9a872dcd7765809
ENCRYPTION_SALT="81IJngXK2FE1+1J2Ugs1VxuK0yTnUyZQCSFbv0SUNRgZpMN7EN8SzoeSDuD+\nOXU0cwQyoFaAgfsckvz0di4SIyxHZs0OWey32Y5VI6Dg8rTNR8q2Z+oIv4tS\n2DOYeQ56uax3nQ/A+JikqvsLAfZYjhe3OpB5GUlgeJFnA30xB68Ock3HSInI\nW1kuZxN8dQu2eGwPT+3iNR9/DHe0Zku3G5MtZNzciHAT04JXVP+YXVraLVv1\nj5ctdDmWx1shNoBidO3q6PS+0peInRJmChVHcfoaBbhQuF2hv5vv5Qcd/c0f\nUDOWqho2DrA3hYm252t5BWTjfNoI3p7M0E1KRHmZDQ==\n"
ENCRYPTION_PATTERN="#_::_#"

RAILS_ENV=development
API_VERSION="v1"

# POSTGRES CONFIG
# This needs to match the 'postgres.docker-example.env' configured variables.
DEV_DB_USER="eduapp_user"
DEV_DB_PSWD="custom-password-1234"
DEV_DB_PORT="5432" # Do not touch.

# HOSTING CONFIG
# Do not touch. This is internal.
PORT=3010
DB_HOST=db # WITH DOCKER
HOST="localhost" # DEVELOPMENT
DOMAIN="localhost" # DEVELOPMENT

# FRONTEND ENPOINT FOR CORS
# It is important for your domain/url not to end with '/', as
# the CORS policy won't detect it an forbid you from entering
# Localhost example:
REACT_APP_FRONTEND_ENDPOINT=http://localhost:8443
REACT_APP_ADMIN_ENDPOINT=http://localhost:4010


# EMAIL
# Do not touch. This is internal.
SMTP_PORT=587
SMTP_ADDRESS=smtp.gmail.com
# If you wish to use a different email for sending
# emails to users, change it here.
GMAIL_USERNAME=youremail@gmail.com
GMAIL_PASSWORD=yourpassword
37 changes: 37 additions & 0 deletions backend/eduapp_db/.env-example-production
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# RAILS
# Do not modify unless you know what you are doing.
RAILS_SECRET_KEY=599fef69235287bd8c268db895897f236aebf4f63971aa48f48e3ee81c5612006a4857751cb1859546ccde67bb84cb3cc799a6aa9196b036d9a872dcd7765809
ENCRYPTION_SALT="81IJngXK2FE1+1J2Ugs1VxuK0yTnUyZQCSFbv0SUNRgZpMN7EN8SzoeSDuD+\nOXU0cwQyoFaAgfsckvz0di4SIyxHZs0OWey32Y5VI6Dg8rTNR8q2Z+oIv4tS\n2DOYeQ56uax3nQ/A+JikqvsLAfZYjhe3OpB5GUlgeJFnA30xB68Ock3HSInI\nW1kuZxN8dQu2eGwPT+3iNR9/DHe0Zku3G5MtZNzciHAT04JXVP+YXVraLVv1\nj5ctdDmWx1shNoBidO3q6PS+0peInRJmChVHcfoaBbhQuF2hv5vv5Qcd/c0f\nUDOWqho2DrA3hYm252t5BWTjfNoI3p7M0E1KRHmZDQ==\n"
ENCRYPTION_PATTERN="#_::_#"

RAILS_ENV=production
API_VERSION="v1"

# POSTGRES CONFIG
# This needs to match the 'postgres.docker-example.env' configured variables.
PROD_DB_USER="eduapp_user"
PROD_DB_PSWD="custom-password-1234"
PROD_DB_PORT="5432" # Do not touch.

# HOSTING CONFIG
# Do not touch. This is internal.
PORT=3010
DB_HOST=db # WITH DOCKER

HOST=your-backend-domain
DOMAIN=your-backend-domain

# FRONTEND ENPOINT FOR CORS
# It is important for your domain/url not to end with '/', as
# the CORS policy won't detect it an forbid you from entering
REACT_APP_FRONTEND_ENDPOINT=https://your-frontend-domain:port
REACT_APP_ADMIN_ENDPOINT=https://your-admin-domain:port

# EMAIL
# Do not touch. This is internal.
SMTP_PORT=587
SMTP_ADDRESS=smtp.gmail.com
# If you wish to use a different email for sending
# emails to users, change it here.
GMAIL_USERNAME=youremail@gmail.com
GMAIL_PASSWORD=yourpassword
13 changes: 13 additions & 0 deletions backend/eduapp_db/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,16 @@ node_modules
*.env
!*docker-example.env
.DS_Store

config-velorcios

.env-real-production
.env-real-development

dockerfile-real-production
dockerfile-real-development

dockerfile

#Uploads files
/public/uploads
2 changes: 1 addition & 1 deletion backend/eduapp_db/.ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-2.6.8
ruby-3.1.2
6 changes: 4 additions & 2 deletions backend/eduapp_db/Gemfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
source "https://rubygems.org"
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby "2.6.8"
# ruby "2.6.9" # Only to be used when building a docker image.
ruby "3.1.2"

gem "rails", "~> 6.1.4", ">= 6.1.4.1"
gem "pg", "~> 1.1"
gem "puma", "~> 5.0"
gem 'carrierwave'
gem "devise"
gem "devise-jwt"
gem "jwt"
Expand All @@ -15,12 +15,14 @@ gem "useragent"
gem "dotenv-rails", :group => [:production, :development, :test]
gem "rack-cors", :require => "rack/cors"
gem "ransack"
gem 'rmagick'
gem "image_processing", "~> 1.2"
gem "active_model_serializers"
gem "bootsnap", ">= 1.4.4", require: false
gem "omniauth-rails_csrf_protection"
gem "omniauth-google-oauth2"
gem "omniauth"
gem "net-smtp"

group :development, :test do
gem "byebug", platforms: [:mri, :mingw, :x64_mingw]
Expand Down
Loading