Skip to content

Commit 10337e4

Browse files
grinonogrinono
committed
update stack
1 parent 03ff87c commit 10337e4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+8601
-44
lines changed

‎backend/src/server/api/auth.js

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
console.log('hallo')

‎backend/src/server/index.js

+3
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,6 @@ if (module.hot) {
2121

2222
module.hot.accept();
2323
}
24+
25+
26+
console.log('alles goed?')

‎client/src/containers/thema/components/Header/Header.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,12 @@ class Header extends Component {
5252

5353
render() {
5454
return (
55-
<header className="app-header navbar">
55+
<header style={{zIndex: 500000}} className="app-header navbar">
5656
{/* <NavbarToggler className="d-lg-none" onClick={this.mobileSidebarToggle}>&#9776;</NavbarToggler> */}
57-
<NavbarBrand href="#"><p>hallo Logo</p></NavbarBrand>
57+
<NavbarBrand href="#">
58+
<img src={'https://raw.githubusercontent.com/grinono/coinValue/master/images/logo.png'} width='45' className="img-avatar" alt="Logo"/>
59+
60+
</NavbarBrand>
5861
{/* <NavbarToggler className="d-md-down-none" onClick={this.sidebarToggle}>&#9776;</NavbarToggler> */}
5962
<Nav className="d-md-down-none" navbar>
6063
<NavItem className="px-3">

‎client/src/containers/thema/containers/Full/Full.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import SimpleLineIcons from '../../views/Icons/SimpleLineIcons/'
2222
import Home from '../../views/Home/main.js'
2323
import Project from '../../views/Project/main.js'
2424
import Projects from '../../views/Projects/App'
25-
// import Rating from '../../views/Rating/main.js'
25+
import Review from '../../views/Review'
2626
// import Projects from '../../views/Main/App.js'
2727

2828
class Full extends Component {
@@ -37,6 +37,7 @@ class Full extends Component {
3737
<div style={{marginTop:40}}></div>
3838
<Container fluid>
3939
<Switch>
40+
<Route path='/review' name='review' component={Review}/>
4041
<Route path='/projects' name='projects' component={Projects}/>
4142
<Route path='/project/:id' name='project' component={Project}/>
4243
<Route path='/main' name='Home' component={Home}/>

‎client/src/containers/thema/views/Home/coin.js

+60-19
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,71 @@ import React, {Component} from 'react'
22
import Widget02 from '../Widgets/Widget02'
33
import './styles.css'
44
import CompanyData from './companyData'
5+
import { Link } from 'react-router-dom'
56
import {Row, Col, CardColumns, Card, CardHeader, CardBlock, Progress, Button, ButtonToolbar, ButtonGroup, ButtonDropdown,} from 'reactstrap'
67

78
export default class Coin extends Component {
9+
10+
goProjectPage() {
11+
console.log('click')
12+
return (
13+
<Link to="/about">About</Link>
14+
)
15+
}
16+
817
render () {
918
return (
10-
<div className='col-3 scrollit'>
11-
<Col xs='12' sm='12' lg='12'>
12-
<Widget02 header='Bitcoin' mainText='Income' icon='fa fa-cogs' color='primary'/>
13-
</Col>
14-
<Col xs='12' sm='12' lg='12'>
15-
<Widget02 header='Litecoin' mainText='Income' icon='fa fa-laptop' color='primary'/>
16-
</Col>
17-
<Col xs='12' sm='12' lg='12'>
18-
<Widget02 header='Etherium' mainText='Income' icon='fa fa-moon-o' color='primary'/>
19-
</Col>
20-
<Col xs='12' sm='12' lg='12'>
21-
<Widget02 header='Ripple' mainText='Income' icon='fa fa-bell' color='primary'/>
22-
</Col>
23-
<Col xs='12' sm='12' lg='12'>
24-
<Widget02 header='Dash' mainText='Income' icon='fa fa-bell' color='primary'/>
25-
</Col>
26-
<Col xs='12' sm='12' lg='12'>
27-
<Widget02 header='$1.999,50' mainText='Income' icon='fa fa-bell' color='primary'/>
28-
</Col>
19+
<div className=''>
20+
<Link to="/project/bitcoin">
21+
<Col xs='12' sm='12' lg='12'>
22+
<Widget02 header='Bitcoin' mainText='Income' icon='fa fa-cogs' color='primary'/>
23+
</Col>
24+
</Link>
25+
<Link to="/project/bitcoin">
26+
<Col xs='12' sm='12' lg='12'>
27+
<Widget02 header='Etherium' mainText='Income' icon='fa fa-cogs' color='primary'/>
28+
</Col>
29+
</Link>
30+
<Link to="/project/bitcoin">
31+
<Col xs='12' sm='12' lg='12'>
32+
<Widget02 header='Bitcoin' mainText='Income' icon='fa fa-cogs' color='primary'/>
33+
</Col>
34+
</Link>
35+
<Link to="/project/bitcoin">
36+
<Col xs='12' sm='12' lg='12'>
37+
<Widget02 header='Bitcoin' mainText='Income' icon='fa fa-cogs' color='primary'/>
38+
</Col>
39+
</Link>
40+
<Link to="/project/bitcoin">
41+
<Col xs='12' sm='12' lg='12'>
42+
<Widget02 header='Bitcoin' mainText='Income' icon='fa fa-cogs' color='primary'/>
43+
</Col>
44+
</Link>
45+
<Link to="/project/bitcoin">
46+
<Col xs='12' sm='12' lg='12'>
47+
<Widget02 header='Bitcoin' mainText='Income' icon='fa fa-cogs' color='primary'/>
48+
</Col>
49+
</Link>
50+
<Link to="/project/bitcoin">
51+
<Col xs='12' sm='12' lg='12'>
52+
<Widget02 header='Bitcoin' mainText='Income' icon='fa fa-cogs' color='primary'/>
53+
</Col>
54+
</Link>
55+
<Link to="/project/bitcoin">
56+
<Col xs='12' sm='12' lg='12'>
57+
<Widget02 header='Bitcoin' mainText='Income' icon='fa fa-cogs' color='primary'/>
58+
</Col>
59+
</Link>
60+
<Link to="/project/bitcoin">
61+
<Col xs='12' sm='12' lg='12'>
62+
<Widget02 header='Bitcoin' mainText='Income' icon='fa fa-cogs' color='primary'/>
63+
</Col>
64+
</Link>
65+
<Link to="/project/bitcoin">
66+
<Col xs='12' sm='12' lg='12'>
67+
<Widget02 header='Bitcoin' mainText='Income' icon='fa fa-cogs' color='primary'/>
68+
</Col>
69+
</Link>
2970
</div>
3071
)
3172
}

‎client/src/containers/thema/views/Home/companyData.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export default class MainCompanyData extends Component {
1010
<Chart />
1111
<Row>
1212
<Col xs="12" sm="12" lg="12">
13-
<Widget01 color="primary" variant="inverse" header="Company phase" mainText='2 phase' smallText='benchmark between same phases' />
13+
<Widget01 color="primary" variant="inverse" header="Project phase" mainText='2 phase' smallText='benchmark between same phases' />
1414
</Col>
1515
</Row>
1616
</div>

‎client/src/containers/thema/views/Home/main.js

+11-8
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,17 @@ export default class Home extends Component {
1010
render () {
1111
return (
1212
<div className='animated fadeIn'>
13-
<Row>
14-
<Coin />
15-
<div className='col-8 fixed'>
16-
<div className="sticky-top" style={{marginTop:0}}>
17-
<CompanyData />
18-
</div>
19-
</div>
20-
</Row>
13+
<div class="container-fluid">
14+
<div class="row">
15+
<div class="col-4">
16+
<Coin />
17+
</div>
18+
<div class="col-8">
19+
<CompanyData />
20+
</div>
21+
22+
</div>
23+
</div>
2124
</div>
2225
)
2326
}

‎client/src/containers/thema/views/Home/styles.css

+21-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,22 @@
11
.fixed { height:500px; overflow:hidden; }
2-
.scrollit { height:500px; overflow-y:scroll; }
2+
.scrollit { overflow-y:scroll; }
3+
4+
5+
/* body, html {
6+
height: 100%;
7+
}
8+
9+
#left {
10+
position: fixed;
11+
top: 0;
12+
bottom: 0;
13+
} */
14+
/* body, html {
15+
height: 100%;
16+
} */
17+
18+
#left {
19+
/* position: fixed; */
20+
top: 0;
21+
bottom: 0;
22+
}

‎client/src/containers/thema/views/Project/main.js

+9-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import {
2323
Table
2424
} from "reactstrap"
2525
import Video from './video'
26+
import ReviewICO from './reviewICO'
2627

2728
const brandPrimary = '#20a8d8';
2829
const brandSuccess = '#4dbd74';
@@ -108,7 +109,14 @@ export default class Project extends Component {
108109
render () {
109110
return (
110111
<div className='animated fadeIn'>
111-
<Video />
112+
<Row>
113+
<Col xs="12" md="8" xl="8">
114+
<Video />
115+
</Col>
116+
<Col xs="12" md="4" xl="4">
117+
<ReviewICO />
118+
</Col>
119+
</Row>
112120
<Row>
113121
<Col>
114122
<Card>

‎client/src/containers/thema/views/Project/reviewICO.js

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
import React, {Component} from 'react'
2+
import { Link } from 'react-router-dom'
3+
import {Row, Col, CardColumns, Card, CardHeader, CardBlock, Progress, Button, ButtonToolbar, ButtonGroup, ButtonDropdown,} from 'reactstrap'
4+
5+
export default class reviewICO extends Component {
6+
render () {
7+
return (
8+
<Card>
9+
<CardHeader>
10+
Your imput
11+
</CardHeader>
12+
<CardBlock className='card-body'>
13+
<Link to="/review">
14+
<Button color="secondary" size="lg" block>Review this ICO</Button>
15+
</Link>
16+
</CardBlock>
17+
</Card>
18+
)
19+
}
20+
}

‎client/src/containers/thema/views/Project/video.js

+3-9
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,16 @@ import {Row, Col, CardColumns, Card, CardHeader, CardBlock, Progress, Button, Bu
44
export default class Coin extends Component {
55
render () {
66
return (
7-
<div className='animated fadeIn'>
8-
9-
<div className='row'>
10-
<div className='col-6'>
117
<Card>
128
<CardHeader>
139
Intro
1410
</CardHeader>
1511
<CardBlock className='card-body'>
16-
<iframe width='auto' height='auto' src='https://www.youtube.com/embed/S0oNO3mbBE8' frameborder='0' allow='autoplay; encrypted-media' allowfullscreen> </iframe>
12+
<div className="embed-responsive embed-responsive-16by9">
13+
<iframe className="embed-responsive-item" src="https://www.youtube.com/embed/S0oNO3mbBE8" allowFullScreen></iframe>
14+
</div>
1715
</CardBlock>
1816
</Card>
19-
</div>
20-
21-
</div>
22-
</div>
2317
)
2418
}
2519
}

‎client/src/containers/thema/views/Rating/main.js ‎client/src/containers/thema/views/Review/index.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ import { ReactTypeformEmbed } from 'react-typeform-embed';
55
export default class Rating extends Component {
66
render () {
77
return (
8-
<div>
9-
<ReactTypeformEmbed url={'https://bartel.typeform.com/to/fsgwiI'}/>
8+
<div style={{width: '100%', height: 500, marginTop:100}}>
9+
{/* <p>sdfsd</p> */}
10+
<ReactTypeformEmbed opacity={'100%'} buttonText={'start'} url={'https://bartel.typeform.com/to/fsgwiI'}/>
1011
</div>
1112
)
1213
}

‎login-with-master/.dockerignore

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
.git
2+
.gitignore
3+
node_modules
4+
example
5+
npm-debug.log

‎login-with-master/.editorconfig

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# top-most EditorConfig file
2+
root = true
3+
4+
# Unix-style newlines with a newline ending every file
5+
[*]
6+
end_of_line = lf
7+
insert_final_newline = true
8+
trim_trailing_whitespace = true
9+
charset = utf-8
10+
indent_style = space
11+
indent_size = 2

‎login-with-master/.gitignore

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# Logs
2+
logs
3+
*.log
4+
npm-debug.log*
5+
6+
# Runtime data
7+
pids
8+
*.pid
9+
*.seed
10+
.env
11+
12+
# Directory for instrumented libs generated by jscoverage/JSCover
13+
lib-cov
14+
15+
# Coverage directory used by tools like istanbul
16+
coverage
17+
18+
# nyc test coverage
19+
.nyc_output
20+
21+
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
22+
.grunt
23+
24+
# node-waf configuration
25+
.lock-wscript
26+
27+
# Compiled binary addons (http://nodejs.org/api/addons.html)
28+
build/Release
29+
30+
# Dependency directories
31+
node_modules
32+
jspm_packages
33+
34+
# Optional npm cache directory
35+
.npm
36+
37+
# Optional REPL history
38+
.node_repl_history
39+
40+
.DS_Store

‎login-with-master/.travis.yml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
language: node_js
2+
3+
node_js:
4+
- "7"
5+
6+
after_success: npm run coverage

‎login-with-master/CONTRIBUTING.md

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# Add new strategy / platform
2+
3+
Supporting new login strategies / platforms is pretty simple if there is a [passport](http://passportjs.org/)
4+
module available for it.
5+
6+
Compare for instance PR #45, which added support for "strava". The steps required are:
7+
8+
- Create a new strategy file (e.g. like [this](https://github.com/lipp/login-with/blob/master/src/strategies/strava.js))
9+
- Add tests
10+
- Add it to the README.md:
11+
- About
12+
- `<Platform>` specific environment variables
13+
- Endpoint
14+
- Test locally with your account
15+
16+
Please run `npm test` and make sure everything is OK before creating the PR. This reduces noise in the PR and commit history.
17+
18+
## Local strategy testing
19+
20+
Before creating the PR, please check your strategy/platform yourself. You will typically need:
21+
22+
- A "dev" account on your platform
23+
- An "App" with a pair of `CLIENTSECRET` and `CLIENTID`. The names for this info vary.
24+
25+
For testing set the `callback` parameter of the "App" to `http://localhost:3000/<platform>/callback`,
26+
e.g. `http://localhost:3000/twitter/callback`.
27+
28+
Then you can run the login-with microservice locally like this:
29+
30+
```sh
31+
LW_JWT_SECRET=whatever LW_SESSION_SECRET=foobar LW_<PLATFORM>_CLIENTID=<YOUR_CLIENTID> LW_<PLATFORM>_CLIENTSECRET=<YOUR_CLIENTSECRET> npm start
32+
```
33+
34+
If everything works right, you can open a browser on `http://locahost:3000/<platform>` and you will see you login profile.
35+
36+
Your are ready for PR!
37+
38+
# Inclusion in login-with.com demo
39+
40+
I am very sorry, but I probably won't enable your login on the "Try it" section of login-with.com, that's why:
41+
42+
To add your specific service to the login-with.com demo site, I have to create a "dev" account on the
43+
respective platform. Eventually I will have to submit a new App (the demo) and sometimes I get refused (snapchat).
44+
45+
Frankly I don't want to spread my personal data on every platform.

‎login-with-master/Dockerfile

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
FROM node:7-alpine
2+
RUN mkdir -p /usr/src/app
3+
WORKDIR /usr/src/app
4+
COPY package.json /usr/src/app/
5+
RUN npm i --production
6+
COPY . /usr/src/app
7+
EXPOSE 3000
8+
ENV NODE_ENV production
9+
CMD ["npm", "start"]

0 commit comments

Comments
 (0)