Browse Source

Merge pull request #9 from garritfra/frontend

Fix cors headers
pull/11/head
Garrit Franke 5 years ago committed by GitHub
parent
commit
168236d01d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 23
      .github/deploy.workflow
  2. 3
      frontend/.gitignore
  3. 14
      frontend/Dockerfile
  4. 6820
      frontend/package-lock.json
  5. 26
      frontend/package.json
  6. 14
      frontend/public/index.html
  7. 15
      frontend/src/App.tsx
  8. 5
      frontend/src/index.tsx
  9. 60
      frontend/tsconfig.json
  10. 12
      server/webserver.go

23
.github/deploy.workflow

@ -0,0 +1,23 @@
workflow "Deploy" {
on = "push"
resolves = [
"Deploy",
]
}
action "on master" {
uses = "actions/bin/filter@46ffca7632504e61db2d4cb16be1e80f333cb859"
args = "branch master"
}
action "install" {
uses = "actions/npm@4633da3702a5366129dca9d8cc3191476fc3433c"
needs = ["on master"]
args = "install"
}
action "build" {
uses = "actions/npm@4633da3702a5366129dca9d8cc3191476fc3433c"
needs = ["install"]
args = "run build"
}

3
frontend/.gitignore vendored

@ -0,0 +1,3 @@
node_modules/
.cache/
dist/

14
frontend/Dockerfile

@ -1,8 +1,16 @@
FROM node
FROM node:10-alpine
RUN mkdir app
COPY . /app
WORKDIR /app
RUN npm install \
&& npm run build
EXPOSE 80
EXPOSE 8080
FROM nginx:stable-alpine
CMD [ "npm", "start" ]
COPY dist /usr/share/nginx/html

6820
frontend/package-lock.json generated

File diff suppressed because it is too large Load Diff

26
frontend/package.json

@ -0,0 +1,26 @@
{
"name": "ditto-frontend",
"version": "1.0.0",
"description": "",
"main": "app.js",
"scripts": {
"start": "parcel public/index.html",
"build": "parcel build public/index.html"
},
"author": "garritfra",
"license": "ISC",
"dependencies": {
"@types/axios": "^0.14.0",
"@types/react": "^16.8.4",
"@types/react-dom": "^16.8.2",
"axios": "^0.18.0",
"body-parser": "^1.18.3",
"express": "^4.16.4",
"parcel-bundler": "^1.11.0",
"react": "^16.8.3",
"react-dom": "^16.8.3"
},
"devDependencies": {
"typescript": "^3.3.3333"
}
}

14
frontend/public/index.html

@ -0,0 +1,14 @@
<!DOCTYPE html>
<html lang="en">
<head>
<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>Ditto Blockchain</title>
</head>
<body>
<div id="root"></div>
<script src="../src/index.tsx"></script>
</body>
</html>

15
frontend/src/App.tsx

@ -0,0 +1,15 @@
import React, { useState, useEffect } from "react";
import axios from "axios";
export default function App() {
useEffect(() => {
axios.get("https://baconipsum.com/api/?type=meat-and-filler").then(res => {
console.log(res.data);
});
});
return (
<div>
<h1>Hello from App!</h1>
</div>
);
}

5
frontend/src/index.tsx

@ -0,0 +1,5 @@
import React from "react";
import ReactDOM from "react-dom";
import App from "./App";
ReactDOM.render(<App />, document.getElementById("root"));

60
frontend/tsconfig.json

@ -0,0 +1,60 @@
{
"compilerOptions": {
/* Basic Options */
"target": "es5" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */,
"module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */,
// "lib": [], /* Specify library files to be included in the compilation. */
// "allowJs": true, /* Allow javascript files to be compiled. */
// "checkJs": true, /* Report errors in .js files. */
"jsx": "react" /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */,
// "declaration": true, /* Generates corresponding '.d.ts' file. */
// "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */
// "sourceMap": true, /* Generates corresponding '.map' file. */
// "outFile": "./", /* Concatenate and emit output to single file. */
// "outDir": "./", /* Redirect output structure to the directory. */
// "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
// "composite": true, /* Enable project compilation */
// "removeComments": true, /* Do not emit comments to output. */
// "noEmit": true, /* Do not emit outputs. */
// "importHelpers": true, /* Import emit helpers from 'tslib'. */
// "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
// "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
/* Strict Type-Checking Options */
"strict": true /* Enable all strict type-checking options. */,
// "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */
// "strictNullChecks": true, /* Enable strict null checks. */
// "strictFunctionTypes": true, /* Enable strict checking of function types. */
// "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
// "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */
// "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */
// "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */
/* Additional Checks */
// "noUnusedLocals": true, /* Report errors on unused locals. */
// "noUnusedParameters": true, /* Report errors on unused parameters. */
// "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
// "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */
/* Module Resolution Options */
// "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
// "baseUrl": "./", /* Base directory to resolve non-absolute module names. */
// "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
// "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */
// "typeRoots": [], /* List of folders to include type definitions from. */
// "types": [], /* Type declaration files to be included in compilation. */
// "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
"esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
// "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */
/* Source Map Options */
// "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
// "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */
// "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
/* Experimental Options */
// "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */
// "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */
}
}

12
server/webserver.go

@ -57,16 +57,23 @@ func registerRouteHandlers() {
http.HandleFunc("/add_peers", handleAddPeers)
}
func enableCors(w *http.ResponseWriter) {
(*w).Header().Set("Access-Control-Allow-Origin", "*")
}
func handleError(err error, w http.ResponseWriter, r *http.Request) {
enableCors(&w)
w.Write([]byte("Error: " + err.Error()))
log.Print(err.Error())
}
func handleListBlocks(w http.ResponseWriter, r *http.Request) {
enableCors(&w)
json.NewEncoder(w).Encode(blockchain.AsJSON())
}
func handleAddTransaction(w http.ResponseWriter, r *http.Request) {
enableCors(&w)
decoder := json.NewDecoder(r.Body)
var receivedTransaction core.Transaction
err := decoder.Decode(&receivedTransaction)
@ -80,21 +87,25 @@ func handleAddTransaction(w http.ResponseWriter, r *http.Request) {
}
func handleMineBlock(w http.ResponseWriter, r *http.Request) {
enableCors(&w)
block := blockchain.MineBlock()
json.NewEncoder(w).Encode(block)
}
func handleListPendingTransactions(w http.ResponseWriter, r *http.Request) {
enableCors(&w)
json.NewEncoder(w).Encode(blockchain.PendingTransactions)
}
func handleIsValid(w http.ResponseWriter, r *http.Request) {
enableCors(&w)
valid := blockchain.IsValid()
json.NewEncoder(w).Encode(valid)
}
// Takes an a string-slice, and adds it to the known peers
func handleAddPeers(w http.ResponseWriter, r *http.Request) {
enableCors(&w)
decoder := json.NewDecoder(r.Body)
var receivedPeers []string
err := decoder.Decode(&receivedPeers)
@ -114,5 +125,6 @@ func handleAddPeers(w http.ResponseWriter, r *http.Request) {
}
func handleUpdate(w http.ResponseWriter, r *http.Request) {
enableCors(&w)
json.NewEncoder(w).Encode(blockchain.Update())
}

Loading…
Cancel
Save