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

Merge develop with main (S1 release) #79

Merged
merged 148 commits into from
Mar 4, 2024
Merged
Changes from 2 commits
Commits
Show all changes
148 commits
Select commit Hold shift + click to select a range
b77c338
feat: style sheet (#16)
MartaInes Feb 22, 2024
a7b79df
Update README.md (#22)
marnunrey2 Feb 22, 2024
1d0ef6e
Fix/repo to develop (#24)
marnunrey2 Feb 22, 2024
c9e1f18
feat: Admin screen-Account configuration
fracalrod3 Feb 23, 2024
054d2b3
Home page (#27)
claugp06 Feb 23, 2024
52adbe3
Add Activities to App routes
FranciscoRossoR Feb 24, 2024
c47b852
Fix App.js import for Activities
FranciscoRossoR Feb 24, 2024
f2cd9b5
Create Activities screen
FranciscoRossoR Feb 24, 2024
682c752
Fix:Components Footer and Header
claugp06 Feb 24, 2024
d2f175a
Fix Activities header and footer
FranciscoRossoR Feb 24, 2024
4cb0da9
fix camps header and footer
FranciscoRossoR Feb 24, 2024
2505b25
Fix screens' capitalization
FranciscoRossoR Feb 24, 2024
123f3b1
Finish activities screen
FranciscoRossoR Feb 24, 2024
50e1fe5
Create style for activities screens
FranciscoRossoR Feb 24, 2024
639b97e
Finish Camps screen
FranciscoRossoR Feb 24, 2024
073102b
Finish CoexistanceRoom screen
FranciscoRossoR Feb 24, 2024
d903fb4
Finish FamilyWorkshops screen
FranciscoRossoR Feb 24, 2024
e6f8d34
Finish OpenRoom screen
FranciscoRossoR Feb 24, 2024
a649a97
Finish SummerClub screen
FranciscoRossoR Feb 24, 2024
b86ca60
Fix Coexistence typo
FranciscoRossoR Feb 24, 2024
c71d0fa
Fix typo in FamilyWorkshops
FranciscoRossoR Feb 24, 2024
38f2a03
Fix hover in main screen of Activities
FranciscoRossoR Feb 24, 2024
0e7602b
Merge branch 'develop' into feature/AdminScreen-AccountConfiguration
fracalrod3 Feb 24, 2024
7b047ed
Fix incomplete link in Activities table
FranciscoRossoR Feb 24, 2024
0621f9a
update
fracalrod3 Feb 24, 2024
4b7b747
Format change
fracalrod3 Feb 24, 2024
98d0864
update
fracalrod3 Feb 24, 2024
4313034
requested changes
fracalrod3 Feb 24, 2024
2d058b2
Feature/register and volunteer form (#34)
samrodman Feb 24, 2024
07dd50f
Merge branch 'develop' into feature/navbar-activities
FranciscoRossoR Feb 24, 2024
2fcbaf4
Merge branch 'develop' into feature/AdminScreen-AccountConfiguration
fracalrod3 Feb 25, 2024
0c76358
Codacy requested changes
fracalrod3 Feb 25, 2024
6d90a52
Merge branch 'feature/AdminScreen-AccountConfiguration' of https://gi…
fracalrod3 Feb 25, 2024
daad535
centering the screen
fracalrod3 Feb 25, 2024
4b36276
Desperately trying to uppease codacy
fracalrod3 Feb 25, 2024
5893152
Nothing's wrong yet Codacy continues to ignore reality :c
fracalrod3 Feb 25, 2024
57b4400
Reverting to ehn codacy liked me
fracalrod3 Feb 25, 2024
369edaf
Didn't work :/
fracalrod3 Feb 25, 2024
1b435ce
Merge pull request #28 from ISPP-G5/feature/navbar-activities
claugp06 Feb 26, 2024
2d93877
Merge branch 'develop' into feature/AdminScreen-AccountConfiguration
fracalrod3 Feb 26, 2024
f61e149
making use of style.css
fracalrod3 Feb 27, 2024
c8ea557
Merge branch 'feature/AdminScreen-AccountConfiguration' of https://gi…
fracalrod3 Feb 27, 2024
daccb46
Merge pull request #29 from ISPP-G5/feature/AdminScreen-AccountConfig…
fracalrod3 Feb 27, 2024
66296a5
fix: register page fixed and login with google
samrodman Feb 27, 2024
eee1d6d
fix: checkbox selection now works well
samrodman Feb 28, 2024
bcbd919
feat: admin view for families done and included some styles
Feb 29, 2024
99998c9
feat: added route missing
Feb 29, 2024
5c58da6
hotfix: styles homepage and activities
MartaInes Feb 29, 2024
e62e3e7
Merge branch 'develop' into hotfix/39-styles
pabpercab1 Feb 29, 2024
d1bc41f
Merge pull request #49 from ISPP-G5/hotfix/39-styles
MartaInes Feb 29, 2024
cdc0068
fix: solving codacy problems
Feb 29, 2024
210c701
fix: change rgb to hex for codacy
Feb 29, 2024
6e06316
fix: codacy problems with styles
Feb 29, 2024
e25379e
fix: codacy problems
Feb 29, 2024
b444708
fix: Merge branch 'develop' into fix/responsive-site-and-register-fix
samrodman Feb 29, 2024
18e334a
Merge branch 'develop' into feature/47-admin-families
marnunrey2 Feb 29, 2024
bb7853f
Merge pull request #55 from ISPP-G5/feature/47-admin-families
marnunrey2 Feb 29, 2024
08dacc7
feat: AboutUs, history and Mision, Overviews and Values screens
manbarjim2 Feb 29, 2024
477895f
fix: more responsive register
samrodman Feb 29, 2024
b8e80b2
fix: responsive register page
samrodman Feb 29, 2024
03acb34
feat: admin styles created
Feb 29, 2024
440548f
feat: plantilla admin
Mar 1, 2024
840169d
feat: menu admin created
Mar 1, 2024
865c158
Feat-51: Creation of the volunteer screen of the navbar
claugp06 Mar 1, 2024
11b0469
Merge pull request #58 from ISPP-G5/bugfix/56-styles
marnunrey2 Mar 1, 2024
d3b5ce5
Merge remote-tracking branch 'origin/develop' into feature/51-volunteers
claugp06 Mar 1, 2024
e7c07a2
Feat-51: Navigation of volunteer screen
claugp06 Mar 1, 2024
3559889
feat: add agenda screen and logos
Mar 1, 2024
f98a4f5
feat: volunteer form and register finished correctly and responsive
samrodman Mar 1, 2024
d3f3b4b
Merge branch 'develop' into fix/responsive-site-and-register-fix
samrodman Mar 1, 2024
40283de
feat: Association screens and make the others more visually
manbarjim2 Mar 1, 2024
afabc7f
feat: transparency screen
MartaInes Mar 1, 2024
6bececc
fix: codacy duplication
MartaInes Mar 1, 2024
59f4c0f
feat:Implemented colaborators entities class
ivaramlar Mar 1, 2024
c4e93ff
fix: requested changes
samrodman Mar 1, 2024
6202533
feat:Implemented whereWeAre class
ivaramlar Mar 1, 2024
4738b65
feat:Implemented whereWeAre class
ivaramlar Mar 1, 2024
402ae72
feat:Implemented whereWeAre class
ivaramlar Mar 1, 2024
050c966
fix: capms screen style
FranciscoRossoR Mar 1, 2024
20ee561
fix: open room screen style
FranciscoRossoR Mar 1, 2024
d874c3a
fix: coexistence room screen style
FranciscoRossoR Mar 1, 2024
83e68f4
fix: family workshops screen style
FranciscoRossoR Mar 1, 2024
eb037df
fix: summer club screen style
FranciscoRossoR Mar 1, 2024
e27988f
fix: img top gap
MartaInes Mar 1, 2024
f6b9410
fix: Camps screen info
FranciscoRossoR Mar 1, 2024
f9538dd
fix: Open Room screen info
FranciscoRossoR Mar 1, 2024
c990e01
fix: Coexistence Room screen info
FranciscoRossoR Mar 1, 2024
37970ff
fix: Family Workshops screen info
FranciscoRossoR Mar 1, 2024
38f0b25
fix: Summer Club screen info
FranciscoRossoR Mar 1, 2024
34d7b72
fix: Change Camps screen wrong info
FranciscoRossoR Mar 1, 2024
d0f42ff
fix: Activities main screen info
FranciscoRossoR Mar 1, 2024
7782af1
fix:Agreggated container style to the whereWeAre class
ivaramlar Mar 2, 2024
e7e8e5d
fix:Agreggated container style to the ubications from whereWeAre class
ivaramlar Mar 2, 2024
37576d4
fix:Agreggated container style to the ubications from whereWeAre class
ivaramlar Mar 2, 2024
0db45fa
fix: Create style for info text
FranciscoRossoR Mar 2, 2024
64c9478
fix: Change Activity screens format
FranciscoRossoR Mar 2, 2024
84a9c37
Merge pull request #70 from ISPP-G5/hotfix/62-activities-screens
FranciscoRossoR Mar 2, 2024
6aa2987
fix: register and volunteer form pr requests
samrodman Mar 2, 2024
8e61f33
Merge branch 'develop' into feature/50-agendaODS
marnunrey2 Mar 2, 2024
966a470
Merge pull request #63 from ISPP-G5/feature/50-agendaODS
marnunrey2 Mar 2, 2024
d7f853e
Update README.md
pabpercab1 Mar 2, 2024
ec11032
Merge branch 'develop' into fix/responsive-site-and-register-fix
claugp06 Mar 2, 2024
106b314
Merge pull request #65 from ISPP-G5/fix/responsive-site-and-register-fix
claugp06 Mar 2, 2024
d675bd9
Merge branch 'develop' into feature/52-asociationdropdown-1
manbarjim2 Mar 2, 2024
916db82
feat: Create Login screen
FranciscoRossoR Mar 2, 2024
f89e018
feat: Add register to login screen
FranciscoRossoR Mar 2, 2024
c134ca3
fix: Resize box
FranciscoRossoR Mar 2, 2024
2c0c2b1
fix: Resize header
FranciscoRossoR Mar 2, 2024
68953b4
feat: best screens
manbarjim2 Mar 2, 2024
0cd76b2
Merge pull request #72 from ISPP-G5/feature/5-navbar-login
FranciscoRossoR Mar 2, 2024
526028d
feat: admin events, lessons, and Projects redone
samrodman Mar 3, 2024
42828f7
Merge branch 'develop' into feature/51-volunteers
claugp06 Mar 3, 2024
7657cf7
Fix:Conflicts merge
claugp06 Mar 3, 2024
f8ba036
Merge branch 'feature/51-volunteers' of https://github.com/ISPP-G5/Ne…
claugp06 Mar 3, 2024
8b405d8
Feat:merge with develop
claugp06 Mar 3, 2024
7ebdad5
Merge branch 'feature/51-volunteers' of https://github.com/ISPP-G5/Ne…
claugp06 Mar 3, 2024
d3cedf3
Merge pull request #59 from ISPP-G5/feature/51-volunteers
claugp06 Mar 3, 2024
225f3aa
Merge branch 'develop' into feature/11-admin-events-lessons-projects
claugp06 Mar 3, 2024
c84783b
hotfix: Fix branch
fracalrod3 Mar 3, 2024
628fee9
Merge pull request #77 from ISPP-G5/hotfix/45-Admin-Menus-Integration
fracalrod3 Mar 3, 2024
8c88111
Merge branch 'develop' into feature/11-admin-events-lessons-projects
claugp06 Mar 3, 2024
2fce40a
Merge branch:Screens admin,events and projects.
claugp06 Mar 3, 2024
13f1d8e
fix: links errors
manbarjim2 Mar 3, 2024
3414a62
fix: photo name
manbarjim2 Mar 3, 2024
be2df6a
fix: mision, overview and values in flex-containers
manbarjim2 Mar 3, 2024
a8ad9b8
Merge branch 'develop' into feature/53-AssociationTransparency
MartaInes Mar 3, 2024
3b3ba9f
Merge pull request #66 from ISPP-G5/feature/53-AssociationTransparency
claugp06 Mar 3, 2024
a6e22f3
Merge branch 'develop' into feature/54-asociationdropdown2
claugp06 Mar 3, 2024
c9be979
Merge branch 'develop' into feature/52-asociationdropdown-1
manbarjim2 Mar 3, 2024
551d140
Merge pull request #57 from ISPP-G5/feature/52-asociationdropdown-1
claugp06 Mar 3, 2024
f792f7a
Merge branch 'develop' into feature/54-asociationdropdown2
fracalrod3 Mar 3, 2024
eca8d7a
fix:Updated Header.js
ivaramlar Mar 3, 2024
f327e70
Fix: duplicated elements in the dropdown
claugp06 Mar 3, 2024
428d151
Merge pull request #68 from ISPP-G5/feature/54-asociationdropdown2
claugp06 Mar 3, 2024
6b86338
Fix: codacy issues
claugp06 Mar 3, 2024
c63ae20
Fix: admin clones
claugp06 Mar 4, 2024
80c7a44
Fix: clones from admin
claugp06 Mar 4, 2024
7742159
Fix: clones in asociaition and actitvities
claugp06 Mar 4, 2024
a32acde
Fix: clone erros from codacy
claugp06 Mar 4, 2024
c6a01d4
Fix: component strcuture
claugp06 Mar 4, 2024
3a52475
Fox: codacy errors
claugp06 Mar 4, 2024
83af78a
Fix: codacy scan
claugp06 Mar 4, 2024
fcbde5e
FIx: codacy security scan
claugp06 Mar 4, 2024
15c6a57
Create LICENSE
pabpercab1 Mar 4, 2024
bd7b2ac
Create SECURITY.md
pabpercab1 Mar 4, 2024
83b50a8
Update LICENSE
pabpercab1 Mar 4, 2024
f436798
Fix: Register and Log in
claugp06 Mar 4, 2024
3b86ad8
Merge branch 'develop' of https://github.com/ISPP-G5/NexONG_Frontend …
claugp06 Mar 4, 2024
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
211 changes: 170 additions & 41 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@
"private": true,
"dependencies": {
"@material-ui/core": "^4.12.4",
"@material-ui/icons": "^4.11.3",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
Binary file added src/logo/logo-manos_abiertas-removebg-preview.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
40 changes: 33 additions & 7 deletions src/screens/App.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@

import Donation from './Donation';
import Suggestions from './Suggestions';
import Register from './Register';
import LogIn from './LogIn';
import Camps from './camps';
import CoexistanceRoom from './CoexistanceRoom';
import FamilyWorkshop from './FamilyWorkshops';
import OpenRoom from './openRoom';
import SummerClub from './summerClub';
import { BrowserRouter as Router, Route , Routes} from 'react-router-dom';
import '../styles/styles.css';
import AdminProfileUpdate from './admin/AdminProfileUpdate';
@@ -54,13 +64,29 @@ function App() {
<div className='header-text'>Registrase</div>
<div className='header-text'>Inciar Sesión</div>
</div>
</div><Router>
<Routes>
<Route path="/adminProfile" exact={true} element={<AdminProfile />} />
<Route path="/adminProfileUpdate" exact={true} element={<AdminProfileUpdate />} />
</Routes>
</Router></>
</div></>

import HomePage from './HomePage';
function App() {
return (
<Router>
<Routes>

<Route path="/" element={<HomePage />} />
<Route path="/donaciones" element={<Donation />} />
<Route path="/sugerencias" element={<Suggestions />} />
<Route path="/registrarse" element={<Register />} />
<Route path="/iniciar-sesion" element={<LogIn />} />
<Route path="/aula-abierta" element={<OpenRoom />} />
<Route path="/campamentos" element={<Camps />} />
<Route path="/aula-convivencia" element={<CoexistanceRoom />} />
<Route path="/talleres-familiares" element={<FamilyWorkshop />} />
<Route path="/club-verano" element={<SummerClub />} />
<Route path="/adminProfile" exact={true} element={<AdminProfile />} />
<Route path="/adminProfileUpdate" exact={true} element={<AdminProfileUpdate />} />

</Routes>
</Router>
);
}

export default App;
8 changes: 8 additions & 0 deletions src/screens/CoexistanceRoom.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
function CoexistanceRoom() {
return (
<div>
<h1>Aula convivencia</h1>
</div>
);
}
export default CoexistanceRoom;
8 changes: 8 additions & 0 deletions src/screens/Donation.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
function Donation() {
return (
<div>
<h1>Donations</h1>
</div>
);
}
export default Donation;
8 changes: 8 additions & 0 deletions src/screens/FamilyWorkshops.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
function FamilyWorkshop() {
return (
<div>
<h1>Talleres en familia </h1>
</div>
);
}
export default FamilyWorkshop;
Loading