From d1353bd1cf28efc6838db48659ca6a565b616c8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Garrido=20Labrador?= Date: Sun, 21 Oct 2018 20:48:35 +0200 Subject: [PATCH] #13 and #18 finished and PreReleased launch --- Source/assets/css/alert.css | 26 ++++++ Source/assets/html/base.twig | 7 ++ Source/assets/html/codebox.twig | 74 ++++++++------- Source/assets/html/codebox_firstPage.twig | 48 ++++++++++ Source/assets/html/loginregister.twig | 1 + Source/assets/html/restore.twig | 2 +- Source/assets/html/saved.twig | 16 ++++ Source/assets/html/user.twig | 107 ++++++++++++++-------- Source/assets/js/like.js | 69 ++++++++++++++ Source/composer.lock | 2 +- Source/src/DB.php | 71 +++++++++++--- Source/src/app.php | 56 +++++++++-- Source/src/dbToTable.php | 36 +++++++- Source/src/domails.php | 29 ++++++ Source/src/users.php | 6 +- 15 files changed, 450 insertions(+), 100 deletions(-) create mode 100644 Source/assets/css/alert.css create mode 100644 Source/assets/html/codebox_firstPage.twig create mode 100644 Source/assets/html/saved.twig create mode 100644 Source/assets/js/like.js create mode 100644 Source/src/domails.php diff --git a/Source/assets/css/alert.css b/Source/assets/css/alert.css new file mode 100644 index 0000000..0ea8e8f --- /dev/null +++ b/Source/assets/css/alert.css @@ -0,0 +1,26 @@ +.myAlert-top{ + position: fixed; + top: 5px; + left:2%; + width: 96%; +} + +.myAlert-bottom{ + position: fixed; + bottom: 5px; + left:2%; + width: 96%; +} + +div.fullscreen { + position: absolute; + width:100%; + height:960px; + top: 0; + left: 0; + background-color: lightblue; +} + +.alert{ + display: none; +} \ No newline at end of file diff --git a/Source/assets/html/base.twig b/Source/assets/html/base.twig index 5ac2ff7..9728b4c 100644 --- a/Source/assets/html/base.twig +++ b/Source/assets/html/base.twig @@ -5,8 +5,10 @@ + + {##} {% block css %}{% endblock %} @@ -19,6 +21,7 @@ + {% include app.fronthtml~'/nav.twig' %} @@ -26,6 +29,10 @@ {% block content %}{% endblock %} +
+ ×Oh snap! Something wrong +
+ {% include app.fronthtml~"/footer.twig" %} {% block js %} diff --git a/Source/assets/html/codebox.twig b/Source/assets/html/codebox.twig index 8bec748..78b6f91 100644 --- a/Source/assets/html/codebox.twig +++ b/Source/assets/html/codebox.twig @@ -1,35 +1,45 @@ - - - - - - - - {% if code.extlib is defined and code.extlib != "" %} - - - {% endif %} - - - - - - - - - - - - -
- {{ code.name }} -
Author: {{ code.nick }} Version: {{ code.version }} - Lang: {{ code.lLang }}
- External library: {{ code.extlib }} - {% if code.extlibver is not null %} - Version used: {{ code.extlibver }} +
+
+
+
{{ code.name }}
+
+
+

+ + + + + + +

+
+
+ {% if page.page!="home"%} + {% if code.extlib is defined and code.extlib != "" %} +
+ External library: {{ code.extlib }} + {% if code.extlibver is not null %} + Version used: {{ code.extlibver }} + {% endif %} +
+
{% endif %} -
Description
{{ code.description }}
Code
+
+
+ {% if page.page!="home"%}Description: {{ code.description }}{% endif %} +
+ +
+
+
{{ code.lLang }}
+
{{ code.nick }}
+
+
+ 
{{ code.code }}
-
+ + + \ No newline at end of file diff --git a/Source/assets/html/codebox_firstPage.twig b/Source/assets/html/codebox_firstPage.twig new file mode 100644 index 0000000..2bf0534 --- /dev/null +++ b/Source/assets/html/codebox_firstPage.twig @@ -0,0 +1,48 @@ +{# + + + + + + + + + +
+

{{ code.name }}

+
Author: {{ code.nick }} Version: {{ code.version }} + Lang: {{ code.lLang }}
+ 
{{ code.code }}
+
#} + +
+
+
{{ code.name }}
+
+
+
+
+ {% if page.page!=home%} + {% if code.extlib is defined and code.extlib != "" %} +
+ External library: {{ code.extlib }} + {% if code.extlibver is not null %} + Version used: {{ code.extlibver }} + {% endif %} +
+
+ {% endif %} +
+ Description: {{ code.description }} +
+
+
{{ code.lLang }}
+
{{ code.nick }}
+
+ {% endif %} +
+
+ 
{{ code.code }}
+
+
+
\ No newline at end of file diff --git a/Source/assets/html/loginregister.twig b/Source/assets/html/loginregister.twig index 7368653..727252e 100644 --- a/Source/assets/html/loginregister.twig +++ b/Source/assets/html/loginregister.twig @@ -12,6 +12,7 @@

Error during sign-up, check your data

The e-mail is currently in use

The nickname is currently in use

+

Please, confirm your email before

diff --git a/Source/assets/html/restore.twig b/Source/assets/html/restore.twig index 0ee753c..6256ee4 100644 --- a/Source/assets/html/restore.twig +++ b/Source/assets/html/restore.twig @@ -25,7 +25,7 @@