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

Authentication refactor #4

Open
wants to merge 162 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
162 commits
Select commit Hold shift + click to select a range
4cfc497
Spring-Version-Update - Updated spring version to latest, made so rep…
daniel097541 Nov 9, 2019
cdb9a3e
Spring-Version-Update - Added Lombok to have more code clearness
daniel097541 Nov 9, 2019
dde0123
Spring-Version-Update - Added service layer and new service interface
daniel097541 Nov 9, 2019
10f9f71
Spring-Version-Update - Removed all repository references from contro…
daniel097541 Nov 9, 2019
c179493
Spring-Version-Update - Removed all un-used scripts and eclipse files
daniel097541 Nov 9, 2019
34c0aa4
Spring-Version-Update - Removed all un-used scripts and eclipse files
daniel097541 Nov 9, 2019
596ed4e
Merge remote-tracking branch 'origin/Spring-Version-Update' into Spri…
daniel097541 Nov 9, 2019
49675a0
Spring-Version-Update - Working with latest spring version!
daniel097541 Nov 17, 2019
64f9b9b
Spring-Version-Update - Added frontend plugin to build angular side w…
daniel097541 Nov 17, 2019
952f1cd
Spring-Version-Update - Deleted useless files that should not be in t…
daniel097541 Nov 17, 2019
fb2b2b8
Create main.yml
daniel097541 Nov 18, 2019
0cf5e35
Spring-Version-Update - Improved the maven build pipeline to compile …
daniel097541 Nov 18, 2019
2c2c02c
Merge branch 'master' of https://github.com/codeurjc-students/2019-Fu…
daniel097541 Nov 18, 2019
2afb8bb
Spring-Version-Update - Moved back to JPA repositories instead of cru…
daniel097541 Nov 23, 2019
6b41480
Angular-Update - Forced commit to perform ng-update command
daniel097541 Dec 25, 2019
e4e1593
Angular-Update - Updated angular core/cli to latest version
daniel097541 Dec 25, 2019
c1dd7a0
Angular-Update - Only one error left on ng serve
daniel097541 Dec 25, 2019
7f327d0
Angular-Update - Added typescript 3.6.4
daniel097541 Dec 25, 2019
d33ecde
Angular-Update - Finally working on angular 9! Not updated specific l…
daniel097541 Dec 28, 2019
3c07d8f
Angular-Update - Application working with latest angular version
daniel097541 Jan 1, 2020
64894ac
Angular-Update - Updated gitignore
daniel097541 Jan 1, 2020
57d1adc
Merge branch 'Angular-Update' of https://github.com/codeurjc-students…
daniel097541 Jan 1, 2020
0932779
Added gradle
daniel097541 Jan 1, 2020
6141f5e
Updated gitignore for gradle
daniel097541 Jan 1, 2020
781923f
gradle - Added gradle in two different modules to make easier deploys
daniel097541 Jan 1, 2020
266b687
Added module backend
daniel097541 Jan 1, 2020
3892c97
gradle - jar built with angular and gradle is working now
daniel097541 Jan 1, 2020
bf924b1
Added postgresql
daniel097541 Jan 1, 2020
7e8b9bf
Working with postgresql
daniel097541 Jan 1, 2020
95fa100
Update main.yml
daniel097541 Jan 1, 2020
6d051ea
Added workflow file
daniel097541 Jan 1, 2020
2c56867
Merge pull request #1 from codeurjc-students/gradle
daniel097541 Jan 5, 2020
f0ad955
Started to refactor angular components that are broken from the update:
daniel097541 Jan 5, 2020
9adc6dd
Angular-Refactor - Added new dashboard layout
daniel097541 Jan 12, 2020
f37cbb6
Angular-Refactor - Main page finished
daniel097541 Jan 12, 2020
0ff45e0
Angular-Refactor - Fixed login
daniel097541 Jan 12, 2020
fc1834b
Angular-Refactor - Now the built jar includes the frontend
daniel097541 Jan 18, 2020
e7acfb6
Angular-Refactor - Added cors support for angular dev, added intercep…
daniel097541 Jan 18, 2020
2902d04
Angular-Refactor - Replaced the old encoding function with new BTOA, …
daniel097541 Jan 18, 2020
4996401
Angular-Refactor - Security working, time to start the page refactor
daniel097541 Jan 19, 2020
aa92484
Angular-Refactor - Started with dashboard recode, already made navbar…
daniel097541 Jan 19, 2020
0a3ca44
Angular-Refactor - Added animated background, started with dashboard …
daniel097541 Jan 19, 2020
93191c5
Angular-Refactor - Register and login now working with error modals
daniel097541 Jan 26, 2020
00134ab
Angular-Refactor - Fixed user not being loaded on reload
daniel097541 Jan 26, 2020
58ee8e1
Angular-Refactor - Updated dashboard and added tabs with cards and ca…
daniel097541 Feb 2, 2020
3b2fa2b
Angular-Refactor - Now course edition and session list working
daniel097541 Feb 9, 2020
bef8f5c
Angular-Refactor - Calendar remade and working
daniel097541 Feb 16, 2020
ef70232
Angular-Refactor - Calendar working with clickable days with sessions
daniel097541 Feb 16, 2020
0dc45dc
Angular-Refactor - Made fancier modal for sessions in calendar
daniel097541 Feb 16, 2020
afaf6c3
Angular-Refactor - Added forum component
daniel097541 Feb 22, 2020
de000ff
Angular-Refactor - Fixed footer
daniel097541 Feb 22, 2020
313ae1a
Angular-Refactor - Fixed calendar
daniel097541 Feb 22, 2020
341b9cd
Angular-Refactor - Fixed login and register components and logout now…
daniel097541 Feb 22, 2020
049ef16
Angular-Refactor - Fixed calendar not differenciating the year of the…
daniel097541 Feb 22, 2020
2ac5e04
Angular-Refactor - Removed useless code
daniel097541 Feb 22, 2020
b9fc001
Angular-Refactor - Fixed presentation
daniel097541 Feb 22, 2020
69aecf5
Angular-Refactor - Fixed some styles in login/register pages
daniel097541 Feb 22, 2020
c6b25f7
Angular-Refactor - Added animated background
daniel097541 Feb 22, 2020
23cea22
Angular-Refactor - Added tooltips and option to disable animated back…
daniel097541 Feb 22, 2020
3ccf39f
Angular-Refactor - Changed forum structure to mat-accordion
daniel097541 Feb 23, 2020
031388c
Angular-Refactor - Forum replies working well
daniel097541 Feb 23, 2020
fc91ab1
Angular-Refactor - Now add comment is working fine
daniel097541 Feb 23, 2020
9f48d50
Angular-Refactor - Added attachments panel
daniel097541 Feb 29, 2020
26d179e
Angular-Refactor - Added file types
daniel097541 Feb 29, 2020
66f10bd
Angular-Refactor - Added edition mode slider
daniel097541 Feb 29, 2020
b04b368
Angular-Refactor - Added remove button for file groups
daniel097541 Feb 29, 2020
83728b9
Angular-Refactor - File group deletion working with a service announc…
daniel097541 Mar 1, 2020
5eda3ee
Angular-Refactor - Now editing file group names correctly
daniel097541 Mar 1, 2020
086ac24
Angular-Refactor - File group creation working
daniel097541 Mar 1, 2020
6ff7caa
Angular-Refactor - Added more info into buttons
daniel097541 Mar 1, 2020
2321ba2
Angular-Refactor - Entry deletion working
daniel097541 Mar 1, 2020
b646539
Angular-Refactor - Added recursive colors in attachments component
daniel097541 Mar 1, 2020
27dbff9
Angular-Refactor - Now course edition working
daniel097541 Mar 1, 2020
9592007
Angular-Refactor - Session names now changing correctly
daniel097541 Mar 1, 2020
0d03c7b
Angular-Refactor - Added file upload directive and component
daniel097541 Mar 1, 2020
b0f15a2
Angular-Refactor - File upload working
daniel097541 Mar 8, 2020
14bf2db
Angular-Refactor - Added docker compose
daniel097541 Mar 8, 2020
2b45af5
Angular-Refactor - Added profile section
daniel097541 Mar 8, 2020
09adbd5
Angular-Refactor - Added change password
daniel097541 Mar 15, 2020
94d0954
Angular-Refactor - Added students tab
daniel097541 Mar 18, 2020
2588e52
Angular-Refactor - Added bulk and single attenders add
daniel097541 Mar 28, 2020
7cc8fc3
Angular-Refactor - Refactor in course controller to make it more simple
daniel097541 Apr 2, 2020
9a2216f
Angular-Refactor - Added type selector for file uploads
daniel097541 Apr 5, 2020
c9c2182
Angular-Refactor - Fixed add attenders modal
daniel097541 Apr 5, 2020
62f027f
Angular-Refactor - Fixed file download
daniel097541 Apr 19, 2020
c2c9653
Merge branches 'Angular-Refactor' and 'master' of https://github.com/…
daniel097541 Apr 19, 2020
c32c5dc
Attachments upload/download now working correctly!
daniel097541 May 9, 2020
2fb27da
Renamed to announcer.service.ts
daniel097541 May 9, 2020
c551208
Added video streaming with a youtube-similar video player
daniel097541 May 9, 2020
da0f650
Video player now working perfectly
daniel097541 May 10, 2020
931bc15
Changed max file size to 50mb
daniel097541 May 10, 2020
e097653
Now streaming controller has security
daniel097541 May 10, 2020
b3d8125
Added hide delay to the video toolbar
daniel097541 May 10, 2020
5cf367a
Added option to remove entry comments
daniel097541 May 11, 2020
06ab075
Made video player draggable
daniel097541 May 11, 2020
77bf46c
Added open vidu
daniel097541 May 24, 2020
9983ee8
Added new db url and dialog size enum
daniel097541 May 24, 2020
4486885
Added button to handle new comments in entries
daniel097541 May 30, 2020
ae3238a
Added audio reply
daniel097541 May 30, 2020
f86170b
Added session details page
daniel097541 May 31, 2020
e691f2b
Adding sessions, file groups etc
daniel097541 May 31, 2020
8d79ffe
Refactor in backend to handle role and login security in an interceptor
daniel097541 May 31, 2020
48b9bea
Added course interceptor, to check if an user belongs to a course
daniel097541 Jun 1, 2020
a5d47cf
Started websockets
daniel097541 Jun 3, 2020
ef456ee
Notifications working!
daniel097541 Jun 3, 2020
a43b8af
Added session notifications
daniel097541 Jun 3, 2020
3294165
Added profile picture changer
daniel097541 Jun 5, 2020
f67ba6c
Now saving profile picture correctly
daniel097541 Jun 6, 2020
4c6dde8
Fixed course attachments creation
daniel097541 Jun 6, 2020
096c092
Updated profile menu and profile page
daniel097541 Jun 6, 2020
b23df3f
Added user profile image in forum messages
daniel097541 Jun 6, 2020
9d3e222
Added pdf viewer
daniel097541 Jun 6, 2020
cf9f7e4
Added image dialog preview
daniel097541 Jun 6, 2020
08dc258
Added comment reply notifications
daniel097541 Jun 6, 2020
313ff06
Added forum redirection on entry comment
daniel097541 Jun 7, 2020
1de1d66
Fixed docker compose, added gradle profiles, adapted properties to ha…
daniel097541 Jun 7, 2020
6a24e1d
Fixed web links
daniel097541 Jun 7, 2020
8c33f35
Added audio comments
daniel097541 Jun 11, 2020
56d4e03
Audio reply completly working
daniel097541 Jun 12, 2020
ca84049
Fixed comment deletion
daniel097541 Jun 12, 2020
86f3045
Added files hidden, added mat-date-time pickers
daniel097541 Jun 13, 2020
1cd5ffd
Chat added and working!
daniel097541 Jun 14, 2020
739bc6d
Added notification-type.enum.ts
daniel097541 Jun 14, 2020
476d2dc
Fixed small things
daniel097541 Jun 14, 2020
2d6282f
Implemented chat search by username
daniel097541 Jun 14, 2020
05b4de8
Added chat view users
daniel097541 Jun 14, 2020
ccb9e87
Fixed chat and hidden files
daniel097541 Jun 16, 2020
61053cf
Added permanent notifications in a dropdown!
daniel097541 Jul 25, 2020
695907e
Added test structure
daniel097541 Aug 9, 2020
8f2bd47
Modified some controllers to use query params, added new annotation t…
daniel097541 Aug 25, 2020
d24fe20
Fixed all tests, removed e2e tests
daniel097541 Aug 25, 2020
17020f4
Added login interceptor tests, added configuration for test database
daniel097541 Aug 25, 2020
fc8e678
Added new CI/CD workflow
daniel097541 Aug 26, 2020
961e17c
Delete main.yml
daniel097541 Aug 26, 2020
caba72a
Added new tests
daniel097541 Aug 26, 2020
2869bc5
Merge remote-tracking branch 'origin/master'
daniel097541 Aug 26, 2020
8ad5c40
Removed workflow file
daniel097541 Aug 26, 2020
d17acfd
Modified github workflow file
daniel097541 Aug 26, 2020
5375815
Deleted .github
daniel097541 Aug 26, 2020
fd1f096
new gradle workflow
daniel097541 Aug 26, 2020
d0f092c
Deleted .github
daniel097541 Aug 26, 2020
820a54b
removed unnecessary log
daniel097541 Aug 26, 2020
659a030
removed unnecessary log
daniel097541 Aug 26, 2020
1c6ccae
Added postgresql database in github workflows
daniel097541 Aug 26, 2020
d327e6e
Update README.md
daniel097541 Aug 26, 2020
022d16c
Added presentation picture
daniel097541 Aug 26, 2020
c5ae4a3
Merge remote-tracking branch 'origin/master'
daniel097541 Aug 26, 2020
36cd4fb
Update README.md
daniel097541 Aug 26, 2020
592830e
Added readme.md images
daniel097541 Aug 26, 2020
615f4d8
Merge remote-tracking branch 'origin/master'
daniel097541 Aug 26, 2020
496ad68
Update README.md
daniel097541 Aug 26, 2020
b39350c
Fixed some UI errors
daniel097541 Sep 30, 2020
9d56402
Fixed error in sessions, now working as spected
daniel097541 Oct 6, 2020
17f849e
Fixed some errors found in login and courses
daniel097541 Oct 6, 2020
fd0f56d
Update README.md
daniel097541 Oct 7, 2020
41de82f
Fixed error in open vidu sessions
Oct 7, 2020
8679232
Merge remote-tracking branch 'origin/master'
Oct 7, 2020
7d24ddc
Added correct db for docker
Oct 7, 2020
754fc83
Removed application chat on video conferences
Oct 7, 2020
67db30e
Fixed some UI issues.
daniel097541 Oct 12, 2020
5c361ee
Updated authentication with declarative approach.
daniel097541 Oct 14, 2020
04eee07
Updated authentication, now working well
daniel097541 Oct 16, 2020
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
  •  
  •  
  •  
