From 5b4c93b3c34032838a9530737833396044c8f587 Mon Sep 17 00:00:00 2001 From: Kevin Nobel Date: Tue, 10 Jan 2017 15:15:12 +0100 Subject: [PATCH 1/4] Removed .idea folder --- website/.idea/website.iml => .idea/WebDB.iml | 0 {website/.idea => .idea}/modules.xml | 2 +- .idea/vcs.xml | 6 ++ website/.idea/workspace.xml | 99 +++++++++++++------- 4 files changed, 70 insertions(+), 37 deletions(-) rename website/.idea/website.iml => .idea/WebDB.iml (100%) rename {website/.idea => .idea}/modules.xml (59%) create mode 100644 .idea/vcs.xml diff --git a/website/.idea/website.iml b/.idea/WebDB.iml similarity index 100% rename from website/.idea/website.iml rename to .idea/WebDB.iml diff --git a/website/.idea/modules.xml b/.idea/modules.xml similarity index 59% rename from website/.idea/modules.xml rename to .idea/modules.xml index b9ceecd..e1b2ef9 100644 --- a/website/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/website/.idea/workspace.xml b/website/.idea/workspace.xml index ce86dc8..0ff983c 100644 --- a/website/.idea/workspace.xml +++ b/website/.idea/workspace.xml @@ -14,23 +14,15 @@ - - - + + + - - - - - - - - - - - - - + + + + + @@ -52,7 +44,7 @@ true DEFINITION_ORDER - + @@ -125,6 +131,12 @@ + project + + + + + @@ -158,32 +170,34 @@ - - + - - - + + + + - - + + - - + + @@ -199,19 +213,32 @@ - + - - - + + + + + - + + + - - - + + + + + + + + + + + + From 40ce3d57b39fc89e2c27a79817c4f8912fb211b6 Mon Sep 17 00:00:00 2001 From: Kevin Nobel Date: Tue, 10 Jan 2017 17:09:11 +0100 Subject: [PATCH 2/4] Added profile view. (WIP) --- website/styles/main.css | 29 ++++++++++++++++++- website/styles/profile.css | 40 ++++++++++++++++++++++++++ website/views/head.php | 3 +- website/views/profile.php | 58 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 128 insertions(+), 2 deletions(-) create mode 100644 website/styles/profile.css create mode 100644 website/views/profile.php diff --git a/website/styles/main.css b/website/styles/main.css index d110eb8..4f3597f 100644 --- a/website/styles/main.css +++ b/website/styles/main.css @@ -5,8 +5,12 @@ last update: 10-01-2017 Website: myhyvesbookplus.tk -----------------------------------------------------------------------------*/ +.profile-picture { + border-radius: 50%; +} + body { - background-color: white; + background-color: #B78996; color: #333; font-family: Arial, sans-serif; } @@ -82,4 +86,27 @@ table { td { text-align: left; font-weight: normal; +} + +/* Custom title box, appears instantaneously */ +a:hover { + position: relative; +} + +a[data-title]:hover:after { + content: attr(data-title); + padding: 4px 4px; + color: #FFFFFF; + position: absolute; + left: 0; + top: 100%; + z-index: 20; + white-space: nowrap; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; + -moz-box-shadow: 0px 0px 4px #222; + -webkit-box-shadow: 0px 0px 4px #222; + box-shadow: 0px 0px 4px #222; + background-color: #333; } \ No newline at end of file diff --git a/website/styles/profile.css b/website/styles/profile.css new file mode 100644 index 0000000..e586b14 --- /dev/null +++ b/website/styles/profile.css @@ -0,0 +1,40 @@ + + +.profile-box { + min-height: 150px; + padding: 25px; + background-color: #FFFFFF; +} + +.profile-box .profile-picture { + width: 150px; + height: 150px; + margin: 0 20px 20px 0; +} + +.profile-box .profile-username { + padding-top: 50px; +} + +.item-box { + width: calc(50% - 60px); + margin: 20px 0 0 0; + padding: 25px; + background-color: #FFFFFF; +} + +.item-box .profile-picture { + width: 25px; +} + +.post-box { + float: left; + width: 250px; + margin: 20px 20px 0 0; + padding: 25px; + background-color: #FFFFFF; +} + +.post-box img { + width: 250px; +} \ No newline at end of file diff --git a/website/views/head.php b/website/views/head.php index a20ed51..2ecd8e0 100644 --- a/website/views/head.php +++ b/website/views/head.php @@ -5,6 +5,7 @@ diff --git a/website/views/profile.php b/website/views/profile.php new file mode 100644 index 0000000..e050cce --- /dev/null +++ b/website/views/profile.php @@ -0,0 +1,58 @@ +
+
+ +

[gebruikersnaam]

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.

+
+ +
+

Vrienden

+

+ [gebruikersnaam]'s profielfoto + [gebruikersnaam]'s profielfoto + [gebruikersnaam]'s profielfoto + [gebruikersnaam]'s profielfoto + [gebruikersnaam]'s profielfoto + ...en nog 25 anderen! +

+
+ +
+

Groepen

+

+ [groepsnaam]'s logo + [groepsnaam]'s logo + [groepsnaam]'s logo + [groepsnaam]'s logo + [groepsnaam]'s logo + ...en nog 6 anderen! +

+
+ +
+

Tekst

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.

+
+ +
+

Afbeelding

+ Foto van [gebruikersnaam] +
+ +
+

Video

+ +
+ +
+

Post

+ +
+ +
+

Post

+
+ +
\ No newline at end of file From ee7a91a6aafee8b5ea7ebedf522481f167ef0d9e Mon Sep 17 00:00:00 2001 From: Kevin Nobel Date: Wed, 11 Jan 2017 11:26:42 +0100 Subject: [PATCH 3/4] Commit before merge --- website/styles/profile.css | 6 ++++++ website/views/profile.php | 2 ++ 2 files changed, 8 insertions(+) diff --git a/website/styles/profile.css b/website/styles/profile.css index e586b14..a65408b 100644 --- a/website/styles/profile.css +++ b/website/styles/profile.css @@ -37,4 +37,10 @@ .post-box img { width: 250px; +} + +.post-box .post-date { + float: right; + color: #aaaaaa; + font-size: 0.8em; } \ No newline at end of file diff --git a/website/views/profile.php b/website/views/profile.php index e050cce..1d4070a 100644 --- a/website/views/profile.php +++ b/website/views/profile.php @@ -32,11 +32,13 @@

Tekst

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.

+

Enkele minuten geleden geplaatst

Afbeelding

Foto van [gebruikersnaam] +

Gisteren geplaatst

From cd93dcb7194886ea1439b37e46be44da5c4297fc Mon Sep 17 00:00:00 2001 From: Kevin Nobel Date: Wed, 11 Jan 2017 14:00:10 +0100 Subject: [PATCH 4/4] Small changes to profile page, added friend request button --- website/img/add-friend.png | Bin 0 -> 676 bytes website/profile.php | 18 ++++++++ website/styles/main.css | 4 +- website/styles/profile.css | 22 ++++++++-- website/views/profile.php | 82 +++++++++++++++++++++++++++---------- 5 files changed, 99 insertions(+), 27 deletions(-) create mode 100644 website/img/add-friend.png create mode 100644 website/profile.php diff --git a/website/img/add-friend.png b/website/img/add-friend.png new file mode 100644 index 0000000000000000000000000000000000000000..87d1d4431c08c20f46133c245b92f6c7c2c9583f GIT binary patch literal 676 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1mUKs7M+SzC{oH>NS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VW5Sk5Uj7}P}D}aLRC7!;n><<~ac?~4&<3Ao?U|=lrba4!^INdwxtaeMH$kFpY zKKo9kr712I5EJQ4T0Nz;^{7VVEzSA{oi|4h9g|l`$#m6}o^8l2zck!Oq}6Ciz$eSk zn?KB|ocBES%*{RTcYdE&ZMEHfl8WIOxk6F?zJ|X^YKQ-A4+?TE-2FIb@)O<)#gk^r z|2fxfD4hQKNW_B)(q@vTtdo~iDsZP%JeZcb|K7>H8`D}Rye(#&BeADv%43^6?sE+1 zA2jdqxEUUGWqDXHuVL!k4Za~a<(^J*VJ>9r@GL3JwA>?9_&)S>+x;^J?vlASQcW$^ zaVJ-9EsRXkI=<=4?xvXzXY5v0e*Mq?QZ0v@kEtn=^ZWyAlc(!dOxffdyO&5ef6wS% zwdVjghmGgku%&*ND-Z6H_L4TyeiichqNbvtN5J8AlVAT$-!nb+QrPR3%0(^_n^(WY7Gp0cwy0*$|wcR#Ki=l*&+EUaps!mtCBk aSdglhUz9%kosASw5re0zpUXO@geCwvC;-y{ literal 0 HcmV?d00001 diff --git a/website/profile.php b/website/profile.php new file mode 100644 index 0000000..0ecdda1 --- /dev/null +++ b/website/profile.php @@ -0,0 +1,18 @@ + + + + + + + diff --git a/website/styles/main.css b/website/styles/main.css index c44b249..a410cdf 100644 --- a/website/styles/main.css +++ b/website/styles/main.css @@ -20,8 +20,8 @@ body { } .content { - margin-top: 80px; - margin-left: 256px; + margin: 80px 0 20px 256px; + padding: 20px; } ::selection { diff --git a/website/styles/profile.css b/website/styles/profile.css index a65408b..da4cc64 100644 --- a/website/styles/profile.css +++ b/website/styles/profile.css @@ -1,4 +1,6 @@ - +.profile-box, .item-box, .post-box { + box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); +} .profile-box { min-height: 150px; @@ -23,8 +25,9 @@ background-color: #FFFFFF; } -.item-box .profile-picture { - width: 25px; +.posts { + background-color: red; + margin-top: 20px; } .post-box { @@ -43,4 +46,17 @@ float: right; color: #aaaaaa; font-size: 0.8em; +} + +.friend-request { + float: right; + padding: 10px; + border-radius: 3px; + background-color: #845663; + color: #FFFFFF; + transition-duration: 250ms; +} + +.friend-request:hover { + background-color: #B78996; } \ No newline at end of file diff --git a/website/views/profile.php b/website/views/profile.php index 1d4070a..408f93a 100644 --- a/website/views/profile.php +++ b/website/views/profile.php @@ -1,6 +1,9 @@
+
+

Als vriend toevoegen

+

[gebruikersnaam]

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.

@@ -29,32 +32,67 @@

-
-

Tekst

-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.

-

Enkele minuten geleden geplaatst

-
+
+
+

Tekst

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.

+

Enkele minuten geleden geplaatst

+
-
-

Afbeelding

- Foto van [gebruikersnaam] -

Gisteren geplaatst

-
+
+

Tekst

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.

+

Enkele minuten geleden geplaatst

+
-
-

Video

- -
+
+

Tekst

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.

+

Enkele minuten geleden geplaatst

+
-
-

Post

- -
+
+

Tekst

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla.

+

Enkele minuten geleden geplaatst

+
-
-

Post

+
+

Tekst

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.

+

Enkele minuten geleden geplaatst

+
+ +
+

Tekst

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.

+

Enkele minuten geleden geplaatst

+
+ +
+

Tekst

+

Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.

+

Enkele minuten geleden geplaatst

+
+ +
+

Afbeelding

+ Foto van [gebruikersnaam] +

Gisteren geplaatst

+
+ +
+

Post

+ +

Maandag geplaatst

+
+ +
+

Post

+

4 Januari geplaatst

+
\ No newline at end of file