Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .idea/codeStyles/codeStyleConfig.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions mcitmocks.iml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
<configuration>
<setting name="validation-enabled" value="true" />
<setting name="provider-name" value="Hibernate" />
<datasource-mapping />
<datasource-mapping>
<factory-entry name="entityManagerFactory" />
</datasource-mapping>
<naming-strategy-map />
</configuration>
</facet>
Expand All @@ -29,8 +31,8 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
<excludeFolder url="file://$MODULE_DIR$/src/main/resources/static" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
Expand Down
2 changes: 1 addition & 1 deletion src/main/client/.prettierrc.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{}
{}
6 changes: 3 additions & 3 deletions src/main/client/src/@types/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export interface User {
email: string;
timeZone: string;
}
email: string;
timeZone: string;
}
10 changes: 9 additions & 1 deletion src/main/client/src/components/Header/Header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,13 @@
font-weight: 500;
font-size: 24px;
}
button {
font-family: "IBM Plex Mono", monospace;
width: 200px;
height: 35px;
right: 20px;
position: absolute;
top: 36px;
}
}
}
}
1 change: 1 addition & 0 deletions src/main/client/src/components/Header/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ const Header: React.FC<{}> = () => {
<header className="header">
<div className="header__left">
<span>_mcitmocks</span>
<button>LOGIN WITH GOOGLE</button>
</div>
</header>
);
Expand Down
2 changes: 1 addition & 1 deletion src/main/client/src/components/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Header from "components/Header/Header";
import Footer from "components/Footer/Footer";

export {Header, Footer};
export { Header, Footer };
2 changes: 1 addition & 1 deletion src/main/client/src/styles/App.scss
Original file line number Diff line number Diff line change
@@ -1 +1 @@
@import url('https://fonts.googleapis.com/css2?family=IBM+Plex+Mono:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;1,100;1,200;1,300;1,400;1,500;1,600;1,700&display=swap');
@import url("https://fonts.googleapis.com/css2?family=IBM+Plex+Mono:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;1,100;1,200;1,300;1,400;1,500;1,600;1,700&display=swap");
123 changes: 102 additions & 21 deletions src/main/client/src/styles/Reset.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,87 @@
License: none (public domain)
*/

html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code,
del, dfn, em, img, ins, kbd, q, s, samp,
small, strike, strong, sub, sup, tt, var,
b, u, i, center,
dl, dt, dd, ol, ul, li,
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td,
article, aside, canvas, details, embed,
figure, figcaption, footer, header, hgroup,
menu, nav, output, ruby, section, summary,
time, mark, audio, video {
html,
body,
div,
span,
applet,
object,
iframe,
h1,
h2,
h3,
h4,
h5,
h6,
p,
blockquote,
pre,
a,
abbr,
acronym,
address,
big,
cite,
code,
del,
dfn,
em,
img,
ins,
kbd,
q,
s,
samp,
small,
strike,
strong,
sub,
sup,
tt,
var,
b,
u,
i,
center,
dl,
dt,
dd,
ol,
ul,
li,
fieldset,
form,
label,
legend,
table,
caption,
tbody,
tfoot,
thead,
tr,
th,
td,
article,
aside,
canvas,
details,
embed,
figure,
figcaption,
footer,
header,
hgroup,
menu,
nav,
output,
ruby,
section,
summary,
time,
mark,
audio,
video {
margin: 0;
padding: 0;
border: 0;
Expand All @@ -25,30 +93,43 @@ time, mark, audio, video {
}

/* HTML5 display-role reset for older browsers */
article, aside, details, figcaption, figure,
footer, header, hgroup, menu, nav, section {
article,
aside,
details,
figcaption,
figure,
footer,
header,
hgroup,
menu,
nav,
section {
display: block;
}

body {
line-height: 1;
}

ol, ul {
ol,
ul {
list-style: none;
}

blockquote, q {
blockquote,
q {
quotes: none;
}

blockquote:before, blockquote:after,
q:before, q:after {
content: '';
blockquote:before,
blockquote:after,
q:before,
q:after {
content: "";
content: none;
}

table {
border-collapse: collapse;
border-spacing: 0;
}
}
Loading