mirror of
https://github.com/rjNemo/ticket_manager
synced 2026-06-12 11:46:40 +00:00
home page layout
This commit is contained in:
parent
b2bbc08e1e
commit
51b83b1976
8 changed files with 89 additions and 91 deletions
10
client/src/components/InputField.tsx
Normal file
10
client/src/components/InputField.tsx
Normal file
|
|
@ -0,0 +1,10 @@
|
||||||
|
import React, { FC } from "react";
|
||||||
|
|
||||||
|
export const InputField: FC = () => {
|
||||||
|
return (
|
||||||
|
<div className="input-field">
|
||||||
|
<input id="email" type="text" className="validate" />
|
||||||
|
<label htmlFor="email">Email</label>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
23
client/src/components/LogInForm.tsx
Normal file
23
client/src/components/LogInForm.tsx
Normal file
|
|
@ -0,0 +1,23 @@
|
||||||
|
import React, { FC } from "react";
|
||||||
|
import { InputField } from "./InputField";
|
||||||
|
import { PasswordField } from "./PasswordField";
|
||||||
|
import { Button } from "./Button";
|
||||||
|
|
||||||
|
export const LogInForm: FC = () => {
|
||||||
|
return (
|
||||||
|
<div className="section col s10 offset-s1 white z-depth-1">
|
||||||
|
<div className="row ">
|
||||||
|
<div className="center ">
|
||||||
|
<h4>Login</h4>
|
||||||
|
<form className="col s10 offset-s1">
|
||||||
|
<InputField />
|
||||||
|
<PasswordField />
|
||||||
|
<Button color="indigo" size="large">
|
||||||
|
Submit
|
||||||
|
</Button>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
10
client/src/components/PasswordField.tsx
Normal file
10
client/src/components/PasswordField.tsx
Normal file
|
|
@ -0,0 +1,10 @@
|
||||||
|
import React, { FC } from "react";
|
||||||
|
|
||||||
|
export const PasswordField: FC = () => {
|
||||||
|
return (
|
||||||
|
<div className="input-field">
|
||||||
|
<input id="password" type="password" className="validate" />
|
||||||
|
<label htmlFor="password">Password</label>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
20
client/src/components/ProfileSelector.tsx
Normal file
20
client/src/components/ProfileSelector.tsx
Normal file
|
|
@ -0,0 +1,20 @@
|
||||||
|
import React, { FC } from "react";
|
||||||
|
import { HorizontalCard } from "./HorizontalCard";
|
||||||
|
import { Avatar } from "./Avatar";
|
||||||
|
import { Link } from "react-router-dom";
|
||||||
|
|
||||||
|
export const ProfileSelector: FC = () => {
|
||||||
|
return (
|
||||||
|
<div className="section col s10 offset-s1 white z-depth-1">
|
||||||
|
<div className="row ">
|
||||||
|
<div className="center ">
|
||||||
|
<h4>Select a profile</h4>
|
||||||
|
<Link to="/users/cd179eb7-3a54-4060-b22c-3e947bdffcbc">
|
||||||
|
<Avatar picture="https://vignette.wikia.nocookie.net/jamescameronsavatar/images/0/08/Neytiri_Profilbild.jpg/revision/latest/scale-to-width-down/250?cb=20100107164021&path-prefix=de" />
|
||||||
|
</Link>
|
||||||
|
<h5>Demo User</h5>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
@ -2,7 +2,6 @@ import React, { FC, useState, useEffect } from "react";
|
||||||
import { useParams } from "react-router-dom";
|
import { useParams } from "react-router-dom";
|
||||||
import { TicketPage } from "../pages/TicketPage";
|
import { TicketPage } from "../pages/TicketPage";
|
||||||
import { ErrorController } from "./ErrorController";
|
import { ErrorController } from "./ErrorController";
|
||||||
import { User } from "../types/User";
|
|
||||||
import { HttpResponse } from "../types/HttpResponse";
|
import { HttpResponse } from "../types/HttpResponse";
|
||||||
import { Preloader } from "../components/Preloader";
|
import { Preloader } from "../components/Preloader";
|
||||||
import { get } from "../utils/http";
|
import { get } from "../utils/http";
|
||||||
|
|
@ -49,76 +48,3 @@ export const TicketController: FC = () => {
|
||||||
const viewModel = new TicketVM(ticket);
|
const viewModel = new TicketVM(ticket);
|
||||||
return isLoading ? <Preloader /> : <TicketPage viewModel={viewModel} />;
|
return isLoading ? <Preloader /> : <TicketPage viewModel={viewModel} />;
|
||||||
};
|
};
|
||||||
|
|
||||||
// const user: User = {
|
|
||||||
// id: "resldsm,dgd",
|
|
||||||
// firstName: "Ti",
|
|
||||||
// lastName: "Nyny",
|
|
||||||
// fullName: "Nilka Netty Nemo",
|
|
||||||
// presentation: "Woman of my life ❤️❤️❤️",
|
|
||||||
// creationDate: new Date().toDateString(),
|
|
||||||
// email: "dw@mail.au",
|
|
||||||
// phone: "0998765432",
|
|
||||||
// picture: require("../images/user_1.jpg"),
|
|
||||||
// projects: [
|
|
||||||
// {
|
|
||||||
// id: 1,
|
|
||||||
// title: "OP Baby",
|
|
||||||
// description: "What is it about",
|
|
||||||
// progression: 25,
|
|
||||||
// creationDate: new Date().toDateString(),
|
|
||||||
// endingDate: "2020-02-17 15:51:02.787373",
|
|
||||||
// status: "Todo",
|
|
||||||
// manager: {} as User,
|
|
||||||
// users: [] as User[],
|
|
||||||
// tickets: [] as Ticket[],
|
|
||||||
// files: [] as AppFile[],
|
|
||||||
// activities: [] as Activity[]
|
|
||||||
// }
|
|
||||||
// ],
|
|
||||||
// tickets: [
|
|
||||||
// {
|
|
||||||
// id: 1,
|
|
||||||
// title: "Client objective meeting",
|
|
||||||
// description: "Client objective meeting",
|
|
||||||
// endingDate: "2020-02-17 15:51:02.787373",
|
|
||||||
// status: "Done",
|
|
||||||
// project: {
|
|
||||||
// id: 1,
|
|
||||||
// title: "Project Title",
|
|
||||||
// description: "What is it about",
|
|
||||||
// progression: 25,
|
|
||||||
// creationDate: new Date().toDateString(),
|
|
||||||
// endingDate: "2020-02-17 15:51:02.787373",
|
|
||||||
// status: "Todo",
|
|
||||||
// manager: {} as User,
|
|
||||||
// users: [] as User[],
|
|
||||||
// tickets: [] as Ticket[],
|
|
||||||
// files: [] as AppFile[],
|
|
||||||
// activities: [] as Activity[]
|
|
||||||
// }
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// id: 2,
|
|
||||||
// title: "Assemble Outcomes Report for client",
|
|
||||||
// description: "Assemble Outcomes Report for client",
|
|
||||||
// endingDate: "2020-02-27 15:51:02.787373",
|
|
||||||
// status: "To Do",
|
|
||||||
// project: {
|
|
||||||
// id: 1,
|
|
||||||
// title: "Project Title",
|
|
||||||
// description: "What is it about",
|
|
||||||
// progression: 25,
|
|
||||||
// creationDate: new Date().toDateString(),
|
|
||||||
// endingDate: "2020-02-17 15:51:02.787373",
|
|
||||||
// status: "Todo",
|
|
||||||
// manager: {} as User,
|
|
||||||
// users: [] as User[],
|
|
||||||
// tickets: [] as Ticket[],
|
|
||||||
// files: [] as AppFile[],
|
|
||||||
// activities: [] as Activity[]
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// ],
|
|
||||||
// activities: []
|
|
||||||
// };
|
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,21 @@
|
||||||
import React from "react";
|
import React from "react";
|
||||||
|
import { LogInForm } from "../components/LogInForm";
|
||||||
|
import { ProfileSelector } from "../components/ProfileSelector";
|
||||||
|
|
||||||
export const HomePage: React.FC = () => {
|
export const HomePage: React.FC = () => {
|
||||||
return (
|
return (
|
||||||
<div className="App">
|
<div className="section">
|
||||||
<p>HomePage</p>
|
<div className="container center">
|
||||||
|
<h1 className="center">Ticket Manager</h1>
|
||||||
|
<div className="row">
|
||||||
|
<div className="col s6">
|
||||||
|
<ProfileSelector />
|
||||||
|
</div>
|
||||||
|
<div className="col s6">
|
||||||
|
<LogInForm />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@ export const TicketPage: FC<IProps> = ({ viewModel }) => {
|
||||||
difficulty
|
difficulty
|
||||||
} = viewModel;
|
} = viewModel;
|
||||||
const daysToEnd: number = getRemainingdays(endingDate);
|
const daysToEnd: number = getRemainingdays(endingDate);
|
||||||
let notes: string = "";
|
// let notes: string = "";
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="section">
|
<div className="section">
|
||||||
|
|
|
||||||
|
|
@ -1,18 +1,12 @@
|
||||||
import React from "react";
|
import React from "react";
|
||||||
import {
|
import { Router, Route, Switch } from "react-router-dom";
|
||||||
Router,
|
|
||||||
Route,
|
|
||||||
Switch
|
|
||||||
// Redirect
|
|
||||||
//Link, NavLink
|
|
||||||
} from "react-router-dom";
|
|
||||||
import * as creacteHistory from "history";
|
import * as creacteHistory from "history";
|
||||||
// import { HomeController } from "../controllers/HomeController";
|
import { HomeController } from "../controllers/HomeController";
|
||||||
import { ProjectController } from "../controllers/ProjectController";
|
import { ProjectController } from "../controllers/ProjectController";
|
||||||
import { UserController } from "../controllers/UserController";
|
import { UserController } from "../controllers/UserController";
|
||||||
import { TicketController } from "../controllers/TicketController";
|
import { TicketController } from "../controllers/TicketController";
|
||||||
import { NotFoundPage } from "../pages/NotFoundPage";
|
import { NotFoundPage } from "../pages/NotFoundPage";
|
||||||
import { TestPage } from "../pages/TestPage";
|
// import { TestPage } from "../pages/TestPage";
|
||||||
|
|
||||||
export const history = creacteHistory.createBrowserHistory();
|
export const history = creacteHistory.createBrowserHistory();
|
||||||
|
|
||||||
|
|
@ -21,24 +15,27 @@ export const AppRouter = () => {
|
||||||
<Router history={history}>
|
<Router history={history}>
|
||||||
<div className="grey lighten-3">
|
<div className="grey lighten-3">
|
||||||
<Switch>
|
<Switch>
|
||||||
<Route exact path="/">
|
{/* <Route exact path="/">
|
||||||
<TestPage />
|
<TestPage />
|
||||||
|
</Route> */}
|
||||||
|
|
||||||
|
<Route exact path="/">
|
||||||
|
<HomeController />
|
||||||
</Route>
|
</Route>
|
||||||
|
|
||||||
{/* <Route path="/">
|
|
||||||
<HomeController />
|
|
||||||
</Route> */}
|
|
||||||
<Route path="/users/:id">
|
<Route path="/users/:id">
|
||||||
<UserController />
|
<UserController />
|
||||||
</Route>
|
</Route>
|
||||||
|
|
||||||
<Route path="/projects/:id">
|
<Route path="/projects/:id">
|
||||||
<ProjectController />
|
<ProjectController />
|
||||||
</Route>
|
</Route>
|
||||||
|
|
||||||
<Route path="/tickets/:id">
|
<Route path="/tickets/:id">
|
||||||
<TicketController />
|
<TicketController />
|
||||||
</Route>
|
</Route>
|
||||||
|
|
||||||
<Route path="/401">
|
<Route path="/404">
|
||||||
<NotFoundPage />
|
<NotFoundPage />
|
||||||
</Route>
|
</Route>
|
||||||
</Switch>
|
</Switch>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue