Skip to content

Commit

Permalink
Merge pull request #109 from evansuong/backend/misc
Browse files Browse the repository at this point in the history
Frontend Icons and Splash Pages
  • Loading branch information
terryzfeng authored Dec 23, 2020
2 parents d564f37 + 637be5a commit b26e9ad
Show file tree
Hide file tree
Showing 11 changed files with 382 additions and 219 deletions.
8 changes: 5 additions & 3 deletions backend/server/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,11 @@ app.use("/notifications", notifications);
app.use("/users", users);

// Cron - Cloud Function usage
cron.schedule("0 0 0 * * *", function () {
// Run at 00:00:00
logger.warn("It's 00:00. Resetting all user hug counts :)");
cron.schedule("0 0 8 * * *", function () {
// Run at 00:00:00 (00:00 PST) == (08:00 UTC)
let d = new Date(Date.now());
let timeString = d.toTimeString();
logger.warn(`It's ${timeString}. Resetting all user hug counts :)`);
CloudFunctionsAPI.resetUserHugCounts();
});

Expand Down
11 changes: 11 additions & 0 deletions frontend/.expo-shared/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
> Why do I have a folder named ".expo-shared" in my project?
The ".expo-shared" folder is created when running commands that produce state that is intended to be shared with all developers on the project. For example, "npx expo-optimize".

> What does the "assets.json" file contain?
The "assets.json" file describes the assets that have been optimized through "expo-optimize" and do not need to be processed again.

> Should I commit the ".expo-shared" folder?
Yes, you should share the ".expo-shared" folder with your collaborators.
17 changes: 10 additions & 7 deletions frontend/app.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"expo": {
"name": "fouro-application",
"slug": "fouro-application",
"name": "Fouro",
"slug": "fouro",
"version": "1.0.0",
"orientation": "portrait",
"icon": "./assets/icon.png",
"icon": "./assets/images/icon.png",
"splash": {
"image": "./assets/splash.png",
"image": "./assets/images/splash.png",
"resizeMode": "contain",
"backgroundColor": "#ffffff"
},
Expand All @@ -30,12 +30,15 @@
},
"android": {
"adaptiveIcon": {
"foregroundImage": "./assets/adaptive-icon.png",
"foregroundImage": "./assets/images/adaptive-icon.png",
"backgroundColor": "#FFFFFF"
}
},
"package": "com.teamcafe.fouro"
},
"web": {
"favicon": "./assets/favicon.png"
}
},
"description": "Fouro is an iOS/Android application that allows you to send virtual hugs to friends and feel close and connected to others. Fouro will help remind you to reach out to friends you haven't connected with in a while as well as serve as a platform to share and store memories together. Send and receive hugs with friends and stay socially connected to loved ones around you!\n",
"githubUrl": "https://github.com/evansuong/fouro-application"
}
}
Binary file removed frontend/assets/adaptive-icon.png
Binary file not shown.
Binary file removed frontend/assets/icon.png
Binary file not shown.
Binary file added frontend/assets/images/adaptive-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/assets/images/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/assets/images/splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed frontend/assets/splash.png
Binary file not shown.
2 changes: 1 addition & 1 deletion frontend/src/API.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import axios from "axios";

const server = "http://192.168.50.7:3000";
const server = "http://54.244.107.90:3000"; // AWS server

const onAccept = (res, response) => {
// console.log('API 6 accepting');
Expand Down
Loading

0 comments on commit b26e9ad

Please sign in to comment.