S1 F1 by RachmannJoubert · Pull Request #5 · RachmannJoubert/CollectorsApp

RachmannJoubert · 2019-08-07T12:37:38Z

.Create and display table

functions.php

index.php

functions.php

…rmat

…added headings for data table

…ions

index.css

functions.php

index.css

styles/index.css

sjr-mayden · 2019-08-08T10:10:10Z

test/functionsTest.php

@@ -0,0 +1,11 @@
+<?php


Functions not currently tested

I've completed success test, will begin working on failure and malform test.

2 more to go

…a new line

styles/index.css

sjr-mayden · 2019-08-08T14:06:55Z

test/functionsTest.php

@@ -0,0 +1,11 @@
+<?php


2 more to go

test/functionsTest.php

…indexed arrays

mallowmew · 2019-08-08T15:39:18Z

I don't think your picture numbers match up with the IDs shown in your table? This isn't a chinese chestnut.

mallowmew · 2019-08-08T15:42:32Z

functions.php

+
+function processData(array $plants): string
 {
+


extra newline

mallowmew · 2019-08-08T15:43:01Z

functions.php

+    if (array_keys($images) !== range(0, count($images) - 1))
+    return false;
+
+


extra newline

mallowmew · 2019-08-08T15:44:27Z

functions.php

+function displayImage(array $images): string {
+
+    if (array_keys($images) !== range(0, count($images) - 1))
+    return false;


Indent this.
Also, you don't need the curlyboys for a one-liner if statement, but they do help readability.

mallowmew · 2019-08-08T15:46:47Z

index.php

-    <link rel="stylesheet" type="text/css" href="index.css">
-    <link rel="stylesheet" type="text/css" href="normalize.css">
+    <link rel="stylesheet" type="text/css" href="styles/index.css">
+    <link rel="stylesheet" type="text/css" href="styles/normalize.css">


Normalize should come before your own CSS, because the browser will overwrite rules in downwards-order. You want your own rules to override normalize, not the other way around.

mallowmew · 2019-08-08T15:47:19Z

index.php

 ?>

 <!DOCTYPE html>
 <html lang="eng">


Correct html lang attribute is en

mallowmew · 2019-08-08T15:49:03Z

index.php

+                    <li>Life Span</li>
+                </ul>
+            </div>
+                <?php echo processData($plants) ?>


Charlie advised that the only functionality you should have in php tags within the html body is echoing string variables you already made in the php block. This method call should go up in the php block and load its message into a string, which you then echo here. This keeps your 'doing stuff' code all together.

mallowmew · 2019-08-08T15:50:40Z

styles/index.css

+}
+
+.row {
+    width: 100%;


Doesn't seem to do anything.

mallowmew · 2019-08-08T15:51:56Z

styles/index.css

+ul {
+    padding-top: 3%;
+    border-top: solid black;
+    width: 100%;


Doesn't seem to do anything.

FelixLetheren

bad

RachmannJoubert added 5 commits August 6, 2019 17:01

added prototype search function

c6c16fc

removed search function and html form

1a24e90

add functions to get image and display image

1207c30

background image

f643073

added functions to create the table and started styling the table

67e3538

mallowmew reviewed Aug 7, 2019

View reviewed changes

functions.php Outdated Show resolved Hide resolved

mallowmew reviewed Aug 7, 2019

View reviewed changes

index.php Outdated Show resolved Hide resolved

mallowmew reviewed Aug 7, 2019

View reviewed changes

index.php Outdated Show resolved Hide resolved

functions.php Outdated Show resolved Hide resolved

RachmannJoubert added 13 commits August 7, 2019 15:05

altered process data function so that it creates the desired table fo…

e763c3a

…rmat

called the processData function to create the table

5a74b15

styled the table so that it scrolls to acomodate overflow

1ece9a1

altered table styling so that columns are appropriately spaced

ed67818

removed getTableBody and getHeadings functions

fee9710

removed redundant function calls and created a div to display images

66d0292

adjusted styling for tables so that they align next to eachother and …

30ea1bd

…added headings for data table

added functions to get and display ID's

e18e74d

created test folder

637f1d7

alligned images within div, ordered id's and altered position of sect…

c5d3547

…ions

gave image id's a top and left value to align over coresponding image

dd3f2e7

un commented displayID array

bea8258

called displayID function and echod id's

7aa4e6a

MotNosniktaw reviewed Aug 8, 2019

View reviewed changes

index.css Show resolved Hide resolved

MotNosniktaw reviewed Aug 8, 2019

View reviewed changes

index.css Show resolved Hide resolved

MotNosniktaw reviewed Aug 8, 2019

View reviewed changes

index.css Outdated Show resolved Hide resolved

RachmannJoubert added 3 commits August 8, 2019 10:54

moved css files to a seperate styles folder

6734cf9

moved css files to a style folder

c6ac42b

removed commented code and altered font size of headings

70eb9d0

sjr-mayden suggested changes Aug 8, 2019

View reviewed changes

RachmannJoubert added 2 commits August 8, 2019 11:18

altered structure of code and removed extra line spacing

a4329bc

removed extra lines and indented where it was missing

a3a41ba

RachmannJoubert added 4 commits August 8, 2019 14:27

vreated test for processData and displayid functions

e40bbfe

began work on responsive testing

94116d5

completed success tests for relevent functions

57de818

changed structure of processData function so that operators start on …

f48a786

…a new line

AlisonYoon reviewed Aug 8, 2019

View reviewed changes

styles/index.css Outdated Show resolved Hide resolved

styles/index.css Outdated Show resolved Hide resolved

sjr-mayden suggested changes Aug 8, 2019

View reviewed changes

RachmannJoubert added 9 commits August 8, 2019 15:55

completed malformed tests for relevent functions

58825e6

structured arrays to make them easier to read

1e4ceda

added if statements into functions to check whether they are getting …

9e0b0de

…indexed arrays

removed unnecessary media queries and line spacings

35718f3

fixed spelling mistake

98a3452

completed doc blocks for functions

eef3e2e

removed redundant doc blocks

0dc09a9

added in breakpoints so that tables shrink more naturaly

04ad53d

removed extra line spaces

d8ded0b

sjr-mayden approved these changes Aug 8, 2019

View reviewed changes

mallowmew reviewed Aug 8, 2019

View reviewed changes

RachmannJoubert added 3 commits August 8, 2019 17:08

changed getImage query so that it returns them in order

c19e629

changed format of code

8290329

added media queries for headings

38ea9ee

FelixLetheren suggested changes Oct 17, 2019

View reviewed changes

		if (array_keys($images) !== range(0, count($images) - 1))
		return false;

Comments

Conversation

RachmannJoubert commented Aug 7, 2019

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

mallowmew commented Aug 8, 2019

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

FelixLetheren left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants