Skip to content
This repository was archived by the owner on Jul 11, 2026. It is now read-only.
Open

Liz #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
0906633
authentication, pending details
LizethRivera04 Apr 14, 2020
9fd9208
Merge pull request #1 from Paotm/Liz
Paotm Apr 14, 2020
f2a7c1a
email and password validation, bulma install
LizethRivera04 Apr 14, 2020
de031f9
Login settings and popup functionality
LizethRivera04 Apr 20, 2020
ceab89e
SPA integration and modularization completed
LizethRivera04 Apr 20, 2020
88516f6
The code was ordered
LizethRivera04 Apr 21, 2020
c096d9c
Merge pull request #3 from Paotm/Liz
Paotm Apr 21, 2020
e3bca0f
Update post.js
AniaCuapio Apr 21, 2020
6fdef39
Update index.html
AniaCuapio Apr 21, 2020
3a82a18
Edit profile
LizethRivera04 Apr 22, 2020
b2db26b
Upload posts ready
LizethRivera04 Apr 23, 2020
db956b2
Merge branch 'master' into Liz
LizethRivera04 Apr 23, 2020
d203845
Merge pull request #4 from Paotm/Liz
LizethRivera04 Apr 23, 2020
5d2bb19
Edit profile picture, get post ID
LizethRivera04 Apr 24, 2020
673ca5a
Se bajaron los cambios
LizethRivera04 Apr 24, 2020
4413c6c
avance en vista profile
JimenaMV Apr 27, 2020
9bda6f7
Navigation bar working, we know if user exists, correction of profile…
LizethRivera04 Apr 28, 2020
d92b6a4
Avances en la pantalla principal y css
JimenaMV Apr 28, 2020
2df30e3
Lista vista principal y estilos css
JimenaMV Apr 28, 2020
d316f8a
Merge branch 'Liz' of https://github.com/Paotm/CDMX009-Social-Network…
JimenaMV Apr 29, 2020
90fd92c
Merge con rama de Liz
JimenaMV Apr 29, 2020
c013b7e
Likes counter ready
LizethRivera04 Apr 29, 2020
8f1db4a
Cambio estilos
Apr 29, 2020
2f1a0fc
Slide y Perfil
Apr 29, 2020
8e311d3
ajustes en el Perfil
Apr 29, 2020
483b5d9
Update profile.js
Paotm Apr 29, 2020
6b34fe0
Profile image by default, correction null photo posts
LizethRivera04 Apr 29, 2020
f506e99
Small modifications posts
LizethRivera04 May 4, 2020
8968c8b
Avoiding conflicts in main
LizethRivera04 May 4, 2020
8355aab
Profile style
LizethRivera04 May 4, 2020
424bb05
Merge branch 'master' into Liz
LizethRivera04 May 4, 2020
88846f9
Algunos cambios para poder cambiar de rama
AniaCuapio May 5, 2020
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
5 changes: 5 additions & 0 deletions .firebaserc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"projects": {
"default": "socialnetwork-15a5f"
}
}
34 changes: 34 additions & 0 deletions _mocks_/firebase-mock.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@

/* const firestore = {
auth: () => {
return {
signInWithPopup: (provider) => {
return new Promise((resolve, reject) => {
resolve('datauser')


})
}
}
}
} */
//Creando un mock manual
/* const firebase = {
auth: () => {
return {
signInWithPopup: (provider) => {
return new Promise((resolve, reject) => {
resolve('datauser')


})
}
}
},


}

export default jest.fn(() => {
return firebase
}) */
6 changes: 6 additions & 0 deletions database.rules.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"rules": {
".read": "auth != null",
".write": "auth != null"
}
}
16 changes: 16 additions & 0 deletions firebase.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"database": {
"rules": "database.rules.json"
},
"hosting": {
"public": "src",
"ignore": [
"firebase.json",
"**/.*",
"**/node_modules/**"
]
},
"storage": {
"rules": "storage.rules"
}
}
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
"scripts": {
"htmlhint": "htmlhint dist/*.html ",
"eslint": "eslint --ext .js src/ test/",
"stylelint": "stylelint --aei src/**/*.css",
"pretest": "npm run htmlhint && npm run eslint && npm run stylelint",
"test": "jest --coverage",
"start": "serve src/"
},
Expand All @@ -32,5 +30,8 @@
"serve": "^11.0.2",
"stylelint": "^10.1.0",
"stylelint-config-recommended": "^2.2.0"
},
"dependencies": {
"bulma": "^0.8.2"
}
}
33 changes: 33 additions & 0 deletions src/404.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Page Not Found</title>