39 changes: 0 additions & 39 deletions .classpath

This file was deleted.

48 changes: 48 additions & 0 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
# This is a basic workflow to help you get started with Actions

name: CI

# Controls when the action will run. Triggers the workflow on push or pull request
# events but only for the master branch
on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

env:
DB_HOST: localhost
DB_USERNAME: postgres
DB_PASSWORD: postgres

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
build:
# The type of runner that the job will run on
runs-on: ubuntu-latest

services:
postgres:
image: postgres:latest
env:
POSTGRES_DB: full-teaching-test
POSTGRES_PASSWORD: postgres
POSTGRES_USER: postgres
ports:
- 5432:5432
# Set health checks to wait until postgres has started
options: >-
--health-cmd pg_isready
--health-interval 10s
--health-timeout 5s
--health-retries 5

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2

# Gradle build step
- name: Gradle build
run: gradle clean build
12 changes: 12 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,15 @@
/bin/
/files/
/pictures/
/.idea/
/.gradle/
/build/
/lib/
/out/production/resources/
/gradle/wrapper/
/.vs/
/.settings/
/.scannerwork/
gradlew.bat
gradlew
/frontend/node_modules
48 changes: 0 additions & 48 deletions .project

This file was deleted.

2 changes: 0 additions & 2 deletions .scannerwork/.gitignore

