Compare commits
2 Commits
31179d7292
...
c6cf6e6b40
Author | SHA1 | Date | |
---|---|---|---|
c6cf6e6b40 | |||
04833277e1 |
2
api/.gitignore
vendored
2
api/.gitignore
vendored
@ -2,3 +2,5 @@ node_modules/
|
|||||||
dist/
|
dist/
|
||||||
package-lock.json
|
package-lock.json
|
||||||
.env
|
.env
|
||||||
|
test-report.html
|
||||||
|
uploads/
|
@ -36,6 +36,7 @@ app.use(morgan("dev"));
|
|||||||
app.use(express.urlencoded({ extended: true }));
|
app.use(express.urlencoded({ extended: true }));
|
||||||
app.use(express.json());
|
app.use(express.json());
|
||||||
app.use(express.static(path.join(__dirname, "public")));
|
app.use(express.static(path.join(__dirname, "public")));
|
||||||
|
app.use('/public/uploads', express.static(path.join(__dirname, '../uploads')));
|
||||||
app.use(cookieParser());
|
app.use(cookieParser());
|
||||||
|
|
||||||
// Routes
|
// Routes
|
||||||
|
@ -49,7 +49,7 @@ export default function BeerAdd() {
|
|||||||
console.log(result);
|
console.log(result);
|
||||||
|
|
||||||
if (!result.canceled) {
|
if (!result.canceled) {
|
||||||
setImage(result.assets[0].uri);
|
setImage(result.assets[0]);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -68,7 +68,7 @@ export default function BeerAdd() {
|
|||||||
console.log(result);
|
console.log(result);
|
||||||
|
|
||||||
if (!result.canceled) {
|
if (!result.canceled) {
|
||||||
setImage(result.assets[0].uri);
|
setImage(result.assets[0]);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -87,20 +87,39 @@ export default function BeerAdd() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
function dataURItoBlob(dataURI) {
|
||||||
|
// convert base64/URLEncoded data component to raw binary data held in a string
|
||||||
|
var byteString;
|
||||||
|
if (dataURI.split(",")[0].indexOf("base64") >= 0)
|
||||||
|
byteString = atob(dataURI.split(",")[1]);
|
||||||
|
else byteString = unescape(dataURI.split(",")[1]);
|
||||||
|
|
||||||
|
// separate out the mime component
|
||||||
|
var mimeString = dataURI.split(",")[0].split(":")[1].split(";")[0];
|
||||||
|
|
||||||
|
// write the bytes of the string to a typed array
|
||||||
|
var ia = new Uint8Array(byteString.length);
|
||||||
|
for (var i = 0; i < byteString.length; i++) {
|
||||||
|
ia[i] = byteString.charCodeAt(i);
|
||||||
|
}
|
||||||
|
|
||||||
|
return new Blob([ia], { type: mimeString });
|
||||||
|
}
|
||||||
|
|
||||||
async function addBeer() {
|
async function addBeer() {
|
||||||
// TODO: after the request - redirect to /beer/{new_beer_id}?; plus some modal about successful state
|
// TODO: after the request - redirect to /beer/{new_beer_id}?; plus some modal about successful state
|
||||||
|
const data = new FormData();
|
||||||
|
data.append("photos", dataURItoBlob(image.uri));
|
||||||
|
data.append("brand", b_brand);
|
||||||
|
data.append("name", b_name);
|
||||||
|
data.append("degree", b_degree);
|
||||||
|
data.append("packaging", "can");
|
||||||
|
|
||||||
|
try {
|
||||||
const req = await fetch(`${process.env.EXPO_PUBLIC_API_URL}/beer/add`, {
|
const req = await fetch(`${process.env.EXPO_PUBLIC_API_URL}/beer/add`, {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
credentials: "include",
|
credentials: "include",
|
||||||
headers: { "Content-Type": "application/json" },
|
body: data,
|
||||||
body: JSON.stringify({
|
|
||||||
brand: b_brand,
|
|
||||||
name: b_name,
|
|
||||||
degree: b_degree,
|
|
||||||
packaging: b_packaging,
|
|
||||||
photos: null,
|
|
||||||
}),
|
|
||||||
});
|
});
|
||||||
const res = await req.json();
|
const res = await req.json();
|
||||||
|
|
||||||
@ -111,6 +130,12 @@ export default function BeerAdd() {
|
|||||||
"Beer was not added successfully. Please check your data and try again.",
|
"Beer was not added successfully. Please check your data and try again.",
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
} catch (err) {
|
||||||
|
alert(
|
||||||
|
"Beer was not added successfully. Please check your data and try again.",
|
||||||
|
);
|
||||||
|
console.error(err);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@ -168,7 +193,7 @@ export default function BeerAdd() {
|
|||||||
textStyle={styles.imageTextButton}
|
textStyle={styles.imageTextButton}
|
||||||
/>
|
/>
|
||||||
</View>
|
</View>
|
||||||
{image && <Image source={{ uri: image }} style={styles.image} />}
|
{image && <Image source={{ uri: image.uri }} style={styles.image} />}
|
||||||
<Button title="Add beer" color={colors.gold} onPress={addBeer} />
|
<Button title="Add beer" color={colors.gold} onPress={addBeer} />
|
||||||
</View>
|
</View>
|
||||||
</View>
|
</View>
|
||||||
|
Loading…
Reference in New Issue
Block a user