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.

Sign up for GitHub

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

Jump to bottom

Update Froodle for future additions and continuity #21

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Update Froodle for future additions and continuity #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
daa9d34
Merge pull request #1 from LibreLabUCM/master
pedro-javierf Oct 9, 2019
6153ba2
Update README.md
pedro-javierf Oct 9, 2019
820111b
remove unused code
pedro-javierf Oct 9, 2019
5b2fd00
Update index.php
pedro-javierf Oct 9, 2019
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
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Froodle
Proyecto molón creado por estudiantes de [LibreLabUCM](https://librelabucm.org/ "Librelab's Homepage")
Froodle is Free Doodle; an open source and free tool/web to organize yourself and your team.
Created by students of [LibreLabUCM](https://librelabucm.org/ "Librelab's Homepage")

## License
You can find the corresponding code license for Froodle in the [LICENSE](LICENSE) file
Expand All @@ -8,14 +9,13 @@ You can find the corresponding code license for Froodle in the [LICENSE](LICENSE
LibreLabUCM members:
- Pedro J
- Daniel
- Daniel (2)
- David
- DevPGSV

## Lista de cosas que hacer:
* [ ] Mejorar ui
* [x] Construir la opcion para que los usuarios vean sus froodles
* [ ] Corregir temasd e seguridad y errores como que no se puedan crear dos froodles con el mismo titulo y que los usuarios tengan que usar su email para que no se puedan falsificar...
* [ ] Corregir temas de seguridad y errores como que no se puedan crear dos froodles con el mismo titulo y que los usuarios tengan que usar su email para que no se puedan falsificar...
* [ ] Hacer el tamño adaptable a distintos dispositivos
* Etc...

Expand Down
14 changes: 0 additions & 14 deletions backend/userManagement.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,18 +111,4 @@ function generateEmailActivationOtp($uuid) {

$collectionUsers->updateOne(['uuid' => $uuid], ['$push' => ['otp' => $otp]]);

/*
$mail = new CustomMailer(true);
try {
$mail->addAddress($user['email'], $user['username']);
$mail->isHTML(true);
$mail->Subject = 'Activate your account!';
$mail->Body = "Your code: {$otp['otp']}";
$mail->send();
echo 'Message has been sent';
} catch (Exception $e) {
echo 'Message could not be sent. Mailer Error: ', $mail->ErrorInfo;
}
*/

}
28 changes: 21 additions & 7 deletions index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,24 @@
<!--
Froodle index.php
Copyright (C) 2019 LibreLabUCM

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
-->
<?php require ('db.php'); ?>
<!--this will allow us to call all the php code from this page if needed-->
<!DOCTYPE html>
<html lang="en" dir="ltr">
<html lang="es" dir="ltr">
<head>
<meta charset="UTF-8">
<title>Welcome to froodle</title>
Expand All @@ -16,10 +33,8 @@
<div class="inner-container">

<div class="box">

<h1>Froodle</h1>

<h2 id="demo">
<h2 id="demo">

<?php

Expand All @@ -33,14 +48,13 @@
?>

</h2>
<h3>froodles created</h3>

<h3>Froodles Created</h3>

<button onclick="location.href='modules/createFroodle.php'">Create Froodle</button>
<p>or</p>
<button onclick = "location.href = 'modules/viewFroodle.php'" type="button" name="button">View your froodle</button>
<p>What is froodle? <span onclick="location.href='https://librelabucm.org/'">Follow the Froodle team</span></p>
<p>Powered by librelab ucm</p>
<p>Powered by LibreLabUcm</p>
</div>
</div>
<script src='http://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js'></script>
Expand Down