This file was deleted.

2 changes: 0 additions & 2 deletions .settings/.gitignore

This file was deleted.

12 changes: 0 additions & 12 deletions .settings/.jsdtscope

This file was deleted.

6 changes: 0 additions & 6 deletions .settings/org.eclipse.core.resources.prefs

This file was deleted.

10 changes: 0 additions & 10 deletions .settings/org.eclipse.jdt.core.prefs

This file was deleted.

4 changes: 0 additions & 4 deletions .settings/org.eclipse.m2e.core.prefs

This file was deleted.

10 changes: 0 additions & 10 deletions .settings/org.eclipse.wst.common.component

This file was deleted.

7 changes: 0 additions & 7 deletions .settings/org.eclipse.wst.common.project.facet.core.prefs.xml

This file was deleted.

9 changes: 0 additions & 9 deletions .settings/org.eclipse.wst.common.project.facet.core.xml

This file was deleted.

1 change: 0 additions & 1 deletion .settings/org.eclipse.wst.jsdt.ui.superType.container

This file was deleted.

1 change: 0 additions & 1 deletion .settings/org.eclipse.wst.jsdt.ui.superType.name

This file was deleted.

2 changes: 0 additions & 2 deletions .settings/org.eclipse.wst.validation.prefs

This file was deleted.

