Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create First page #85

Open
wants to merge 26 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
87f588d
add basic dependencies (#3)
olegLevochkin Nov 8, 2020
22b10f0
Add compiler settings (#4)
SerhiiNahornyi Nov 8, 2020
ccd8518
Add JWT security on back-end part. (#10)
SerhiiNahornyi Nov 10, 2020
a1612a9
Change token expiration (#12)
olegLevochkin Nov 12, 2020
dba1eac
Create user model (#13)
olegLevochkin Nov 13, 2020
8a2759d
Create/client web (#17)
olegLevochkin Nov 13, 2020
87f8c40
Add MySql DB to project (#20)
SerhiiNahornyi Nov 13, 2020
28a4437
Add custom TSlint (#37)
olegLevochkin Nov 14, 2020
4e74c3a
Make maven to work with jupiter tests (#38)
SerhiiNahornyi Nov 14, 2020
1a06065
Change user id type and generation strategy (#43)
SerhiiNahornyi Nov 14, 2020
bc3630f
Move token expiration time to property file (#42)
olegLevochkin Nov 14, 2020
125c676
Change server port (#45)
olegLevochkin Nov 14, 2020
e198f6c
Create authentication folder (#44)
olegLevochkin Nov 14, 2020
f2e8535
Make model from Jwt properties. (#46)
SerhiiNahornyi Nov 14, 2020
7d872e7
Update user login logic to work with username and email (#47)
SerhiiNahornyi Nov 14, 2020
cf792e0
Add user role (#48)
olegLevochkin Nov 14, 2020
99cc4f8
Create one type exception response (#50)
SerhiiNahornyi Nov 14, 2020
1b53e40
Add BCrypt password encoder (#52)
SerhiiNahornyi Nov 15, 2020
7110ee3
Remove null fields from json response (#54)
SerhiiNahornyi Nov 15, 2020
f117e6f
Create/udate/endpoint (#71)
olegLevochkin Nov 15, 2020
a2c12ce
Remove password field in json (#72)
olegLevochkin Nov 15, 2020
0440b07
Update validation test (#75)
olegLevochkin Nov 17, 2020
79f5a89
Created change password endpoint and fixed bag (#77)
olegLevochkin Nov 17, 2020
865c9ad
Add TSLint to build (#76)
olegLevochkin Nov 17, 2020
ce29e47
Build front-end stage with maven (#82)
SerhiiNahornyi Nov 17, 2020
acdcf71
Test commit, stash then force
Dec 9, 2020
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
16 changes: 16 additions & 0 deletions .github/workflows/pullrequest.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Java CI

on: [push]

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 11
- name: Build with Maven
run: mvn -B package --file pom.xml
156 changes: 156 additions & 0 deletions checkstyle.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,156 @@
<?xml version="1.0"?>
<!DOCTYPE module PUBLIC
"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
"https://checkstyle.org/dtds/configuration_1_3.dtd">

<module name="Checker">
<property name="fileExtensions" value="java, properties, xml"/>

<module name="NewlineAtEndOfFile"/>
<module name="Translation"/>
<module name="FileLength"/>
<module name="FileTabCharacter"/>
<module name="RegexpSingleline">
<property name="format" value="\s+$"/>
<property name="minimum" value="0"/>
<property name="maximum" value="0"/>
<property name="message" value="Line has trailing spaces."/>
</module>
<module name="RegexpMultiline">
<property name="format" value="^([^\n ]+ )*(class|interface|enum) [^{]*\{\n[^\n}]"/>
<property name="message" value="Leave empty row after class/interface/enum definition!"/>
<property name="severity" value="error"/>
<property name="fileExtensions" value="groovy,java"/>
</module>
<module name="RegexpMultiline">
<property name="format" value="System\.(out|err)\.print"/>
</module>
<module name="LineLength">
<property name="max" value="120"/>
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|@see|//"/>
</module>
<module name="SuppressWarningsFilter" />
<module name="TreeWalker">
<module name="Indentation">
<property name="lineWrappingIndentation" value="8" />
<property name="arrayInitIndent" value="8" />
<property name="forceStrictCondition" value="false" />
</module>
<module name="EmptyLineSeparator">
<property name="allowNoEmptyLineBetweenFields" value="true" />
<property name="allowMultipleEmptyLines" value="false" />
<property name="allowMultipleEmptyLinesInsideClassMembers" value="false" />
</module>
<module name="NoLineWrap"/>
<module name="NeedBraces"/>
<module name="ConstantName">
<property name="format" value="^([A-Z][A-Z0-9]*(_[A-Z0-9]+)*|logger|conditionalLogger)$" />
</module>
<module name="LocalFinalVariableName"/>
<module name="LocalVariableName"/>
<module name="MemberName"/>
<module name="MethodName"/>
<module name="MultipleVariableDeclarations" />
<module name="PackageName"/>
<module name="ParameterName"/>
<module name="StaticVariableName"/>
<module name="TypeName"/>
<module name="AvoidStarImport"/>
<module name="AvoidStaticImport"/>
<module name="IllegalImport">
<!-- Avoids shaded imports if IDE autosuggests them. Avoid lang in favor of lang3. -->
<property name="illegalPkgs" value="autovalue.shaded.com.google,org.inferred.freebuilder.shaded.com.google,org.apache.commons.lang"/>
</module>
<module name="RedundantImport"/>
<module name="UnusedImports">
<property name="processJavadoc" value="true"/>
</module>
<module name="ImportOrder">
<property name="option" value="bottom" />
<property name="groups" value="*,/^java/" />
<property name="ordered" value="false" />
<property name="separated" value="true" />
<property name="caseSensitive" value="true" />
<property name="sortStaticImportsAlphabetically" value="true" />
<property name="useContainerOrderingForStatic" value="false" />
</module>
<module name="MethodLength"/>
<module name="EmptyForIteratorPad"/>
<module name="GenericWhitespace"/>
<module name="MethodParamPad">
<property name="allowLineBreaks" value="false" />
</module>
<module name="NoWhitespaceAfter">
<property name="tokens" value="INC,DEC,UNARY_MINUS,UNARY_PLUS,BNOT,LNOT,DOT,ARRAY_DECLARATOR,INDEX_OP"/>
<property name="allowLineBreaks" value="true"/>
</module>
<module name="NoWhitespaceBefore"/>
<module name="OperatorWrap"/>
<module name="ParenPad"/>
<module name="TypecastParenPad"/>
<module name="WhitespaceAfter"/>
<module name="WhitespaceAround"/>
<module name="AnnotationLocation">
<property name="allowSamelineMultipleAnnotations" value="false" />
<property name="allowSamelineSingleParameterlessAnnotation" value="false" />
</module>
<module name="ModifierOrder"/>
<module name="RedundantModifier"/>
<module name="AvoidNestedBlocks"/>
<module name="EmptyBlock"/>
<module name="LeftCurly" />
<module name="RightCurly" />
<module name="RightCurly">
<property name="option" value="alone" />
<property name="tokens" value="METHOD_DEF" />
</module>
<module name="EmptyStatement"/>
<module name="EqualsHashCode"/>
<module name="IllegalInstantiation"/>
<module name="InnerAssignment"/>
<module name="MissingSwitchDefault"/>
<module name="MissingOverride" />
<module name="SimplifyBooleanExpression"/>
<module name="SimplifyBooleanReturn"/>
<module name="HideUtilityClassConstructor"/>
<module name="ArrayTypeStyle"/>
<module name="CommentsIndentation"/>
<module name="UpperEll"/>
<module name="IllegalThrows" />
<module name="OneStatementPerLine"/>
<module name="OuterTypeFilename" />
<module name="OverloadMethodsDeclarationOrder" />
<module name="SeparatorWrap">
<property name="option" value="nl" />
<property name="tokens" value="DOT" />
</module>
<module name="SeparatorWrap">
<property name="option" value="eol" />
<property name="tokens" value="COMMA" />
</module>
<module name="SimplifyBooleanExpression" />
<module name="SimplifyBooleanReturn" />
<module name="SingleSpaceSeparator"/>
<module name="StringLiteralEquality" />
<module name="UnnecessaryParentheses"/>
<module name="SuppressWarningsHolder" />

<module name="IllegalImport">
<property name="id" value="BanVertxJsonImport"/>
<property name="illegalClasses" value="io.vertx.core.json.Json"/>
</module>
</module>
<module name="SuppressionSingleFilter">
<property name="id" value="BanVertxJsonImport"/>
<property name="files" value="src/main/java/org/prebid/server/json/ObjectMapperProvider\.java"/>
</module>

<module name="SuppressionSingleFilter">
<property name="checks" value="AvoidStaticImport"/>
<property name="files" value=".*Test\.java"/>
</module>
<module name="SuppressionSingleFilter">
<property name="checks" value="FileLength"/>
<property name="files" value=".*Test\.java"/>
</module>
</module>
23 changes: 23 additions & 0 deletions client-web/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# dependencies
/node_modules
/.pnp
.pnp.js
package-lock.json

# testing
/coverage

# production
/build
/node

# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local

npm-debug.log*
yarn-debug.log*
yarn-error.log*
48 changes: 48 additions & 0 deletions client-web/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"name": "front-end",
"version": "0.1.0",
"private": true,
"dependencies": {
"@material-ui/core": "^4.11.0",
"@testing-library/jest-dom": "^5.11.5",
"@testing-library/react": "^11.1.2",
"@testing-library/user-event": "^12.2.2",
"bootstrap": "^4.5.3",
"node-sass": "^5.0.0",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"react-redux": "^7.2.2",
"react-router-dom": "^5.2.0",
"react-scripts": "4.0.0",
"redux": "^4.0.5",
"web-vitals": "^0.2.4"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject",
"lint": "tslint src/*",
"build:tslint": "npm run lint && npm run build"
},
"eslintConfig": {
"extends": [
"react-app",
"react-app/jest"
]
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version"
]
},
"devDependencies": {
"tslint": "^6.1.3",
"typescript": "~3.7.2"
}
}
12 changes: 12 additions & 0 deletions client-web/public/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8"/>
<meta content="width=device-width, initial-scale=1" name="viewport"/>
<title>social-network</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
</body>
</html>
10 changes: 10 additions & 0 deletions client-web/src/App.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import React from "react"
import {Login} from "./pages/Login/Login";

function App() {
return (
<Login/>
);
}

export default App;
10 changes: 10 additions & 0 deletions client-web/src/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import React from 'react';
import ReactDOM from 'react-dom';
import App from './App';

ReactDOM.render(
<React.StrictMode>
<App/>
</React.StrictMode>,
document.getElementById('root')
);
4 changes: 4 additions & 0 deletions client-web/src/pages/Login/Login.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import * as React from 'react';

export const Login = () => <h1>Login page</h1>

1 change: 1 addition & 0 deletions client-web/src/react-app-env.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/// <reference types="react-scripts" />
26 changes: 26 additions & 0 deletions client-web/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"compilerOptions": {
"target": "es5",
"lib": [
"dom",
"dom.iterable",
"esnext"
],
"allowJs": true,
"skipLibCheck": true,
"esModuleInterop": true,
"allowSyntheticDefaultImports": true,
"strict": true,
"forceConsistentCasingInFileNames": true,
"noFallthroughCasesInSwitch": true,
"module": "esnext",
"moduleResolution": "node",
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
"jsx": "react"
},
"include": [
"src"
]
}
82 changes: 82 additions & 0 deletions client-web/tslint.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
{
"extends": "tslint:recommended",
"rules": {
"max-line-length": {
"options": [
120
]
},
"new-parens": true,
"no-arg": true,
"no-bitwise": true,
"no-conditional-assignment": true,
"no-consecutive-blank-lines": false,
"no-console": {
"severity": "warning",
"options": [
"debug",
"info",
"log",
"time",
"timeEnd",
"trace"
]
}
},
"jsRules": {
"max-line-length": {
"options": [
120
]
},
"no-empty": true,
"member-ordering": [
true,
{
"order": "fields-first"
}
],
"no-magic-numbers": [
true,
1,
2,
3,
0
],
"no-reference": true,
"ban-comma-operator": true,
"curly": [
true,
"ignore-same-line"
],
"no-console": [
true,
"log",
"error"
],
"no-duplicate-super": true,
"no-duplicate-switch-case": true,
"no-duplicate-variable": [
true,
"check-parameters"
],
"no-invalid-template-strings": true,
"switch-default": true,
"triple-equals": true,
"use-isnan": true,
"no-duplicate-imports": [
true,
{
"allow-namespace-imports": true
}
],
"arrow-return-shorthand": true,
"ordered-imports": true,
"whitespace": [
true,
"check-branch",
"check-operator",
"check-typecast"
]
}
}
Loading