created backend for project section and updated the css for the images
This commit is contained in:
parent
33dd85d162
commit
9a282cb305
1
dist/api/index.php
vendored
1
dist/api/index.php
vendored
@ -10,6 +10,7 @@ use Slim\Factory\AppFactory;
|
|||||||
//require “routes.php”;
|
//require “routes.php”;
|
||||||
require "../vendor/autoload.php";
|
require "../vendor/autoload.php";
|
||||||
include "timelineData.php";
|
include "timelineData.php";
|
||||||
|
include "projectData.php";
|
||||||
|
|
||||||
// Start slim
|
// Start slim
|
||||||
$app = AppFactory::create();
|
$app = AppFactory::create();
|
||||||
|
2
dist/api/timelineData.php
vendored
2
dist/api/timelineData.php
vendored
@ -29,7 +29,7 @@ class TimelineData
|
|||||||
function getWorkData()
|
function getWorkData()
|
||||||
{
|
{
|
||||||
$conn = dbConn();
|
$conn = dbConn();
|
||||||
$stmt = $conn->prepare("SELECT DATE_FORMAT(startPeriod, '%b, %Y') as startPeriod, DATE_FORMAT(endPeriod, '%b, %Y') as endPeriod, companyName, area, title FROM work ORDER BY startPeriod DESC;");
|
$stmt = $conn->prepare("SELECT DATE_FORMAT(startPeriod, '%b, %Y') as startPeriod, DATE_FORMAT(endPeriod, '%b, %Y') as endPeriod, companyName, area, title FROM work ORDER BY work.startPeriod DESC;");
|
||||||
$stmt->execute();
|
$stmt->execute();
|
||||||
|
|
||||||
// set the resulting array to associative
|
// set the resulting array to associative
|
||||||
|
2
dist/css/main.css
vendored
2
dist/css/main.css
vendored
File diff suppressed because one or more lines are too long
@ -10,6 +10,7 @@ use Slim\Factory\AppFactory;
|
|||||||
//require “routes.php”;
|
//require “routes.php”;
|
||||||
require "../vendor/autoload.php";
|
require "../vendor/autoload.php";
|
||||||
include "timelineData.php";
|
include "timelineData.php";
|
||||||
|
include "projectData.php";
|
||||||
|
|
||||||
// Start slim
|
// Start slim
|
||||||
$app = AppFactory::create();
|
$app = AppFactory::create();
|
||||||
@ -22,6 +23,7 @@ $errorMiddleware = $app->addErrorMiddleware(true, true, true);
|
|||||||
$app->setBasePath("/api");
|
$app->setBasePath("/api");
|
||||||
|
|
||||||
$timelineData = new TimelineData();
|
$timelineData = new TimelineData();
|
||||||
|
$projectData = new ProjectData();
|
||||||
|
|
||||||
$app->get("/timelineData/{timeline}", function (Request $request, Response $response, array $args)
|
$app->get("/timelineData/{timeline}", function (Request $request, Response $response, array $args)
|
||||||
{
|
{
|
||||||
@ -52,6 +54,26 @@ $app->get("/timelineData/{timeline}", function (Request $request, Response $resp
|
|||||||
{
|
{
|
||||||
$response = $response->withStatus(404);
|
$response = $response->withStatus(404);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//use content type json to indicate json data on frontend.
|
||||||
|
return $response->withHeader("Content-Type", "application/json");
|
||||||
|
});
|
||||||
|
|
||||||
|
$app->get('/projectData', function (Request $request, Response $response)
|
||||||
|
{
|
||||||
|
global $projectData;
|
||||||
|
|
||||||
|
$result= $projectData->getProjectData();
|
||||||
|
|
||||||
|
$json = json_encode($result);
|
||||||
|
|
||||||
|
$response->getBody()->write($json);
|
||||||
|
|
||||||
|
if(array_key_exists("errorMessage", $result[0]))
|
||||||
|
{
|
||||||
|
$response = $response->withStatus(404);
|
||||||
|
}
|
||||||
|
|
||||||
//use content type json to indicate json data on frontend.
|
//use content type json to indicate json data on frontend.
|
||||||
return $response->withHeader("Content-Type", "application/json");
|
return $response->withHeader("Content-Type", "application/json");
|
||||||
});
|
});
|
||||||
|
28
src/api/projectData.php
Normal file
28
src/api/projectData.php
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
<?php
|
||||||
|
require_once "./config.php";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Project Data Class
|
||||||
|
* Define all functions which either get, update, create or delete timeline data
|
||||||
|
*/
|
||||||
|
class ProjectData
|
||||||
|
{
|
||||||
|
function getProjectData()
|
||||||
|
{
|
||||||
|
$conn = dbConn();
|
||||||
|
$stmt = $conn->prepare("SELECT title, information, imgLocation, projectLink, githubLink FROM projects;");
|
||||||
|
$stmt->execute();
|
||||||
|
|
||||||
|
// set the resulting array to associative
|
||||||
|
$result = $stmt->fetchAll(PDO::FETCH_ASSOC);
|
||||||
|
|
||||||
|
if ($result)
|
||||||
|
{
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return array(array("errorMessage" => "Error, project data not found"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -17,13 +17,11 @@ section#projects .mainProj, section#projects .otherProj {
|
|||||||
|
|
||||||
|
|
||||||
section#projects .mainProj {
|
section#projects .mainProj {
|
||||||
justify-content: center;
|
|
||||||
border-right: 2px solid var(--mutedGrey);
|
border-right: 2px solid var(--mutedGrey);
|
||||||
padding: 0 2.5em 5em 0;
|
padding: 0 2.5em 5em 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
section#projects .mainProj img, section#projects .otherProj .oProjItem img {
|
section#projects .mainProj img, section#projects .otherProj .oProjItem img {
|
||||||
|
|
||||||
-webkit-border-radius: 10px;
|
-webkit-border-radius: 10px;
|
||||||
-moz-border-radius: 10px;
|
-moz-border-radius: 10px;
|
||||||
border-radius: 10px;
|
border-radius: 10px;
|
||||||
@ -33,7 +31,7 @@ section#projects .mainProj img, section#projects .otherProj .oProjItem img {
|
|||||||
|
|
||||||
section#projects .mainProj img {
|
section#projects .mainProj img {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
max-width: 30rem;
|
max-width: 40rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
section#projects .mainProj .flexRow {
|
section#projects .mainProj .flexRow {
|
||||||
@ -79,7 +77,7 @@ section#projects .otherProj > div .oProjItem:nth-child(2) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
section#projects .otherProj .oProjItem img {
|
section#projects .otherProj .oProjItem img {
|
||||||
max-width: 30rem;
|
max-width: 15rem;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
padding: 0 1em;
|
padding: 0 1em;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user