Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
112 commits
Select commit Hold shift + click to select a range
ee06722
se a gregan templates
Tamarunghi May 3, 2023
41231aa
test
Tamarunghi May 5, 2023
a57c8c7
css + firebase
Tamarunghi May 5, 2023
684504b
image
Tamarunghi May 5, 2023
4a37f79
Merge pull request #1 from Clau2210/Tamara
Clau2210 May 5, 2023
6e69e67
primeros pasos autenticacionFirebase
Ivonnefm03 May 8, 2023
85c5c42
Merge pull request #2 from Clau2210/main
Tamarunghi May 8, 2023
70ccace
Merge pull request #3 from Clau2210/Ivonne
Ivonnefm03 May 8, 2023
9aff8f5
prueba
Clau2210 May 8, 2023
997a095
Merge branch 'main' of https://github.com/Clau2210/DEV006-social-netw…
Clau2210 May 8, 2023
eb83ae0
cambio a nodos home
Ivonnefm03 May 8, 2023
a805760
Merge pull request #4 from Clau2210/Ivonne
Ivonnefm03 May 8, 2023
3832390
Merge branch 'develop' of https://github.com/Clau2210/DEV006-social-n…
Tamarunghi May 8, 2023
e6b4c28
Merge branch 'develop' of https://github.com/Clau2210/DEV006-social-n…
Clau2210 May 8, 2023
9c345bb
rutero funcionando
Ivonnefm03 May 10, 2023
61125ac
funciones organizadas
Ivonnefm03 May 10, 2023
97fc077
Merge pull request #5 from Clau2210/Ivonne
Ivonnefm03 May 10, 2023
c77d4ff
css container nuevo
Ivonnefm03 May 10, 2023
d643f03
Merge branch 'Ivonne' into develop
Ivonnefm03 May 10, 2023
1da0b8e
Merge branch 'develop' of https://github.com/Clau2210/DEV006-social-n…
Tamarunghi May 10, 2023
6badf98
Merge branch 'develop' of https://github.com/Clau2210/DEV006-social-n…
Clau2210 May 10, 2023
347316d
log in con google
Tamarunghi May 10, 2023
91b9a63
Merge branch 'Tamara' of https://github.com/Clau2210/DEV006-social-ne…
Tamarunghi May 10, 2023
86ffe8e
Merge pull request #7 from Clau2210/Tamara
Tamarunghi May 10, 2023
1148584
Merge branch 'develop' of https://github.com/Clau2210/DEV006-social-n…
Clau2210 May 10, 2023
64571b9
Errores & SignIn
Clau2210 May 11, 2023
b9262e3
Merge pull request #8 from Clau2210/Claudia
Clau2210 May 11, 2023
4de86ee
para hacer pull
Tamarunghi May 11, 2023
3e6413f
Merge branch 'develop' of https://github.com/Clau2210/DEV006-social-n…
Tamarunghi May 11, 2023
bec761c
view wall
Tamarunghi May 12, 2023
2339459
Merge pull request #9 from Clau2210/Tamara
Tamarunghi May 12, 2023
9adeace
currentPage
Tamarunghi May 15, 2023
a1f2cc3
Merge branch 'develop' of https://github.com/Clau2210/DEV006-social-n…
Tamarunghi May 15, 2023
7c8f5f7
Merge pull request #10 from Clau2210/Tamara
Tamarunghi May 15, 2023
302fbca
Merge pull request #11 from Clau2210/develop
Tamarunghi May 15, 2023
eaa7352
avance posts
Ivonnefm03 May 15, 2023
5eb0236
Merge pull request #12 from Clau2210/Ivonne
Ivonnefm03 May 15, 2023
f5d5b02
Despliegue de colección en pantalla
Clau2210 May 16, 2023
5e806c6
Merge pull request #13 from Clau2210/Claudia
Clau2210 May 16, 2023
3f6732f
Merge branch 'develop' of https://github.com/Clau2210/DEV006-social-n…
Tamarunghi May 16, 2023
3604ff2
algo de css
Ivonnefm03 May 16, 2023
5184c7d
Merge pull request #14 from Clau2210/Ivonne
Ivonnefm03 May 16, 2023
94d1deb
Merge branch 'Ivonne' of https://github.com/Clau2210/DEV006-social-ne…
Tamarunghi May 16, 2023
5950572
wall css esquema con colores
Tamarunghi May 16, 2023
72b5a89
Merge pull request #15 from Clau2210/Tamara
Tamarunghi May 16, 2023
533de7f
Modificación de wall con containers
Clau2210 May 16, 2023
efe6579
css wall
Tamarunghi May 16, 2023
0ea758e
Merge pull request #16 from Clau2210/Tamara
Tamarunghi May 16, 2023
08d342b
Merge branch 'develop' of https://github.com/Clau2210/DEV006-social-n…
Clau2210 May 16, 2023
a6e0de9
post adn wall
Tamarunghi May 18, 2023
a76c570
Merge pull request #17 from Clau2210/Tamara
Tamarunghi May 18, 2023
d7ebd75
Merge branch 'develop' of https://github.com/Clau2210/DEV006-social-n…
Clau2210 May 18, 2023
17c19e5
Login
Clau2210 May 18, 2023
5679f44
Merge pull request #18 from Clau2210/Claudia
Clau2210 May 18, 2023
8a86873
css botones + funciones
Ivonnefm03 May 19, 2023
94c4dfc
Merge pull request #19 from Clau2210/Ivonne
Ivonnefm03 May 19, 2023
2ea671d
css wall
Tamarunghi May 22, 2023
4cbac92
Merge pull request #20 from Clau2210/Tamara
Tamarunghi May 22, 2023
a70b3c2
css wall parte 2
Tamarunghi May 22, 2023
573302e
agregar email de usario y fecha del dia
Tamarunghi May 22, 2023
d2c5de6
Merge pull request #21 from Clau2210/Tamara
Tamarunghi May 22, 2023
fe0882e
Imagen de perfil de usuario
Clau2210 May 23, 2023
50cd1fd
Merge pull request #22 from Clau2210/Claudia
Clau2210 May 23, 2023
f94efec
Modificación grid
Clau2210 May 23, 2023
5001e02
Merge pull request #23 from Clau2210/Claudia
Clau2210 May 23, 2023
e8c02b6
css newPost
Ivonnefm03 May 24, 2023
517b7cf
Merge pull request #24 from Clau2210/Ivonne
Ivonnefm03 May 24, 2023
9de8f6e
likeCounter
Tamarunghi May 25, 2023
32ba713
Merge pull request #25 from Clau2210/Tamara
Tamarunghi May 25, 2023
f8ca3b8
createaccount issue
Tamarunghi May 26, 2023
a415dc5
Modificación de create account
Clau2210 May 29, 2023
8d5e2c7
Merge pull request #26 from Clau2210/Claudia
Clau2210 May 29, 2023
1939282
Merge branch 'develop' of https://github.com/Clau2210/DEV006-social-n…
Tamarunghi May 29, 2023
419ec80
like con label
Ivonnefm03 May 29, 2023
fd70129
Merge pull request #27 from Clau2210/Ivonne
Ivonnefm03 May 29, 2023
4a08125
Merge branch 'develop' of https://github.com/Clau2210/DEV006-social-n…
Tamarunghi May 29, 2023
8279c90
Merge pull request #28 from Clau2210/develop
Clau2210 May 29, 2023
00412e5
mostrar opciones de eliminar y editar
Ivonnefm03 May 29, 2023
708071c
Merge pull request #29 from Clau2210/Ivonne
Ivonnefm03 May 29, 2023
d309e4a
Merge branch 'develop' of https://github.com/Clau2210/DEV006-social-n…
Tamarunghi May 30, 2023
2e7da12
Merge pull request #30 from Clau2210/develop
Tamarunghi May 30, 2023
a4fedd2
Merge branch 'Tamara' of https://github.com/Clau2210/DEV006-social-ne…
Tamarunghi May 30, 2023
b17df70
Modal Edit Delete
Clau2210 May 30, 2023
5c27865
Merge pull request #31 from Clau2210/Claudia
Clau2210 May 30, 2023
5559a56
Merge branch 'main' of https://github.com/Clau2210/DEV006-social-netw…
Tamarunghi May 30, 2023
c7e40ed
Merge branch 'develop' of https://github.com/Clau2210/DEV006-social-n…
Tamarunghi May 30, 2023
c90b9b1
modales de opciones de menu
Ivonnefm03 May 30, 2023
ec11c3d
Merge pull request #32 from Clau2210/Ivonne
Ivonnefm03 May 30, 2023
592ccf8
Merge branch 'develop' of https://github.com/Clau2210/DEV006-social-n…
Tamarunghi May 30, 2023
9035e04
edit post
Tamarunghi May 31, 2023
25a8af7
eliminar post
Ivonnefm03 May 31, 2023
b487ed2
Merge pull request #33 from Clau2210/Ivonne
Ivonnefm03 May 31, 2023
4867462
add edit y primeros test
Tamarunghi May 31, 2023
e67a978
Merge pull request #34 from Clau2210/Tamara
Tamarunghi May 31, 2023
c346688
ordenar
Tamarunghi Jun 1, 2023
cfdbb72
Merge pull request #35 from Clau2210/Tamara
Tamarunghi Jun 1, 2023
83b7fc8
proteccion de ruta wall y mock de test
Ivonnefm03 Jun 1, 2023
02e430e
Merge pull request #36 from Clau2210/Ivonne
Ivonnefm03 Jun 1, 2023
4a7d35a
LogOut
Clau2210 Jun 2, 2023
8d52179
Merge pull request #37 from Clau2210/Claudia
Clau2210 Jun 2, 2023
ed18177
hovers
Tamarunghi Jun 2, 2023
cd1ac35
update real time
Tamarunghi Jun 2, 2023
b94d78d
Merge pull request #38 from Clau2210/develop
Tamarunghi Jun 2, 2023
85f8028
Merge pull request #39 from Clau2210/Tamara
Tamarunghi Jun 2, 2023
13bea85
Borrador de readme
Clau2210 Jun 5, 2023
9f22adc
Borrador de Readme parte 2
Clau2210 Jun 5, 2023
159d691
Borrador de Readme parte 3
Clau2210 Jun 5, 2023
d61ac81
Borrador de Readme parte 4
Clau2210 Jun 5, 2023
a3e2f25
readme
Tamarunghi Jun 5, 2023
e690e4e
Merge pull request #40 from Clau2210/Tamara
Tamarunghi Jun 5, 2023
9ec1b59
firebase deploy
Ivonnefm03 Jun 6, 2023
13e5da1
lineas de cache
Ivonnefm03 Jun 13, 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
40 changes: 40 additions & 0 deletions .firebase/hosting.ZGlzdA.cache
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
404.html,1685981902332,05cbc6f94d7a69ce2e29646eab13be2c884e61ba93e3094df5028866876d18b3
assets/index.0228c706.js,1685988749718,a87ccf50f6f805c1c02611273b6b142f6cc1edca0382952da8724d11b428dc8b
assets/index.3ad72261.js,1685993895689,f2374ade5cf43868e879e2ede52a4723ec2b70d137aba786edf58ae0c9717b53
assets/index.4894615e.js,1685983941763,2e56184e1236bed80a28d86331884f14f342a09046b05c76b897a8962ec8a84e
assets/index.5b40586e.js,1685984218502,8c2f38dede2376becd398a4798b80c827e9c7a10449c9e0f9d712ef16da43a5a
assets/index.7473aa66.js,1685982961343,c70e7b923e05b99a46ad392d1c65e39a7c80127c0947e45dcc73316f6dec914b
assets/index.8581d718.js,1685983794746,ee99d3d05b32cb9a850e2698758aaa23711ba1f5410cb7e30e8da37288ccc122
assets/index.887910e3.js,1685983499655,1aeae7cda75ff1e3bf56cb0a5f074820e2545d9d9f515376810d1d20741eae02
assets/index.89d7b3f8.js,1685994184383,fab01136f5c0bf3ecc244af49d9939554dad062d3a7a8c165722f4b2d909d4e1
assets/index.8a8ecbbe.js,1685993208274,9448d5ec413b66c6b15f0668fd665557661709a423da20f184b5ad2005087b19
assets/index.95ec0159.js,1685993789210,2bd209a673010d779ed7d60552148146e6734ccece6b9f129294b4d5adb4ba08
assets/index.ad52540f.js,1685989292413,6acde7faa20dcad2c72ea2af0d774db16bbd7dc517a54b9999f49eb9906d361a
assets/index.bab315a4.js,1685984477796,e6690e3b9ccc361ce63db9440a771f1bf2703d9a805c9ac9d23dc257edf8a7b5
assets/index.cba7cce5.js,1685984098138,be6e92062a129afcc8aaf7bb59bd26eb3017d500640ae65a86efb80a32d1634c
assets/index.d173e84e.js,1685985472572,e6441051576dd867368c8d4af0471f34afc39cdb8cc16075f2c6ce4717bd0123
assets/index.d8a39a69.js,1685981191140,89ba17138465dfef8cc4294923987ed085b77c075511dc1f11d01a2abbbc35ef
assets/index.ee9b7827.js,1685983867622,fd97b8456dc60902e4ba7322a0814b87bd66deaa80417f41cd8611ffdda30b5f
assets/index.f07bfc0e.js,1685982573798,77dca1d21ede1793250cdce16b65303a681da9dd21254af350975300ce269194
assets/index.f79b7006.js,1685982750457,bc8f7a5527580fd3982e754b13df6d90b18ebf2eb9c9cef95cbf59baa21503c5
images/Avatar.png,1685994149226,2306b7c2e69c3b031f09412a04c7dd0248b3243d1195baa2a9e919e1e52cd437
images/Like.png,1685994149228,4047ec9a7978ed344cd8b98371e97a530eac6b5adcbc8d7c6b607ce1a7d89c3b
images/Likes.png,1685994149228,c05765a83b2002564569857102a720f4825e4db3350d7312b073c84fa3517059
images/closeModal.png,1685994149229,137e67ae1813d4cb5c289a8c12168fc04e8ed35f0263a9a01432e88c0e0303db
images/createacc.png,1685994149230,fb89c5336963105cca30db76261537e9253a1d3055d5cb0b5ceed10ada196c7a
images/delete.png,1685994149230,7c162b036dba38a1f2605596d7571266534117062c228d8fce6a7e9c5cc9fbca
images/edit.png,1685994149230,3c8a731521c287c4457ab4a195bbc386d36fec89f348716d2ea675136a8aca93
images/home.png,1685994149231,d5c4a0e4b578e380596984e248ab4ff7292c01c09fdacb9648e86464a8a074a9
images/logoCompleto.png,1685994149232,01d30e9b98e31990500e66e51d4e90340a3834ebc6ac3703b4d853b34b5d2096
images/logoEasygym.png,1685994149233,5dd2496aba58b827741cc08629dd8e191c2750685d9c691b7f7616bb123f19e7
images/logoEasygymOnly.png,1685994149234,e428af64427326ca14985696d147e78593568d1897bfba5cab3e307d50246472
images/logoGoogle.png,1685994149235,0bfb24f605e9a4aeafab4df2e14942744ab7b1153e7e228731a8245967e3cc40
images/logoNameEasygym.png,1685994149236,4025c6cf57f628ebffd1c0d1aef9cd97823b64e9da3cc14d803977e6c5ba0858
images/logout.png,1685994149236,714de0db9f8bc9b68cac053a90f60586756cd92bf4cacd5141a29d4d9e2e4018
images/logout2.png,1685994149237,6b910d1d3f546cb30524a216cbc511d840c61b49b18c03de4c14cb92a2d9ebc1
images/menuOptions.png,1685994149238,b8a45cdb084d3134c944dd7e7823c45dd30d1ee13090f0b8e621941ce3e2c0c3
images/signin.png,1685994149242,66f8dd7afeefc18109c30240839fbb67ccc33c9deeca07783d8f7738795dd278
images/wall.png,1685994149242,d4ab9de5a1252c522897a23b1e892ac7b3bd43a12556f0937383d6a8746d2726
index.html,1686064752252,0fc073f0f6131a6645364ea7da2938d1dbf644a3cfbc6f16aa83c7f08e373ec6
assets/index.a91b78aa.css,1686064752252,3f55dd2b1bb7d1005a13f40a46e66ae6f77e9205634c00d33b378fdddde4acfc
assets/index.3ff87eb7.js,1686064752252,23d47de3c4df5a86b6aa946574d5ebddbbdb30aa5cc5fd9266f3dd0860b57e6b
1 change: 1 addition & 0 deletions .firebase/hosting.cHVibGlj.cache
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
index.html,1685980088686,eee70fc660fc5325efe8e1846f70391119a17f9125ce9aaadd0d76e61c51a013
5 changes: 5 additions & 0 deletions .firebaserc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"projects": {
"default": "easygym-sn-d107b"
}
}
20 changes: 20 additions & 0 deletions .github/workflows/firebase-hosting-merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# This file was auto-generated by the Firebase CLI
# https://github.com/firebase/firebase-tools

name: Deploy to Firebase Hosting on merge
'on':
push:
branches:
- main
jobs:
build_and_deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- run: npm ci && npm run build
- uses: FirebaseExtended/action-hosting-deploy@v0
with:
repoToken: '${{ secrets.GITHUB_TOKEN }}'
firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_EASYGYM_SN_D107B }}'
channelId: live
projectId: easygym-sn-d107b
17 changes: 17 additions & 0 deletions .github/workflows/firebase-hosting-pull-request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# This file was auto-generated by the Firebase CLI
# https://github.com/firebase/firebase-tools

name: Deploy to Firebase Hosting on PR
'on': pull_request
jobs:
build_and_preview:
if: '${{ github.event.pull_request.head.repo.full_name == github.repository }}'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- run: npm ci && npm run build
- uses: FirebaseExtended/action-hosting-deploy@v0
with:
repoToken: '${{ secrets.GITHUB_TOKEN }}'
firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_EASYGYM_SN_D107B }}'
projectId: easygym-sn-d107b
Loading