16 changes: 0 additions & 16 deletions .springBeans

This file was deleted.

3 changes: 0 additions & 3 deletions BuildFront.sh

This file was deleted.

3 changes: 0 additions & 3 deletions BuildFrontProd.sh

This file was deleted.

6 changes: 0 additions & 6 deletions BuildFrontProdWarAndRun.sh

This file was deleted.

6 changes: 0 additions & 6 deletions BuildFrontWarAndRun.sh

This file was deleted.

3 changes: 0 additions & 3 deletions BuildWarAndRun.sh

This file was deleted.

6 changes: 0 additions & 6 deletions DockerBuild.sh

This file was deleted.

7 changes: 0 additions & 7 deletions DockerBuildPush.sh

This file was deleted.

29 changes: 0 additions & 29 deletions DockerBuildPushBugs.sh

This file was deleted.

26 changes: 13 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# FullTeaching Experiment
# FULL TEACHING 2.0: AN ONLINE TEACHING PLATFORM WITH VIDEO-CLASSES

[![Build Status](https://travis-ci.org/pabloFuente/full-teaching.png?branch=master)](https://travis-ci.org/pabloFuente/full-teaching)

<p align="center"><img src="https://github.com/pabloFuente/full-teaching/blob/master/ReadmeImages/presentation.png?raw=true"/></p>
![CI](https://github.com/codeurjc-students/2019-FullTeaching/workflows/CI/badge.svg)
<p align="center"><img src="https://github.com/codeurjc-students/2019-FullTeaching/blob/master/images/presentation.png?raw=true"/></p>


## What is FullTeaching?
Expand All @@ -21,22 +21,22 @@ FullTeaching is an educational web application to make online classes easy for t
- FullTeaching uses [OpenVidu](http://openvidu.io) technology to provide video-conference capabilities. Teachers can initialize a class and every student invited can connect and see the teacher in real time. FullTeaching also allows students to intervene during the class (the teacher must authorize it first).

*Dashboard: all your courses and your calendar*
<p align="center"><img src="https://github.com/pabloFuente/full-teaching/blob/master/ReadmeImages/dashboard.png?raw=true"/></p>
<p align="center"><img src="https://github.com/codeurjc-students/2019-FullTeaching/blob/master/images/dashboard.png?raw=true"/></p>

*Calendar: here you have all your sessions, with direct access to their specific course*
<p align="center"><img src="https://github.com/pabloFuente/full-teaching/blob/master/ReadmeImages/calendar.png?raw=true"/></p>
<p align="center"><img src="https://github.com/codeurjc-students/2019-FullTeaching/blob/master/images/calendar.png?raw=true"/></p>

*Classes: ordered by date, teachers can easily add new ones and modify existing ones*
<p align="center"><img src="https://github.com/pabloFuente/full-teaching/blob/master/ReadmeImages/sessions.png?raw=true"/></p>
<p align="center"><img src="https://github.com/codeurjc-students/2019-FullTeaching/blob/master/images/sessions.png?raw=true"/></p>

*Forum: unlimited entries for posting all your questions*
<p align="center"><img src="https://github.com/pabloFuente/full-teaching/blob/master/ReadmeImages/forum.png?raw=true"/></p>
<p align="center"><img src="https://github.com/codeurjc-students/2019-FullTeaching/blob/master/images/forum.png?raw=true"/></p>

*Files: advanced tree structure to keep all the course's files clear and tidy*
<p align="center"><img src="https://github.com/pabloFuente/full-teaching/blob/master/ReadmeImages/files.png?raw=true"/></p>
<p align="center"><img src="https://github.com/codeurjc-students/2019-FullTeaching/blob/master/images/files.png?raw=true"/></p>

*Adding students to the course is as simple as pasting their emails. FullTeaching will automatically do the rest*
<p align="center"><img src="https://github.com/pabloFuente/full-teaching/blob/master/ReadmeImages/addattedners.png?raw=true"/></p>
<p align="center"><img src="https://github.com/codeurjc-students/2019-FullTeaching/blob/master/images/students.png?raw=true"/></p>

# Quick start guide

Expand Down Expand Up @@ -81,17 +81,17 @@ To get a full development version of the app just execute the following commands
$ sudo apt-get install npm
$ npm install -g @angular/cli

- **Maven**
- **Gradle**

*Check version*:

$ mvn -v
$ gradle -v

*Install*:

$ sudo apt-get install maven
$ sudo apt-get install gradle

- **MySQL**
- **PostgreSQL**

*Check version*:

Expand Down
9 changes: 9 additions & 0 deletions backend/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
FROM openjdk:8-jdk-alpine

MAINTAINER daniel097541

ADD ./build/libs/backend-1.0-SNAPSHOT.jar ./full-teaching.jar

EXPOSE 5001

ENTRYPOINT ["java","-jar","/full-teaching.jar"]
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
some xml
Loading