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

feat(add slack button): add button and basic landing page #152

Merged
merged 2 commits into from
Sep 19, 2020
Merged
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
6,890 changes: 5,632 additions & 1,258 deletions package-lock.json

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
"pm2": "^4.4.1",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-router-dom": "^5.2.0",
"uuid": "^8.3.0"
},
"engines": {
Expand Down Expand Up @@ -77,7 +78,9 @@
"jest": "^26.4.2",
"lint-staged": "^10.4.0",
"nodemon": "^2.0.4",
"postcss": "^8.0.5",
"postcss-loader": "^4.0.2",
"precss": "^4.0.0",
"prettier": "^2.1.2",
"semantic-release": "^17.1.1",
"style-loader": "^1.2.1",
Expand Down
3 changes: 3 additions & 0 deletions postcss.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module.exports = {
plugins: [require('precss'), require('autoprefixer')],
}
23 changes: 20 additions & 3 deletions web/client/App.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,31 @@
import React from 'react'
import { BrowserRouter as Router, Switch, Route } from 'react-router-dom'

import Header from './components/Header'
import Frame from './components/Frame'
import Landing from './pages/Landing'
import Dashboard from './pages/Dashboard'

import './App.pcss'

const App = () => {
return (
<div>
<Dashboard />
</div>
<>
<div className="inner">
<Router>
<Header />
<Switch>
<Route exact path="/">
<Landing />
</Route>
<Route path="/dashboard">
<Dashboard />
</Route>
</Switch>
</Router>
</div>
<Frame />
</>
)
}

Expand Down
25 changes: 23 additions & 2 deletions web/client/App.pcss
Original file line number Diff line number Diff line change
@@ -1,5 +1,26 @@
ul, ol {
@import url('https://fonts.googleapis.com/css2?family=Bangers&family=Open+Sans&display=swap');

* {
color: #000000;
}

html,
body {
margin: 0;
font-family: 'Open Sans', sans-serif;
}

ul,
ol {
margin: 0;
padding: 0;
list-style: none;
}
}

a {
text-decoration: none;
}

.inner {
padding: 32px;
}
37 changes: 37 additions & 0 deletions web/client/components/AddToSlack.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import React, { useEffect, useState } from 'react'
import config from '../../config'

const AddToSlack = () => {
const [url, setUrl] = useState('')

const getInstallUrlPath = async () => {
try {
const response = await fetch(
`${config.prod.app}${config.prod.installUrlPath}`,
)
const { installUrl } = await response.json()

setUrl(installUrl)
} catch (e) {
console.error(e)
}
}

useEffect(() => {
getInstallUrlPath()
}, [])

return url ? (
<a href={url}>
<img
alt="Add to Slack"
height="60"
src="https://platform.slack-edge.com/img/add_to_slack.png"
srcSet="https://platform.slack-edge.com/img/add_to_slack.png 1x,
https://platform.slack-edge.com/img/add_to_slack@2x.png 2x"
/>
</a>
) : null
}

export default AddToSlack
16 changes: 16 additions & 0 deletions web/client/components/Frame.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import React from 'react'

import './Frame.pcss'

const Frame = () => {
return (
<>
<div id="top"></div>
<div id="right"></div>
<div id="bottom"></div>
<div id="left"></div>
</>
)
}

export default Frame
35 changes: 35 additions & 0 deletions web/client/components/Frame.pcss
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
#top {
position: fixed;
top: 0;
left: 0;
width: 100vw;
height: 16px;
background: #000000;
}

#right {
position: fixed;
top: 0;
right: 0;
width: 16px;
height: 100vh;
background: #000000;
}

#bottom {
position: fixed;
bottom: 0;
left: 0;
width: 100vw;
height: 16px;
background: #000000;
}

#left {
position: fixed;
top: 0;
left: 0;
width: 16px;
height: 100vh;
background: #000000;
}
18 changes: 18 additions & 0 deletions web/client/components/Header.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import React from 'react'

import UserMenu from '../components/UserMenu'

import './Header.pcss'

const Header = () => {
return (
<header>
<a className="logo" href="/">
Post Your Standup
</a>
<UserMenu />
</header>
)
}

export default Header
12 changes: 12 additions & 0 deletions web/client/components/Header.pcss
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
@import url('https://fonts.googleapis.com/css2?family=Bangers&display=swap');

header {
display: flex;
align-items: center;
justify-content: space-between;

& .logo {
font-family: 'Bangers', cursive;
font-size: 50px;
}
}
2 changes: 1 addition & 1 deletion web/client/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta http-equiv="X-UA-Compatible" content="ie=edge" />
<title>Post Your Standup Dashboard</title>
<title>Post Your Standup</title>
</head>
<body>
<div id="root"></div>
Expand Down
2 changes: 0 additions & 2 deletions web/client/pages/Dashboard.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import React from 'react'

import Workspaces from '../components/Workspaces'
import UserMenu from '../components/UserMenu'
import withAuth from '../hocs/withAuth'

const Dashboard = () => {
return (
<div>
<UserMenu />
<h1>Dashboard</h1>
<Workspaces />
</div>
Expand Down
14 changes: 14 additions & 0 deletions web/client/pages/Landing.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import React from 'react'

import AddToSlack from '../components/AddToSlack'

const Landing = () => {
return (
<div>
<h1>Post your Standup</h1>
<AddToSlack />
</div>
)
}

export default Landing
4 changes: 4 additions & 0 deletions web/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,8 @@ module.exports = {
server: {
port: 4100,
},
prod: {
app: 'https://post-your-standup.codinginsights.blog',
installUrlPath: '/install-url',
},
}
21 changes: 8 additions & 13 deletions webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
const path = require('path')
const webpack = require('webpack')
const autoprefixer = require('autoprefixer')
const HtmlWebpackPlugin = require('html-webpack-plugin')

require('dotenv').config()
Expand All @@ -12,7 +11,7 @@ module.exports = {
path: path.resolve(__dirname, 'dist'),
filename: 'bundle.js',
chunkFilename: '[id].js',
publicPath: '',
publicPath: '/',
},
resolve: {
extensions: ['.js', '.jsx'],
Expand All @@ -28,24 +27,17 @@ module.exports = {
test: /\.pcss$/,
exclude: /node_modules/,
use: [
{ loader: 'style-loader' },
{
loader: 'style-loader',
},
{
loader: 'css-loader',
options: {
modules: {
localIdentName: '[name]__[local]___[hash:base64:5]',
},
sourceMap: true,
importLoaders: 1,
},
},
{
loader: 'postcss-loader',
options: {
postcssOptions: {
ident: 'postcss',
plugins: () => [autoprefixer({})],
},
},
},
],
},
Expand All @@ -68,4 +60,7 @@ module.exports = {
}),
],
devtool: 'source-map',
devServer: {
historyApiFallback: true,
},
}