<style media="screen">
body { background: #ECEFF1; color: rgba(0,0,0,0.87); font-family: Roboto, Helvetica, Arial, sans-serif; margin: 0; padding: 0; }
#message { background: white; max-width: 360px; margin: 100px auto 16px; padding: 32px 24px 16px; border-radius: 3px; }
#message h3 { color: #888; font-weight: normal; font-size: 16px; margin: 16px 0 12px; }
#message h2 { color: #ffa100; font-weight: bold; font-size: 16px; margin: 0 0 8px; }
#message h1 { font-size: 22px; font-weight: 300; color: rgba(0,0,0,0.6); margin: 0 0 16px;}
#message p { line-height: 140%; margin: 16px 0 24px; font-size: 14px; }
#message a { display: block; text-align: center; background: #039be5; text-transform: uppercase; text-decoration: none; color: white; padding: 16px; border-radius: 4px; }
#message, #message a { box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); }
#load { color: rgba(0,0,0,0.4); text-align: center; font-size: 13px; }
@media (max-width: 600px) {
body, #message { margin-top: 0; background: white; box-shadow: none; }
body { border-top: 16px solid #ffa100; }
}
</style>
</head>
<body>
<div id="message">
<h2>404</h2>
<h1>Page Not Found</h1>
<p>The specified file was not found on this website. Please check the URL for mistakes and try again.</p>
<h3>Why am I seeing this?</h3>
<p>This page was generated by the Firebase Command-Line Interface. To modify it, edit the <code>404.html</code> file in your project's configured <code>public</code> directory.</p>
</div>
</body>
</html>
3 changes: 0 additions & 3 deletions src/example.js

This file was deleted.

Binary file added src/img/Thumbs.db
Binary file not shown.
Binary file added src/img/ojo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/slider1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/slider2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/slider3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
61 changes: 60 additions & 1 deletion src/index.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,71 @@
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>Document</title>
<link rel="stylesheet" href="styles.css">
<script src="https://kit.fontawesome.com/90e469c395.js" crossorigin="anonymous"></script>
<script defer src="https://use.fontawesome.com/releases/v5.3.1/js/all.js"></script>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.8.2/css/bulma.min.css">
</head>

<body>
<script type="module" src="index.js"></script>

<div id="root"></div>
<div id="showP"></div>
<nav class="navbar is-fixed-bottom is-hoverable is-primary navBottom" id="navBar" role="navigation"
aria-label="main navigation">
<div class="navbar-brand">
<a href="#/Home" id="home" class="navbar-item is-expanded is-primary centerItem"><i class="fas fa-home"></i></a>
<a href="#/Post" id="post" class="navbar-item is-expanded is-primary centerItem"><i
class="fas fa-plus-circle"></i></a>
<a href="#/My_profile" id="profile" class="navbar-item is-expanded centerItem"><i class="fas fa-user"></i></a>
<a href="#/Exit" id="exit" class="navbar-item is-expanded centerItem"><i class="fas fa-power-off"></i></a>
<a role="button" class="navbar-burger" aria-label="menu" aria-expanded="active" data-target="navbarBasicExample">
<span aria-hidden="true"></span>
<span aria-hidden="true"></span>
<span aria-hidden="true"></span>
</a>
</div>
</nav>


<!-- The core Firebase JS SDK is always required and must be listed first -->
<!-- <script src="https://www.gstatic.com/firebasejs/7.14.0/firebase-app.js"></script>
<script src="https://www.gstatic.com/firebasejs/7.14.0/firebase-firestore.js"></script> -->
<!-- include only the Firebase features as you need -->
<!-- <script src="https://www.gstatic.com/firebasejs/7.14.0/firebase-auth.js"></script>
<script src="https://www.gstatic.com/firebasejs/7.14.0/firebase-database.js"></script> -->
<!-- <script src="https://www.gstatic.com/firebasejs/firebase/7.14.0/firebase-messaging.js"></script> -->
<!-- <script src="https://www.gstatic.com/firebasejs/7.14.0/firebase-storage.js"></script> -->

<!-- TODO: Add SDKs for Firebase products that you want to use
https://firebase.google.com/docs/web/setup#available-libraries
<script src="https://www.gstatic.com/firebasejs/7.14.0/firebase-analytics.js"></script> -->
<script src="https://www.gstatic.com/firebasejs/7.14.0/firebase.js"></script>


<script>
// Your web app's Firebase configuration
var firebaseConfig = {
apiKey: "AIzaSyCBWMiBIM_0KMxQgbZZarPb4R_htLsd9UE",
authDomain: "socialnetwork-15a5f.firebaseapp.com",
databaseURL: "https://socialnetwork-15a5f.firebaseio.com",
projectId: "socialnetwork-15a5f",
storageBucket: "socialnetwork-15a5f.appspot.com",
messagingSenderId: "863801306874",
appId: "1:863801306874:web:c6631f9d9d65117d44a343",
measurementId: "G-YSFLLZDYTT"
};
// Initialize Firebase
firebase.initializeApp(firebaseConfig);
//firebase.analytics();
</script>
<script type="module" src="main.js"></script>
<!-- <script src="pops.js"></script> -->
</body>

</html>
Loading